From 03fa5c7f2f8517c0f4ccc5b5c807028570f91d1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Dr=C4=85g?= Date: Sun, 24 Jul 2016 20:59:11 +0200 Subject: [PATCH 0001/1316] Add Language headers to po files Future versions of gettext will fail if this header is missing. --- po/ca@valencia.po | 2 +- po/oc.po | 2 +- po/rw.po | 1 - po/sl.po | 2 +- po/sr@latin.po | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/po/ca@valencia.po b/po/ca@valencia.po index bcd017a4..63b334fb 100644 --- a/po/ca@valencia.po +++ b/po/ca@valencia.po @@ -15,7 +15,7 @@ msgstr "" "PO-Revision-Date: 2014-10-13 00:01+0200\n" "Last-Translator: JoanColl \n" "Language-Team: Catalan \n" -"Language: ca-XV\n" +"Language: ca@valencia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bits\n" diff --git a/po/oc.po b/po/oc.po index a2e46d14..81f981e9 100644 --- a/po/oc.po +++ b/po/oc.po @@ -11,7 +11,7 @@ msgstr "" "PO-Revision-Date: 2016-03-17 22:33+0100\n" "Last-Translator: Cédric Valmary (totenoc.eu) \n" "Language-Team: Tot En Òc\n" -"Language: fr\n" +"Language: oc\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/rw.po b/po/rw.po index 01cc3805..0dbcbb22 100644 --- a/po/rw.po +++ b/po/rw.po @@ -23,7 +23,6 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"ULL NAME \n" #: meld.desktop.in.h:1 #, fuzzy diff --git a/po/sl.po b/po/sl.po index 0c10e6af..8a1cd8f3 100644 --- a/po/sl.po +++ b/po/sl.po @@ -13,7 +13,7 @@ msgstr "" "PO-Revision-Date: 2015-03-24 19:50+0100\n" "Last-Translator: Matej Urbančič \n" "Language-Team: Slovenian GNOME Translation Team \n" -"Language: sl_SI\n" +"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/sr@latin.po b/po/sr@latin.po index de30f9d5..eb3fd05e 100644 --- a/po/sr@latin.po +++ b/po/sr@latin.po @@ -14,7 +14,7 @@ msgstr "" "PO-Revision-Date: 2016-03-09 09:19+0200\n" "Last-Translator: Miroslav Nikolić \n" "Language-Team: Serbian <(nothing)>\n" -"Language: sr\n" +"Language: sr@latin\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" From 47e95cd9652df91fe1b497bad1bc2266f1f14513 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sat, 30 Jul 2016 08:09:14 +1000 Subject: [PATCH 0002/1316] vc._vc: Add binary output support to Vc.run() --- meld/vc/_vc.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meld/vc/_vc.py b/meld/vc/_vc.py index d0499e16..61130e75 100644 --- a/meld/vc/_vc.py +++ b/meld/vc/_vc.py @@ -144,18 +144,22 @@ def __init__(self, path): self._tree_meta_cache = {} self._tree_missing_cache = collections.defaultdict(set) - def run(self, *args): + def run(self, *args, use_locale_encoding=True): """Return subprocess running VC with `args` at VC's location For example, `git_vc.run('log', '-p')` will run `git log -p` and return the subprocess object. + If use_locale_encoding is True, the return value is a unicode + text stream with universal newlines. If use_locale_encoding is + False, the return value is a binary stream. + Note that this runs at the *location*, not at the *root*. """ cmd = (self.CMD,) + args return subprocess.Popen( cmd, cwd=self.location, stdout=subprocess.PIPE, - universal_newlines=True) + universal_newlines=use_locale_encoding) def get_files_to_commit(self, paths): """Get a list of files that will be committed from paths From c1d703f0ee61822fd2c32fbd5df83728a4045e60 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sat, 30 Jul 2016 08:10:01 +1000 Subject: [PATCH 0003/1316] vc: Fix git's remerge helpers for py3k --- meld/vc/_vc.py | 10 +++++----- meld/vc/git.py | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meld/vc/_vc.py b/meld/vc/_vc.py index 61130e75..d87628ed 100644 --- a/meld/vc/_vc.py +++ b/meld/vc/_vc.py @@ -427,11 +427,11 @@ def call(cmd, cwd=None): base_re = re.compile( - r"^<{7}.*?$\r?\n(?P.*?)" - r"^\|{7}.*?$\r?\n(?P.*?)" - r"^={7}.*?$\r?\n(?P.*?)" - r"^>{7}.*?$\r?\n", flags=re.DOTALL | re.MULTILINE) + br"^<{7}.*?$\r?\n(?P.*?)" + br"^\|{7}.*?$\r?\n(?P.*?)" + br"^={7}.*?$\r?\n(?P.*?)" + br"^>{7}.*?$\r?\n", flags=re.DOTALL | re.MULTILINE) def base_from_diff3(merged): - return base_re.sub(r"==== BASE ====\n\g==== BASE ====\n", merged) + return base_re.sub(br"==== BASE ====\n\g==== BASE ====\n", merged) diff --git a/meld/vc/git.py b/meld/vc/git.py index 7f86457a..c36fbc3d 100644 --- a/meld/vc/git.py +++ b/meld/vc/git.py @@ -187,7 +187,7 @@ def remerge_with_ancestor(self, local, base, remote): pre-merged result everywhere that has no conflict, and the common ancestor anywhere there *is* a conflict. """ - proc = self.run("merge-file", "-p", "--diff3", local, base, remote) + proc = self.run("merge-file", "-p", "--diff3", local, base, remote, universal_newlines=False) vc_file = io.BytesIO( _vc.base_from_diff3(proc.stdout.read())) From c9dd17d65f89b65bf79b70c9c61bf656a5bac91a Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Wed, 3 Aug 2016 07:15:56 +1000 Subject: [PATCH 0004/1316] Remove now-gone meld.util package from setup --- setup.py | 1 - setup_win32.py | 1 - 2 files changed, 2 deletions(-) diff --git a/setup.py b/setup.py index 6055d762..588978b0 100755 --- a/setup.py +++ b/setup.py @@ -31,7 +31,6 @@ packages=[ 'meld', 'meld.ui', - 'meld.util', 'meld.vc', ], package_data={ diff --git a/setup_win32.py b/setup_win32.py index e0a78822..afc07614 100644 --- a/setup_win32.py +++ b/setup_win32.py @@ -131,7 +131,6 @@ packages=[ 'meld', 'meld.ui', - 'meld.util', 'meld.vc', ], package_data={ From bf9fbfa333deb1d8c3e6a11bac8aacbd1742be99 Mon Sep 17 00:00:00 2001 From: Vasily Galkin Date: Wed, 3 Aug 2016 18:34:02 +0300 Subject: [PATCH 0005/1316] Pause reload notifications monitoring during asynchronous save (bgo#759851) Notifications are paused before saving and resumed after both successful and failed saves. This definitely loses reload notifications if another application tries saving file in the same time, but such situation is very racy and notification can be lost before this change too. --- meld/filediff.py | 4 +++- meld/meldbuffer.py | 10 +++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/meld/filediff.py b/meld/filediff.py index 00a672d7..f1888f81 100644 --- a/meld/filediff.py +++ b/meld/filediff.py @@ -1539,6 +1539,7 @@ def on_file_changed_response(msgarea, response_id, *args): # handling the GtkSource.FileSaverError.EXTERNALLY_MODIFIED error if force_overwrite: saver.set_flags(GtkSource.FileSaverFlags.IGNORE_MODIFICATION_TIME) + bufdata.disconnect_monitor() saver.save_async( GLib.PRIORITY_HIGH, callback=self.file_saved_cb, @@ -1549,6 +1550,8 @@ def on_file_changed_response(msgarea, response_id, *args): def file_saved_cb(self, saver, result, user_data): gfile = saver.get_location() pane = user_data[0] + buf = saver.get_buffer() + buf.data.connect_monitor() try: saver.save_finish(result) @@ -1565,7 +1568,6 @@ def file_saved_cb(self, saver, result, user_data): self.state = melddoc.STATE_SAVING_ERROR return - buf = saver.get_buffer() self.emit('file-changed', gfile.get_path()) self.undosequence.checkpoint(buf) buf.data.update_mtime() diff --git a/meld/meldbuffer.py b/meld/meldbuffer.py index 5fec8416..8c0b7632 100644 --- a/meld/meldbuffer.py +++ b/meld/meldbuffer.py @@ -123,7 +123,7 @@ def reset(self, gfile): self.savefile = None def __del__(self): - self._disconnect_monitor() + self.disconnect_monitor() @property def label(self): @@ -139,14 +139,14 @@ def label(self, value): return self._label = value - def _connect_monitor(self): + def connect_monitor(self): if not self._gfile: return monitor = self._gfile.monitor_file(Gio.FileMonitorFlags.NONE, None) handler_id = monitor.connect('changed', self._handle_file_change) self._monitor = monitor, handler_id - def _disconnect_monitor(self): + def disconnect_monitor(self): if not self._monitor: return monitor, handler_id = self._monitor @@ -176,7 +176,7 @@ def gfile(self): @gfile.setter def gfile(self, value): - self._disconnect_monitor() + self.disconnect_monitor() self._gfile = value self._sourcefile = GtkSource.File() self._sourcefile.set_location(value) @@ -186,7 +186,7 @@ def gfile(self, value): # FIXME: maintaining previous comment above; this is now wrong in different awful ways self.filename = value.get_path() if value else None self.update_mtime() - self._connect_monitor() + self.connect_monitor() @property def sourcefile(self): From 3afd4335f666498297f2043b0c86029dfa56f8ee Mon Sep 17 00:00:00 2001 From: Tiago Santos Date: Sun, 14 Aug 2016 21:26:06 +0000 Subject: [PATCH 0006/1316] Updated Portuguese translation --- po/pt.po | 450 +++++++++++++++++++++++++------------------------------ 1 file changed, 201 insertions(+), 249 deletions(-) diff --git a/po/pt.po b/po/pt.po index f63ce267..4760cac3 100644 --- a/po/pt.po +++ b/po/pt.po @@ -3,14 +3,14 @@ # This file is distributed under the same license as the meld package. # Duarte Loreto , 2003. # Pedro Albuquerque , 2015. -# Tiago Santos , 2015, 2016. +# Tiago Santos , 2014 - 2016. # msgid "" msgstr "" "Project-Id-Version: 2.6\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=meld&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-05-01 20:45+0000\n" +"POT-Creation-Date: 2016-07-29 22:12+0000\n" "PO-Revision-Date: 2016-05-04 20:37+0100\n" "Last-Translator: Tiago Santos \n" "Language-Team: Duarte Loreto \n" @@ -21,20 +21,16 @@ msgstr "" "X-Generator: Poedit 1.5.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../bin/meld:144 +#: ../bin/meld:142 msgid "Cannot import: " msgstr "Impossível importar:" -#: ../bin/meld:147 +#: ../bin/meld:145 #, c-format msgid "Meld requires %s or higher." msgstr "O Meld requer o %s ou superior." -#: ../bin/meld:151 -msgid "Meld does not support Python 3." -msgstr "O Meld não suporta Python 3." - -#: ../bin/meld:200 +#: ../bin/meld:194 #, c-format msgid "" "Couldn't load Meld-specific CSS (%s)\n" @@ -566,7 +562,7 @@ msgstr "Copiar para a direita" msgid "Delete selected" msgstr "Apagar selecção" -#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:860 ../meld/filediff.py:1366 +#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:859 ../meld/filediff.py:1384 msgid "Hide" msgstr "Ocultar %s" @@ -602,7 +598,7 @@ msgstr "Novo" msgid "Show new" msgstr "Apresentar novo" -#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:74 +#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:76 msgid "Modified" msgstr "Alterado" @@ -635,7 +631,7 @@ msgid "_Add" msgstr "_Adicionar" #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11 -#: ../meld/vcview.py:649 +#: ../meld/vcview.py:638 msgid "_Remove" msgstr "_Remover" @@ -657,7 +653,7 @@ msgstr "Mover para _Baixo" #. Create icon and filename CellRenderer #: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35 -#: ../meld/dirdiff.py:374 +#: ../meld/dirdiff.py:373 msgid "Name" msgstr "Nome" @@ -859,8 +855,8 @@ msgstr "Se não gravar, as alterações serão irremediavelmente perdidas." msgid "Close _without Saving" msgstr "Fechar sem gra_Var" -#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:942 ../meld/filediff.py:1432 -#: ../meld/filediff.py:1500 +#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:941 ../meld/filediff.py:1450 +#: ../meld/filediff.py:1518 msgid "_Cancel" msgstr "_Cancelar" @@ -898,7 +894,7 @@ msgstr "" "Alterações feitas aos seguintes documentos serão irremediavelmente " "perdidas:\n" -#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:943 ../meld/filediff.py:1433 +#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:942 ../meld/filediff.py:1451 msgid "_Replace" msgstr "Substitui_R" @@ -946,7 +942,7 @@ msgstr "Formatar como patch" msgid "Copy to Clipboard" msgstr "Copiar para a área de transferência" -#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:149 +#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:144 msgid "Save Patch" msgstr "Gravar patch" @@ -1136,7 +1132,7 @@ msgstr "" "Cada padrão é uma lista de descritores estilo linha de comandos, separados " "por espaços." -#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:104 +#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:103 msgid "File Filters" msgstr "Filtros de Ficheiros" @@ -1176,97 +1172,81 @@ msgid "General" msgstr "Geral" #: ../data/ui/shortcuts.ui.h:2 -#| msgid "New comparison" msgctxt "shortcut window" msgid "New comparison" msgstr "Nova comparação" #: ../data/ui/shortcuts.ui.h:3 -#| msgid "File comparison" msgctxt "shortcut window" msgid "Close a comparison" msgstr "Fechar comparação" #: ../data/ui/shortcuts.ui.h:4 -#| msgid "About Meld" msgctxt "shortcut window" msgid "Quit Meld" msgstr "Sair do Meld" #: ../data/ui/shortcuts.ui.h:5 -#| msgid "Stop the current action" msgctxt "shortcut window" msgid "Stop the current action" msgstr "Parar a ação atual" #: ../data/ui/shortcuts.ui.h:6 -#| msgid "New comparison" msgctxt "shortcut window" msgid "Refresh comparison" msgstr "Atualizar comparação" #: ../data/ui/shortcuts.ui.h:7 -#| msgid "Fullscreen" msgctxt "shortcut window" msgid "Fullscreen" msgstr "Ecrã completo" #: ../data/ui/shortcuts.ui.h:8 -#| msgid "_Tabs" msgctxt "shortcut window" msgid "Tabs" msgstr "Separadores" #: ../data/ui/shortcuts.ui.h:9 -#| msgid "Go to the previous change" msgctxt "shortcut window" msgid "Go to previous tab" msgstr "Ir para o separador anterior" #: ../data/ui/shortcuts.ui.h:10 -#| msgid "Go to the next change" msgctxt "shortcut window" msgid "Go to next tab" msgstr "Ir para o separador seguinte" #: ../data/ui/shortcuts.ui.h:11 -#| msgid "Switch to this tab" msgctxt "shortcut window" msgid "Switch to tab" msgstr "Mudar para o separador" #: ../data/ui/shortcuts.ui.h:12 -#| msgid "Move Tab _Left" msgctxt "shortcut window" msgid "Move tab left" msgstr "Mover separador à es_querda" #: ../data/ui/shortcuts.ui.h:13 -#| msgid "Move Tab _Right" msgctxt "shortcut window" msgid "Move tab right" msgstr "Mover sepa_rador à direita" #: ../data/ui/shortcuts.ui.h:14 -#| msgid "_Changes" msgctxt "shortcut window" msgid "Changes" msgstr "Alterações" #: ../data/ui/shortcuts.ui.h:15 -#| msgid "Go to the previous change" msgctxt "shortcut window" msgid "Go to previous change" msgstr "Ir para a alteração anterior" #: ../data/ui/shortcuts.ui.h:16 -#| msgid "Go to the next change" msgctxt "shortcut window" msgid "Go to next change" msgstr "Ir para a alteração seguinte" #: ../data/ui/shortcuts.ui.h:17 -#| msgid "Edit" msgctxt "shortcut window" msgid "Editing" msgstr "Editar" @@ -1287,7 +1267,6 @@ msgid "Cut" msgstr "Cortar" #: ../data/ui/shortcuts.ui.h:21 -#| msgid "Copy _up" msgctxt "shortcut window" msgid "Copy" msgstr "Copiar" @@ -1298,168 +1277,142 @@ msgid "Paste" msgstr "Colar" #: ../data/ui/shortcuts.ui.h:23 -#| msgid "Find:" msgctxt "shortcut window" msgid "Find" msgstr "Localizar" #: ../data/ui/shortcuts.ui.h:24 -#| msgid "Find Ne_xt" msgctxt "shortcut window" msgid "Find Next" msgstr "Localizar seguinte" #: ../data/ui/shortcuts.ui.h:25 -#| msgid "Find _Previous" msgctxt "shortcut window" msgid "Find Previous" msgstr "Localizar anterior" #: ../data/ui/shortcuts.ui.h:26 -#| msgid "_Replace" msgctxt "shortcut window" msgid "Replace" msgstr "Substituir" #: ../data/ui/shortcuts.ui.h:27 -#| msgid "File comparison" msgctxt "shortcut window" msgid "File comparison" msgstr "Comparação de ficheiros" #: ../data/ui/shortcuts.ui.h:28 -#| msgid "Save the current file" msgctxt "shortcut window" msgid "Save current file" msgstr "Gravar o ficheiro atual" #: ../data/ui/shortcuts.ui.h:29 -#| msgid "Save the current file" msgctxt "shortcut window" msgid "Save current file to new path" msgstr "Gravar o ficheiro num novo caminho" #: ../data/ui/shortcuts.ui.h:30 -#| msgid "Save all files in the current comparison" msgctxt "shortcut window" msgid "Save all files in comparison" msgstr "Gravar todos os ficheiros na comparação" #: ../data/ui/shortcuts.ui.h:31 -#| msgid "Previous Conflict" msgctxt "shortcut window" msgid "Previous conflict" msgstr "Conflito anterior" #: ../data/ui/shortcuts.ui.h:32 -#| msgid "Next Conflict" msgctxt "shortcut window" msgid "Next conflict" msgstr "Conflito seguinte" #: ../data/ui/shortcuts.ui.h:33 -#| msgid "Push current change to the left" msgctxt "shortcut window" msgid "Push change to left" msgstr "Empurrar alteração atual para a esquerda" #: ../data/ui/shortcuts.ui.h:34 -#| msgid "Push current change to the right" msgctxt "shortcut window" msgid "Push change to right" msgstr "Empurrar alteração atual para a direita" #: ../data/ui/shortcuts.ui.h:35 -#| msgid "Pull change from the left" msgctxt "shortcut window" msgid "Pull change from left" msgstr "Puxar alteração da esquerda" #: ../data/ui/shortcuts.ui.h:36 -#| msgid "Pull change from the right" msgctxt "shortcut window" msgid "Pull change from right" msgstr "Puxar alteração da direita" #: ../data/ui/shortcuts.ui.h:37 -#| msgid "Copy change above the left chunk" msgctxt "shortcut window" msgid "Copy change above left" msgstr "Copiar alteração acima do bloco esquerdo" #: ../data/ui/shortcuts.ui.h:38 -#| msgid "Copy change below the left chunk" msgctxt "shortcut window" msgid "Copy change below left" msgstr "Copiar alteração abaixo do bloco esquerdo" #: ../data/ui/shortcuts.ui.h:39 -#| msgid "Copy change above the right chunk" msgctxt "shortcut window" msgid "Copy change above right" msgstr "Copiar alteração acima do bloco direito" #: ../data/ui/shortcuts.ui.h:40 -#| msgid "Copy change below the right chunk" msgctxt "shortcut window" msgid "Copy change below right" msgstr "Copiar alteração abaixo do bloco direito" #: ../data/ui/shortcuts.ui.h:41 -#| msgid "Delete change" msgctxt "shortcut window" msgid "Delete change" msgstr "Eliminar alteração" #: ../data/ui/shortcuts.ui.h:42 -#| msgid "Previous Pane" msgctxt "shortcut window" msgid "Previous comparison pane" msgstr "Painel de comparação anterior" #: ../data/ui/shortcuts.ui.h:43 -#| msgid "New comparison" msgctxt "shortcut window" msgid "Next comparison pane" msgstr "Próximo painel de comparação" #: ../data/ui/shortcuts.ui.h:44 -#| msgid "Folder Comparisons" msgctxt "shortcut window" msgid "Folder comparison" msgstr "Comparação de pastas" #: ../data/ui/shortcuts.ui.h:45 -#| msgid "Copy to left" msgctxt "shortcut window" msgid "Copy to left" msgstr "Copiar para a esquerda" #: ../data/ui/shortcuts.ui.h:46 -#| msgid "Copy to right" msgctxt "shortcut window" msgid "Copy to right" msgstr "Copiar para a direita" #: ../data/ui/shortcuts.ui.h:47 -#| msgid "Start a version control comparison" msgctxt "shortcut window" msgid "Version control comparison" msgstr "Comparação de controlo de versão" #: ../data/ui/shortcuts.ui.h:48 -#| msgid "Commit changes to version control" msgctxt "shortcut window" msgid "Commit to version control" msgstr "Submeter ao controlo de versão" #: ../data/ui/shortcuts.ui.h:49 -#| msgid "Console output" msgctxt "shortcut window" msgid "Show/hide console output" msgstr "Alternar saída da consola" -#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:571 +#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:570 +#: ../meld/newdifftab.py:38 msgid "New comparison" msgstr "Nova comparação" @@ -1607,7 +1560,7 @@ msgstr "Sem _Versão" msgid "Show unversioned files" msgstr "Mostrar ficheiros sem versão" -#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:67 +#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69 msgid "Ignored" msgstr "Ignorado" @@ -1635,7 +1588,7 @@ msgstr "Diários anteriores:" msgid "Co_mmit" msgstr "Co_Mmit" -#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:337 +#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:326 msgid "Location" msgstr "Localização" @@ -1678,44 +1631,44 @@ msgid "Mac OS (CR)" msgstr "Mac OS (CR)" #. Create file size CellRenderer -#: ../meld/dirdiff.py:392 ../meld/preferences.py:82 +#: ../meld/dirdiff.py:391 ../meld/preferences.py:82 msgid "Size" msgstr "Tamanho" #. Create date-time CellRenderer -#: ../meld/dirdiff.py:400 ../meld/preferences.py:83 +#: ../meld/dirdiff.py:399 ../meld/preferences.py:83 msgid "Modification time" msgstr "Hora de modificação" #. Create permissions CellRenderer -#: ../meld/dirdiff.py:408 ../meld/preferences.py:84 +#: ../meld/dirdiff.py:407 ../meld/preferences.py:84 msgid "Permissions" msgstr "Permissões" -#: ../meld/dirdiff.py:538 +#: ../meld/dirdiff.py:537 #, python-format msgid "Hide %s" msgstr "Esconder %s" -#: ../meld/dirdiff.py:670 ../meld/dirdiff.py:694 +#: ../meld/dirdiff.py:669 ../meld/dirdiff.py:693 #, python-format msgid "[%s] Scanning %s" msgstr "[%s] A analizar %s" -#: ../meld/dirdiff.py:827 +#: ../meld/dirdiff.py:826 #, python-format msgid "[%s] Done" msgstr "[%s] Terminado" -#: ../meld/dirdiff.py:835 +#: ../meld/dirdiff.py:834 msgid "Folders have no differences" msgstr "As pastas não têm diferenças" -#: ../meld/dirdiff.py:837 +#: ../meld/dirdiff.py:836 msgid "Contents of scanned files in folders are identical." msgstr "Os conteúdos de ficheiros pesquisados nas pastas são idênticos." -#: ../meld/dirdiff.py:839 +#: ../meld/dirdiff.py:838 msgid "" "Scanned files in folders appear identical, but contents have not been " "scanned." @@ -1723,44 +1676,43 @@ msgstr "" "Os ficheiros pesquisados nas pastas parecem idênticos, mas os conteúdos não " "foram pesquisados." -#: ../meld/dirdiff.py:842 +#: ../meld/dirdiff.py:841 msgid "File filters are in use, so not all files have been scanned." msgstr "" "Os filtros de ficheiros estão em uso, pelo que nem todos os ficheiros foram " "pesquisados." -#: ../meld/dirdiff.py:844 +#: ../meld/dirdiff.py:843 msgid "Text filters are in use and may be masking content differences." msgstr "" "Os filtros de texto estão em uso e podem estar a mascarar diferenças de " "conteúdo." -#: ../meld/dirdiff.py:862 ../meld/filediff.py:1368 ../meld/filediff.py:1398 -#: ../meld/filediff.py:1400 ../meld/ui/msgarea.py:109 -#: ../meld/ui/msgarea.py:122 +#: ../meld/dirdiff.py:861 ../meld/filediff.py:1386 ../meld/filediff.py:1416 +#: ../meld/filediff.py:1418 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 msgid "Hi_de" msgstr "_Ocultar" -#: ../meld/dirdiff.py:872 +#: ../meld/dirdiff.py:871 msgid "Multiple errors occurred while scanning this folder" msgstr "Ocorreram múltiplos erros ao pesquisar esta pasta" -#: ../meld/dirdiff.py:873 +#: ../meld/dirdiff.py:872 msgid "Files with invalid encodings found" msgstr "Encontrados ficheiros com codificação inválida" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:875 +#: ../meld/dirdiff.py:874 msgid "Some files were in an incorrect encoding. The names are something like:" msgstr "" "Alguns ficheiros tinham uma codificação incorreta. Os nomes são algo como:" -#: ../meld/dirdiff.py:877 +#: ../meld/dirdiff.py:876 msgid "Files hidden by case insensitive comparison" msgstr "Ficheiros ocultos por comparação insensível a maiúsculas" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:879 +#: ../meld/dirdiff.py:878 msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. The following files in this folder are hidden:" @@ -1769,17 +1721,17 @@ msgstr "" "ficheiros sensível a maiúsculas. Os seguintes ficheiros nesta pasta estão " "ocultos:" -#: ../meld/dirdiff.py:890 +#: ../meld/dirdiff.py:889 #, python-format msgid "'%s' hidden by '%s'" msgstr "'%s' escondido por '%s'" -#: ../meld/dirdiff.py:946 +#: ../meld/dirdiff.py:945 #, python-format msgid "Replace folder “%s”?" msgstr "Substituir pasta “%s”?" -#: ../meld/dirdiff.py:948 +#: ../meld/dirdiff.py:947 #, python-format msgid "" "Another folder with the same name already exists in “%s”.\n" @@ -1789,11 +1741,11 @@ msgstr "" "Se substituir a pasta existente, todos os ficheiros nela contidos serão " "perdidos." -#: ../meld/dirdiff.py:961 +#: ../meld/dirdiff.py:960 msgid "Error copying file" msgstr "Erro ao copiar o ficheiro" -#: ../meld/dirdiff.py:962 +#: ../meld/dirdiff.py:961 #, python-format msgid "" "Couldn't copy %s\n" @@ -1806,38 +1758,35 @@ msgstr "" "\n" "%s." -#: ../meld/dirdiff.py:985 +#: ../meld/dirdiff.py:984 #, python-format msgid "Error deleting %s" msgstr "Erro ao eliminar %s" -#: ../meld/dirdiff.py:1492 +#: ../meld/dirdiff.py:1489 msgid "No folder" msgstr "Sem pasta" #. Abbreviations for insert and overwrite that fit in the status bar -#: ../meld/filediff.py:357 +#: ../meld/filediff.py:354 msgid "INS" msgstr "INS" -#: ../meld/filediff.py:357 +#: ../meld/filediff.py:354 msgid "OVR" msgstr "SUBS" #. Abbreviation for line, column so that it will fit in the status bar -#: ../meld/filediff.py:359 +#: ../meld/filediff.py:356 #, python-format msgid "Ln %i, Col %i" msgstr "Lin %i, Col %i" -#: ../meld/filediff.py:774 +#: ../meld/filediff.py:781 msgid "Comparison results will be inaccurate" msgstr "Os resultados da comparação serão imprecisos" -#: ../meld/filediff.py:776 -#| msgid "" -#| "Filter “%s” changed the number of lines in the file, which is " -#| "unsupported. The comparison will not be accurate." +#: ../meld/filediff.py:783 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1845,65 +1794,65 @@ msgstr "" "O filtro alterou o número de linhas no ficheiro, o que não é suportado. A " "comparação será imprecisa." -#: ../meld/filediff.py:834 +#: ../meld/filediff.py:841 msgid "Mark conflict as resolved?" msgstr "Marcar conflito como resolvido?" -#: ../meld/filediff.py:836 +#: ../meld/filediff.py:843 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:838 +#: ../meld/filediff.py:845 msgid "Cancel" msgstr "Cancelar" -#: ../meld/filediff.py:839 +#: ../meld/filediff.py:846 msgid "Mark _Resolved" msgstr "Marcar _Resolvido" -#: ../meld/filediff.py:1084 +#: ../meld/filediff.py:1095 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Houve um problema ao abrir o ficheiro \"%s\"." -#: ../meld/filediff.py:1092 +#: ../meld/filediff.py:1103 #, python-format msgid "File %s appears to be a binary file." msgstr "%s parece ser um ficheiro binário." -#: ../meld/filediff.py:1094 +#: ../meld/filediff.py:1105 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:1096 +#: ../meld/filediff.py:1107 msgid "Open" msgstr "Abrir" -#: ../meld/filediff.py:1112 +#: ../meld/filediff.py:1123 #, python-format msgid "[%s] Computing differences" msgstr "[%s] A calcular diferenças" -#: ../meld/filediff.py:1177 +#: ../meld/filediff.py:1188 #, python-format msgid "File %s has changed on disk" msgstr "O ficheiro %s foi alterado no disco" -#: ../meld/filediff.py:1178 +#: ../meld/filediff.py:1189 msgid "Do you want to reload the file?" msgstr "Quer recarregar o ficheiro?" -#: ../meld/filediff.py:1180 +#: ../meld/filediff.py:1191 msgid "_Reload" msgstr "_Recarregar" -#: ../meld/filediff.py:1331 +#: ../meld/filediff.py:1349 msgid "Files are identical" msgstr "Os ficheiros são idênticos" -#: ../meld/filediff.py:1344 +#: ../meld/filediff.py:1362 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1911,11 +1860,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:1349 +#: ../meld/filediff.py:1367 msgid "Files differ in line endings only" msgstr "Os ficheiros só diferem nos fins de linha" -#: ../meld/filediff.py:1351 +#: ../meld/filediff.py:1369 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1924,15 +1873,15 @@ msgstr "" "Os ficheiros são idênticos, exceto por diferentes fins de linha:\n" "%s" -#: ../meld/filediff.py:1371 +#: ../meld/filediff.py:1389 msgid "Show without filters" msgstr "Mostrar sem filtros" -#: ../meld/filediff.py:1393 +#: ../meld/filediff.py:1411 msgid "Change highlighting incomplete" msgstr "Alterar realce incompleto" -#: ../meld/filediff.py:1394 +#: ../meld/filediff.py:1412 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." @@ -1941,20 +1890,20 @@ msgstr "" "forçar o Meld para demorar mais a realçar alterações grandes, mas pode ser " "lento." -#: ../meld/filediff.py:1402 +#: ../meld/filediff.py:1420 msgid "Keep highlighting" msgstr "Manter realce" -#: ../meld/filediff.py:1404 +#: ../meld/filediff.py:1422 msgid "_Keep highlighting" msgstr "_Manter realce" -#: ../meld/filediff.py:1436 +#: ../meld/filediff.py:1454 #, python-format msgid "Replace file “%s”?" msgstr "Substituir ficheiro “%s”?" -#: ../meld/filediff.py:1438 +#: ../meld/filediff.py:1456 #, python-format msgid "" "A file with this name already exists in “%s”.\n" @@ -1963,45 +1912,45 @@ msgstr "" "Um ficheiro com este nome já existe em \"%s\".\n" "Se substituir o ficheiro existente, o seu conteúdo será perdido." -#: ../meld/filediff.py:1455 +#: ../meld/filediff.py:1473 msgid "Save Left Pane As" msgstr "Gravar painel esquerdo como" -#: ../meld/filediff.py:1457 +#: ../meld/filediff.py:1475 msgid "Save Middle Pane As" msgstr "Gravar painel central como" -#: ../meld/filediff.py:1459 +#: ../meld/filediff.py:1477 msgid "Save Right Pane As" msgstr "Gravar painel direito como" -#: ../meld/filediff.py:1473 +#: ../meld/filediff.py:1491 #, 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:1475 +#: ../meld/filediff.py:1493 msgid "If you save it, any external changes will be lost." msgstr "Se o gravar, todas as alterações externas serão perdidas." -#: ../meld/filediff.py:1478 +#: ../meld/filediff.py:1496 msgid "Save Anyway" msgstr "Gravar mesmo assim" -#: ../meld/filediff.py:1479 +#: ../meld/filediff.py:1497 msgid "Don't Save" msgstr "Não gravar" -#: ../meld/filediff.py:1501 +#: ../meld/filediff.py:1519 msgid "_Save as UTF-8" msgstr "Gravar como UTF-8" -#: ../meld/filediff.py:1504 +#: ../meld/filediff.py:1522 #, python-format msgid "Couldn't encode text as “%s”" msgstr "Impossível codificar texto como \"%s\"" -#: ../meld/filediff.py:1506 +#: ../meld/filediff.py:1524 #, python-format msgid "" "File “%s” contains characters that can't be encoded using encoding “%s”.\n" @@ -2011,12 +1960,12 @@ msgstr "" "\".\n" "Quer gravar como UTF-8?" -#: ../meld/filediff.py:1543 ../meld/patchdialog.py:125 +#: ../meld/filediff.py:1561 ../meld/patchdialog.py:120 #, python-format msgid "Could not save file %s." msgstr "Impossível gravar o ficheiro %s." -#: ../meld/filediff.py:1544 ../meld/patchdialog.py:126 +#: ../meld/filediff.py:1562 ../meld/patchdialog.py:121 #, python-format msgid "" "Couldn't save file due to:\n" @@ -2025,11 +1974,11 @@ msgstr "" "Impossível gravar o ficheiro porque:\n" "%s" -#: ../meld/filediff.py:1890 +#: ../meld/filediff.py:1908 msgid "Live comparison updating disabled" msgstr "Atualização ao vivo da comparação desativada" -#: ../meld/filediff.py:1891 +#: ../meld/filediff.py:1909 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -2052,99 +2001,99 @@ msgstr "Copiar a_Cima" msgid "Copy _down" msgstr "Copiar a_Baixo" -#: ../meld/meldapp.py:177 +#: ../meld/meldapp.py:175 msgid "wrong number of arguments supplied to --diff" msgstr "número errado de argumentos fornecidos a --diff" -#: ../meld/meldapp.py:182 +#: ../meld/meldapp.py:180 msgid "Start with an empty window" msgstr "Começar com uma janela vazia" -#: ../meld/meldapp.py:183 ../meld/meldapp.py:185 +#: ../meld/meldapp.py:181 ../meld/meldapp.py:183 msgid "file" msgstr "ficheiro" -#: ../meld/meldapp.py:183 ../meld/meldapp.py:187 +#: ../meld/meldapp.py:181 ../meld/meldapp.py:185 msgid "folder" msgstr "pasta" -#: ../meld/meldapp.py:184 +#: ../meld/meldapp.py:182 msgid "Start a version control comparison" msgstr "Começar uma comparação de controlo de versão" -#: ../meld/meldapp.py:186 +#: ../meld/meldapp.py:184 msgid "Start a 2- or 3-way file comparison" msgstr "Começar uma comparação de ficheiros de duas ou três vias" -#: ../meld/meldapp.py:188 +#: ../meld/meldapp.py:186 msgid "Start a 2- or 3-way folder comparison" msgstr "Começar uma comparação de pastas de duas ou três vias" -#: ../meld/meldapp.py:231 +#: ../meld/meldapp.py:229 #, python-format msgid "Error: %s\n" msgstr "Erro: %s\n" -#: ../meld/meldapp.py:238 +#: ../meld/meldapp.py:236 msgid "Meld is a file and directory comparison tool." msgstr "O Meld é uma ferramenta de comparação de ficheiros e pastas." -#: ../meld/meldapp.py:242 +#: ../meld/meldapp.py:240 msgid "Set label to use instead of file name" msgstr "Definir rótulo a usar em vez do nome de ficheiro" -#: ../meld/meldapp.py:245 +#: ../meld/meldapp.py:243 msgid "Open a new tab in an already running instance" msgstr "Abrir novo separador numa instância já em execução" -#: ../meld/meldapp.py:248 +#: ../meld/meldapp.py:246 msgid "Automatically compare all differing files on startup" msgstr "Comparar automaticamente todos os ficheiros diferentes no arranque" -#: ../meld/meldapp.py:251 +#: ../meld/meldapp.py:249 msgid "Ignored for compatibility" msgstr "Ignorado para compatibilidade" -#: ../meld/meldapp.py:255 +#: ../meld/meldapp.py:253 msgid "Set the target file for saving a merge result" msgstr "Definir ficheiro destino para gravar o resultado de uma união" -#: ../meld/meldapp.py:258 +#: ../meld/meldapp.py:256 msgid "Automatically merge files" msgstr "Unir ficheiros automaticamente" -#: ../meld/meldapp.py:262 +#: ../meld/meldapp.py:260 msgid "Load a saved comparison from a Meld comparison file" msgstr "Carregar uma comparação gravada de um ficheiro do Meld" -#: ../meld/meldapp.py:266 +#: ../meld/meldapp.py:264 msgid "Create a diff tab for the supplied files or folders" msgstr "Criar um separador Diff para os ficheiros/pastas selecionados" -#: ../meld/meldapp.py:286 +#: ../meld/meldapp.py:284 #, python-format msgid "too many arguments (wanted 0-3, got %d)" msgstr "demasiados argumentos (desejados 0-3, obtidos %d)" -#: ../meld/meldapp.py:289 +#: ../meld/meldapp.py:287 msgid "can't auto-merge less than 3 files" msgstr "impossível unir automaticamente menos de 3 ficheiros" -#: ../meld/meldapp.py:291 +#: ../meld/meldapp.py:289 msgid "can't auto-merge directories" msgstr "impossível unir automaticamente pastas" -#: ../meld/meldapp.py:305 +#: ../meld/meldapp.py:303 msgid "Error reading saved comparison file" msgstr "Erro ao ler ficheiro de comparação gravado" -#: ../meld/meldapp.py:332 +#: ../meld/meldapp.py:330 #, python-format msgid "invalid path or URI \"%s\"" msgstr "Caminho ou URI inválido \"%s\"" #. TRANSLATORS: This is the label of a new, currently-unnamed file. -#: ../meld/meldbuffer.py:132 +#: ../meld/meldbuffer.py:131 msgid "" msgstr "" @@ -2152,207 +2101,207 @@ msgstr "" msgid "untitled" msgstr "sem título" -#: ../meld/meldwindow.py:49 +#: ../meld/meldwindow.py:48 msgid "_File" msgstr "_Ficheiro" -#: ../meld/meldwindow.py:50 +#: ../meld/meldwindow.py:49 msgid "_New Comparison..." msgstr "_Nova comparação..." -#: ../meld/meldwindow.py:51 +#: ../meld/meldwindow.py:50 msgid "Start a new comparison" msgstr "Iniciar uma nova comparação" -#: ../meld/meldwindow.py:54 +#: ../meld/meldwindow.py:53 msgid "Save the current file" msgstr "Gravar o ficheiro atual" -#: ../meld/meldwindow.py:56 +#: ../meld/meldwindow.py:55 msgid "Save As..." msgstr "Gravar como..." -#: ../meld/meldwindow.py:57 +#: ../meld/meldwindow.py:56 msgid "Save the current file with a different name" msgstr "Gravar o ficheiro atual com um nome diferente" -#: ../meld/meldwindow.py:60 +#: ../meld/meldwindow.py:59 msgid "Close the current file" msgstr "Fechar o ficheiro atual" -#: ../meld/meldwindow.py:63 +#: ../meld/meldwindow.py:62 msgid "_Edit" msgstr "_Editar" -#: ../meld/meldwindow.py:65 +#: ../meld/meldwindow.py:64 msgid "Undo the last action" msgstr "Desfazer a última ação" -#: ../meld/meldwindow.py:68 +#: ../meld/meldwindow.py:67 msgid "Redo the last undone action" msgstr "Refazer a última ação desfeita" -#: ../meld/meldwindow.py:70 +#: ../meld/meldwindow.py:69 msgid "Cut the selection" msgstr "Cortar a seleção" -#: ../meld/meldwindow.py:72 +#: ../meld/meldwindow.py:71 msgid "Copy the selection" msgstr "Copiar a seleção" -#: ../meld/meldwindow.py:74 +#: ../meld/meldwindow.py:73 msgid "Paste the clipboard" msgstr "Colar a área de transferência" -#: ../meld/meldwindow.py:76 +#: ../meld/meldwindow.py:75 msgid "Find..." msgstr "Localizar..." -#: ../meld/meldwindow.py:76 +#: ../meld/meldwindow.py:75 msgid "Search for text" msgstr "Procurar texto" -#: ../meld/meldwindow.py:78 +#: ../meld/meldwindow.py:77 msgid "Find Ne_xt" msgstr "Localizar segui_Nte" -#: ../meld/meldwindow.py:79 +#: ../meld/meldwindow.py:78 msgid "Search forwards for the same text" msgstr "Procura o mesmo texto para a frente" -#: ../meld/meldwindow.py:81 +#: ../meld/meldwindow.py:80 msgid "Find _Previous" msgstr "Localizar _Anterior" -#: ../meld/meldwindow.py:82 +#: ../meld/meldwindow.py:81 msgid "Search backwards for the same text" msgstr "Procura o mesmo texto para trás" -#: ../meld/meldwindow.py:85 +#: ../meld/meldwindow.py:84 msgid "_Replace..." msgstr "Substitui_R..." -#: ../meld/meldwindow.py:86 +#: ../meld/meldwindow.py:85 msgid "Find and replace text" msgstr "Localizar e substituir texto" -#: ../meld/meldwindow.py:89 +#: ../meld/meldwindow.py:88 msgid "_Changes" msgstr "_Alterações" -#: ../meld/meldwindow.py:90 +#: ../meld/meldwindow.py:89 msgid "Next Change" msgstr "Alteração seguinte" -#: ../meld/meldwindow.py:91 +#: ../meld/meldwindow.py:90 msgid "Go to the next change" msgstr "Ir para a alteração seguinte" -#: ../meld/meldwindow.py:93 +#: ../meld/meldwindow.py:92 msgid "Previous Change" msgstr "Alteração anterior" -#: ../meld/meldwindow.py:94 +#: ../meld/meldwindow.py:93 msgid "Go to the previous change" msgstr "Ir para a alteração anterior" -#: ../meld/meldwindow.py:96 +#: ../meld/meldwindow.py:95 msgid "Open Externally" msgstr "Abrir externamente" -#: ../meld/meldwindow.py:97 +#: ../meld/meldwindow.py:96 msgid "Open selected file or directory in the default external application" msgstr "Abrir ficheiro ou pasta selecionados na aplicação externa predefinida" -#: ../meld/meldwindow.py:101 +#: ../meld/meldwindow.py:100 msgid "_View" msgstr "_Ver" -#: ../meld/meldwindow.py:102 +#: ../meld/meldwindow.py:101 msgid "File Status" msgstr "Estado do ficheiro" -#: ../meld/meldwindow.py:103 +#: ../meld/meldwindow.py:102 msgid "Version Status" msgstr "Estado da versão" -#: ../meld/meldwindow.py:106 +#: ../meld/meldwindow.py:105 msgid "Stop the current action" msgstr "Parar a ação atual" -#: ../meld/meldwindow.py:109 +#: ../meld/meldwindow.py:108 msgid "Refresh the view" msgstr "Atualizar a vista" -#: ../meld/meldwindow.py:113 +#: ../meld/meldwindow.py:112 msgid "Fullscreen" msgstr "Ecrã completo" -#: ../meld/meldwindow.py:114 +#: ../meld/meldwindow.py:113 msgid "View the comparison in fullscreen" msgstr "Ver a comparação em ecrã completo" -#: ../meld/meldwindow.py:116 +#: ../meld/meldwindow.py:115 msgid "_Toolbar" msgstr "Barra de ferramen_Tas" -#: ../meld/meldwindow.py:117 +#: ../meld/meldwindow.py:116 msgid "Show or hide the toolbar" msgstr "Mostrar ou ocultar a barra de ferramentas" -#: ../meld/meldwindow.py:127 +#: ../meld/meldwindow.py:126 msgid "Open Recent" msgstr "Abrir recentes" -#: ../meld/meldwindow.py:128 +#: ../meld/meldwindow.py:127 msgid "Open recent files" msgstr "Abrir ficheiros recentes" -#: ../meld/meldwindow.py:150 +#: ../meld/meldwindow.py:149 msgid "_Meld" msgstr "_Meld" -#: ../meld/meldwindow.py:151 +#: ../meld/meldwindow.py:150 msgid "Quit the program" msgstr "Sair do programa" -#: ../meld/meldwindow.py:153 +#: ../meld/meldwindow.py:152 msgid "Prefere_nces" msgstr "Preferê_Ncias" -#: ../meld/meldwindow.py:154 +#: ../meld/meldwindow.py:153 msgid "Configure the application" msgstr "Configurar a aplicação" -#: ../meld/meldwindow.py:156 +#: ../meld/meldwindow.py:155 msgid "_Contents" msgstr "_Conteúdo" -#: ../meld/meldwindow.py:157 +#: ../meld/meldwindow.py:156 msgid "Open the Meld manual" msgstr "Abrir o manual do Meld" -#: ../meld/meldwindow.py:159 +#: ../meld/meldwindow.py:158 msgid "About this application" msgstr "Acerca desta aplicação" -#: ../meld/meldwindow.py:605 +#: ../meld/meldwindow.py:604 #, python-format msgid "Need three files to auto-merge, got: %r" msgstr "Necessários três ficheiros para união automática, obtidos %r" -#: ../meld/meldwindow.py:619 +#: ../meld/meldwindow.py:618 msgid "Cannot compare a mixture of files and directories" msgstr "Impossível comparar uma mistura de ficheiros e pastas" -#: ../meld/misc.py:202 +#: ../meld/misc.py:203 #, python-format msgid "Couldn't find colour scheme details for %s-%s; this is a bad install" msgstr "" "Impossível encontrar detalhes do esquema de cores para %s-%s; má instalação" #. no common path. empty names get changed to "[None]" -#: ../meld/misc.py:287 +#: ../meld/misc.py:263 msgid "[None]" msgstr "[Nenhum]" @@ -2364,7 +2313,7 @@ msgstr "rótulo" msgid "pattern" msgstr "padrão" -#: ../meld/recent.py:115 +#: ../meld/recent.py:114 msgid "Version control:" msgstr "Controlo de versão:" @@ -2372,43 +2321,43 @@ msgstr "Controlo de versão:" msgid "Close tab" msgstr "Fechar separador" -#: ../meld/ui/vcdialogs.py:50 +#: ../meld/ui/vcdialogs.py:48 msgid "No files will be committed" msgstr "Não serão submetidos nenhuns ficheiros" #. Translators: First %s is replaced by translated "%d unpushed #. commits", second %s is replaced by translated "%d branches" -#: ../meld/vc/git.py:95 +#: ../meld/vc/git.py:94 #, python-format msgid "%s in %s" msgstr "%s commits não submetidos em %s ramos" #. Translators: These messages cover the case where there is #. only one branch, and are not part of another message. -#: ../meld/vc/git.py:96 ../meld/vc/git.py:103 +#: ../meld/vc/git.py:95 ../meld/vc/git.py:102 #, python-format msgid "%d unpushed commit" msgid_plural "%d unpushed commits" msgstr[0] "%d commit não empurrado" msgstr[1] "%d commits não empurrados" -#: ../meld/vc/git.py:98 +#: ../meld/vc/git.py:97 #, python-format msgid "%d branch" msgid_plural "%d branches" msgstr[0] "%d ramo" msgstr[1] "%d ramos" -#: ../meld/vc/git.py:352 +#: ../meld/vc/git.py:330 #, python-format msgid "Mode changed from %s to %s" msgstr "Modo alterado de %s para %s" -#: ../meld/vc/git.py:360 +#: ../meld/vc/git.py:338 msgid "Partially staged" msgstr "Parcialmente em estágio" -#: ../meld/vc/git.py:360 +#: ../meld/vc/git.py:338 msgid "Staged" msgstr "Em estágio" @@ -2418,140 +2367,140 @@ msgstr "Em estágio" msgid "None" msgstr "Nenhum" -#: ../meld/vc/svn.py:216 +#: ../meld/vc/svn.py:204 #, python-format msgid "Rev %s" msgstr "Rev %s" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Merged" msgstr "Unidos" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Base" msgstr "Base" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Local" msgstr "Local" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Remote" msgstr "Remoto" -#: ../meld/vc/_vc.py:68 +#: ../meld/vc/_vc.py:70 msgid "Unversioned" msgstr "Sem versão" -#: ../meld/vc/_vc.py:71 +#: ../meld/vc/_vc.py:73 msgid "Error" msgstr "Erro" -#: ../meld/vc/_vc.py:73 +#: ../meld/vc/_vc.py:75 msgid "Newly added" msgstr "Recentemente adicionados" -#: ../meld/vc/_vc.py:75 +#: ../meld/vc/_vc.py:77 msgid "Renamed" msgstr "Renomeados" -#: ../meld/vc/_vc.py:76 +#: ../meld/vc/_vc.py:78 msgid "Conflict" msgstr "Conflito" -#: ../meld/vc/_vc.py:77 +#: ../meld/vc/_vc.py:79 msgid "Removed" msgstr "Removido" -#: ../meld/vc/_vc.py:78 +#: ../meld/vc/_vc.py:80 msgid "Missing" msgstr "Em falta" -#: ../meld/vc/_vc.py:79 +#: ../meld/vc/_vc.py:81 msgid "Not present" msgstr "Não presentes" #. Translators: This error message is shown when a version #. control binary isn't installed. -#: ../meld/vcview.py:255 +#: ../meld/vcview.py:245 #, python-format msgid "%(name)s (%(cmd)s not installed)" msgstr "%(name)s (%(cmd)s não instalado)" #. Translators: This error message is shown when a version #. controlled repository is invalid. -#: ../meld/vcview.py:259 +#: ../meld/vcview.py:249 #, python-format msgid "%(name)s (Invalid repository)" msgstr "%(name)s (repositório inválido)" -#: ../meld/vcview.py:280 +#: ../meld/vcview.py:270 msgid "No valid version control system found in this folder" msgstr "Não se encontrou um sistema de controlo de versão válido nesta pasta" -#: ../meld/vcview.py:282 +#: ../meld/vcview.py:272 msgid "Only one version control system found in this folder" msgstr "Só se encontrou um sistema de controlo de versão válido nesta pasta" -#: ../meld/vcview.py:284 +#: ../meld/vcview.py:274 msgid "Choose which version control system to use" msgstr "Escolha qual o sistema de controlo de versão a usar" #. TRANSLATORS: This is the location of the directory being viewed -#: ../meld/vcview.py:337 +#: ../meld/vcview.py:326 #, python-format msgid "%s: %s" msgstr "%s: %s" -#: ../meld/vcview.py:357 +#: ../meld/vcview.py:346 #, python-format msgid "Scanning %s" msgstr "A analisar %s" -#: ../meld/vcview.py:396 +#: ../meld/vcview.py:385 msgid "(Empty)" msgstr "(Vazio)" -#: ../meld/vcview.py:440 +#: ../meld/vcview.py:429 #, python-format msgid "%s — local" msgstr "%s — local" -#: ../meld/vcview.py:441 +#: ../meld/vcview.py:430 #, python-format msgid "%s — remote" msgstr "%s — remoto" -#: ../meld/vcview.py:449 +#: ../meld/vcview.py:438 #, python-format msgid "%s (local, merge, remote)" msgstr "%s (local, unir, remoto)" -#: ../meld/vcview.py:454 +#: ../meld/vcview.py:443 #, python-format msgid "%s (remote, merge, local)" msgstr "%s (remoto, unir, local)" -#: ../meld/vcview.py:465 +#: ../meld/vcview.py:454 #, python-format msgid "%s — repository" msgstr "%s — repositório" -#: ../meld/vcview.py:471 +#: ../meld/vcview.py:460 #, python-format msgid "%s (working, repository)" msgstr "%s (trabalho, repositório)" -#: ../meld/vcview.py:475 +#: ../meld/vcview.py:464 #, python-format msgid "%s (repository, working)" msgstr "%s (repositório, trabalho)" -#: ../meld/vcview.py:643 +#: ../meld/vcview.py:632 msgid "Remove folder and all its files?" msgstr "Remover pasta e todos os ficheiros?" -#: ../meld/vcview.py:645 +#: ../meld/vcview.py:634 msgid "" "This will remove all selected files and folders, and all files within any " "selected folders, from version control." @@ -2559,15 +2508,18 @@ msgstr "" "Isto vai remover todos os ficheiros e pastas selecionados e todos os " "ficheiros dentro das pastas selecionadas do controlo de versão." -#: ../meld/vcview.py:670 +#: ../meld/vcview.py:659 #, python-format msgid "Error removing %s" msgstr "Erro ao remover %s" -#: ../meld/vcview.py:750 +#: ../meld/vcview.py:739 msgid "Clear" msgstr "Limpar" +#~ msgid "Meld does not support Python 3." +#~ msgstr "O Meld não suporta Python 3." + #~ msgid "_Previous Tab" #~ msgstr "Se_Parador anterior" From 805b04dc21a15c7397fc30914d74fd584f566a5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Urban=C4=8Di=C4=8D?= Date: Thu, 18 Aug 2016 23:15:45 +0200 Subject: [PATCH 0007/1316] Updated Slovenian translation --- po/sl.po | 1790 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 1124 insertions(+), 666 deletions(-) diff --git a/po/sl.po b/po/sl.po index 8a1cd8f3..6d72c203 100644 --- a/po/sl.po +++ b/po/sl.po @@ -2,40 +2,43 @@ # Copyright (C) 2009 meld's COPYRIGHT HOLDER # This file is distributed under the same license as the meld package. # -# Matej Urbančič , 2009-2015. +# Matej Urbančič , 2009-2016. # msgid "" msgstr "" "Project-Id-Version: meld master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=meld&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-03-24 11:18+0000\n" -"PO-Revision-Date: 2015-03-24 19:50+0100\n" +"POT-Creation-Date: 2016-08-18 22:43+0200\n" +"PO-Revision-Date: 2016-08-18 22:44+0200\n" "Last-Translator: Matej Urbančič \n" "Language-Team: Slovenian GNOME Translation Team \n" -"Language: sl\n" +"Language: sl_SI\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%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" -"%100==4 ? 3 : 0);\n" +"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 1.5.4\n" +"X-Generator: Poedit 1.8.7.1\n" -#: ../bin/meld:138 +#: ../bin/meld:142 msgid "Cannot import: " msgstr "Ni mogoče uvoziti:" -#: ../bin/meld:141 +#: ../bin/meld:145 #, c-format msgid "Meld requires %s or higher." msgstr "Program Meld zahteva najmanj različico %s." -#: ../bin/meld:145 -msgid "Meld does not support Python 3." -msgstr "Program Meld ne podpira okolja Python 3." +#: ../bin/meld:194 +#, c-format +msgid "" +"Couldn't load Meld-specific CSS (%s)\n" +"%s" +msgstr "" -#: ../data/meld.desktop.in.h:1 ../data/ui/meldapp.ui.h:1 +#: ../data/meld.desktop.in.h:1 ../data/meld.appdata.xml.in.h:1 +#: ../data/ui/meldapp.ui.h:1 msgid "Meld" msgstr "Meld" @@ -47,11 +50,16 @@ msgstr "Pregledovalnik sprememb" msgid "Meld Diff Viewer" msgstr "Meld pregledovalnik različic" -#: ../data/meld.desktop.in.h:4 +#: ../data/meld.desktop.in.h:4 ../data/meld.appdata.xml.in.h:2 msgid "Compare and merge your files" msgstr "Primerjava in združevanje datotek" -#: ../data/meld.appdata.xml.in.h:1 +#. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! +#: ../data/meld.desktop.in.h:6 +msgid "diff;merge;" +msgstr "" + +#: ../data/meld.appdata.xml.in.h:3 msgid "" "Meld is a visual diff and merge tool targeted at developers. Meld helps you " "compare files, directories, and version controlled projects. It provides " @@ -59,7 +67,7 @@ msgid "" "many version control systems including Git, Mercurial, Bazaar and Subversion." msgstr "" -#: ../data/meld.appdata.xml.in.h:2 +#: ../data/meld.appdata.xml.in.h:4 msgid "" "Meld helps you review code changes, understand patches, and makes enormous " "merge conflicts slightly less painful." @@ -96,14 +104,15 @@ msgid "If true, the window statusbar is visible." msgstr "Prav, če je okno lastnosti razpeto." #: ../data/org.gnome.meld.gschema.xml.h:7 -#, fuzzy -msgid "Automatically detected text encodings" -msgstr "Dovoli samodejno skrčenje besedila ob združevanju" +msgid "Additional automatically detected text encodings" +msgstr "" #: ../data/org.gnome.meld.gschema.xml.h:8 msgid "" -"These text encodings will be automatically used (in order) to try to decode " -"loaded text files." +"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.h:9 @@ -143,127 +152,134 @@ msgid "" msgstr "" #: ../data/org.gnome.meld.gschema.xml.h:17 +msgid "Color scheme to use for syntax highlighting" +msgstr "" + +#: ../data/org.gnome.meld.gschema.xml.h:18 +msgid "Used by GtkSourceView to determine colors for syntax highlighting" +msgstr "" + +#: ../data/org.gnome.meld.gschema.xml.h:19 #, fuzzy msgid "Displayed whitespace" msgstr "Prikazana stran" -#: ../data/org.gnome.meld.gschema.xml.h:18 +#: ../data/org.gnome.meld.gschema.xml.h:20 msgid "" "Selector for individual whitespace character types to be shown. Possible " "values are 'space', 'tab', 'newline' and 'nbsp'." msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:19 +#: ../data/org.gnome.meld.gschema.xml.h:21 msgid "Wrap mode" msgstr "Način preloma" -#: ../data/org.gnome.meld.gschema.xml.h:20 +#: ../data/org.gnome.meld.gschema.xml.h:22 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.h:21 +#: ../data/org.gnome.meld.gschema.xml.h:23 msgid "Highlight current line" msgstr "Poudari trenutno vrstico" -#: ../data/org.gnome.meld.gschema.xml.h:22 +#: ../data/org.gnome.meld.gschema.xml.h:24 msgid "" "If true, the line containing the cursor will be highlighted in file " "comparisons." msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:23 +#: ../data/org.gnome.meld.gschema.xml.h:25 #, fuzzy msgid "Use the system default monospace font" msgstr "Ali naj se uporabi privzeta sistemska pisava enake širine znakov" -#: ../data/org.gnome.meld.gschema.xml.h:24 +#: ../data/org.gnome.meld.gschema.xml.h:26 msgid "" -"If false, the defined custom font will be used instead of the system " -"monospace font." +"If false, custom-font will be used instead of the system monospace font." msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:25 +#: ../data/org.gnome.meld.gschema.xml.h:27 msgid "Custom font" msgstr "Pisava po meri" -#: ../data/org.gnome.meld.gschema.xml.h:26 +#: ../data/org.gnome.meld.gschema.xml.h:28 msgid "" "The custom font to use, stored as a string and parsed as a Pango font " "description." msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:27 +#: ../data/org.gnome.meld.gschema.xml.h:29 msgid "Ignore blank lines when comparing files" msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:28 +#: ../data/org.gnome.meld.gschema.xml.h:30 msgid "" "If true, blank lines will be trimmed when highlighting changes between files." msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:29 +#: ../data/org.gnome.meld.gschema.xml.h:31 #, fuzzy msgid "Use the system default editor" msgstr "Uporabi _privzet sistemski urejevalnik besedil." -#: ../data/org.gnome.meld.gschema.xml.h:30 +#: ../data/org.gnome.meld.gschema.xml.h:32 msgid "" -"If false, the defined custom editor will be used instead of the system " -"editor when opening files externally." +"If false, custom-editor-command will be used instead of the system editor " +"when opening files externally." msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:31 +#: ../data/org.gnome.meld.gschema.xml.h:33 #, fuzzy msgid "The custom editor launch command" msgstr "Ukaz za zagon urejevalnika:" -#: ../data/org.gnome.meld.gschema.xml.h:32 +#: ../data/org.gnome.meld.gschema.xml.h:34 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.h:33 +#: ../data/org.gnome.meld.gschema.xml.h:35 msgid "Columns to display" msgstr "Prikazani stolpci" -#: ../data/org.gnome.meld.gschema.xml.h:34 +#: ../data/org.gnome.meld.gschema.xml.h:36 msgid "" "List of column names in folder comparison and whether they should be " "displayed." msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:35 ../data/ui/preferences.ui.h:30 +#: ../data/org.gnome.meld.gschema.xml.h:37 ../data/ui/preferences.ui.h:32 msgid "Ignore symbolic links" msgstr "Prezri simbolne povezave" -#: ../data/org.gnome.meld.gschema.xml.h:36 +#: ../data/org.gnome.meld.gschema.xml.h:38 msgid "" "If true, folder comparisons do not follow symbolic links when traversing the " "folder tree." msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:37 +#: ../data/org.gnome.meld.gschema.xml.h:39 #, fuzzy msgid "Use shallow comparison" msgstr "Nova primerjava" -#: ../data/org.gnome.meld.gschema.xml.h:38 +#: ../data/org.gnome.meld.gschema.xml.h:40 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.h:39 +#: ../data/org.gnome.meld.gschema.xml.h:41 #, fuzzy msgid "File timestamp resolution" msgstr "Ploskev žariščne ločljivosti X" -#: ../data/org.gnome.meld.gschema.xml.h:40 +#: ../data/org.gnome.meld.gschema.xml.h:42 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 " @@ -271,124 +287,151 @@ msgid "" "resolution." msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:41 +#: ../data/org.gnome.meld.gschema.xml.h:43 ../data/ui/preferences.ui.h:30 +msgid "Apply text filters during folder comparisons" +msgstr "" + +#: ../data/org.gnome.meld.gschema.xml.h:44 +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.h:45 msgid "File status filters" msgstr "Filtri stanja datotek" -#: ../data/org.gnome.meld.gschema.xml.h:42 +#: ../data/org.gnome.meld.gschema.xml.h:46 msgid "List of statuses used to filter visible files in folder comparison." msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:43 +#: ../data/org.gnome.meld.gschema.xml.h:47 #, fuzzy msgid "Show the version control console output" msgstr "Izbor različice sistema za nadzor različic za uporabo" -#: ../data/org.gnome.meld.gschema.xml.h:44 +#: ../data/org.gnome.meld.gschema.xml.h:48 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.h:45 +#: ../data/org.gnome.meld.gschema.xml.h:49 #, fuzzy msgid "Version control pane position" msgstr "Vstavek sistema nadzora različic" -#: ../data/org.gnome.meld.gschema.xml.h:46 +#: ../data/org.gnome.meld.gschema.xml.h:50 msgid "" "This is the height of the main version control tree when the console pane is " "shown." msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:47 +#: ../data/org.gnome.meld.gschema.xml.h:51 msgid "Present version comparisons as left-local/right-remote" msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:48 +#: ../data/org.gnome.meld.gschema.xml.h:52 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.h:49 +#: ../data/org.gnome.meld.gschema.xml.h:53 #, fuzzy msgid "Order for files in three-way version control merge comparisons" msgstr "Zagon primerjave nadzora različic" -#: ../data/org.gnome.meld.gschema.xml.h:50 +#: ../data/org.gnome.meld.gschema.xml.h:54 msgid "" -"Choices for file order are remote/merge/local and local/merged/remote. This " +"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.h:51 +#: ../data/org.gnome.meld.gschema.xml.h:55 #, fuzzy msgid "Show margin in commit message editor" msgstr "Pokaži desni rob v pogledu sporočil uveljavitev" -#: ../data/org.gnome.meld.gschema.xml.h:52 +#: ../data/org.gnome.meld.gschema.xml.h:56 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.h:53 +#: ../data/org.gnome.meld.gschema.xml.h:57 #, fuzzy msgid "Margin column in commit message editor" msgstr "Pokaži desni rob v pogledu sporočil uveljavitev" -#: ../data/org.gnome.meld.gschema.xml.h:54 +#: ../data/org.gnome.meld.gschema.xml.h:58 msgid "" "The column at which to show the margin in the version control commit message " "editor." msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:55 +#: ../data/org.gnome.meld.gschema.xml.h:59 msgid "Automatically hard-wrap commit messages" msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:56 +#: ../data/org.gnome.meld.gschema.xml.h:60 msgid "" "If true, the version control commit message editor will hard-wrap (i.e., " -"insert line breaks) at the defined commit margin before commit." +"insert line breaks) at the commit margin before commit." msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:57 +#: ../data/org.gnome.meld.gschema.xml.h:61 #, fuzzy msgid "Version control status filters" msgstr "Vstavek sistema nadzora različic" -#: ../data/org.gnome.meld.gschema.xml.h:58 +#: ../data/org.gnome.meld.gschema.xml.h:62 msgid "" "List of statuses used to filter visible files in version control comparison." msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:59 +#: ../data/org.gnome.meld.gschema.xml.h:63 #, fuzzy msgid "Filename-based filters" msgstr "Izvoz Balsinih filtrov" -#: ../data/org.gnome.meld.gschema.xml.h:60 +#: ../data/org.gnome.meld.gschema.xml.h:64 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.h:61 +#: ../data/org.gnome.meld.gschema.xml.h:65 #, fuzzy msgid "Text-based filters" msgstr "Izvoz Balsinih filtrov" -#: ../data/org.gnome.meld.gschema.xml.h:62 +#: ../data/org.gnome.meld.gschema.xml.h:66 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.xml.h:1 +msgid "Meld base scheme" +msgstr "" + +#: ../data/styles/meld-base.xml.h:2 +msgid "Base color scheme for Meld highlighting" +msgstr "" + +#: ../data/styles/meld-dark.xml.h:1 +msgid "Meld dark scheme" +msgstr "" + +#: ../data/styles/meld-dark.xml.h:2 +msgid "Dark color scheme for Meld highlighting" +msgstr "" + #: ../data/ui/application.ui.h:1 msgid "About Meld" msgstr "O programu" @@ -418,10 +461,14 @@ msgid "_Help" msgstr "Pomo_č" #: ../data/ui/application.ui.h:8 +msgid "Keyboard Shortcuts" +msgstr "" + +#: ../data/ui/application.ui.h:9 msgid "_About" msgstr "_O programu" -#: ../data/ui/application.ui.h:9 +#: ../data/ui/application.ui.h:10 msgid "_Quit" msgstr "_Končaj" @@ -434,16 +481,16 @@ msgid "Compare selected files" msgstr "Primerjajo izbrane datoteke" #: ../data/ui/dirdiff.ui.h:3 -msgid "Copy _Left" -msgstr "Kopiraj _levo" +msgid "Copy to _Left" +msgstr "" #: ../data/ui/dirdiff.ui.h:4 msgid "Copy to left" msgstr "Kopiraj na levo" #: ../data/ui/dirdiff.ui.h:5 -msgid "Copy _Right" -msgstr "Kopiraj _desno" +msgid "Copy to _Right" +msgstr "" #: ../data/ui/dirdiff.ui.h:6 msgid "Copy to right" @@ -453,7 +500,7 @@ msgstr "Kopiraj na desno" msgid "Delete selected" msgstr "Izbriši izbor" -#: ../data/ui/dirdiff.ui.h:8 ../meld/filediff.py:1463 +#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:859 ../meld/filediff.py:1384 msgid "Hide" msgstr "Skrij" @@ -489,7 +536,7 @@ msgstr "Novo" msgid "Show new" msgstr "Pokaži novejše" -#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:71 +#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:76 msgid "Modified" msgstr "Spremenjeno" @@ -522,7 +569,7 @@ msgid "_Add" msgstr "_Dodaj" #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11 -#: ../meld/vcview.py:747 +#: ../meld/vcview.py:638 msgid "_Remove" msgstr "_Odstrani" @@ -543,8 +590,8 @@ msgid "Move _Down" msgstr "Premakni navz_dol" #. Create icon and filename CellRenderer -#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:363 -#: ../meld/vcview.py:203 +#: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35 +#: ../meld/dirdiff.py:373 msgid "Name" msgstr "Ime" @@ -561,129 +608,302 @@ msgid "Remove selected filter" msgstr "Odstrani izbrani filter" #: ../data/ui/filediff.ui.h:1 -msgid "Save changes to documents before closing?" -msgstr "Ali želite shraniti spremembe dokumenta pred zapiranjem?" +msgid "Format as Patch..." +msgstr "Oblikuj kot popravek ..." #: ../data/ui/filediff.ui.h:2 -msgid "If you don't save, changes will be permanently lost." -msgstr "V primeru, da sprememb ne shranite, bodo te trajno izgubljene." +msgid "Create a patch using differences between files" +msgstr "Ustvari popravek z razlikovanjem med datotekami" #: ../data/ui/filediff.ui.h:3 -msgid "Close _without Saving" -msgstr "Zapri _brez shranjevanja" +msgid "Save A_ll" +msgstr "Shrani _vse" #: ../data/ui/filediff.ui.h:4 -msgid "_Cancel" -msgstr "_Prekliči" +msgid "Save all files in the current comparison" +msgstr "Shrani vse datoteke trenutne primerjave" #: ../data/ui/filediff.ui.h:5 -msgid "_Save" -msgstr "_Shrani" +msgid "Revert files to their saved versions" +msgstr "Povrni datoteke na shranjene različice" #: ../data/ui/filediff.ui.h:6 -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 "" -"V datoteko ni mogoče pisati. S klikom na to mesto lahko odklenete datoteko " -"in vsebino spreminjate, vendar pa je treba spremembe shraniti v datoteko z " -"drugim imenom." +msgid "Add Synchronization Point" +msgstr "Dodaj točko usklajevanja" #: ../data/ui/filediff.ui.h:7 -msgid "File 3" -msgstr "Datoteka 3" +msgid "Add a synchronization point for changes between files" +msgstr "" #: ../data/ui/filediff.ui.h:8 -msgid "File 2" -msgstr "Datoteka 2" +msgid "Clear Synchronization Points" +msgstr "Počisti točke usklajevanja" #: ../data/ui/filediff.ui.h:9 -msgid "File 1" -msgstr "Datoteka 1" +msgid "Clear sychronization points for changes between files" +msgstr "" #: ../data/ui/filediff.ui.h:10 -msgid "Revert unsaved changes to documents?" -msgstr "Ali naj se povrnejo neshranjene spremembe dokumentov?" +msgid "Previous Conflict" +msgstr "Predhodni spor" #: ../data/ui/filediff.ui.h:11 -msgid "Changes made to the following documents will be permanently lost:\n" -msgstr "Spremembe navedenih dokumentov bodo trajno izgubljene:\n" - -#: ../data/ui/findbar.ui.h:1 -msgid "_Replace" -msgstr "_Zamenjaj" +msgid "Go to the previous conflict" +msgstr "Skoči na predhodni niz v sporu" -#: ../data/ui/findbar.ui.h:2 -msgid "Replace _All" -msgstr "Zamenjaj _vse" +#: ../data/ui/filediff.ui.h:12 +msgid "Next Conflict" +msgstr "Naslednji spor" -#: ../data/ui/findbar.ui.h:3 -msgid "_Previous" -msgstr "_Predhodni" +#: ../data/ui/filediff.ui.h:13 +msgid "Go to the next conflict" +msgstr "Skoči na naslednji niz v sporu" -#: ../data/ui/findbar.ui.h:4 -msgid "_Next" -msgstr "_Naslednji" +#: ../data/ui/filediff.ui.h:14 +msgid "Push to Left" +msgstr "Potisni levo" -#: ../data/ui/findbar.ui.h:5 -msgid "Find:" -msgstr "Najdi:" +#: ../data/ui/filediff.ui.h:15 +msgid "Push current change to the left" +msgstr "Potisni trenutne spremembe na levo" -#: ../data/ui/findbar.ui.h:6 -msgid "Replace _with:" -msgstr "Zamenjaj _z:" +#: ../data/ui/filediff.ui.h:16 +msgid "Push to Right" +msgstr "Potisni desno" -#: ../data/ui/findbar.ui.h:7 -msgid "_Match case" -msgstr "_Upoštevaj velikost črk" +#: ../data/ui/filediff.ui.h:17 +msgid "Push current change to the right" +msgstr "Potisni trenutne spremembe na desno" -#: ../data/ui/findbar.ui.h:8 -msgid "Who_le word" -msgstr "Cele _besede" +#: ../data/ui/filediff.ui.h:18 +msgid "Pull from Left" +msgstr "Potegni z leve" -#: ../data/ui/findbar.ui.h:9 -msgid "Regular e_xpression" -msgstr "_Logični izraz" +#: ../data/ui/filediff.ui.h:19 +msgid "Pull change from the left" +msgstr "Potegni spremembe z leve" -#: ../data/ui/findbar.ui.h:10 -msgid "Wrapped" -msgstr "Prelomljeno" +#: ../data/ui/filediff.ui.h:20 +msgid "Pull from Right" +msgstr "Potegni z desne" -#: ../data/ui/patch-dialog.ui.h:1 -msgid "Format as Patch" -msgstr "Oblikuj kot popravek" +#: ../data/ui/filediff.ui.h:21 +msgid "Pull change from the right" +msgstr "Potegni spremembe z desne" -#: ../data/ui/patch-dialog.ui.h:2 -msgid "Copy to Clipboard" -msgstr "Kopiraj v odložišče" +#: ../data/ui/filediff.ui.h:22 +msgid "Copy Above Left" +msgstr "Kopiraj nad levo" -#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:119 -msgid "Save Patch" -msgstr "Shrani popravek" +#: ../data/ui/filediff.ui.h:23 +msgid "Copy change above the left chunk" +msgstr "Kopiraj spremembe nad levi del" -#: ../data/ui/patch-dialog.ui.h:4 -msgid "Use differences between:" -msgstr "Uporabi razlike med:" +#: ../data/ui/filediff.ui.h:24 +msgid "Copy Below Left" +msgstr "Kopiraj pod levo" -#: ../data/ui/patch-dialog.ui.h:5 -msgid "Left and middle panes" -msgstr "Levi in srednji pladenj" +#: ../data/ui/filediff.ui.h:25 +msgid "Copy change below the left chunk" +msgstr "Kopiraj spremembe pod levi del" -#: ../data/ui/patch-dialog.ui.h:6 -msgid "Middle and right panes" -msgstr "Srednji in desni pladenj" +#: ../data/ui/filediff.ui.h:26 +msgid "Copy Above Right" +msgstr "Kopiraj nad desno" -#: ../data/ui/patch-dialog.ui.h:7 -msgid "_Reverse patch direction" -msgstr "Obrni smer popravka" +#: ../data/ui/filediff.ui.h:27 +msgid "Copy change above the right chunk" +msgstr "Kopiraj spremembe nad desni del" -#: ../data/ui/preferences.ui.h:1 -msgid "Left is remote, right is local" -msgstr "Levo je oddaljeno, desno krajevno" +#: ../data/ui/filediff.ui.h:28 +msgid "Copy Below Right" +msgstr "Kopiraj pod desno" -#: ../data/ui/preferences.ui.h:2 -msgid "Left is local, right is remote" -msgstr "Levo je krajevno, desno oddaljeno" +#: ../data/ui/filediff.ui.h:29 +msgid "Copy change below the right chunk" +msgstr "Kopiraj spremembe pod desni del" + +#: ../data/ui/filediff.ui.h:30 +msgid "Delete" +msgstr "Izbriši" + +#: ../data/ui/filediff.ui.h:31 +msgid "Delete change" +msgstr "Izbriši spremembo" + +#: ../data/ui/filediff.ui.h:32 +msgid "Merge All from Left" +msgstr "Združi vse spremembe z leve" + +#: ../data/ui/filediff.ui.h:33 +msgid "Merge all non-conflicting changes from the left" +msgstr "Združi vse spremembe brez sporov z leve" + +#: ../data/ui/filediff.ui.h:34 +msgid "Merge All from Right" +msgstr "Združi vse spremembe z desne" + +#: ../data/ui/filediff.ui.h:35 +msgid "Merge all non-conflicting changes from the right" +msgstr "Združi vse spremembe brez sporov z desne" + +#: ../data/ui/filediff.ui.h:36 +msgid "Merge All" +msgstr "Združi vse" + +#: ../data/ui/filediff.ui.h:37 +msgid "Merge all non-conflicting changes from left and right panes" +msgstr "Združi vse spremembe brez sporov z leve in z desne" + +#: ../data/ui/filediff.ui.h:38 +msgid "Previous Pane" +msgstr "" + +#: ../data/ui/filediff.ui.h:39 +msgid "Move keyboard focus to the previous document in this comparison" +msgstr "" + +#: ../data/ui/filediff.ui.h:40 +msgid "Next Pane" +msgstr "" + +#: ../data/ui/filediff.ui.h:41 +msgid "Move keyboard focus to the next document in this comparison" +msgstr "Premakni dejavnost tipkovnice na naslednji dokument primerjave" + +#: ../data/ui/filediff.ui.h:42 +msgid "Lock Scrolling" +msgstr "Zakleni drsenje" + +#: ../data/ui/filediff.ui.h:43 +msgid "Lock scrolling of all panes" +msgstr "Zakleni drsenje vseh pladnjev" + +#: ../data/ui/filediff.ui.h:44 +msgid "Save changes to documents before closing?" +msgstr "Ali želite shraniti spremembe dokumenta pred zapiranjem?" + +#: ../data/ui/filediff.ui.h:45 +msgid "If you don't save, changes will be permanently lost." +msgstr "V primeru, da sprememb ne shranite, bodo te trajno izgubljene." + +#: ../data/ui/filediff.ui.h:46 +msgid "Close _without Saving" +msgstr "Zapri _brez shranjevanja" + +#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:941 ../meld/filediff.py:1450 +#: ../meld/filediff.py:1518 +msgid "_Cancel" +msgstr "_Prekliči" + +#: ../data/ui/filediff.ui.h:48 +msgid "_Save" +msgstr "_Shrani" + +#: ../data/ui/filediff.ui.h:49 +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 "" +"V datoteko ni mogoče pisati. S klikom na to mesto lahko odklenete datoteko " +"in vsebino spreminjate, vendar pa je treba spremembe shraniti v datoteko z " +"drugim imenom." + +#: ../data/ui/filediff.ui.h:50 +msgid "File 3" +msgstr "Datoteka 3" + +#: ../data/ui/filediff.ui.h:51 +msgid "File 2" +msgstr "Datoteka 2" + +#: ../data/ui/filediff.ui.h:52 +msgid "File 1" +msgstr "Datoteka 1" + +#: ../data/ui/filediff.ui.h:53 +msgid "Revert unsaved changes to documents?" +msgstr "Ali naj se povrnejo neshranjene spremembe dokumentov?" + +#: ../data/ui/filediff.ui.h:54 +msgid "Changes made to the following documents will be permanently lost:\n" +msgstr "Spremembe navedenih dokumentov bodo trajno izgubljene:\n" + +#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:942 ../meld/filediff.py:1451 +msgid "_Replace" +msgstr "_Zamenjaj" + +#: ../data/ui/findbar.ui.h:2 +msgid "Replace _All" +msgstr "Zamenjaj _vse" + +#: ../data/ui/findbar.ui.h:3 +msgid "_Previous" +msgstr "_Predhodni" + +#: ../data/ui/findbar.ui.h:4 +msgid "_Next" +msgstr "_Naslednji" + +#: ../data/ui/findbar.ui.h:5 +msgid "Find:" +msgstr "Najdi:" + +#: ../data/ui/findbar.ui.h:6 +msgid "Replace _with:" +msgstr "Zamenjaj _z:" + +#: ../data/ui/findbar.ui.h:7 +msgid "_Match case" +msgstr "_Upoštevaj velikost črk" + +#: ../data/ui/findbar.ui.h:8 +msgid "Who_le word" +msgstr "Cele _besede" + +#: ../data/ui/findbar.ui.h:9 +msgid "Regular e_xpression" +msgstr "_Logični izraz" + +#: ../data/ui/findbar.ui.h:10 +msgid "Wrapped" +msgstr "Prelomljeno" + +#: ../data/ui/patch-dialog.ui.h:1 +msgid "Format as Patch" +msgstr "Oblikuj kot popravek" + +#: ../data/ui/patch-dialog.ui.h:2 +msgid "Copy to Clipboard" +msgstr "Kopiraj v odložišče" + +#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:144 +msgid "Save Patch" +msgstr "Shrani popravek" + +#: ../data/ui/patch-dialog.ui.h:4 +msgid "Use differences between:" +msgstr "Uporabi razlike med:" + +#: ../data/ui/patch-dialog.ui.h:5 +msgid "Left and middle panes" +msgstr "Levi in srednji pladenj" + +#: ../data/ui/patch-dialog.ui.h:6 +msgid "Middle and right panes" +msgstr "Srednji in desni pladenj" + +#: ../data/ui/patch-dialog.ui.h:7 +msgid "_Reverse patch direction" +msgstr "Obrni smer popravka" + +#: ../data/ui/preferences.ui.h:1 +msgid "Left is remote, right is local" +msgstr "Levo je oddaljeno, desno krajevno" + +#: ../data/ui/preferences.ui.h:2 +msgid "Left is local, right is remote" +msgstr "Levo je krajevno, desno oddaljeno" #: ../data/ui/preferences.ui.h:3 #, fuzzy @@ -764,80 +984,84 @@ msgid "Use s_yntax highlighting" msgstr "Uporabi _barvno poudarjanje skladnje" #: ../data/ui/preferences.ui.h:22 +msgid "Syntax highlighting color scheme:" +msgstr "" + +#: ../data/ui/preferences.ui.h:23 msgid "External Editor" msgstr "Zunanji urejevalnik" -#: ../data/ui/preferences.ui.h:23 +#: ../data/ui/preferences.ui.h:24 msgid "Use _default system editor" msgstr "Uporabi _privzet sistemski urejevalnik besedil." -#: ../data/ui/preferences.ui.h:24 +#: ../data/ui/preferences.ui.h:25 msgid "Edito_r command:" msgstr "Ukaz _urejevalnika:" -#: ../data/ui/preferences.ui.h:25 +#: ../data/ui/preferences.ui.h:26 msgid "Editor" msgstr "Urejevalnik" -#: ../data/ui/preferences.ui.h:26 +#: ../data/ui/preferences.ui.h:27 msgid "Shallow Comparison" msgstr "Groba primerjava" -#: ../data/ui/preferences.ui.h:27 +#: ../data/ui/preferences.ui.h:28 msgid "C_ompare files based only on size and timestamp" msgstr "_Primerjaj datoteke na osnovi velikosti in časovnega žiga" -#: ../data/ui/preferences.ui.h:28 +#: ../data/ui/preferences.ui.h:29 msgid "_Timestamp resolution:" msgstr "Ločljivost časovnega _žiga:" -#: ../data/ui/preferences.ui.h:29 +#: ../data/ui/preferences.ui.h:31 msgid "Symbolic Links" msgstr "Simbolne povezave" -#: ../data/ui/preferences.ui.h:31 +#: ../data/ui/preferences.ui.h:33 msgid "Visible Columns" msgstr "Vidni stolpci" -#: ../data/ui/preferences.ui.h:32 +#: ../data/ui/preferences.ui.h:34 msgid "Folder Comparisons" msgstr "Primerjava map" -#: ../data/ui/preferences.ui.h:33 +#: ../data/ui/preferences.ui.h:35 msgid "Version Comparisons" msgstr "Primerjave različic" -#: ../data/ui/preferences.ui.h:34 +#: ../data/ui/preferences.ui.h:36 #, fuzzy msgid "_Order when comparing file revisions:" msgstr "_Med primerjavo predelav datotek" -#: ../data/ui/preferences.ui.h:35 +#: ../data/ui/preferences.ui.h:37 #, fuzzy msgid "Order when _merging files:" msgstr "Predvajaj _glasbene datoteke, ko so povezane" -#: ../data/ui/preferences.ui.h:36 +#: ../data/ui/preferences.ui.h:38 msgid "Commit Messages" msgstr "Uveljavi sporočila" -#: ../data/ui/preferences.ui.h:37 +#: ../data/ui/preferences.ui.h:39 msgid "Show _right margin at:" msgstr "Pokaži _desni rob pri:" -#: ../data/ui/preferences.ui.h:38 +#: ../data/ui/preferences.ui.h:40 msgid "Automatically _break lines at right margin on commit" msgstr "Samodejno _prelomi vrstice na desnem robu ob uveljavitvi" -#: ../data/ui/preferences.ui.h:39 +#: ../data/ui/preferences.ui.h:41 msgid "Version Control" msgstr "Nadzor različic" -#: ../data/ui/preferences.ui.h:40 +#: ../data/ui/preferences.ui.h:42 msgid "Filename filters" msgstr "Datotečni filtri" -#: ../data/ui/preferences.ui.h:41 +#: ../data/ui/preferences.ui.h:43 msgid "" "When performing directory comparisons, you may filter out files and " "directories by name. Each pattern is a list of shell style wildcards " @@ -847,24 +1071,24 @@ msgstr "" "vzorec na seznamu je zapisan z nadomestnimi znaki (npr: * in ?), ločenimi s " "presledki." -#: ../data/ui/preferences.ui.h:42 ../meld/meldwindow.py:103 +#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:103 msgid "File Filters" msgstr "Filtri datotek" -#: ../data/ui/preferences.ui.h:43 +#: ../data/ui/preferences.ui.h:45 #, fuzzy msgid "Change trimming" msgstr "Spremeni opazovanje" -#: ../data/ui/preferences.ui.h:44 +#: ../data/ui/preferences.ui.h:46 msgid "Trim blank line differences from the start and end of changes" msgstr "" -#: ../data/ui/preferences.ui.h:45 +#: ../data/ui/preferences.ui.h:47 msgid "Text filters" msgstr "Filtri besedila" -#: ../data/ui/preferences.ui.h:46 +#: ../data/ui/preferences.ui.h:48 msgid "" "When performing file comparisons, you may ignore certain types of changes. " "Each pattern here is a python regular expression which replaces matching " @@ -878,11 +1102,257 @@ msgstr "" "izraz vključuje skupine, so zamenjane le te. Več podrobnosti je zapisanih v " "priročniku." -#: ../data/ui/preferences.ui.h:47 +#: ../data/ui/preferences.ui.h:49 msgid "Text Filters" msgstr "Filtri besedila" -#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:623 +#: ../data/ui/shortcuts.ui.h:1 +msgctxt "shortcut window" +msgid "General" +msgstr "" + +#: ../data/ui/shortcuts.ui.h:2 +msgctxt "shortcut window" +msgid "New comparison" +msgstr "" + +#: ../data/ui/shortcuts.ui.h:3 +msgctxt "shortcut window" +msgid "Close a comparison" +msgstr "" + +#: ../data/ui/shortcuts.ui.h:4 +msgctxt "shortcut window" +msgid "Quit Meld" +msgstr "Končaj program" + +#: ../data/ui/shortcuts.ui.h:5 +msgctxt "shortcut window" +msgid "Stop the current action" +msgstr "" + +#: ../data/ui/shortcuts.ui.h:6 +msgctxt "shortcut window" +msgid "Refresh comparison" +msgstr "" + +#: ../data/ui/shortcuts.ui.h:7 +msgctxt "shortcut window" +msgid "Fullscreen" +msgstr "" + +#: ../data/ui/shortcuts.ui.h:8 +msgctxt "shortcut window" +msgid "Tabs" +msgstr "" + +#: ../data/ui/shortcuts.ui.h:9 +msgctxt "shortcut window" +msgid "Go to previous tab" +msgstr "" + +#: ../data/ui/shortcuts.ui.h:10 +msgctxt "shortcut window" +msgid "Go to next tab" +msgstr "" + +#: ../data/ui/shortcuts.ui.h:11 +msgctxt "shortcut window" +msgid "Switch to tab" +msgstr "" + +#: ../data/ui/shortcuts.ui.h:12 +msgctxt "shortcut window" +msgid "Move tab left" +msgstr "" + +#: ../data/ui/shortcuts.ui.h:13 +msgctxt "shortcut window" +msgid "Move tab right" +msgstr "" + +#: ../data/ui/shortcuts.ui.h:14 +msgctxt "shortcut window" +msgid "Changes" +msgstr "" + +#: ../data/ui/shortcuts.ui.h:15 +msgctxt "shortcut window" +msgid "Go to previous change" +msgstr "" + +#: ../data/ui/shortcuts.ui.h:16 +msgctxt "shortcut window" +msgid "Go to next change" +msgstr "" + +#: ../data/ui/shortcuts.ui.h:17 +msgctxt "shortcut window" +msgid "Editing" +msgstr "" + +#: ../data/ui/shortcuts.ui.h:18 +msgctxt "shortcut window" +msgid "Undo" +msgstr "" + +#: ../data/ui/shortcuts.ui.h:19 +msgctxt "shortcut window" +msgid "Redo" +msgstr "" + +#: ../data/ui/shortcuts.ui.h:20 +msgctxt "shortcut window" +msgid "Cut" +msgstr "" + +#: ../data/ui/shortcuts.ui.h:21 +msgctxt "shortcut window" +msgid "Copy" +msgstr "" + +#: ../data/ui/shortcuts.ui.h:22 +msgctxt "shortcut window" +msgid "Paste" +msgstr "" + +#: ../data/ui/shortcuts.ui.h:23 +msgctxt "shortcut window" +msgid "Find" +msgstr "" + +#: ../data/ui/shortcuts.ui.h:24 +msgctxt "shortcut window" +msgid "Find Next" +msgstr "" + +#: ../data/ui/shortcuts.ui.h:25 +msgctxt "shortcut window" +msgid "Find Previous" +msgstr "" + +#: ../data/ui/shortcuts.ui.h:26 +msgctxt "shortcut window" +msgid "Replace" +msgstr "" + +#: ../data/ui/shortcuts.ui.h:27 +msgctxt "shortcut window" +msgid "File comparison" +msgstr "" + +#: ../data/ui/shortcuts.ui.h:28 +msgctxt "shortcut window" +msgid "Save current file" +msgstr "" + +#: ../data/ui/shortcuts.ui.h:29 +msgctxt "shortcut window" +msgid "Save current file to new path" +msgstr "" + +#: ../data/ui/shortcuts.ui.h:30 +msgctxt "shortcut window" +msgid "Save all files in comparison" +msgstr "" + +#: ../data/ui/shortcuts.ui.h:31 +msgctxt "shortcut window" +msgid "Previous conflict" +msgstr "" + +#: ../data/ui/shortcuts.ui.h:32 +msgctxt "shortcut window" +msgid "Next conflict" +msgstr "" + +#: ../data/ui/shortcuts.ui.h:33 +msgctxt "shortcut window" +msgid "Push change to left" +msgstr "" + +#: ../data/ui/shortcuts.ui.h:34 +msgctxt "shortcut window" +msgid "Push change to right" +msgstr "" + +#: ../data/ui/shortcuts.ui.h:35 +msgctxt "shortcut window" +msgid "Pull change from left" +msgstr "" + +#: ../data/ui/shortcuts.ui.h:36 +msgctxt "shortcut window" +msgid "Pull change from right" +msgstr "" + +#: ../data/ui/shortcuts.ui.h:37 +msgctxt "shortcut window" +msgid "Copy change above left" +msgstr "" + +#: ../data/ui/shortcuts.ui.h:38 +msgctxt "shortcut window" +msgid "Copy change below left" +msgstr "" + +#: ../data/ui/shortcuts.ui.h:39 +msgctxt "shortcut window" +msgid "Copy change above right" +msgstr "" + +#: ../data/ui/shortcuts.ui.h:40 +msgctxt "shortcut window" +msgid "Copy change below right" +msgstr "" + +#: ../data/ui/shortcuts.ui.h:41 +msgctxt "shortcut window" +msgid "Delete change" +msgstr "" + +#: ../data/ui/shortcuts.ui.h:42 +msgctxt "shortcut window" +msgid "Previous comparison pane" +msgstr "" + +#: ../data/ui/shortcuts.ui.h:43 +msgctxt "shortcut window" +msgid "Next comparison pane" +msgstr "" + +#: ../data/ui/shortcuts.ui.h:44 +msgctxt "shortcut window" +msgid "Folder comparison" +msgstr "" + +#: ../data/ui/shortcuts.ui.h:45 +msgctxt "shortcut window" +msgid "Copy to left" +msgstr "" + +#: ../data/ui/shortcuts.ui.h:46 +msgctxt "shortcut window" +msgid "Copy to right" +msgstr "" + +#: ../data/ui/shortcuts.ui.h:47 +msgctxt "shortcut window" +msgid "Version control comparison" +msgstr "" + +#: ../data/ui/shortcuts.ui.h:48 +msgctxt "shortcut window" +msgid "Commit to version control" +msgstr "" + +#: ../data/ui/shortcuts.ui.h:49 +msgctxt "shortcut window" +msgid "Show/hide console output" +msgstr "" + +#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:570 +#: ../meld/newdifftab.py:38 msgid "New comparison" msgstr "Nova primerjava" @@ -1031,7 +1501,7 @@ msgstr "Brez določene _različice" msgid "Show unversioned files" msgstr "Pokaži datoteke z nedoločenimi različicami" -#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:64 +#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69 msgid "Ignored" msgstr "Prezrto" @@ -1059,376 +1529,258 @@ msgstr "Predhodni dnevniki:" msgid "Co_mmit" msgstr "_Uveljavi" -#: ../data/ui/vcview.ui.h:35 +#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:326 +msgid "Location" +msgstr "Mesto" + +#: ../data/ui/vcview.ui.h:37 +msgid "Status" +msgstr "Stanje" + +#: ../data/ui/vcview.ui.h:38 +msgid "Extra" +msgstr "" + +#: ../data/ui/vcview.ui.h:39 msgid "Console output" msgstr "Odvod konzole" -#: ../data/ui/vcview.ui.h:36 +#: ../data/ui/vcview.ui.h:40 msgid "Push local commits to remote?" msgstr "Ali naj se objavijo krajevne uveljavitve v oddaljeno skladišče?" -#: ../data/ui/vcview.ui.h:37 +#: ../data/ui/vcview.ui.h:41 msgid "The commits to be pushed are determined by your version control system." msgstr "Uveljavitve za objavo določa sistem za nadzor različic." -#: ../data/ui/vcview.ui.h:38 +#: ../data/ui/vcview.ui.h:42 msgid "_Push commits" msgstr "_Objavi uveljavitve" +#: ../meld/const.py:12 +msgid "UNIX (LF)" +msgstr "" + +#: ../meld/const.py:13 +msgid "DOS/Windows (CR-LF)" +msgstr "" + +#: ../meld/const.py:14 +msgid "Mac OS (CR)" +msgstr "" + #. Create file size CellRenderer -#: ../meld/dirdiff.py:381 ../meld/preferences.py:82 +#: ../meld/dirdiff.py:391 ../meld/preferences.py:82 msgid "Size" msgstr "Velikost" #. Create date-time CellRenderer -#: ../meld/dirdiff.py:389 ../meld/preferences.py:83 +#: ../meld/dirdiff.py:399 ../meld/preferences.py:83 msgid "Modification time" msgstr "Čas spremembe" #. Create permissions CellRenderer -#: ../meld/dirdiff.py:397 ../meld/preferences.py:84 -msgid "Permissions" -msgstr "Dovoljenja" - -#: ../meld/dirdiff.py:543 -#, python-format -msgid "Hide %s" -msgstr "Skrij %s" - -#: ../meld/dirdiff.py:672 ../meld/dirdiff.py:694 -#, python-format -msgid "[%s] Scanning %s" -msgstr "[%s] Preiskovanje %s" - -#: ../meld/dirdiff.py:823 -#, python-format -msgid "[%s] Done" -msgstr "[%s] končano" - -#: ../meld/dirdiff.py:830 -msgid "Multiple errors occurred while scanning this folder" -msgstr "Med preiskovanjem mape, je prišlo do več napak." - -#: ../meld/dirdiff.py:831 -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:833 -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:835 -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:837 -msgid "" -"You are running a case insensitive comparison on a case sensitive " -"filesystem. The following files in this folder are hidden:" -msgstr "" -"Zagnan je način primerjave brez upoštevanja velikosti črk na sistemu, ki " -"razlike velikosti upošteva. Nekatere datoteke so skrite:\n" -"%s" - -#: ../meld/dirdiff.py:848 -#, python-format -msgid "'%s' hidden by '%s'" -msgstr "'%s' je skrit; '%s'" - -#: ../meld/dirdiff.py:873 ../meld/filediff.py:1138 ../meld/filediff.py:1289 -#: ../meld/filediff.py:1465 ../meld/filediff.py:1495 ../meld/filediff.py:1497 -msgid "Hi_de" -msgstr "S_krij" - -#: ../meld/dirdiff.py:904 -#, python-format -msgid "" -"'%s' exists.\n" -"Overwrite?" -msgstr "" -"'%s' že obstaja.\n" -"Ali naj bo prepisana?" - -#: ../meld/dirdiff.py:912 -msgid "Error copying file" -msgstr "Napaka kopiranja datoteke" - -#: ../meld/dirdiff.py:913 -#, python-format -msgid "" -"Couldn't copy %s\n" -"to %s.\n" -"\n" -"%s" -msgstr "" -"Ni mogoče kopirati %s\n" -"v %s.\n" -"\n" -"%s" - -#: ../meld/dirdiff.py:936 -#, python-format -msgid "Error deleting %s" -msgstr "Napaka med brisanjem %s" - -#: ../meld/filediff.py:251 -msgid "Format as Patch..." -msgstr "Oblikuj kot popravek ..." - -#: ../meld/filediff.py:252 -msgid "Create a patch using differences between files" -msgstr "Ustvari popravek z razlikovanjem med datotekami" - -#: ../meld/filediff.py:254 -msgid "Save A_ll" -msgstr "Shrani _vse" - -#: ../meld/filediff.py:255 -msgid "Save all files in the current comparison" -msgstr "Shrani vse datoteke trenutne primerjave" - -#: ../meld/filediff.py:258 -msgid "Revert files to their saved versions" -msgstr "Povrni datoteke na shranjene različice" - -#: ../meld/filediff.py:260 -msgid "Add Synchronization Point" -msgstr "Dodaj točko usklajevanja" - -#: ../meld/filediff.py:261 -msgid "Add a manual point for synchronization of changes between files" -msgstr "Dodaj ročno točko usklajevanja sprememb med datotekami" - -#: ../meld/filediff.py:264 -msgid "Clear Synchronization Points" -msgstr "Počisti točke usklajevanja" - -#: ../meld/filediff.py:265 -msgid "Clear manual change sychronization points" -msgstr "Počisti ročno spremenjene točke usklajevanja" - -#: ../meld/filediff.py:267 -msgid "Previous Conflict" -msgstr "Predhodni spor" - -#: ../meld/filediff.py:268 -msgid "Go to the previous conflict" -msgstr "Skoči na predhodni niz v sporu" - -#: ../meld/filediff.py:270 -msgid "Next Conflict" -msgstr "Naslednji spor" - -#: ../meld/filediff.py:271 -msgid "Go to the next conflict" -msgstr "Skoči na naslednji niz v sporu" - -#: ../meld/filediff.py:273 -msgid "Push to Left" -msgstr "Potisni levo" - -#: ../meld/filediff.py:274 -msgid "Push current change to the left" -msgstr "Potisni trenutne spremembe na levo" - -#: ../meld/filediff.py:277 -msgid "Push to Right" -msgstr "Potisni desno" - -#: ../meld/filediff.py:278 -msgid "Push current change to the right" -msgstr "Potisni trenutne spremembe na desno" - -#: ../meld/filediff.py:282 -msgid "Pull from Left" -msgstr "Potegni z leve" - -#: ../meld/filediff.py:283 -msgid "Pull change from the left" -msgstr "Potegni spremembe z leve" - -#: ../meld/filediff.py:286 -msgid "Pull from Right" -msgstr "Potegni z desne" +#: ../meld/dirdiff.py:407 ../meld/preferences.py:84 +msgid "Permissions" +msgstr "Dovoljenja" -#: ../meld/filediff.py:287 -msgid "Pull change from the right" -msgstr "Potegni spremembe z desne" +#: ../meld/dirdiff.py:537 +#, python-format +msgid "Hide %s" +msgstr "Skrij %s" -#: ../meld/filediff.py:289 -msgid "Copy Above Left" -msgstr "Kopiraj nad levo" +#: ../meld/dirdiff.py:669 ../meld/dirdiff.py:693 +#, python-format +msgid "[%s] Scanning %s" +msgstr "[%s] Preiskovanje %s" -#: ../meld/filediff.py:290 -msgid "Copy change above the left chunk" -msgstr "Kopiraj spremembe nad levi del" +#: ../meld/dirdiff.py:826 +#, python-format +msgid "[%s] Done" +msgstr "[%s] končano" -#: ../meld/filediff.py:292 -msgid "Copy Below Left" -msgstr "Kopiraj pod levo" +#: ../meld/dirdiff.py:834 +msgid "Folders have no differences" +msgstr "" -#: ../meld/filediff.py:293 -msgid "Copy change below the left chunk" -msgstr "Kopiraj spremembe pod levi del" +#: ../meld/dirdiff.py:836 +msgid "Contents of scanned files in folders are identical." +msgstr "" -#: ../meld/filediff.py:295 -msgid "Copy Above Right" -msgstr "Kopiraj nad desno" +#: ../meld/dirdiff.py:838 +msgid "" +"Scanned files in folders appear identical, but contents have not been " +"scanned." +msgstr "" -#: ../meld/filediff.py:296 -msgid "Copy change above the right chunk" -msgstr "Kopiraj spremembe nad desni del" +#: ../meld/dirdiff.py:841 +msgid "File filters are in use, so not all files have been scanned." +msgstr "" -#: ../meld/filediff.py:298 -msgid "Copy Below Right" -msgstr "Kopiraj pod desno" +#: ../meld/dirdiff.py:843 +msgid "Text filters are in use and may be masking content differences." +msgstr "" -#: ../meld/filediff.py:299 -msgid "Copy change below the right chunk" -msgstr "Kopiraj spremembe pod desni del" +#: ../meld/dirdiff.py:861 ../meld/filediff.py:1386 ../meld/filediff.py:1416 +#: ../meld/filediff.py:1418 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 +msgid "Hi_de" +msgstr "S_krij" -#: ../meld/filediff.py:301 -msgid "Delete" -msgstr "Izbriši" +#: ../meld/dirdiff.py:871 +msgid "Multiple errors occurred while scanning this folder" +msgstr "Med preiskovanjem mape, je prišlo do več napak." -#: ../meld/filediff.py:302 -msgid "Delete change" -msgstr "Izbriši spremembo" +#: ../meld/dirdiff.py:872 +msgid "Files with invalid encodings found" +msgstr "Zaznane so datoteke z neveljavnim znakovnim naborom" -#: ../meld/filediff.py:304 -msgid "Merge All from Left" -msgstr "Združi vse spremembe z leve" +#. TRANSLATORS: This is followed by a list of files +#: ../meld/dirdiff.py:874 +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/filediff.py:305 -msgid "Merge all non-conflicting changes from the left" -msgstr "Združi vse spremembe brez sporov z leve" +#: ../meld/dirdiff.py:876 +msgid "Files hidden by case insensitive comparison" +msgstr "Datoteke skrite zaradi primerjave brez upoštevanja velikosti črk" -#: ../meld/filediff.py:307 -msgid "Merge All from Right" -msgstr "Združi vse spremembe z desne" +#. TRANSLATORS: This is followed by a list of files +#: ../meld/dirdiff.py:878 +msgid "" +"You are running a case insensitive comparison on a case sensitive " +"filesystem. The following files in this folder are hidden:" +msgstr "" +"Zagnan je način primerjave brez upoštevanja velikosti črk na sistemu, ki " +"razlike velikosti upošteva. Nekatere datoteke so skrite:\n" +"%s" -#: ../meld/filediff.py:308 -msgid "Merge all non-conflicting changes from the right" -msgstr "Združi vse spremembe brez sporov z desne" +#: ../meld/dirdiff.py:889 +#, python-format +msgid "'%s' hidden by '%s'" +msgstr "'%s' je skrit; '%s'" -#: ../meld/filediff.py:310 -msgid "Merge All" -msgstr "Združi vse" +#: ../meld/dirdiff.py:945 +#, python-format +msgid "Replace folder “%s”?" +msgstr "" -#: ../meld/filediff.py:311 -msgid "Merge all non-conflicting changes from left and right panes" -msgstr "Združi vse spremembe brez sporov z leve in z desne" +#: ../meld/dirdiff.py:947 +#, 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/filediff.py:315 -msgid "Cycle Through Documents" -msgstr "Preklopi med dokumenti" +#: ../meld/dirdiff.py:960 +msgid "Error copying file" +msgstr "Napaka kopiranja datoteke" -#: ../meld/filediff.py:316 -msgid "Move keyboard focus to the next document in this comparison" -msgstr "Premakni dejavnost tipkovnice na naslednji dokument primerjave" +#: ../meld/dirdiff.py:961 +#, python-format +msgid "" +"Couldn't copy %s\n" +"to %s.\n" +"\n" +"%s" +msgstr "" +"Ni mogoče kopirati %s\n" +"v %s.\n" +"\n" +"%s" -#: ../meld/filediff.py:322 -msgid "Lock Scrolling" -msgstr "Zakleni drsenje" +#: ../meld/dirdiff.py:984 +#, python-format +msgid "Error deleting %s" +msgstr "Napaka med brisanjem %s" -#: ../meld/filediff.py:323 -msgid "Lock scrolling of all panes" -msgstr "Zakleni drsenje vseh pladnjev" +#: ../meld/dirdiff.py:1489 +msgid "No folder" +msgstr "" #. Abbreviations for insert and overwrite that fit in the status bar -#: ../meld/filediff.py:483 +#: ../meld/filediff.py:354 msgid "INS" msgstr "VST" -#: ../meld/filediff.py:483 +#: ../meld/filediff.py:354 msgid "OVR" msgstr "PRE" #. Abbreviation for line, column so that it will fit in the status bar -#: ../meld/filediff.py:485 +#: ../meld/filediff.py:356 #, python-format msgid "Ln %i, Col %i" msgstr "Vr. %i, St. %i" -#: ../meld/filediff.py:832 -#, python-format +#: ../meld/filediff.py:781 +msgid "Comparison results will be inaccurate" +msgstr "" + +#: ../meld/filediff.py:783 msgid "" -"Filter '%s' changed the number of lines in the file. Comparison will be " -"incorrect. See the user manual for more details." +"A filter changed the number of lines in the file, which is unsupported. The " +"comparison will not be accurate." 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." -#: ../meld/filediff.py:904 +#: ../meld/filediff.py:841 #, fuzzy msgid "Mark conflict as resolved?" msgstr "Označi kot razrešeno v VC" -#: ../meld/filediff.py:906 +#: ../meld/filediff.py:843 msgid "" "If the conflict was resolved successfully, you may mark it as resolved now." msgstr "" -#: ../meld/filediff.py:908 +#: ../meld/filediff.py:845 msgid "Cancel" msgstr "Prekliči" -#: ../meld/filediff.py:909 +#: ../meld/filediff.py:846 msgid "Mark _Resolved" msgstr "" -#: ../meld/filediff.py:1125 -#, python-format -msgid "[%s] Set num panes" -msgstr "[%s] Določi okna" - -#: ../meld/filediff.py:1132 +#: ../meld/filediff.py:1095 #, python-format -msgid "[%s] Opening files" -msgstr "[%s] Odpiranje datotek" - -#: ../meld/filediff.py:1155 ../meld/filediff.py:1165 ../meld/filediff.py:1178 -#: ../meld/filediff.py:1184 -msgid "Could not read file" -msgstr "Ni mogoče prebrati datoteke" +msgid "There was a problem opening the file “%s”." +msgstr "" -#: ../meld/filediff.py:1156 +#: ../meld/filediff.py:1103 #, python-format -msgid "[%s] Reading files" -msgstr "[%s] Branje datotek" +msgid "File %s appears to be a binary file." +msgstr "" -#: ../meld/filediff.py:1166 -#, python-format -msgid "%s appears to be a binary file." -msgstr "%s je videti kot dvojiška datoteka." +#: ../meld/filediff.py:1105 +msgid "Do you want to open the file using the default application?" +msgstr "" -#: ../meld/filediff.py:1179 -#, python-format -msgid "%s is not in encodings: %s" -msgstr "%s ni zapisan v naboru: %s" +#: ../meld/filediff.py:1107 +msgid "Open" +msgstr "" -#: ../meld/filediff.py:1217 +#: ../meld/filediff.py:1123 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Računanje razlik" -#: ../meld/filediff.py:1284 +#: ../meld/filediff.py:1188 #, python-format msgid "File %s has changed on disk" msgstr "Datoteka %s je bila na disku spremenjena." -#: ../meld/filediff.py:1285 +#: ../meld/filediff.py:1189 msgid "Do you want to reload the file?" msgstr "Ali želite ponovno naložiti datoteko?" -#: ../meld/filediff.py:1288 +#: ../meld/filediff.py:1191 msgid "_Reload" msgstr "_Ponovno naloži" -#: ../meld/filediff.py:1454 +#: ../meld/filediff.py:1349 +msgid "Files are identical" +msgstr "Datoteki sta enaki" + +#: ../meld/filediff.py:1362 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1436,19 +1788,26 @@ msgstr "" "Uporabljani so filtri besedila, zato so lahko razlike med datotekami skrite. " "Ali naj se primerja vsebina brez dejavnih filtrov?" -#: ../meld/filediff.py:1460 -msgid "Files are identical" -msgstr "Datoteki sta enaki" +#: ../meld/filediff.py:1367 +msgid "Files differ in line endings only" +msgstr "" + +#: ../meld/filediff.py:1369 +#, python-format +msgid "" +"Files are identical except for differing line endings:\n" +"%s" +msgstr "" -#: ../meld/filediff.py:1468 +#: ../meld/filediff.py:1389 msgid "Show without filters" msgstr "Pokaži brez filtrov" -#: ../meld/filediff.py:1490 +#: ../meld/filediff.py:1411 msgid "Change highlighting incomplete" msgstr "Spremeni označevanje kot nedokončano" -#: ../meld/filediff.py:1491 +#: ../meld/filediff.py:1412 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." @@ -1456,91 +1815,91 @@ 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:1499 +#: ../meld/filediff.py:1420 msgid "Keep highlighting" msgstr "Poudarjanje skladnje" -#: ../meld/filediff.py:1501 +#: ../meld/filediff.py:1422 msgid "_Keep highlighting" msgstr "_Poudarjanje skladnje" -#: ../meld/filediff.py:1630 +#: ../meld/filediff.py:1454 #, python-format -msgid "" -"\"%s\" exists!\n" -"Overwrite?" +msgid "Replace file “%s”?" msgstr "" -"\"%s\" že obstaja!\n" -"Ali naj bo datoteka prepisana?" -#: ../meld/filediff.py:1643 +#: ../meld/filediff.py:1456 #, python-format msgid "" -"Error writing to %s\n" -"\n" -"%s." +"A file with this name already exists in “%s”.\n" +"If you replace the existing file, its contents will be lost." msgstr "" -"Napaka med pisanjem na %s\n" -"\n" -"%s." -#: ../meld/filediff.py:1654 +#: ../meld/filediff.py:1473 msgid "Save Left Pane As" msgstr "Shrani levi pladenj kot" -#: ../meld/filediff.py:1656 +#: ../meld/filediff.py:1475 msgid "Save Middle Pane As" msgstr "Shrani srednji pladenj kot" -#: ../meld/filediff.py:1658 +#: ../meld/filediff.py:1477 msgid "Save Right Pane As" msgstr "Shrani desni pladenj kot" -#: ../meld/filediff.py:1671 +#: ../meld/filediff.py:1491 #, python-format msgid "File %s has changed on disk since it was opened" msgstr "" -#: ../meld/filediff.py:1673 +#: ../meld/filediff.py:1493 #, fuzzy msgid "If you save it, any external changes will be lost." msgstr "" "V primeru, da datoteko shranite, bodo vse zunanje spremembe izgubljene. Ali " "jo želite vseeno shraniti?" -#: ../meld/filediff.py:1676 +#: ../meld/filediff.py:1496 msgid "Save Anyway" msgstr "Vseeno shrani" -#: ../meld/filediff.py:1677 +#: ../meld/filediff.py:1497 msgid "Don't Save" msgstr "Ne shrani" -#: ../meld/filediff.py:1701 +#: ../meld/filediff.py:1519 +msgid "_Save as UTF-8" +msgstr "" + +#: ../meld/filediff.py:1522 #, python-format -msgid "" -"This file '%s' contains a mixture of line endings.\n" -"\n" -"Which format would you like to use?" +msgid "Couldn't encode text as “%s”" msgstr "" -"Datoteka '%s' vsebuje različne zaključne znake vrstic.\n" -"\n" -"Kateri zapis želite uporabiti?" -#: ../meld/filediff.py:1717 +#: ../meld/filediff.py:1524 #, python-format msgid "" -"'%s' contains characters not encodable with '%s'\n" +"File “%s” contains characters that can't be encoded using encoding “%s”.\n" "Would you like to save as UTF-8?" msgstr "" -"'%s' vsebuje znake, ki jih ni mogoče kodirati v naboru '%s'\n" -"Ali naj se datoteka shrani v naboru UTF-8?" -#: ../meld/filediff.py:2084 +#: ../meld/filediff.py:1564 ../meld/patchdialog.py:120 +#, python-format +msgid "Could not save file %s." +msgstr "" + +#: ../meld/filediff.py:1565 ../meld/patchdialog.py:121 +#, python-format +msgid "" +"Couldn't save file due to:\n" +"%s" +msgstr "" + +#: ../meld/filediff.py:1910 msgid "Live comparison updating disabled" msgstr "Živo posodabljanje ob primerjavi je onemogočeno" -#: ../meld/filediff.py:2085 +#: ../meld/filediff.py:1911 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -1550,112 +1909,117 @@ msgstr "" "Še vedno je mogoče ročno osvežiti primerjavo, živo posodabljanje pa bo spet " "na voljo, ko bo usklajevanje končano." -#: ../meld/filemerge.py:48 +#: ../meld/filemerge.py:37 #, python-format msgid "[%s] Merging files" msgstr "[%s] Združevanje datotek" -#: ../meld/gutterrendererchunk.py:90 +#: ../meld/gutterrendererchunk.py:159 msgid "Copy _up" msgstr "Kopiraj _navzgor" -#: ../meld/gutterrendererchunk.py:91 +#: ../meld/gutterrendererchunk.py:160 msgid "Copy _down" msgstr "Kopiraj _navzdol" -#: ../meld/meldapp.py:170 +#: ../meld/meldapp.py:175 msgid "wrong number of arguments supplied to --diff" msgstr "Neveljavno število argumentov pri ukazu --diff." -#: ../meld/meldapp.py:175 +#: ../meld/meldapp.py:180 msgid "Start with an empty window" msgstr "Zagon brez odprtih oken" -#: ../meld/meldapp.py:176 ../meld/meldapp.py:178 +#: ../meld/meldapp.py:181 ../meld/meldapp.py:183 msgid "file" msgstr "datoteka" -#: ../meld/meldapp.py:176 ../meld/meldapp.py:180 +#: ../meld/meldapp.py:181 ../meld/meldapp.py:185 msgid "folder" msgstr "mapa" -#: ../meld/meldapp.py:177 +#: ../meld/meldapp.py:182 msgid "Start a version control comparison" msgstr "Zagon primerjave nadzora različic" -#: ../meld/meldapp.py:179 +#: ../meld/meldapp.py:184 msgid "Start a 2- or 3-way file comparison" msgstr "Zagon z dvojno ali trojno primerjavo datotek" -#: ../meld/meldapp.py:181 +#: ../meld/meldapp.py:186 #, fuzzy msgid "Start a 2- or 3-way folder comparison" msgstr "Zagon z dvojno ali trojno primerjavo datotek" -#: ../meld/meldapp.py:224 +#: ../meld/meldapp.py:229 #, python-format msgid "Error: %s\n" msgstr "Napaka: %s\n" -#: ../meld/meldapp.py:231 +#: ../meld/meldapp.py:236 msgid "Meld is a file and directory comparison tool." msgstr "Meld je orodje za primerjavo vsebine datotek in map." -#: ../meld/meldapp.py:235 +#: ../meld/meldapp.py:240 msgid "Set label to use instead of file name" msgstr "Določi naslov namesto imena datoteke" -#: ../meld/meldapp.py:238 +#: ../meld/meldapp.py:243 msgid "Open a new tab in an already running instance" msgstr "Odpri nov zavihek v že zagnanem programu" -#: ../meld/meldapp.py:241 +#: ../meld/meldapp.py:246 msgid "Automatically compare all differing files on startup" msgstr "Ob zagonu samodejno primerjaj vse različne datoteke." -#: ../meld/meldapp.py:244 +#: ../meld/meldapp.py:249 msgid "Ignored for compatibility" msgstr "Prezrto zaradi skladnosti" -#: ../meld/meldapp.py:248 +#: ../meld/meldapp.py:253 msgid "Set the target file for saving a merge result" msgstr "Določitev ciljne datoteke za shranjevanje rezultatov združevanja." -#: ../meld/meldapp.py:251 +#: ../meld/meldapp.py:256 msgid "Automatically merge files" msgstr "Samodejno združi datoteke" -#: ../meld/meldapp.py:255 +#: ../meld/meldapp.py:260 msgid "Load a saved comparison from a Meld comparison file" msgstr "Naloži shranjeno datoteko primerjav Meld" -#: ../meld/meldapp.py:259 +#: ../meld/meldapp.py:264 msgid "Create a diff tab for the supplied files or folders" msgstr "Ustvari zavihke primerjav za navedene datoteke ali mape." -#: ../meld/meldapp.py:279 +#: ../meld/meldapp.py:284 #, python-format msgid "too many arguments (wanted 0-3, got %d)" msgstr "preveč argumentov (zahtevanih 0-3, prejetih %d)" -#: ../meld/meldapp.py:282 +#: ../meld/meldapp.py:287 msgid "can't auto-merge less than 3 files" msgstr "manj kot treh datotek ni mogoče samodejno združevati" -#: ../meld/meldapp.py:284 +#: ../meld/meldapp.py:289 msgid "can't auto-merge directories" msgstr "map ni mogoče samodejno združevati" -#: ../meld/meldapp.py:298 +#: ../meld/meldapp.py:303 msgid "Error reading saved comparison file" msgstr "Napaka med branjem datoteke primerjav" +#: ../meld/meldapp.py:330 +#, python-format +msgid "invalid path or URI \"%s\"" +msgstr "" + #. TRANSLATORS: This is the label of a new, currently-unnamed file. #: ../meld/meldbuffer.py:131 msgid "" msgstr "" -#: ../meld/melddoc.py:78 ../meld/melddoc.py:79 +#: ../meld/melddoc.py:64 msgid "untitled" msgstr "neimenovano" @@ -1791,109 +2155,74 @@ msgstr "Ustavi trenutno dejanje" msgid "Refresh the view" msgstr "Osveži pogled" -#: ../meld/meldwindow.py:111 -msgid "_Tabs" -msgstr "_Zavihki" - #: ../meld/meldwindow.py:112 -msgid "_Previous Tab" -msgstr "_Predhodni zavihek" - -#: ../meld/meldwindow.py:113 -msgid "Activate previous tab" -msgstr "Pokaži predhodni zavihek" - -#: ../meld/meldwindow.py:115 -msgid "_Next Tab" -msgstr "_Naslednji zavihek" - -#: ../meld/meldwindow.py:116 -msgid "Activate next tab" -msgstr "Pokaži naslednji zavihek" - -#: ../meld/meldwindow.py:119 -msgid "Move Tab _Left" -msgstr "Premakni zavihek _levo" - -#: ../meld/meldwindow.py:120 -msgid "Move current tab to left" -msgstr "Premakni trenutni zavihek na levo" - -#: ../meld/meldwindow.py:123 -msgid "Move Tab _Right" -msgstr "Premakni zavihek _desno" - -#: ../meld/meldwindow.py:124 -msgid "Move current tab to right" -msgstr "Premakni trenutni zavihek na desno" - -#: ../meld/meldwindow.py:128 msgid "Fullscreen" msgstr "Celozaslonski način" -#: ../meld/meldwindow.py:129 +#: ../meld/meldwindow.py:113 msgid "View the comparison in fullscreen" msgstr "Pokaži primerjavo v celozaslonskem načinu" -#: ../meld/meldwindow.py:131 +#: ../meld/meldwindow.py:115 msgid "_Toolbar" msgstr "_Orodna vrstica" -#: ../meld/meldwindow.py:132 +#: ../meld/meldwindow.py:116 msgid "Show or hide the toolbar" msgstr "Pokaži ali skrij orodno vrstico" -#: ../meld/meldwindow.py:141 +#: ../meld/meldwindow.py:126 msgid "Open Recent" msgstr "Odpri nedavno" -#: ../meld/meldwindow.py:142 +#: ../meld/meldwindow.py:127 msgid "Open recent files" msgstr "Odpri nedavne datoteke" -#: ../meld/meldwindow.py:164 +#: ../meld/meldwindow.py:149 msgid "_Meld" msgstr "_Meld" -#: ../meld/meldwindow.py:165 +#: ../meld/meldwindow.py:150 msgid "Quit the program" msgstr "Končaj program" -#: ../meld/meldwindow.py:167 +#: ../meld/meldwindow.py:152 msgid "Prefere_nces" msgstr "Mož_nosti" -#: ../meld/meldwindow.py:168 +#: ../meld/meldwindow.py:153 msgid "Configure the application" msgstr "Spremeni nastavitve programa" -#: ../meld/meldwindow.py:170 +#: ../meld/meldwindow.py:155 msgid "_Contents" msgstr "_Vsebina" -#: ../meld/meldwindow.py:171 +#: ../meld/meldwindow.py:156 msgid "Open the Meld manual" msgstr "Odpri priročnik Meld" -#: ../meld/meldwindow.py:173 +#: ../meld/meldwindow.py:158 msgid "About this application" msgstr "O programu" -#: ../meld/meldwindow.py:546 -msgid "Switch to this tab" -msgstr "Preklopi na ta zavihek" - -#: ../meld/meldwindow.py:657 +#: ../meld/meldwindow.py:604 #, python-format msgid "Need three files to auto-merge, got: %r" msgstr "" -#: ../meld/meldwindow.py:671 +#: ../meld/meldwindow.py:618 msgid "Cannot compare a mixture of files and directories" msgstr "Ni mogoče sočasno primerjati datotek in map" +#: ../meld/misc.py:203 +#, python-format +msgid "Couldn't find colour scheme details for %s-%s; this is a bad install" +msgstr "" + #. no common path. empty names get changed to "[None]" -#: ../meld/misc.py:218 +#: ../meld/misc.py:263 msgid "[None]" msgstr "[noben]" @@ -1909,28 +2238,24 @@ msgstr "vzorec" msgid "Version control:" msgstr "Nadzor različic:" -#: ../meld/ui/findbar.py:144 -msgid "Regular expression error" -msgstr "Napaka v logičnem izrazu" - -#: ../meld/ui/notebooklabel.py:65 +#: ../meld/ui/notebooklabel.py:63 msgid "Close tab" msgstr "Zapri zavihek" -#: ../meld/ui/vcdialogs.py:61 +#: ../meld/ui/vcdialogs.py:48 msgid "No files will be committed" msgstr "Ni pripravljenih datotek za uveljavitev" #. Translators: First %s is replaced by translated "%d unpushed #. commits", second %s is replaced by translated "%d branches" -#: ../meld/vc/git.py:126 +#: ../meld/vc/git.py:94 #, python-format msgid "%s in %s" msgstr "%s v %s" #. Translators: These messages cover the case where there is #. only one branch, and are not part of another message. -#: ../meld/vc/git.py:127 ../meld/vc/git.py:134 +#: ../meld/vc/git.py:95 ../meld/vc/git.py:102 #, python-format msgid "%d unpushed commit" msgid_plural "%d unpushed commits" @@ -1939,7 +2264,7 @@ msgstr[1] "%d neobjavljena uveljavitev" msgstr[2] "%d neobjavljeni uveljavitvi" msgstr[3] "%d neobjavljene uveljavitve" -#: ../meld/vc/git.py:129 +#: ../meld/vc/git.py:97 #, python-format msgid "%d branch" msgid_plural "%d branches" @@ -1948,164 +2273,159 @@ msgstr[1] "%d veja" msgstr[2] "%d veji" msgstr[3] "%d veje" -#: ../meld/vc/git.py:348 +#: ../meld/vc/git.py:330 #, python-format msgid "Mode changed from %s to %s" msgstr "Način je spremenjen iz %s v %s" -#: ../meld/vc/_vc.py:47 +#: ../meld/vc/git.py:338 +msgid "Partially staged" +msgstr "" + +#: ../meld/vc/git.py:338 +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 "Brez" + +#: ../meld/vc/svn.py:204 +#, python-format +msgid "Rev %s" +msgstr "" + +#: ../meld/vc/_vc.py:54 msgid "Merged" msgstr "Združeno" -#: ../meld/vc/_vc.py:47 +#: ../meld/vc/_vc.py:54 msgid "Base" msgstr "Osnova" -#: ../meld/vc/_vc.py:47 +#: ../meld/vc/_vc.py:54 msgid "Local" msgstr "Krajevno" -#: ../meld/vc/_vc.py:47 +#: ../meld/vc/_vc.py:54 msgid "Remote" msgstr "Oddaljeno" -#: ../meld/vc/_vc.py:65 +#: ../meld/vc/_vc.py:70 msgid "Unversioned" msgstr "Brez določene različice" -#: ../meld/vc/_vc.py:68 +#: ../meld/vc/_vc.py:73 msgid "Error" msgstr "Napaka" -#: ../meld/vc/_vc.py:70 +#: ../meld/vc/_vc.py:75 msgid "Newly added" msgstr "Nedavno dodano" -#: ../meld/vc/_vc.py:72 +#: ../meld/vc/_vc.py:77 msgid "Renamed" msgstr "Preimenovano" -#: ../meld/vc/_vc.py:73 +#: ../meld/vc/_vc.py:78 msgid "Conflict" msgstr "V sporu" -#: ../meld/vc/_vc.py:74 +#: ../meld/vc/_vc.py:79 msgid "Removed" msgstr "Odstranjeno" -#: ../meld/vc/_vc.py:75 +#: ../meld/vc/_vc.py:80 msgid "Missing" msgstr "Manjkajoče" -#: ../meld/vc/_vc.py:76 +#: ../meld/vc/_vc.py:81 msgid "Not present" msgstr "Ni na voljo" -#: ../meld/vcview.py:233 ../meld/vcview.py:417 -msgid "Location" -msgstr "Mesto" - -#: ../meld/vcview.py:234 -msgid "Status" -msgstr "Stanje" - -#: ../meld/vcview.py:235 -msgid "Revision" -msgstr "Predelava" - -#: ../meld/vcview.py:236 -msgid "Options" -msgstr "Možnosti" - -#. TRANSLATORS: this is an error message when a version control -#. application isn't installed or can't be found -#: ../meld/vcview.py:324 +#. Translators: This error message is shown when a version +#. control binary isn't installed. +#: ../meld/vcview.py:245 #, python-format -msgid "%s not installed" -msgstr "Program %s ni nameščen" - -#. TRANSLATORS: this is an error message when a version -#. controlled repository is invalid or corrupted -#: ../meld/vcview.py:328 -msgid "Invalid repository" -msgstr "Neveljavno skladišče" +msgid "%(name)s (%(cmd)s not installed)" +msgstr "" -#: ../meld/vcview.py:337 +#. Translators: This error message is shown when a version +#. controlled repository is invalid. +#: ../meld/vcview.py:249 #, python-format -msgid "%s (%s)" -msgstr "%s (%s)" - -#: ../meld/vcview.py:339 ../meld/vcview.py:347 -msgid "None" -msgstr "Brez" +msgid "%(name)s (Invalid repository)" +msgstr "" -#: ../meld/vcview.py:358 +#: ../meld/vcview.py:270 msgid "No valid version control system found in this folder" msgstr "Ni veljavnega sistema za nadzor različic v tej mapi" -#: ../meld/vcview.py:360 +#: ../meld/vcview.py:272 msgid "Only one version control system found in this folder" msgstr "V tej mapi je le en sistem nadzora različic" -#: ../meld/vcview.py:362 +#: ../meld/vcview.py:274 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 the user is diffing -#: ../meld/vcview.py:417 +#. TRANSLATORS: This is the location of the directory being viewed +#: ../meld/vcview.py:326 #, python-format msgid "%s: %s" msgstr "%s: %s" -#: ../meld/vcview.py:431 ../meld/vcview.py:439 +#: ../meld/vcview.py:346 #, python-format msgid "Scanning %s" msgstr "Preiskovanje %s" -#: ../meld/vcview.py:479 +#: ../meld/vcview.py:385 msgid "(Empty)" msgstr "(Prazno)" -#: ../meld/vcview.py:522 +#: ../meld/vcview.py:429 #, python-format msgid "%s — local" msgstr "%s — krajevno" -#: ../meld/vcview.py:523 +#: ../meld/vcview.py:430 #, python-format msgid "%s — remote" msgstr "%s — oddaljeno" -#: ../meld/vcview.py:531 +#: ../meld/vcview.py:438 #, fuzzy, python-format msgid "%s (local, merge, remote)" msgstr "Objavljanje krajevne veje <%s> na oddaljeno vejo <%s>" -#: ../meld/vcview.py:536 +#: ../meld/vcview.py:443 #, fuzzy, python-format msgid "%s (remote, merge, local)" msgstr "Objavljanje krajevne veje <%s> na oddaljeno vejo <%s>" -#: ../meld/vcview.py:547 +#: ../meld/vcview.py:454 #, python-format msgid "%s — repository" msgstr "%s — skladišče" -#: ../meld/vcview.py:553 +#: ../meld/vcview.py:460 #, python-format msgid "%s (working, repository)" msgstr "%s (delovno, skladišče)" -#: ../meld/vcview.py:557 +#: ../meld/vcview.py:464 #, python-format msgid "%s (repository, working)" msgstr "%s (skladišče, delovno)" -#: ../meld/vcview.py:741 +#: ../meld/vcview.py:632 msgid "Remove folder and all its files?" msgstr "Ali želite izbrisati mapo in vse njene datoteke?" -#: ../meld/vcview.py:743 +#: ../meld/vcview.py:634 msgid "" "This will remove all selected files and folders, and all files within any " "selected folders, from version control." @@ -2113,11 +2433,149 @@ msgstr "" "S tem dejanjem bodo odstranjene vse izbrane datoteke in mape in vse " "podrejene datoteke iz sistema za nadzor različic" -#: ../meld/vcview.py:777 +#: ../meld/vcview.py:659 #, python-format msgid "Error removing %s" msgstr "Napaka med odstranjevanjem %s" +#: ../meld/vcview.py:739 +msgid "Clear" +msgstr "" + +#~ msgid "Meld does not support Python 3." +#~ msgstr "Program Meld ne podpira okolja Python 3." + +#, fuzzy +#~ msgid "Automatically detected text encodings" +#~ msgstr "Dovoli samodejno skrčenje besedila ob združevanju" + +#~ 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 "" +#~ "'%s' contains characters not encodable with '%s'\n" +#~ "Would you like to save as UTF-8?" +#~ msgstr "" +#~ "'%s' vsebuje znake, ki jih ni mogoče kodirati v naboru '%s'\n" +#~ "Ali naj se datoteka shrani v naboru UTF-8?" + +#~ 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 "Invalid repository" +#~ msgstr "Neveljavno skladišče" + +#~ 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" From 4ff3f5ac5cc998a47d43e9b18375a489079f002a Mon Sep 17 00:00:00 2001 From: Vasily Galkin Date: Thu, 18 Aug 2016 11:56:28 +0300 Subject: [PATCH 0008/1316] vcview: Go to parent directory until existing one found (bgo#770076) After this change when meld is passed non-existing path it opens the first existing parent. --- meld/vcview.py | 52 ++++++++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/meld/vcview.py b/meld/vcview.py index cbc827a1..0476d5b1 100644 --- a/meld/vcview.py +++ b/meld/vcview.py @@ -229,30 +229,36 @@ def populate_vcs_for_location(self, location): vcs_model = self.combobox_vcs.get_model() vcs_model.clear() - # VC systems work at the directory level, so make sure we're checking - # for VC support there instead of on a specific file. + # VC systems can be executed at the directory level, so make sure + # we're checking for VC support there instead of + # on a specific file or on deleted/unexisting path inside vc location = os.path.abspath(location or ".") - if os.path.isfile(location): - location = os.path.dirname(location) - - for avc in vc.get_vcs(location): - err_str = '' - vc_details = {'name': avc.NAME, 'cmd': avc.CMD} - - if not avc.is_installed(): - # Translators: This error message is shown when a version - # control binary isn't installed. - err_str = _("%(name)s (%(cmd)s not installed)") - elif not avc.valid_repo(location): - # Translators: This error message is shown when a version - # controlled repository is invalid. - err_str = _("%(name)s (Invalid repository)") - - if err_str: - vcs_model.append([err_str % vc_details, avc, False]) - continue - - vcs_model.append([avc.NAME, avc(location), True]) + while not os.path.isdir(location): + parent_location = os.path.dirname(location) + if len(parent_location) >= len(location): + # no existing parent: for example unexisting drive on Windows + break + location = parent_location + else: + # existing parent directory was found + for avc in vc.get_vcs(location): + err_str = '' + vc_details = {'name': avc.NAME, 'cmd': avc.CMD} + + if not avc.is_installed(): + # Translators: This error message is shown when a version + # control binary isn't installed. + err_str = _("%(name)s (%(cmd)s not installed)") + elif not avc.valid_repo(location): + # Translators: This error message is shown when a version + # controlled repository is invalid. + err_str = _("%(name)s (Invalid repository)") + + if err_str: + vcs_model.append([err_str % vc_details, avc, False]) + continue + + vcs_model.append([avc.NAME, avc(location), True]) valid_vcs = [(i, r[1].NAME) for i, r in enumerate(vcs_model) if r[2]] default_active = min(valid_vcs)[0] if valid_vcs else 0 From 5929ab6e6214ac65c4877cc107c6b81035b3e8a5 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 21 Aug 2016 07:36:22 +1000 Subject: [PATCH 0009/1316] Update AppData to include new fields and switch the contact Since the contact is primarily there for update requests, there's not much point in it going to a list it's not subscribed to... I just end up moderating it anyway. --- data/meld.appdata.xml.in | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/data/meld.appdata.xml.in b/data/meld.appdata.xml.in index 99d6220a..dfde438a 100644 --- a/data/meld.appdata.xml.in +++ b/data/meld.appdata.xml.in @@ -27,20 +27,23 @@ UserDocs - + http://meldmerge.org/images/meld-filediff-full.png - + http://meldmerge.org/images/meld-dircomp-full.png - + http://meldmerge.org/images/meld-vc-full.png http://meldmerge.org + http://meldmerge.org/help/ https://bugzilla.gnome.org/enter_bug.cgi?product=meld http://www.gnome.org/friends/ - meld-list@gnome.org + https://wiki.gnome.org/TranslationProject + kai.willadsen@gmail.com GNOME + <_developer_name>The GNOME Project meld From 946abbd7cec6803515e4e118602f754221e39ff3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Dr=C4=85g?= Date: Sun, 21 Aug 2016 09:52:18 +0200 Subject: [PATCH 0010/1316] Updated Polish translation --- po/pl.po | 723 ++++++++++++++++++++++++++----------------------------- 1 file changed, 340 insertions(+), 383 deletions(-) diff --git a/po/pl.po b/po/pl.po index f6739dcf..c69d6072 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1,43 +1,35 @@ -# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -# Aviary.pl -# Jeśli masz jakiekolwiek uwagi odnoszące się do tłumaczenia lub chcesz -# pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas: -# gnomepl@aviary.pl -# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +# Polish translation for meld. +# Copyright © 2011-2016 the meld authors. +# This file is distributed under the same license as the meld package. # Marcin Floryan , 2011. # Piotr Drąg , 2011-2016. -# Aviary.pl , 2011-2016. +# Aviary.pl , 2011-2016. +# msgid "" msgstr "" "Project-Id-Version: meld\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-08 14:34+0100\n" -"PO-Revision-Date: 2016-03-08 14:35+0100\n" +"POT-Creation-Date: 2016-08-21 09:50+0200\n" +"PO-Revision-Date: 2016-08-21 09:51+0200\n" "Last-Translator: Piotr Drąg \n" -"Language-Team: Polish \n" +"Language-Team: Polish \n" "Language: pl\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%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Poedit-Language: Polish\n" -"X-Poedit-Country: Poland\n" -#: ../bin/meld:144 +#: ../bin/meld:142 msgid "Cannot import: " msgstr "Nie można zaimportować: " -#: ../bin/meld:147 +#: ../bin/meld:145 #, c-format msgid "Meld requires %s or higher." msgstr "Program Meld wymaga wersji %s lub nowszej." -#: ../bin/meld:151 -msgid "Meld does not support Python 3." -msgstr "Program Meld nie obsługuje biblioteki Python 3." - -#: ../bin/meld:200 +#: ../bin/meld:194 #, c-format msgid "" "Couldn't load Meld-specific CSS (%s)\n" @@ -61,7 +53,7 @@ msgstr "Przeglądarka różnic Meld" #: ../data/meld.desktop.in.h:4 ../data/meld.appdata.xml.in.h:2 msgid "Compare and merge your files" -msgstr "Porównywanie i scalanie plików" +msgstr "Porównywanie i scalanie plików" #. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! #: ../data/meld.desktop.in.h:6 @@ -75,20 +67,24 @@ msgid "" "two- and three-way comparison of both files and directories, and supports " "many version control systems including Git, Mercurial, Bazaar and Subversion." msgstr "" -"Meld jest narzędziem do wizualnego porównywania i scalania plików " +"Meld jest narzędziem do wizualnego porównywania i scalania plików " "przeznaczonym dla programistów. Program Meld pomaga porównywać pliki, " -"katalogi i projekty systemów kontroli wersji. Umożliwia on porównywanie " -"dwóch lub trzech plików i katalogów, i obsługuje wiele systemów kontroli " -"wersji, w tym Git, Mercurial, Bazaar i Subversion." +"katalogi i projekty systemów kontroli wersji. Umożliwia on porównywanie " +"dwóch lub trzech plików i katalogów, i obsługuje wiele systemów kontroli " +"wersji, w tym Git, Mercurial, Bazaar i Subversion." #: ../data/meld.appdata.xml.in.h:4 msgid "" "Meld helps you review code changes, understand patches, and makes enormous " "merge conflicts slightly less painful." msgstr "" -"Program Meld pomaga przeglądać zmiany w kodzie, rozumieć poprawki i choć " +"Program Meld pomaga przeglądać zmiany w kodzie, rozumieć poprawki i choć " "trochę ułatwić olbrzymie konflikty scalania." +#: ../data/meld.appdata.xml.in.h:5 +msgid "The GNOME Project" +msgstr "Projekt GNOME" + #: ../data/mime/meld.xml.in.h:1 msgid "Meld comparison description" msgstr "Opis porównywania programu Meld" @@ -130,8 +126,8 @@ msgid "" msgstr "" "Program Meld będzie używał tych kodowań tekstu, aby próbować dekodować " "wczytane pliki tekstowe przed próbowaniem innych kodowań. Dodatkowo poza " -"kodowaniami na tej liście, UTF-8 i domyślne kodowanie bieżącej lokalizacji " -"będą zawsze używane. Inne kodowania mogą być także próbowane, w zależności " +"kodowaniami na tej liście, UTF-8 i domyślne kodowanie bieżącej lokalizacji " +"będą zawsze używane. Inne kodowania mogą być także próbowane, w zależności " "od lokalizacji użytkownika." #: ../data/org.gnome.meld.gschema.xml.h:9 @@ -170,8 +166,8 @@ msgid "" "Whether to highlight syntax in comparisons. Because of Meld's own color " "highlighting, this is off by default." msgstr "" -"Określa, czy wyróżniać składnię w porównaniach. Jest to domyślnie wyłączone " -"z powodu własnego wyróżniania kolorów programu Meld." +"Określa, czy wyróżniać składnię w porównaniach. Jest to domyślnie wyłączone " +"z powodu własnego wyróżniania kolorów programu Meld." #: ../data/org.gnome.meld.gschema.xml.h:17 msgid "Color scheme to use for syntax highlighting" @@ -193,7 +189,7 @@ msgid "" "values are 'space', 'tab', 'newline' and 'nbsp'." msgstr "" "Wybór poszczególnych typów białych znaków do wyświetlania. Możliwe wartości: " -"„space”, „tab”, „newline” i „nbsp”." +"„space”, „tab”, „newline” i „nbsp”." #: ../data/org.gnome.meld.gschema.xml.h:21 msgid "Wrap mode" @@ -205,7 +201,7 @@ msgid "" "not at all ('none'), at any character ('char') or only at the end of words " "('word')." msgstr "" -"Wiersze w porównaniach plików będą zawijane według tego ustawienia. Możliwe " +"Wiersze w porównaniach plików będą zawijane według tego ustawienia. Możliwe " "wartości: „none” (brak zawijania), „char” (na dowolnym znaku) lub " "„word” (tylko na końcu wyrazów)." @@ -218,19 +214,19 @@ msgid "" "If true, the line containing the cursor will be highlighted in file " "comparisons." msgstr "" -"Jeśli wynosi „true”, to wiersz zawierający kursor będzie wyróżniany w " -"porównaniach plików." +"Jeśli wynosi „true”, to wiersz zawierający kursor będzie wyróżniany " +"w porównaniach plików." #: ../data/org.gnome.meld.gschema.xml.h:25 msgid "Use the system default monospace font" -msgstr "Używanie domyślnej systemowej czcionki o stałej szerokości" +msgstr "Używanie domyślnej systemowej czcionki o stałej szerokości" #: ../data/org.gnome.meld.gschema.xml.h:26 msgid "" "If false, custom-font will be used instead of the system monospace font." msgstr "" -"Jeśli wynosi „false”, to podana własna czcionka w „custom-font” będzie " -"używana zamiast systemowej czcionki o stałej szerokości." +"Jeśli wynosi „false”, to podana własna czcionka w „custom-font” będzie " +"używana zamiast systemowej czcionki o stałej szerokości." #: ../data/org.gnome.meld.gschema.xml.h:27 msgid "Custom font" @@ -241,7 +237,7 @@ msgid "" "The custom font to use, stored as a string and parsed as a Pango font " "description." msgstr "" -"Używana własna czcionka, przechowywana jako ciąg i przetwarzana jako opis " +"Używana własna czcionka, przechowywana jako ciąg i przetwarzana jako opis " "czcionki biblioteki Pango." #: ../data/org.gnome.meld.gschema.xml.h:29 @@ -264,7 +260,7 @@ msgid "" "If false, custom-editor-command will be used instead of the system editor " "when opening files externally." msgstr "" -"Jeśli wynosi „false”, to podany własny edytor w „custom-editor-command” " +"Jeśli wynosi „false”, to podany własny edytor w „custom-editor-command” " "będzie używany zamiast systemowego edytora podczas zewnętrznego otwierania " "plików." @@ -278,7 +274,7 @@ msgid "" "supported here; at the moment '{file}' and '{line}' are recognised tokens." msgstr "" "Polecenie używane do uruchamiania własnego edytora. Niektóre ograniczone " -"szablony są obsługiwane. W tej chwili „{file}” i „{line}” są rozpoznawanymi " +"szablony są obsługiwane. W tej chwili „{file}” i „{line}” są rozpoznawanymi " "tokenami." #: ../data/org.gnome.meld.gschema.xml.h:35 @@ -290,7 +286,7 @@ msgid "" "List of column names in folder comparison and whether they should be " "displayed." msgstr "" -"Lista nazwa kolumn w porównaniu katalogów i czy powinny być wyświetlane." +"Lista nazwa kolumn w porównaniu katalogów i czy powinny być wyświetlane." #: ../data/org.gnome.meld.gschema.xml.h:37 ../data/ui/preferences.ui.h:32 msgid "Ignore symbolic links" @@ -314,9 +310,9 @@ msgid "" "considering files to be identical if their size and mtime match, and " "different otherwise." msgstr "" -"Jeśli wynosi „true”, to porównania katalogów będą porównywały pliki w " -"oparciu wyłącznie o rozmiar i czas modyfikacji. Pliki o identycznym " -"rozmiarze i czasie modyfikacji będą uznawane za identyczne." +"Jeśli wynosi „true”, to porównania katalogów będą porównywały pliki " +"w oparciu wyłącznie o rozmiar i czas modyfikacji. Pliki o identycznym " +"rozmiarze i czasie modyfikacji będą uznawane za identyczne." #: ../data/org.gnome.meld.gschema.xml.h:41 msgid "File timestamp resolution" @@ -329,9 +325,9 @@ msgid "" "is useful when comparing files between filesystems with different timestamp " "resolution." msgstr "" -"Podczas porównywania opartego o czas modyfikacji jest to minimalna różnica w " -"nanosekundach między dwoma plikami, aby zostały uznane za różne. Jest to " -"przydatne podczas porównywania plików między systemami plików z różnym " +"Podczas porównywania opartego o czas modyfikacji jest to minimalna różnica " +"w nanosekundach między dwoma plikami, aby zostały uznane za różne. Jest to " +"przydatne podczas porównywania plików między systemami plików z różnym " "rozwiązywaniem czasu modyfikacji." #: ../data/org.gnome.meld.gschema.xml.h:43 ../data/ui/preferences.ui.h:30 @@ -345,7 +341,7 @@ msgid "" "differences." msgstr "" "Jeśli wynosi „true”, to porównania katalogów, które porównują treść plików " -"także zastosowują aktywne filtry tekstowe i opcję usuwania pustych wierszy, " +"także zastosowują aktywne filtry tekstowe i opcję usuwania pustych wierszy, " "oraz ignorują różnice znaczników nowych wierszy." #: ../data/org.gnome.meld.gschema.xml.h:45 @@ -355,7 +351,7 @@ msgstr "Filtry stanu plików" #: ../data/org.gnome.meld.gschema.xml.h:46 msgid "List of statuses used to filter visible files in folder comparison." msgstr "" -"Lista stanów używanych do filtrowania widocznym plików w porównaniu " +"Lista stanów używanych do filtrowania widocznym plików w porównaniu " "katalogów." #: ../data/org.gnome.meld.gschema.xml.h:47 @@ -367,7 +363,7 @@ msgid "" "If true, a console output section will be shown in version control views, " "showing the commands run for version control operations." msgstr "" -"Jeśli wynosi „true”, to sekcja wyjścia konsoli będzie wyświetlana w widokach " +"Jeśli wynosi „true”, to sekcja wyjścia konsoli będzie wyświetlana w widokach " "kontroli wersji, wyświetlając polecenia wykonywane do działań kontroli " "wersji." @@ -395,14 +391,14 @@ msgid "" msgstr "" "Jeśli wynosi „true”, to porównania kontroli wersji będą używały schematu " "lewy-jest-lokalny, prawy-jest-zdalny, aby ustalić kolejność wyświetlania " -"plików w panelach. W przeciwnym wypadku używany będzie schemat lewo-jest-" +"plików w panelach. W przeciwnym wypadku używany będzie schemat lewo-jest-" "ich, prawo-jest-moje." #: ../data/org.gnome.meld.gschema.xml.h:53 msgid "Order for files in three-way version control merge comparisons" msgstr "" -"Kolejność plików podczas porównywania trzech plików w czasie scalania w " -"systemie kontroli wersji" +"Kolejność plików podczas porównywania trzech plików w czasie scalania " +"w systemie kontroli wersji" #: ../data/org.gnome.meld.gschema.xml.h:54 msgid "" @@ -411,13 +407,13 @@ msgid "" "control view, so is used solely for merges/conflict resolution within Meld." msgstr "" "Można wybrać kolejność: zdalne/scalone/lokalne lub lokalne/scalone/zdalne. " -"Ta preferencja ma wpływ tylko na porównania trzech plików wykonane z widoku " +"Ta preferencja ma wpływ tylko na porównania trzech plików wykonane z widoku " "kontroli wersji, więc jest używana wyłącznie do scalania/rozwiązywania " -"konfliktów w ramach programu Meld." +"konfliktów w ramach programu Meld." #: ../data/org.gnome.meld.gschema.xml.h:55 msgid "Show margin in commit message editor" -msgstr "Wyświetlanie marginesów w edytorze komunikatów zatwierdzeń" +msgstr "Wyświetlanie marginesów w edytorze komunikatów zatwierdzeń" #: ../data/org.gnome.meld.gschema.xml.h:56 msgid "" @@ -425,18 +421,18 @@ msgid "" "the version control commit message editor." msgstr "" "Jeśli wynosi „true”, to wyświetlana będzie linia oznaczająca kolumnę " -"marginesu w edytorze komunikatów zatwierdzeń kontroli wersji." +"marginesu w edytorze komunikatów zatwierdzeń kontroli wersji." #: ../data/org.gnome.meld.gschema.xml.h:57 msgid "Margin column in commit message editor" -msgstr "Kolumna marginesu w edytorze komunikatów zatwierdzeń" +msgstr "Kolumna marginesu w edytorze komunikatów zatwierdzeń" #: ../data/org.gnome.meld.gschema.xml.h:58 msgid "" "The column at which to show the margin in the version control commit message " "editor." msgstr "" -"Kolumna, w której wyświetlać margines w edytorze komunikatów zatwierdzeń " +"Kolumna, w której wyświetlać margines w edytorze komunikatów zatwierdzeń " "kontroli wersji." #: ../data/org.gnome.meld.gschema.xml.h:59 @@ -460,20 +456,20 @@ msgstr "Filtry stanu kontroli wersji" msgid "" "List of statuses used to filter visible files in version control comparison." msgstr "" -"Lista stanów używanych do filtrowania widocznych plików w porównaniu " +"Lista stanów używanych do filtrowania widocznych plików w porównaniu " "kontroli wersji." #: ../data/org.gnome.meld.gschema.xml.h:63 msgid "Filename-based filters" -msgstr "Filtry oparte o nazwy plików" +msgstr "Filtry oparte o nazwy plików" #: ../data/org.gnome.meld.gschema.xml.h:64 msgid "" "List of predefined filename-based filters that, if active, will remove " "matching files from a folder comparison." msgstr "" -"Lista uprzednio podanych filtrów opartych o nazwy plików które, jeśli są " -"aktywne, będą usuwały pasujące pliki z porównania katalogów." +"Lista uprzednio podanych filtrów opartych o nazwy plików które, jeśli są " +"aktywne, będą usuwały pasujące pliki z porównania katalogów." #: ../data/org.gnome.meld.gschema.xml.h:65 msgid "Text-based filters" @@ -485,9 +481,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 "" -"Lista uprzednio podanych filtrów wyrażeń regularnych opartych o tekst które, " -"jeśli są aktywne, będą usuwały tekst z porównania plików. Tekst będzie nadal " -"wyświetlany, ale nie będzie zawarty w samym porównaniu." +"Lista uprzednio podanych filtrów wyrażeń regularnych opartych o tekst które, " +"jeśli są aktywne, będą usuwały tekst z porównania plików. Tekst będzie nadal " +"wyświetlany, ale nie będzie zawarty w samym porównaniu." #: ../data/styles/meld-base.xml.h:1 msgid "Meld base scheme" @@ -496,8 +492,8 @@ msgstr "Podstawowy schemat kolorów programu Meld" #: ../data/styles/meld-base.xml.h:2 msgid "Base color scheme for Meld highlighting" msgstr "" -"Podstawowy schemat kolorów używany do wyróżniania elementów składni w " -"programie Meld" +"Podstawowy schemat kolorów używany do wyróżniania elementów składni " +"w programie Meld" #: ../data/styles/meld-dark.xml.h:1 msgid "Meld dark scheme" @@ -506,12 +502,12 @@ msgstr "Ciemny schemat kolorów programu Meld" #: ../data/styles/meld-dark.xml.h:2 msgid "Dark color scheme for Meld highlighting" msgstr "" -"Ciemny schemat kolorów używany do wyróżniania elementów składni w programie " +"Ciemny schemat kolorów używany do wyróżniania elementów składni w programie " "Meld" #: ../data/ui/application.ui.h:1 msgid "About Meld" -msgstr "O programie Meld" +msgstr "O programie Meld" #: ../data/ui/application.ui.h:2 msgid "" @@ -530,7 +526,7 @@ msgid "translator-credits" msgstr "" "Marcin Floryan , 2011\n" "Piotr Drąg , 2011-2016\n" -"Aviary.pl , 2011-2016" +"Aviary.pl , 2011-2016" #: ../data/ui/application.ui.h:6 msgid "_Preferences" @@ -546,7 +542,7 @@ msgstr "Skróty klawiszowe" #: ../data/ui/application.ui.h:9 msgid "_About" -msgstr "_O programie" +msgstr "_O programie" #: ../data/ui/application.ui.h:10 msgid "_Quit" @@ -562,7 +558,7 @@ msgstr "Porównuje zaznaczone pliki" #: ../data/ui/dirdiff.ui.h:3 msgid "Copy to _Left" -msgstr "Skopiuj w _lewo" +msgstr "Skopiuj w _lewo" #: ../data/ui/dirdiff.ui.h:4 msgid "Copy to left" @@ -570,7 +566,7 @@ msgstr "Kopiuje element na lewo" #: ../data/ui/dirdiff.ui.h:5 msgid "Copy to _Right" -msgstr "Skopiuj w p_rawo" +msgstr "Skopiuj w p_rawo" #: ../data/ui/dirdiff.ui.h:6 msgid "Copy to right" @@ -580,7 +576,7 @@ msgstr "Kopiuje element na prawo" msgid "Delete selected" msgstr "Usuwa zaznaczone" -#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:858 ../meld/filediff.py:1381 +#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:859 ../meld/filediff.py:1384 msgid "Hide" msgstr "Ukryj" @@ -590,13 +586,13 @@ msgstr "Ukrywa zaznaczone" #: ../data/ui/dirdiff.ui.h:10 msgid "Ignore Filename Case" -msgstr "Ignorowanie wielkości liter w nazwach plików" +msgstr "Ignorowanie wielkości liter w nazwach plików" #: ../data/ui/dirdiff.ui.h:11 msgid "" "Consider differently-cased filenames that are otherwise-identical to be the " "same" -msgstr "Traktuje nazwy plików z literami różnej wielkości jako takie same" +msgstr "Traktuje nazwy plików z literami różnej wielkości jako takie same" #: ../data/ui/dirdiff.ui.h:12 msgid "Same" @@ -614,7 +610,7 @@ msgstr "Nowe" msgid "Show new" msgstr "Wyświetla nowe" -#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:74 +#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:76 msgid "Modified" msgstr "Zmodyfikowane" @@ -647,7 +643,7 @@ msgid "_Add" msgstr "_Dodaj" #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11 -#: ../meld/vcview.py:649 +#: ../meld/vcview.py:644 msgid "_Remove" msgstr "U_suń" @@ -661,15 +657,15 @@ msgstr "Przesuń do gó_ry" #: ../data/ui/EditableList.ui.h:8 msgid "Move item down" -msgstr "Przesuwa element w dół" +msgstr "Przesuwa element w dół" #: ../data/ui/EditableList.ui.h:9 msgid "Move _Down" -msgstr "Przesuń w _dół" +msgstr "Przesuń w _dół" #. Create icon and filename CellRenderer #: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35 -#: ../meld/dirdiff.py:372 +#: ../meld/dirdiff.py:373 msgid "Name" msgstr "Nazwa" @@ -699,7 +695,7 @@ msgstr "Z_apisz wszystkie" #: ../data/ui/filediff.ui.h:4 msgid "Save all files in the current comparison" -msgstr "Zapisuje wszystkie pliki w bieżącym porównaniu" +msgstr "Zapisuje wszystkie pliki w bieżącym porównaniu" #: ../data/ui/filediff.ui.h:5 msgid "Revert files to their saved versions" @@ -739,7 +735,7 @@ msgstr "Przechodzi do następnego konfliktu" #: ../data/ui/filediff.ui.h:14 msgid "Push to Left" -msgstr "Przenieś w lewo" +msgstr "Przenieś w lewo" #: ../data/ui/filediff.ui.h:15 msgid "Push current change to the left" @@ -747,7 +743,7 @@ msgstr "Przenosi bieżącą zmianę na lewo" #: ../data/ui/filediff.ui.h:16 msgid "Push to Right" -msgstr "Przenieś w prawo" +msgstr "Przenieś w prawo" #: ../data/ui/filediff.ui.h:17 msgid "Push current change to the right" @@ -755,19 +751,19 @@ msgstr "Przenosi bieżącą zmianę na prawo" #: ../data/ui/filediff.ui.h:18 msgid "Pull from Left" -msgstr "Wprowadź z lewej" +msgstr "Wprowadź z lewej" #: ../data/ui/filediff.ui.h:19 msgid "Pull change from the left" -msgstr "Wprowadza zmianę z lewej" +msgstr "Wprowadza zmianę z lewej" #: ../data/ui/filediff.ui.h:20 msgid "Pull from Right" -msgstr "Wprowadź z prawej" +msgstr "Wprowadź z prawej" #: ../data/ui/filediff.ui.h:21 msgid "Pull change from the right" -msgstr "Wprowadza zmianę z prawej" +msgstr "Wprowadza zmianę z prawej" #: ../data/ui/filediff.ui.h:22 msgid "Copy Above Left" @@ -811,19 +807,19 @@ msgstr "Usuwa zmianę" #: ../data/ui/filediff.ui.h:32 msgid "Merge All from Left" -msgstr "Scal wszystkie z lewej" +msgstr "Scal wszystkie z lewej" #: ../data/ui/filediff.ui.h:33 msgid "Merge all non-conflicting changes from the left" -msgstr "Scala wszystkie zmiany bez konfliktów z lewej" +msgstr "Scala wszystkie zmiany bez konfliktów z lewej" #: ../data/ui/filediff.ui.h:34 msgid "Merge All from Right" -msgstr "Scal wszystkie z prawej" +msgstr "Scal wszystkie z prawej" #: ../data/ui/filediff.ui.h:35 msgid "Merge all non-conflicting changes from the right" -msgstr "Scala wszystkie zmiany bez konfliktów z prawej" +msgstr "Scala wszystkie zmiany bez konfliktów z prawej" #: ../data/ui/filediff.ui.h:36 msgid "Merge All" @@ -831,7 +827,7 @@ msgstr "Scal wszystkie" #: ../data/ui/filediff.ui.h:37 msgid "Merge all non-conflicting changes from left and right panes" -msgstr "Scala wszystkie zmiany bez konfliktów z lewej oraz z prawej strony" +msgstr "Scala wszystkie zmiany bez konfliktów z lewej oraz z prawej strony" #: ../data/ui/filediff.ui.h:38 msgid "Previous Pane" @@ -839,7 +835,7 @@ msgstr "Poprzedni panel" #: ../data/ui/filediff.ui.h:39 msgid "Move keyboard focus to the previous document in this comparison" -msgstr "Przechodzi do poprzedniego dokumentu w porównywanym zestawie" +msgstr "Przechodzi do poprzedniego dokumentu w porównywanym zestawie" #: ../data/ui/filediff.ui.h:40 msgid "Next Pane" @@ -847,7 +843,7 @@ msgstr "Następny panel" #: ../data/ui/filediff.ui.h:41 msgid "Move keyboard focus to the next document in this comparison" -msgstr "Przechodzi do następnego dokumentu w porównywanym zestawie" +msgstr "Przechodzi do następnego dokumentu w porównywanym zestawie" #: ../data/ui/filediff.ui.h:42 msgid "Lock Scrolling" @@ -870,8 +866,8 @@ msgstr "" msgid "Close _without Saving" msgstr "Zamknij _bez zapisywania" -#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:940 ../meld/filediff.py:1447 -#: ../meld/filediff.py:1515 +#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:941 ../meld/filediff.py:1450 +#: ../meld/filediff.py:1518 msgid "_Cancel" msgstr "_Anuluj" @@ -884,8 +880,8 @@ 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 "" -"Do tego pliku nie można zapisać. Można kliknąć tutaj, aby go odblokować i " -"wprowadzić zmiany mimo to, ale muszę być one zapisane do nowego pliku." +"Do tego pliku nie można zapisać. Można kliknąć tutaj, aby go odblokować " +"i wprowadzić zmiany mimo to, ale muszę być one zapisane do nowego pliku." #: ../data/ui/filediff.ui.h:50 msgid "File 3" @@ -901,14 +897,14 @@ msgstr "1. plik" #: ../data/ui/filediff.ui.h:53 msgid "Revert unsaved changes to documents?" -msgstr "Przywrócić niezapisane zmiany w dokumentach?" +msgstr "Przywrócić niezapisane zmiany w dokumentach?" #: ../data/ui/filediff.ui.h:54 msgid "Changes made to the following documents will be permanently lost:\n" msgstr "" "Zmiany naniesione do poniższych dokumentów zostaną bezpowrotnie utracone:\n" -#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:941 ../meld/filediff.py:1448 +#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:942 ../meld/filediff.py:1451 msgid "_Replace" msgstr "Z_amień" @@ -934,7 +930,7 @@ msgstr "Zmiana _na:" #: ../data/ui/findbar.ui.h:7 msgid "_Match case" -msgstr "_Rozróżnianie małych i wielkich liter" +msgstr "_Rozróżnianie małych i wielkich liter" #: ../data/ui/findbar.ui.h:8 msgid "Who_le word" @@ -956,7 +952,7 @@ msgstr "Sformatowanie jako poprawka" msgid "Copy to Clipboard" msgstr "Skopiuj do schowka" -#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:149 +#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:144 msgid "Save Patch" msgstr "Zapisz poprawkę" @@ -966,11 +962,11 @@ msgstr "Użycie różnic między:" #: ../data/ui/patch-dialog.ui.h:5 msgid "Left and middle panes" -msgstr "Lewym i środkowym panelem" +msgstr "Lewym i środkowym panelem" #: ../data/ui/patch-dialog.ui.h:6 msgid "Middle and right panes" -msgstr "Środkowym i prawym panelem" +msgstr "Środkowym i prawym panelem" #: ../data/ui/patch-dialog.ui.h:7 msgid "_Reverse patch direction" @@ -1018,7 +1014,7 @@ msgstr "Czcionka" #: ../data/ui/preferences.ui.h:11 msgid "_Use the system fixed width font" -msgstr "Systemowa o stałej s_zerokości" +msgstr "Systemowa o stałej s_zerokości" #: ../data/ui/preferences.ui.h:12 msgid "_Editor font:" @@ -1086,7 +1082,7 @@ msgstr "Płytkie porównanie" #: ../data/ui/preferences.ui.h:28 msgid "C_ompare files based only on size and timestamp" -msgstr "P_orównywanie plików w oparciu tylko o rozmiar i czas modyfikacji" +msgstr "P_orównywanie plików w oparciu tylko o rozmiar i czas modyfikacji" #: ../data/ui/preferences.ui.h:29 msgid "_Timestamp resolution:" @@ -1122,7 +1118,7 @@ msgstr "Opisy zatwierdzeń" #: ../data/ui/preferences.ui.h:39 msgid "Show _right margin at:" -msgstr "P_rawy margines w kolumnie:" +msgstr "P_rawy margines w kolumnie:" #: ../data/ui/preferences.ui.h:40 msgid "Automatically _break lines at right margin on commit" @@ -1147,7 +1143,7 @@ msgstr "" "podstawie nazwy. Każdy wzorzec jest listą symboli wieloznacznych powłoki " "rozdzieloną spacjami." -#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:104 +#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:103 msgid "File Filters" msgstr "Filtry plików" @@ -1157,7 +1153,7 @@ msgstr "Obcinanie zmian" #: ../data/ui/preferences.ui.h:46 msgid "Trim blank line differences from the start and end of changes" -msgstr "Obcinanie różnic pustych wierszy z początku i końca zmian" +msgstr "Obcinanie różnic pustych wierszy z początku i końca zmian" #: ../data/ui/preferences.ui.h:47 msgid "Text filters" @@ -1174,8 +1170,8 @@ msgstr "" "Podczas porównywania plików można zignorować pewne rodzaje zmian. Każdy " "wzorzec jest wyrażeniem regularnym języka Python, które zamienia pasujący " "tekst na pusty ciąg znaków przed wykonaniem porównania. Jeżeli wyrażenie " -"zawiera grupy, tylko grupy są zamieniane. Więcej informacji dostępne jest w " -"podręczniku użytkownika." +"zawiera grupy, tylko grupy są zamieniane. Więcej informacji dostępne jest " +"w podręczniku użytkownika." #: ../data/ui/preferences.ui.h:49 msgid "Text Filters" @@ -1239,12 +1235,12 @@ msgstr "Przełączenie na kartę" #: ../data/ui/shortcuts.ui.h:12 msgctxt "shortcut window" msgid "Move tab left" -msgstr "Przesunięcie karty w lewo" +msgstr "Przesunięcie karty w lewo" #: ../data/ui/shortcuts.ui.h:13 msgctxt "shortcut window" msgid "Move tab right" -msgstr "Przesunięcie karty w prawo" +msgstr "Przesunięcie karty w prawo" #: ../data/ui/shortcuts.ui.h:14 msgctxt "shortcut window" @@ -1324,12 +1320,12 @@ msgstr "Zapisanie bieżącego pliku" #: ../data/ui/shortcuts.ui.h:29 msgctxt "shortcut window" msgid "Save current file to new path" -msgstr "Zapisanie bieżącego pliku w nowej ścieżce" +msgstr "Zapisanie bieżącego pliku w nowej ścieżce" #: ../data/ui/shortcuts.ui.h:30 msgctxt "shortcut window" msgid "Save all files in comparison" -msgstr "Zapisanie wszystkich plików w porównaniu" +msgstr "Zapisanie wszystkich plików w porównaniu" #: ../data/ui/shortcuts.ui.h:31 msgctxt "shortcut window" @@ -1354,12 +1350,12 @@ msgstr "Przeniesienie zmiany na prawo" #: ../data/ui/shortcuts.ui.h:35 msgctxt "shortcut window" msgid "Pull change from left" -msgstr "Wprowadzenie zmiany z lewej" +msgstr "Wprowadzenie zmiany z lewej" #: ../data/ui/shortcuts.ui.h:36 msgctxt "shortcut window" msgid "Pull change from right" -msgstr "Wprowadzenie zmiany z prawej" +msgstr "Wprowadzenie zmiany z prawej" #: ../data/ui/shortcuts.ui.h:37 msgctxt "shortcut window" @@ -1419,14 +1415,15 @@ msgstr "Porównanie systemu kontroli wersji" #: ../data/ui/shortcuts.ui.h:48 msgctxt "shortcut window" msgid "Commit to version control" -msgstr "Zatwierdzenie zmiany w systemie kontroli wersji" +msgstr "Zatwierdzenie zmiany w systemie kontroli wersji" #: ../data/ui/shortcuts.ui.h:49 msgctxt "shortcut window" msgid "Show/hide console output" msgstr "Wyświetlenie/ukrycie wyjścia konsoli" -#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:668 +#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:570 +#: ../meld/newdifftab.py:38 msgid "New comparison" msgstr "Nowe porównanie" @@ -1472,7 +1469,7 @@ msgstr "Wybierz trzeci katalog" #: ../data/ui/tab-placeholder.ui.h:12 msgid "Select A Version-Controlled Folder" -msgstr "Wybierz katalog z kontrolą wersji" +msgstr "Wybierz katalog z kontrolą wersji" #: ../data/ui/tab-placeholder.ui.h:13 msgid "_Blank comparison" @@ -1488,7 +1485,7 @@ msgstr "_Zatwierdź…" #: ../data/ui/vcview.ui.h:4 msgid "Commit changes to version control" -msgstr "Zatwierdza zmiany w systemie kontroli wersji" +msgstr "Zatwierdza zmiany w systemie kontroli wersji" #: ../data/ui/vcview.ui.h:5 msgid "_Update" @@ -1496,7 +1493,7 @@ msgstr "Zaktualiz_uj" #: ../data/ui/vcview.ui.h:6 msgid "Update working copy from version control" -msgstr "Aktualizuje kopię roboczą z systemu kontroli wersji" +msgstr "Aktualizuje kopię roboczą z systemu kontroli wersji" #: ../data/ui/vcview.ui.h:7 msgid "_Push" @@ -1512,7 +1509,7 @@ msgstr "Dodaje do systemu kontroli wersji" #: ../data/ui/vcview.ui.h:12 msgid "Remove from version control" -msgstr "Usuwa z systemu kontroli wersji" +msgstr "Usuwa z systemu kontroli wersji" #: ../data/ui/vcview.ui.h:13 msgid "Mar_k as Resolved" @@ -1520,7 +1517,7 @@ msgstr "Oznacz jako _rozwiązane" #: ../data/ui/vcview.ui.h:14 msgid "Mark as resolved in version control" -msgstr "Oznacza konflikt jako rozwiązany w systemie kontroli wersji" +msgstr "Oznacza konflikt jako rozwiązany w systemie kontroli wersji" #: ../data/ui/vcview.ui.h:15 msgid "Re_vert" @@ -1532,7 +1529,7 @@ msgstr "Przywraca kopię roboczą do pierwotnego stanu" #: ../data/ui/vcview.ui.h:17 msgid "Delete from working copy" -msgstr "Usuwa z kopii roboczej" +msgstr "Usuwa z kopii roboczej" #: ../data/ui/vcview.ui.h:18 msgid "Console" @@ -1574,7 +1571,7 @@ msgstr "Poza systemem kontroli _wersji" msgid "Show unversioned files" msgstr "Wyświetla pliki poza systemem kontroli wersji" -#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:67 +#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69 msgid "Ignored" msgstr "Zignorowane" @@ -1602,7 +1599,7 @@ msgstr "Wcześniejsze zmiany:" msgid "Co_mmit" msgstr "_Zatwierdź" -#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:337 +#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:332 msgid "Location" msgstr "Położenie" @@ -1643,44 +1640,44 @@ msgid "Mac OS (CR)" msgstr "Mac OS (CR)" #. Create file size CellRenderer -#: ../meld/dirdiff.py:390 ../meld/preferences.py:82 +#: ../meld/dirdiff.py:391 ../meld/preferences.py:82 msgid "Size" msgstr "Rozmiar" #. Create date-time CellRenderer -#: ../meld/dirdiff.py:398 ../meld/preferences.py:83 +#: ../meld/dirdiff.py:399 ../meld/preferences.py:83 msgid "Modification time" msgstr "Czas modyfikacji" #. Create permissions CellRenderer -#: ../meld/dirdiff.py:406 ../meld/preferences.py:84 +#: ../meld/dirdiff.py:407 ../meld/preferences.py:84 msgid "Permissions" msgstr "Uprawnienia" -#: ../meld/dirdiff.py:536 +#: ../meld/dirdiff.py:537 #, python-format msgid "Hide %s" msgstr "Ukryj %s" -#: ../meld/dirdiff.py:668 ../meld/dirdiff.py:692 +#: ../meld/dirdiff.py:669 ../meld/dirdiff.py:693 #, python-format msgid "[%s] Scanning %s" msgstr "[%s] Skanowanie %s" -#: ../meld/dirdiff.py:825 +#: ../meld/dirdiff.py:826 #, python-format msgid "[%s] Done" msgstr "[%s] Ukończono" -#: ../meld/dirdiff.py:833 +#: ../meld/dirdiff.py:834 msgid "Folders have no differences" msgstr "Katalogi się nie różnią" -#: ../meld/dirdiff.py:835 +#: ../meld/dirdiff.py:836 msgid "Contents of scanned files in folders are identical." -msgstr "Treść zeskanowanych plików w katalogach jest identyczna." +msgstr "Treść zeskanowanych plików w katalogach jest identyczna." -#: ../meld/dirdiff.py:837 +#: ../meld/dirdiff.py:838 msgid "" "Scanned files in folders appear identical, but contents have not been " "scanned." @@ -1688,73 +1685,73 @@ msgstr "" "Zeskanowane pliki wydają się identyczne, ale treść mogła nie zostać " "zeskanowana." -#: ../meld/dirdiff.py:840 +#: ../meld/dirdiff.py:841 msgid "File filters are in use, so not all files have been scanned." msgstr "" "Filtry plików są używane, więc nie wszystkie pliki zostały zeskanowane." -#: ../meld/dirdiff.py:842 +#: ../meld/dirdiff.py:843 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." +msgstr "Filtry tekstowe są używane i mogą ukrywać różnice między plikami." -#: ../meld/dirdiff.py:860 ../meld/filediff.py:1383 ../meld/filediff.py:1413 -#: ../meld/filediff.py:1415 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 +#: ../meld/dirdiff.py:861 ../meld/filediff.py:1386 ../meld/filediff.py:1416 +#: ../meld/filediff.py:1418 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 msgid "Hi_de" msgstr "_Ukryj" -#: ../meld/dirdiff.py:870 +#: ../meld/dirdiff.py:871 msgid "Multiple errors occurred while scanning this folder" msgstr "Wystąpiło wiele błędów podczas skanowania tego katalogu" -#: ../meld/dirdiff.py:871 +#: ../meld/dirdiff.py:872 msgid "Files with invalid encodings found" -msgstr "Odnaleziono pliki z nieprawidłowym kodowaniem znaków" +msgstr "Odnaleziono pliki z nieprawidłowym kodowaniem znaków" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:873 +#: ../meld/dirdiff.py:874 msgid "Some files were in an incorrect encoding. The names are something like:" msgstr "" "Niektóre pliki mają nieprawidłowe kodowanie znaków. Nazwy tych plików to:" -#: ../meld/dirdiff.py:875 +#: ../meld/dirdiff.py:876 msgid "Files hidden by case insensitive comparison" msgstr "Pliku ukryte przez porównywanie bez uwzględniania wielkości liter" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:877 +#: ../meld/dirdiff.py:878 msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. The following files in this folder are hidden:" msgstr "" -"Uruchomione zostało porównywanie bez uwzględniania wielkości liter w " -"systemie plików, który rozróżnia wielkość liter. Następujące pliki w tym " +"Uruchomione zostało porównywanie bez uwzględniania wielkości liter " +"w systemie plików, który rozróżnia wielkość liter. Następujące pliki w tym " "katalogu zostały ukryte:" -#: ../meld/dirdiff.py:888 +#: ../meld/dirdiff.py:889 #, python-format msgid "'%s' hidden by '%s'" msgstr "„%s” ukryty przez „%s”" -#: ../meld/dirdiff.py:944 +#: ../meld/dirdiff.py:945 #, python-format msgid "Replace folder “%s”?" msgstr "Zastąpić katalog „%s”?" -#: ../meld/dirdiff.py:946 +#: ../meld/dirdiff.py:947 #, 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 "" -"Inny katalog o tej samej nazwie już istnieje w „%s”.\n" -"Zastąpienie istniejącego katalogu spowoduje utratę wszystkich plików w nim " +"Inny katalog o tej samej nazwie już istnieje w „%s”.\n" +"Zastąpienie istniejącego katalogu spowoduje utratę wszystkich plików w nim " "zawartych." -#: ../meld/dirdiff.py:959 +#: ../meld/dirdiff.py:960 msgid "Error copying file" msgstr "Błąd podczas kopiowania pliku" -#: ../meld/dirdiff.py:960 +#: ../meld/dirdiff.py:961 #, python-format msgid "" "Couldn't copy %s\n" @@ -1767,131 +1764,131 @@ msgstr "" "\n" "%s" -#: ../meld/dirdiff.py:983 +#: ../meld/dirdiff.py:984 #, python-format msgid "Error deleting %s" msgstr "Błąd podczas usuwania %s" -#: ../meld/dirdiff.py:1488 +#: ../meld/dirdiff.py:1489 msgid "No folder" msgstr "Brak katalogu" #. Abbreviations for insert and overwrite that fit in the status bar -#: ../meld/filediff.py:359 +#: ../meld/filediff.py:354 msgid "INS" msgstr "WST" -#: ../meld/filediff.py:359 +#: ../meld/filediff.py:354 msgid "OVR" msgstr "ZAS" #. Abbreviation for line, column so that it will fit in the status bar -#: ../meld/filediff.py:361 +#: ../meld/filediff.py:356 #, python-format msgid "Ln %i, Col %i" msgstr "Wrsz %i, kol %i" -#: ../meld/filediff.py:794 +#: ../meld/filediff.py:781 msgid "Comparison results will be inaccurate" msgstr "Wyniki porównania będą niepoprawne" -#: ../meld/filediff.py:796 +#: ../meld/filediff.py:783 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." msgstr "" -"Filtr zmienił liczbę wierszy w pliku, co nie jest obsługiwane. Porównanie " +"Filtr zmienił liczbę wierszy w pliku, co nie jest obsługiwane. Porównanie " "będzie niepoprawne." -#: ../meld/filediff.py:854 +#: ../meld/filediff.py:841 msgid "Mark conflict as resolved?" msgstr "Oznaczyć konflikt jako rozwiązany?" -#: ../meld/filediff.py:856 +#: ../meld/filediff.py:843 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:858 +#: ../meld/filediff.py:845 msgid "Cancel" msgstr "Anuluj" -#: ../meld/filediff.py:859 +#: ../meld/filediff.py:846 msgid "Mark _Resolved" msgstr "Oznacz jako _rozwiązane" -#: ../meld/filediff.py:1099 +#: ../meld/filediff.py:1095 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Wystąpił problem podczas otwierania pliku „%s”." -#: ../meld/filediff.py:1107 +#: ../meld/filediff.py:1103 #, python-format msgid "File %s appears to be a binary file." msgstr "Plik %s wygląda na plik binarny." -#: ../meld/filediff.py:1109 +#: ../meld/filediff.py:1105 msgid "Do you want to open the file using the default application?" -msgstr "Otworzyć go w domyślnym programie?" +msgstr "Otworzyć go w domyślnym programie?" -#: ../meld/filediff.py:1111 +#: ../meld/filediff.py:1107 msgid "Open" msgstr "Otwórz" -#: ../meld/filediff.py:1127 +#: ../meld/filediff.py:1123 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Analizowanie różnic" -#: ../meld/filediff.py:1192 +#: ../meld/filediff.py:1188 #, python-format msgid "File %s has changed on disk" msgstr "Plik %s został zmieniony na dysku" -#: ../meld/filediff.py:1193 +#: ../meld/filediff.py:1189 msgid "Do you want to reload the file?" msgstr "Ponownie wczytać plik?" -#: ../meld/filediff.py:1195 +#: ../meld/filediff.py:1191 msgid "_Reload" msgstr "_Wczytaj ponownie" -#: ../meld/filediff.py:1346 +#: ../meld/filediff.py:1349 msgid "Files are identical" msgstr "Pliki są identyczne" -#: ../meld/filediff.py:1359 +#: ../meld/filediff.py:1362 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" msgstr "" -"Filtry tekstowe są używane i mogą ukrywać różnice między plikami. Porównać " +"Filtry tekstowe są używane i mogą ukrywać różnice między plikami. Porównać " "pliki bez uwzględniania filtrów?" -#: ../meld/filediff.py:1364 +#: ../meld/filediff.py:1367 msgid "Files differ in line endings only" msgstr "Pliki różnią się tylko znacznikami końca wierszy" -#: ../meld/filediff.py:1366 +#: ../meld/filediff.py:1369 #, python-format msgid "" "Files are identical except for differing line endings:\n" "%s" msgstr "" -"Pliki są identyczne, z wyjątkiem różnych znaczników końca wierszy:\n" +"Pliki są identyczne, z wyjątkiem różnych znaczników końca wierszy:\n" "%s" -#: ../meld/filediff.py:1386 +#: ../meld/filediff.py:1389 msgid "Show without filters" msgstr "Wyświetl bez filtrów" -#: ../meld/filediff.py:1408 +#: ../meld/filediff.py:1411 msgid "Change highlighting incomplete" msgstr "Wyróżnianie zmian jest niepełne" -#: ../meld/filediff.py:1409 +#: ../meld/filediff.py:1412 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." @@ -1899,69 +1896,69 @@ 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:1417 +#: ../meld/filediff.py:1420 msgid "Keep highlighting" msgstr "Wyróżniaj dalej" -#: ../meld/filediff.py:1419 +#: ../meld/filediff.py:1422 msgid "_Keep highlighting" msgstr "_Wyróżniaj dalej" -#: ../meld/filediff.py:1451 +#: ../meld/filediff.py:1454 #, python-format msgid "Replace file “%s”?" msgstr "Zastąpić plik „%s”?" -#: ../meld/filediff.py:1453 +#: ../meld/filediff.py:1456 #, 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 "" -"Plik o tej samej nazwie już istnieje w „%s”.\n" +"Plik o tej samej nazwie już istnieje w „%s”.\n" "Zastąpienie istniejącego pliku spowoduje utratę jego zawartości." -#: ../meld/filediff.py:1470 +#: ../meld/filediff.py:1473 msgid "Save Left Pane As" msgstr "Zapis lewego panelu jako" -#: ../meld/filediff.py:1472 +#: ../meld/filediff.py:1475 msgid "Save Middle Pane As" msgstr "Zapis środkowego panelu jako" -#: ../meld/filediff.py:1474 +#: ../meld/filediff.py:1477 msgid "Save Right Pane As" msgstr "Zapis prawego panelu jako" -#: ../meld/filediff.py:1488 +#: ../meld/filediff.py:1491 #, 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:1490 +#: ../meld/filediff.py:1493 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:1493 +#: ../meld/filediff.py:1496 msgid "Save Anyway" msgstr "Zapisz mimo to" -#: ../meld/filediff.py:1494 +#: ../meld/filediff.py:1497 msgid "Don't Save" msgstr "Nie zapisuj" -#: ../meld/filediff.py:1516 +#: ../meld/filediff.py:1519 msgid "_Save as UTF-8" msgstr "_Zapisz za pomocą UTF-8" -#: ../meld/filediff.py:1519 +#: ../meld/filediff.py:1522 #, python-format msgid "Couldn't encode text as “%s”" msgstr "Nie można zakodować tekstu za pomocą „%s”" -#: ../meld/filediff.py:1521 +#: ../meld/filediff.py:1524 #, python-format msgid "" "File “%s” contains characters that can't be encoded using encoding “%s”.\n" @@ -1971,32 +1968,32 @@ msgstr "" "„%s”.\n" "Zapisać za pomocą kodowania UTF-8?" -#: ../meld/filediff.py:1558 ../meld/patchdialog.py:125 +#: ../meld/filediff.py:1564 ../meld/patchdialog.py:120 #, python-format msgid "Could not save file %s." msgstr "Nie można zapisać pliku %s." -#: ../meld/filediff.py:1559 ../meld/patchdialog.py:126 +#: ../meld/filediff.py:1565 ../meld/patchdialog.py:121 #, python-format msgid "" "Couldn't save file due to:\n" "%s" msgstr "" -"Nie można zapisać pliku z powodu:\n" +"Nie można zapisać pliku z powodu:\n" "%s" -#: ../meld/filediff.py:1905 +#: ../meld/filediff.py:1910 msgid "Live comparison updating disabled" msgstr "Wyłączono aktualizowanie porównań na żywo" -#: ../meld/filediff.py:1906 +#: ../meld/filediff.py:1911 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 "" "Aktualizowanie porównań na żywo jest wyłączone, kiedy punkty synchronizacji " -"są aktywne. Można ręcznie odświeżać porównanie, a aktualizowanie na żywo " +"są aktywne. Można ręcznie odświeżać porównanie, a aktualizowanie na żywo " "zostanie wznowione po wyczyszczeniu punktów synchronizacji." #: ../meld/filemerge.py:37 @@ -2006,347 +2003,307 @@ msgstr "[%s] Scalanie plików" #: ../meld/gutterrendererchunk.py:159 msgid "Copy _up" -msgstr "Skopiuj w gó_rę" +msgstr "Skopiuj w gó_rę" #: ../meld/gutterrendererchunk.py:160 msgid "Copy _down" -msgstr "Skopiuj w _dół" +msgstr "Skopiuj w _dół" -#: ../meld/meldapp.py:177 +#: ../meld/meldapp.py:175 msgid "wrong number of arguments supplied to --diff" msgstr "błędna liczba parametrów dla opcji --diff" -#: ../meld/meldapp.py:182 +#: ../meld/meldapp.py:180 msgid "Start with an empty window" -msgstr "Rozpoczyna z pustym oknem" +msgstr "Rozpoczyna z pustym oknem" -#: ../meld/meldapp.py:183 ../meld/meldapp.py:185 +#: ../meld/meldapp.py:181 ../meld/meldapp.py:183 msgid "file" msgstr "plik" -#: ../meld/meldapp.py:183 ../meld/meldapp.py:187 +#: ../meld/meldapp.py:181 ../meld/meldapp.py:185 msgid "folder" msgstr "katalog" -#: ../meld/meldapp.py:184 +#: ../meld/meldapp.py:182 msgid "Start a version control comparison" msgstr "Rozpoczyna porównanie systemu kontroli wersji" -#: ../meld/meldapp.py:186 +#: ../meld/meldapp.py:184 msgid "Start a 2- or 3-way file comparison" msgstr "Rozpoczyna porównanie 2 lub 3 plików" -#: ../meld/meldapp.py:188 +#: ../meld/meldapp.py:186 msgid "Start a 2- or 3-way folder comparison" msgstr "Rozpoczyna porównanie 2 lub 3 katalogów" -#: ../meld/meldapp.py:231 +#: ../meld/meldapp.py:229 #, python-format msgid "Error: %s\n" msgstr "Błąd: %s\n" -#: ../meld/meldapp.py:238 +#: ../meld/meldapp.py:236 msgid "Meld is a file and directory comparison tool." -msgstr "Program Meld jest narzędziem do porównywania plików i katalogów." +msgstr "Program Meld jest narzędziem do porównywania plików i katalogów." -#: ../meld/meldapp.py:242 +#: ../meld/meldapp.py:240 msgid "Set label to use instead of file name" msgstr "Ustawia etykietę, która ma być użyta zamiast nazwy pliku" -#: ../meld/meldapp.py:245 +#: ../meld/meldapp.py:243 msgid "Open a new tab in an already running instance" -msgstr "Otwiera nową kartę w już uruchomionej kopii" +msgstr "Otwiera nową kartę w już uruchomionej kopii" -#: ../meld/meldapp.py:248 +#: ../meld/meldapp.py:246 msgid "Automatically compare all differing files on startup" msgstr "" "Automatycznie porównuje wszystkie różniące się pliki podczas uruchamiania" -#: ../meld/meldapp.py:251 +#: ../meld/meldapp.py:249 msgid "Ignored for compatibility" msgstr "Ignorowane — dla zachowania zgodności" -#: ../meld/meldapp.py:255 +#: ../meld/meldapp.py:253 msgid "Set the target file for saving a merge result" -msgstr "Ustawia nazwę pliku, w którym zapisany zostanie wynik scalenia" +msgstr "Ustawia nazwę pliku, w którym zapisany zostanie wynik scalenia" -#: ../meld/meldapp.py:258 +#: ../meld/meldapp.py:256 msgid "Automatically merge files" msgstr "Automatycznie scala pliki" -#: ../meld/meldapp.py:262 +#: ../meld/meldapp.py:260 msgid "Load a saved comparison from a Meld comparison file" -msgstr "Wczytuje zapisane porównanie z pliku porównania programu Meld" +msgstr "Wczytuje zapisane porównanie z pliku porównania programu Meld" -#: ../meld/meldapp.py:266 +#: ../meld/meldapp.py:264 msgid "Create a diff tab for the supplied files or folders" msgstr "Tworzy kartę różnicy dla podanych plików lub katalogów" -#: ../meld/meldapp.py:286 +#: ../meld/meldapp.py:284 #, python-format msgid "too many arguments (wanted 0-3, got %d)" msgstr "za dużo parametrów (powinno być 0-3, jest %d)" -#: ../meld/meldapp.py:289 +#: ../meld/meldapp.py:287 msgid "can't auto-merge less than 3 files" msgstr "nie można automatycznie scalić mniej niż 3 plików" -#: ../meld/meldapp.py:291 +#: ../meld/meldapp.py:289 msgid "can't auto-merge directories" msgstr "nie można automatycznie scalić katalogów" -#: ../meld/meldapp.py:305 +#: ../meld/meldapp.py:303 msgid "Error reading saved comparison file" msgstr "Błąd podczas odczytywania zapisanego pliku porównania" -#: ../meld/meldapp.py:332 +#: ../meld/meldapp.py:330 #, python-format msgid "invalid path or URI \"%s\"" msgstr "nieprawidłowa ścieżka lub adres URL „%s”" #. TRANSLATORS: This is the label of a new, currently-unnamed file. -#: ../meld/meldbuffer.py:127 +#: ../meld/meldbuffer.py:131 msgid "" msgstr "" -#: ../meld/melddoc.py:83 ../meld/melddoc.py:84 +#: ../meld/melddoc.py:64 msgid "untitled" msgstr "bez nazwy" -#: ../meld/meldwindow.py:49 +#: ../meld/meldwindow.py:48 msgid "_File" msgstr "_Plik" -#: ../meld/meldwindow.py:50 +#: ../meld/meldwindow.py:49 msgid "_New Comparison..." msgstr "_Nowe porównanie…" -#: ../meld/meldwindow.py:51 +#: ../meld/meldwindow.py:50 msgid "Start a new comparison" msgstr "Rozpoczyna nowe porównanie" -#: ../meld/meldwindow.py:54 +#: ../meld/meldwindow.py:53 msgid "Save the current file" msgstr "Zapisuje bieżący plik" -#: ../meld/meldwindow.py:56 +#: ../meld/meldwindow.py:55 msgid "Save As..." msgstr "Zapisz jako…" -#: ../meld/meldwindow.py:57 +#: ../meld/meldwindow.py:56 msgid "Save the current file with a different name" msgstr "Zapisuje bieżący plik pod inną nazwą" -#: ../meld/meldwindow.py:60 +#: ../meld/meldwindow.py:59 msgid "Close the current file" msgstr "Zamyka bieżący plik" -#: ../meld/meldwindow.py:63 +#: ../meld/meldwindow.py:62 msgid "_Edit" msgstr "_Edycja" -#: ../meld/meldwindow.py:65 +#: ../meld/meldwindow.py:64 msgid "Undo the last action" msgstr "Wycofuje ostatnią czynność" -#: ../meld/meldwindow.py:68 +#: ../meld/meldwindow.py:67 msgid "Redo the last undone action" msgstr "Ponownie wykonuje ostatnio wycofaną czynność" -#: ../meld/meldwindow.py:70 +#: ../meld/meldwindow.py:69 msgid "Cut the selection" msgstr "Wycina zaznaczone" -#: ../meld/meldwindow.py:72 +#: ../meld/meldwindow.py:71 msgid "Copy the selection" msgstr "Kopiuje zaznaczone" -#: ../meld/meldwindow.py:74 +#: ../meld/meldwindow.py:73 msgid "Paste the clipboard" msgstr "Wklej zawartość schowka" -#: ../meld/meldwindow.py:76 +#: ../meld/meldwindow.py:75 msgid "Find..." msgstr "Wyszukiwanie…" -#: ../meld/meldwindow.py:76 +#: ../meld/meldwindow.py:75 msgid "Search for text" msgstr "Znajdź tekst" -#: ../meld/meldwindow.py:78 +#: ../meld/meldwindow.py:77 msgid "Find Ne_xt" msgstr "Znajdź _następny" -#: ../meld/meldwindow.py:79 +#: ../meld/meldwindow.py:78 msgid "Search forwards for the same text" -msgstr "Szuka w przód tego samego tekstu" +msgstr "Szuka w przód tego samego tekstu" -#: ../meld/meldwindow.py:81 +#: ../meld/meldwindow.py:80 msgid "Find _Previous" msgstr "Znajdź p_oprzedni" -#: ../meld/meldwindow.py:82 +#: ../meld/meldwindow.py:81 msgid "Search backwards for the same text" msgstr "Szuka wstecz tego samego tekstu" -#: ../meld/meldwindow.py:85 +#: ../meld/meldwindow.py:84 msgid "_Replace..." msgstr "Z_amień…" -#: ../meld/meldwindow.py:86 +#: ../meld/meldwindow.py:85 msgid "Find and replace text" -msgstr "Wyszukiwanie i zastępowanie testu" +msgstr "Wyszukiwanie i zastępowanie testu" -#: ../meld/meldwindow.py:89 +#: ../meld/meldwindow.py:88 msgid "_Changes" msgstr "_Zmiany" -#: ../meld/meldwindow.py:90 +#: ../meld/meldwindow.py:89 msgid "Next Change" msgstr "Następna zmiana" -#: ../meld/meldwindow.py:91 +#: ../meld/meldwindow.py:90 msgid "Go to the next change" msgstr "Przechodzi do następnej zmiany" -#: ../meld/meldwindow.py:93 +#: ../meld/meldwindow.py:92 msgid "Previous Change" msgstr "Poprzednia zmiana" -#: ../meld/meldwindow.py:94 +#: ../meld/meldwindow.py:93 msgid "Go to the previous change" msgstr "Przechodzi do poprzedniej zmiany" -#: ../meld/meldwindow.py:96 +#: ../meld/meldwindow.py:95 msgid "Open Externally" msgstr "Otwórz zewnętrznie" -#: ../meld/meldwindow.py:97 +#: ../meld/meldwindow.py:96 msgid "Open selected file or directory in the default external application" -msgstr "Otwiera wybrany plik lub katalog w domyślnym programie" +msgstr "Otwiera wybrany plik lub katalog w domyślnym programie" -#: ../meld/meldwindow.py:101 +#: ../meld/meldwindow.py:100 msgid "_View" msgstr "_Widok" -#: ../meld/meldwindow.py:102 +#: ../meld/meldwindow.py:101 msgid "File Status" msgstr "Stan pliku" -#: ../meld/meldwindow.py:103 +#: ../meld/meldwindow.py:102 msgid "Version Status" msgstr "Stan wersji" -#: ../meld/meldwindow.py:106 +#: ../meld/meldwindow.py:105 msgid "Stop the current action" msgstr "Przerywa bieżące działanie" -#: ../meld/meldwindow.py:109 +#: ../meld/meldwindow.py:108 msgid "Refresh the view" msgstr "Odświeża widok" #: ../meld/meldwindow.py:112 -msgid "_Tabs" -msgstr "_Karty" - -#: ../meld/meldwindow.py:113 -msgid "_Previous Tab" -msgstr "_Poprzednia karta" - -#: ../meld/meldwindow.py:114 -msgid "Activate previous tab" -msgstr "Przechodzi do poprzedniej karty" - -#: ../meld/meldwindow.py:116 -msgid "_Next Tab" -msgstr "_Następna karta" - -#: ../meld/meldwindow.py:117 -msgid "Activate next tab" -msgstr "Przechodzi do następnej karty" - -#: ../meld/meldwindow.py:120 -msgid "Move Tab _Left" -msgstr "Przesuń kartę w _lewo" - -#: ../meld/meldwindow.py:121 -msgid "Move current tab to left" -msgstr "Przesuwa bieżącą kartę w lewo" - -#: ../meld/meldwindow.py:124 -msgid "Move Tab _Right" -msgstr "Przesuń kartę w p_rawo" - -#: ../meld/meldwindow.py:125 -msgid "Move current tab to right" -msgstr "Przesuwa bieżącą kartę w prawo" - -#: ../meld/meldwindow.py:129 msgid "Fullscreen" msgstr "Pełny ekran" -#: ../meld/meldwindow.py:130 +#: ../meld/meldwindow.py:113 msgid "View the comparison in fullscreen" msgstr "Wyświetla porównanie na pełnym ekranie" -#: ../meld/meldwindow.py:132 +#: ../meld/meldwindow.py:115 msgid "_Toolbar" msgstr "Pasek _narzędziowy" -#: ../meld/meldwindow.py:133 +#: ../meld/meldwindow.py:116 msgid "Show or hide the toolbar" msgstr "Wyświetla/ukrywa pasek narzędziowy" -#: ../meld/meldwindow.py:143 +#: ../meld/meldwindow.py:126 msgid "Open Recent" msgstr "Otwórz ostatnio używane" -#: ../meld/meldwindow.py:144 +#: ../meld/meldwindow.py:127 msgid "Open recent files" msgstr "Otwiera ostatnio używane pliki" -#: ../meld/meldwindow.py:166 +#: ../meld/meldwindow.py:149 msgid "_Meld" msgstr "_Meld" -#: ../meld/meldwindow.py:167 +#: ../meld/meldwindow.py:150 msgid "Quit the program" msgstr "Kończy działanie programu" -#: ../meld/meldwindow.py:169 +#: ../meld/meldwindow.py:152 msgid "Prefere_nces" msgstr "Prefere_ncje" -#: ../meld/meldwindow.py:170 +#: ../meld/meldwindow.py:153 msgid "Configure the application" msgstr "Konfiguracja programu" -#: ../meld/meldwindow.py:172 +#: ../meld/meldwindow.py:155 msgid "_Contents" msgstr "_Spis treści" -#: ../meld/meldwindow.py:173 +#: ../meld/meldwindow.py:156 msgid "Open the Meld manual" msgstr "Otwiera podręcznik programu Meld" -#: ../meld/meldwindow.py:175 +#: ../meld/meldwindow.py:158 msgid "About this application" -msgstr "Informacje o tym programie" - -#: ../meld/meldwindow.py:587 -msgid "Switch to this tab" -msgstr "Przechodzi do tej karty" +msgstr "Informacje o tym programie" -#: ../meld/meldwindow.py:702 +#: ../meld/meldwindow.py:604 #, python-format msgid "Need three files to auto-merge, got: %r" msgstr "Automatyczne scalenie wymaga trzech plików, otrzymano: %r" -#: ../meld/meldwindow.py:716 +#: ../meld/meldwindow.py:618 msgid "Cannot compare a mixture of files and directories" -msgstr "Jednoczesne porównanie plików i katalogów nie jest możliwe" +msgstr "Jednoczesne porównanie plików i katalogów nie jest możliwe" -#: ../meld/misc.py:179 +#: ../meld/misc.py:203 #, python-format msgid "Couldn't find colour scheme details for %s-%s; this is a bad install" msgstr "" @@ -2354,7 +2311,7 @@ msgstr "" "instalacja" #. no common path. empty names get changed to "[None]" -#: ../meld/misc.py:264 +#: ../meld/misc.py:263 msgid "[None]" msgstr "[Brak]" @@ -2366,7 +2323,7 @@ msgstr "etykieta" msgid "pattern" msgstr "wzorzec" -#: ../meld/recent.py:115 +#: ../meld/recent.py:114 msgid "Version control:" msgstr "System kontroli wersji:" @@ -2374,20 +2331,20 @@ msgstr "System kontroli wersji:" msgid "Close tab" msgstr "Zamknij kartę" -#: ../meld/ui/vcdialogs.py:50 +#: ../meld/ui/vcdialogs.py:48 msgid "No files will be committed" msgstr "Żadne pliki nie zostaną zatwierdzone" #. Translators: First %s is replaced by translated "%d unpushed #. commits", second %s is replaced by translated "%d branches" -#: ../meld/vc/git.py:95 +#: ../meld/vc/git.py:94 #, python-format msgid "%s in %s" -msgstr "%s w %s" +msgstr "%s w %s" #. Translators: These messages cover the case where there is #. only one branch, and are not part of another message. -#: ../meld/vc/git.py:96 ../meld/vc/git.py:103 +#: ../meld/vc/git.py:95 ../meld/vc/git.py:102 #, python-format msgid "%d unpushed commit" msgid_plural "%d unpushed commits" @@ -2395,7 +2352,7 @@ msgstr[0] "%d niewysłane zatwierdzenie" msgstr[1] "%d niewysłane zatwierdzenia" msgstr[2] "%d niewysłanych zatwierdzeń" -#: ../meld/vc/git.py:98 +#: ../meld/vc/git.py:97 #, python-format msgid "%d branch" msgid_plural "%d branches" @@ -2403,18 +2360,18 @@ msgstr[0] "%d gałęzi" msgstr[1] "%d gałęziach" msgstr[2] "%d gałęziach" -#: ../meld/vc/git.py:352 +#: ../meld/vc/git.py:330 #, python-format msgid "Mode changed from %s to %s" -msgstr "Zmieniono tryb z %s na %s" +msgstr "Zmieniono tryb z %s na %s" -#: ../meld/vc/git.py:360 +#: ../meld/vc/git.py:338 msgid "Partially staged" -msgstr "Częściowo w przechowalni" +msgstr "Częściowo w przechowalni" -#: ../meld/vc/git.py:360 +#: ../meld/vc/git.py:338 msgid "Staged" -msgstr "W przechowalni" +msgstr "W przechowalni" #. Translators: This is the displayed name of a version control system #. when no version control system is actually found. @@ -2422,153 +2379,153 @@ msgstr "W przechowalni" msgid "None" msgstr "Brak" -#: ../meld/vc/svn.py:216 +#: ../meld/vc/svn.py:204 #, python-format msgid "Rev %s" msgstr "Wersja %s" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Merged" msgstr "Scalone" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Base" msgstr "Podstawa" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Local" msgstr "Lokalne" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Remote" msgstr "Zdalne" -#: ../meld/vc/_vc.py:68 +#: ../meld/vc/_vc.py:70 msgid "Unversioned" msgstr "Poza systemem kontroli wersji" -#: ../meld/vc/_vc.py:71 +#: ../meld/vc/_vc.py:73 msgid "Error" msgstr "Błąd" -#: ../meld/vc/_vc.py:73 +#: ../meld/vc/_vc.py:75 msgid "Newly added" msgstr "Nowo dodany" -#: ../meld/vc/_vc.py:75 +#: ../meld/vc/_vc.py:77 msgid "Renamed" msgstr "Zmieniono nazwę" -#: ../meld/vc/_vc.py:76 +#: ../meld/vc/_vc.py:78 msgid "Conflict" msgstr "Konflikt" -#: ../meld/vc/_vc.py:77 +#: ../meld/vc/_vc.py:79 msgid "Removed" msgstr "Usunięty" -#: ../meld/vc/_vc.py:78 +#: ../meld/vc/_vc.py:80 msgid "Missing" msgstr "Brakujący" -#: ../meld/vc/_vc.py:79 +#: ../meld/vc/_vc.py:81 msgid "Not present" msgstr "Nieobecny" #. Translators: This error message is shown when a version #. control binary isn't installed. -#: ../meld/vcview.py:255 +#: ../meld/vcview.py:251 #, python-format msgid "%(name)s (%(cmd)s not installed)" msgstr "%(name)s (program %(cmd)s nie jest zainstalowany)" #. Translators: This error message is shown when a version #. controlled repository is invalid. -#: ../meld/vcview.py:259 +#: ../meld/vcview.py:255 #, python-format msgid "%(name)s (Invalid repository)" msgstr "%(name)s (nieprawidłowe repozytorium)" -#: ../meld/vcview.py:280 +#: ../meld/vcview.py:276 msgid "No valid version control system found in this folder" msgstr "" -"W tym katalogu nie odnaleziono żadnego prawidłowego systemu kontroli wersji" +"W tym katalogu nie odnaleziono żadnego prawidłowego systemu kontroli wersji" -#: ../meld/vcview.py:282 +#: ../meld/vcview.py:278 msgid "Only one version control system found in this folder" -msgstr "W tym katalogu odnaleziono tylko jeden system kontroli wersji" +msgstr "W tym katalogu odnaleziono tylko jeden system kontroli wersji" -#: ../meld/vcview.py:284 +#: ../meld/vcview.py:280 msgid "Choose which version control system to use" msgstr "Proszę wybrać system kontroli wersji do użycia" #. TRANSLATORS: This is the location of the directory being viewed -#: ../meld/vcview.py:337 +#: ../meld/vcview.py:332 #, python-format msgid "%s: %s" msgstr "%s: %s" -#: ../meld/vcview.py:357 +#: ../meld/vcview.py:352 #, python-format msgid "Scanning %s" msgstr "Skanowanie %s" -#: ../meld/vcview.py:396 +#: ../meld/vcview.py:391 msgid "(Empty)" msgstr "(Pusty)" -#: ../meld/vcview.py:440 +#: ../meld/vcview.py:435 #, python-format msgid "%s — local" msgstr "%s — lokalne" -#: ../meld/vcview.py:441 +#: ../meld/vcview.py:436 #, python-format msgid "%s — remote" msgstr "%s — zdalne" -#: ../meld/vcview.py:449 +#: ../meld/vcview.py:444 #, python-format msgid "%s (local, merge, remote)" msgstr "%s (lokalne, scalanie, zdalne)" -#: ../meld/vcview.py:454 +#: ../meld/vcview.py:449 #, python-format msgid "%s (remote, merge, local)" msgstr "%s (zdalne, scalanie, lokalne)" -#: ../meld/vcview.py:465 +#: ../meld/vcview.py:460 #, python-format msgid "%s — repository" msgstr "%s — repozytorium" -#: ../meld/vcview.py:471 +#: ../meld/vcview.py:466 #, python-format msgid "%s (working, repository)" msgstr "%s (kopia robocza, repozytorium)" -#: ../meld/vcview.py:475 +#: ../meld/vcview.py:470 #, python-format msgid "%s (repository, working)" msgstr "%s (repozytorium, kopia robocza)" -#: ../meld/vcview.py:643 +#: ../meld/vcview.py:638 msgid "Remove folder and all its files?" -msgstr "Usunąć katalog i wszystkie zawarte w nim pliki?" +msgstr "Usunąć katalog i wszystkie zawarte w nim pliki?" -#: ../meld/vcview.py:645 +#: ../meld/vcview.py:640 msgid "" "This will remove all selected files and folders, and all files within any " "selected folders, from version control." msgstr "" -"Spowoduje to usunięcie z systemu kontroli wersji wszystkich zaznaczonych " -"plików i katalogów, a także wszystkich plików w zaznaczonych katalogach." +"Spowoduje to usunięcie z systemu kontroli wersji wszystkich zaznaczonych " +"plików i katalogów, a także wszystkich plików w zaznaczonych katalogach." -#: ../meld/vcview.py:670 +#: ../meld/vcview.py:665 #, python-format msgid "Error removing %s" msgstr "Błąd podczas usuwania %s" -#: ../meld/vcview.py:750 +#: ../meld/vcview.py:745 msgid "Clear" msgstr "Wyczyść" From 91aa92c4904abeff8b25e232a95fa2cf37377b57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20=C4=8Cernock=C3=BD?= Date: Sun, 21 Aug 2016 11:12:16 +0200 Subject: [PATCH 0011/1316] Updated Czech translation --- po/cs.po | 478 +++++++++++++++++++++++++++---------------------------- 1 file changed, 236 insertions(+), 242 deletions(-) diff --git a/po/cs.po b/po/cs.po index 090b35e3..9ec12623 100644 --- a/po/cs.po +++ b/po/cs.po @@ -11,10 +11,10 @@ msgstr "" "Project-Id-Version: meld\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=meld&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-03-13 17:33+0000\n" -"PO-Revision-Date: 2016-03-14 04:20+0100\n" +"POT-Creation-Date: 2016-08-20 21:39+0000\n" +"PO-Revision-Date: 2016-08-21 11:08+0200\n" "Last-Translator: Marek Černocký \n" -"Language-Team: Czech \n" +"Language-Team: čeština \n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,20 +22,16 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Gtranslator 2.91.7\n" -#: ../bin/meld:144 +#: ../bin/meld:142 msgid "Cannot import: " msgstr "Nelze importovat: " -#: ../bin/meld:147 +#: ../bin/meld:145 #, c-format msgid "Meld requires %s or higher." msgstr "Meld vyžaduje %s nebo vyšší." -#: ../bin/meld:151 -msgid "Meld does not support Python 3." -msgstr "Meld nepodporuje Python 3." - -#: ../bin/meld:200 +#: ../bin/meld:194 #, c-format msgid "" "Couldn't load Meld-specific CSS (%s)\n" @@ -89,6 +85,10 @@ msgstr "" "Pomocí aplikace Meld můžete kontrolovat změny kódu, pochopit jednotlivé " "záplaty a řešit konflikty při rozsáhlém slučování více bezbolestně." +#: ../data/meld.appdata.xml.in.h:5 +msgid "The GNOME Project" +msgstr "Projekt GNOME" + #: ../data/mime/meld.xml.in.h:1 msgid "Meld comparison description" msgstr "Definice porovnávání Meld" @@ -567,7 +567,7 @@ msgstr "Kopírovat doprava" msgid "Delete selected" msgstr "Odstranit vybrané" -#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:858 ../meld/filediff.py:1381 +#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:859 ../meld/filediff.py:1384 msgid "Hide" msgstr "Skrýt" @@ -603,7 +603,7 @@ msgstr "Nové" msgid "Show new" msgstr "Zobrazovat nové" -#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:74 +#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:76 msgid "Modified" msgstr "Změněné" @@ -636,7 +636,7 @@ msgid "_Add" msgstr "_Přidat" #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11 -#: ../meld/vcview.py:649 +#: ../meld/vcview.py:644 msgid "_Remove" msgstr "_Odstranit" @@ -658,7 +658,7 @@ msgstr "Přesunout _dolů" #. Create icon and filename CellRenderer #: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35 -#: ../meld/dirdiff.py:372 +#: ../meld/dirdiff.py:373 msgid "Name" msgstr "Název" @@ -858,8 +858,8 @@ msgstr "Pokud se změny neuloží, budou trvale ztraceny." msgid "Close _without Saving" msgstr "Zavřít _bez uložení" -#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:940 ../meld/filediff.py:1447 -#: ../meld/filediff.py:1515 +#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:941 ../meld/filediff.py:1450 +#: ../meld/filediff.py:1518 msgid "_Cancel" msgstr "_Zrušit" @@ -896,7 +896,7 @@ msgstr "Vrátit stav před neuložené změny v dokumentu?" msgid "Changes made to the following documents will be permanently lost:\n" msgstr "Změny provedené v následujících dokumentech budou trvale ztraceny:\n" -#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:941 ../meld/filediff.py:1448 +#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:942 ../meld/filediff.py:1451 msgid "_Replace" msgstr "Nahradi_t" @@ -944,7 +944,7 @@ msgstr "Formátovat jako záplatu" msgid "Copy to Clipboard" msgstr "Kopírovat do schránky" -#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:149 +#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:144 msgid "Save Patch" msgstr "Uložení záplaty" @@ -1134,7 +1134,7 @@ msgstr "" "Každý vzorek je seznamem zástupných znaků ve stylu shellu oddělovaný " "mezerami." -#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:104 +#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:103 msgid "File Filters" msgstr "Filtry souborů" @@ -1413,7 +1413,8 @@ msgctxt "shortcut window" msgid "Show/hide console output" msgstr "Zobrazit/skrýt výstup konzoly" -#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:668 +#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:570 +#: ../meld/newdifftab.py:38 msgid "New comparison" msgstr "Nové porovnání" @@ -1561,7 +1562,7 @@ msgstr "Ne_verzované" msgid "Show unversioned files" msgstr "Zobrazovat soubory bez verzí" -#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:67 +#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69 msgid "Ignored" msgstr "Ignorované" @@ -1589,7 +1590,7 @@ msgstr "Předchozí záznamy:" msgid "Co_mmit" msgstr "Co_mmit" -#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:337 +#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:332 msgid "Location" msgstr "Umístění" @@ -1631,44 +1632,44 @@ msgid "Mac OS (CR)" msgstr "Mac OS (CR)" #. Create file size CellRenderer -#: ../meld/dirdiff.py:390 ../meld/preferences.py:82 +#: ../meld/dirdiff.py:391 ../meld/preferences.py:82 msgid "Size" msgstr "Velikost" #. Create date-time CellRenderer -#: ../meld/dirdiff.py:398 ../meld/preferences.py:83 +#: ../meld/dirdiff.py:399 ../meld/preferences.py:83 msgid "Modification time" msgstr "Čas změny" #. Create permissions CellRenderer -#: ../meld/dirdiff.py:406 ../meld/preferences.py:84 +#: ../meld/dirdiff.py:407 ../meld/preferences.py:84 msgid "Permissions" msgstr "Oprávnění" -#: ../meld/dirdiff.py:536 +#: ../meld/dirdiff.py:537 #, python-format msgid "Hide %s" msgstr "Skrýt %s" -#: ../meld/dirdiff.py:668 ../meld/dirdiff.py:692 +#: ../meld/dirdiff.py:669 ../meld/dirdiff.py:693 #, python-format msgid "[%s] Scanning %s" msgstr "[%s] Prochází se %s" -#: ../meld/dirdiff.py:825 +#: ../meld/dirdiff.py:826 #, python-format msgid "[%s] Done" msgstr "[%s] Hotovo" -#: ../meld/dirdiff.py:833 +#: ../meld/dirdiff.py:834 msgid "Folders have no differences" msgstr "Mezi složkami není žádný rozdíl" -#: ../meld/dirdiff.py:835 +#: ../meld/dirdiff.py:836 msgid "Contents of scanned files in folders are identical." msgstr "Obsah kontrolovaných souborů ve složkách je stejný." -#: ../meld/dirdiff.py:837 +#: ../meld/dirdiff.py:838 msgid "" "Scanned files in folders appear identical, but contents have not been " "scanned." @@ -1676,42 +1677,42 @@ msgstr "" "Kontrolované soubory ve složkách vypadají stejně, ale nebyl kontrolován " "jejich obsah." -#: ../meld/dirdiff.py:840 +#: ../meld/dirdiff.py:841 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:842 +#: ../meld/dirdiff.py:843 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:860 ../meld/filediff.py:1383 ../meld/filediff.py:1413 -#: ../meld/filediff.py:1415 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 +#: ../meld/dirdiff.py:861 ../meld/filediff.py:1386 ../meld/filediff.py:1416 +#: ../meld/filediff.py:1418 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 msgid "Hi_de" msgstr "_Skrýt" -#: ../meld/dirdiff.py:870 +#: ../meld/dirdiff.py:871 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:871 +#: ../meld/dirdiff.py:872 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:873 +#: ../meld/dirdiff.py:874 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:875 +#: ../meld/dirdiff.py:876 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:877 +#: ../meld/dirdiff.py:878 msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. The following files in this folder are hidden:" @@ -1719,17 +1720,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:888 +#: ../meld/dirdiff.py:889 #, python-format msgid "'%s' hidden by '%s'" msgstr "„%s“ skryto v „%s“" -#: ../meld/dirdiff.py:944 +#: ../meld/dirdiff.py:945 #, python-format msgid "Replace folder “%s”?" msgstr "Nahradit složku „%s“?" -#: ../meld/dirdiff.py:946 +#: ../meld/dirdiff.py:947 #, python-format msgid "" "Another folder with the same name already exists in “%s”.\n" @@ -1738,11 +1739,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:959 +#: ../meld/dirdiff.py:960 msgid "Error copying file" msgstr "Chyba při kopírování souboru" -#: ../meld/dirdiff.py:960 +#: ../meld/dirdiff.py:961 #, python-format msgid "" "Couldn't copy %s\n" @@ -1755,35 +1756,35 @@ msgstr "" "\n" "%s" -#: ../meld/dirdiff.py:983 +#: ../meld/dirdiff.py:984 #, python-format msgid "Error deleting %s" msgstr "Chyba při mazání %s" -#: ../meld/dirdiff.py:1488 +#: ../meld/dirdiff.py:1489 msgid "No folder" msgstr "Žádná složka" #. Abbreviations for insert and overwrite that fit in the status bar -#: ../meld/filediff.py:359 +#: ../meld/filediff.py:354 msgid "INS" msgstr "VKL" -#: ../meld/filediff.py:359 +#: ../meld/filediff.py:354 msgid "OVR" msgstr "PŘE" #. Abbreviation for line, column so that it will fit in the status bar -#: ../meld/filediff.py:361 +#: ../meld/filediff.py:356 #, python-format msgid "Ln %i, Col %i" msgstr "Řád %i, sl %i" -#: ../meld/filediff.py:794 +#: ../meld/filediff.py:781 msgid "Comparison results will be inaccurate" msgstr "Výsledky porovnávání budou nepřesné" -#: ../meld/filediff.py:796 +#: ../meld/filediff.py:783 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1791,64 +1792,64 @@ msgstr "" "Filtr změnil počet řádků v souboru, což není podporováno. Porovnání nebude " "správné." -#: ../meld/filediff.py:854 +#: ../meld/filediff.py:841 msgid "Mark conflict as resolved?" msgstr "Označit konflikt jako vyřešený?" -#: ../meld/filediff.py:856 +#: ../meld/filediff.py:843 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:858 +#: ../meld/filediff.py:845 msgid "Cancel" msgstr "Zrušit" -#: ../meld/filediff.py:859 +#: ../meld/filediff.py:846 msgid "Mark _Resolved" msgstr "Označi_t za vyřešené" -#: ../meld/filediff.py:1099 +#: ../meld/filediff.py:1095 #, 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:1107 +#: ../meld/filediff.py:1103 #, python-format msgid "File %s appears to be a binary file." msgstr "Soubor %s je zřejmě binární." -#: ../meld/filediff.py:1109 +#: ../meld/filediff.py:1105 msgid "Do you want to open the file using the default application?" msgstr "Chcete soubor otevřít pomocí výchozí aplikace?" -#: ../meld/filediff.py:1111 +#: ../meld/filediff.py:1107 msgid "Open" msgstr "Otevřít" -#: ../meld/filediff.py:1127 +#: ../meld/filediff.py:1123 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Počítají se rozdíly" -#: ../meld/filediff.py:1192 +#: ../meld/filediff.py:1188 #, python-format msgid "File %s has changed on disk" msgstr "Soubor „%s“ byl změněn na disku." -#: ../meld/filediff.py:1193 +#: ../meld/filediff.py:1189 msgid "Do you want to reload the file?" msgstr "Chcete soubor znovu načíst?" -#: ../meld/filediff.py:1195 +#: ../meld/filediff.py:1191 msgid "_Reload" msgstr "Zno_vu načíst" -#: ../meld/filediff.py:1346 +#: ../meld/filediff.py:1349 msgid "Files are identical" msgstr "Soubory jsou stejné" -#: ../meld/filediff.py:1359 +#: ../meld/filediff.py:1362 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1856,11 +1857,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:1364 +#: ../meld/filediff.py:1367 msgid "Files differ in line endings only" msgstr "Soubory se liší pouze zakončením řádků" -#: ../meld/filediff.py:1366 +#: ../meld/filediff.py:1369 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1869,15 +1870,15 @@ msgstr "" "Soubory jsou shodné, vyjma rozdílného zakončení řádků:\n" "%s" -#: ../meld/filediff.py:1386 +#: ../meld/filediff.py:1389 msgid "Show without filters" msgstr "Zobrazit bez filtrů" -#: ../meld/filediff.py:1408 +#: ../meld/filediff.py:1411 msgid "Change highlighting incomplete" msgstr "Změnit zvýraznění neúplných" -#: ../meld/filediff.py:1409 +#: ../meld/filediff.py:1412 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." @@ -1886,20 +1887,20 @@ 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:1417 +#: ../meld/filediff.py:1420 msgid "Keep highlighting" msgstr "Zachovat zvýrazňování" -#: ../meld/filediff.py:1419 +#: ../meld/filediff.py:1422 msgid "_Keep highlighting" msgstr "Z_achovat zvýrazňování" -#: ../meld/filediff.py:1451 +#: ../meld/filediff.py:1454 #, python-format msgid "Replace file “%s”?" msgstr "Nahradit soubor „%s“?" -#: ../meld/filediff.py:1453 +#: ../meld/filediff.py:1456 #, python-format msgid "" "A file with this name already exists in “%s”.\n" @@ -1908,45 +1909,45 @@ msgstr "" "V „%s“ již existuje soubor se stejným názvem.\n" "Pokud stávající soubor nahradíte, jeho obsah bude ztracen." -#: ../meld/filediff.py:1470 +#: ../meld/filediff.py:1473 msgid "Save Left Pane As" msgstr "Uložení levého panelu jako" -#: ../meld/filediff.py:1472 +#: ../meld/filediff.py:1475 msgid "Save Middle Pane As" msgstr "Uložení prostředního panelu jako" -#: ../meld/filediff.py:1474 +#: ../meld/filediff.py:1477 msgid "Save Right Pane As" msgstr "Uložení pravého panelu jako" -#: ../meld/filediff.py:1488 +#: ../meld/filediff.py:1491 #, 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:1490 +#: ../meld/filediff.py:1493 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:1493 +#: ../meld/filediff.py:1496 msgid "Save Anyway" msgstr "Přesto uložit" -#: ../meld/filediff.py:1494 +#: ../meld/filediff.py:1497 msgid "Don't Save" msgstr "Neukládat" -#: ../meld/filediff.py:1516 +#: ../meld/filediff.py:1519 msgid "_Save as UTF-8" msgstr "_Uložit v UTF-8" -#: ../meld/filediff.py:1519 +#: ../meld/filediff.py:1522 #, python-format msgid "Couldn't encode text as “%s”" msgstr "Text nelze zakódovat jako „%s“" -#: ../meld/filediff.py:1521 +#: ../meld/filediff.py:1524 #, python-format msgid "" "File “%s” contains characters that can't be encoded using encoding “%s”.\n" @@ -1955,12 +1956,12 @@ msgstr "" "Soubor „%s“ obsahuje znaky, které nelze zakódovat pomocí kódování „%s“\n" "Chcete jej uložit v UTF-8?" -#: ../meld/filediff.py:1558 ../meld/patchdialog.py:125 +#: ../meld/filediff.py:1564 ../meld/patchdialog.py:120 #, python-format msgid "Could not save file %s." msgstr "Nelze uložit soubor %s." -#: ../meld/filediff.py:1559 ../meld/patchdialog.py:126 +#: ../meld/filediff.py:1565 ../meld/patchdialog.py:121 #, python-format msgid "" "Couldn't save file due to:\n" @@ -1969,11 +1970,11 @@ msgstr "" "Nelze uložit soubor z důvodu:\n" "%s" -#: ../meld/filediff.py:1905 +#: ../meld/filediff.py:1910 msgid "Live comparison updating disabled" msgstr "Živá aktualizace porovnání zakázána" -#: ../meld/filediff.py:1906 +#: ../meld/filediff.py:1911 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -1996,347 +1997,307 @@ msgstr "Kopírovat nahor_u" msgid "Copy _down" msgstr "Kopírovat _dolů" -#: ../meld/meldapp.py:177 +#: ../meld/meldapp.py:175 msgid "wrong number of arguments supplied to --diff" msgstr "poskytnut nesprávný počet argumentů pro --diff" -#: ../meld/meldapp.py:182 +#: ../meld/meldapp.py:180 msgid "Start with an empty window" msgstr "Spustit s prázdným oknem" -#: ../meld/meldapp.py:183 ../meld/meldapp.py:185 +#: ../meld/meldapp.py:181 ../meld/meldapp.py:183 msgid "file" msgstr "soubor" -#: ../meld/meldapp.py:183 ../meld/meldapp.py:187 +#: ../meld/meldapp.py:181 ../meld/meldapp.py:185 msgid "folder" msgstr "složka" -#: ../meld/meldapp.py:184 +#: ../meld/meldapp.py:182 msgid "Start a version control comparison" msgstr "Spustit nové porovnání správy verzí" -#: ../meld/meldapp.py:186 +#: ../meld/meldapp.py:184 msgid "Start a 2- or 3-way file comparison" msgstr "Spustit dvojcestné nebo trojcestné porovnání souborů" -#: ../meld/meldapp.py:188 +#: ../meld/meldapp.py:186 msgid "Start a 2- or 3-way folder comparison" msgstr "Spustit dvojcestné nebo trojcestné porovnání složek" -#: ../meld/meldapp.py:231 +#: ../meld/meldapp.py:229 #, python-format msgid "Error: %s\n" msgstr "Chyba: %s\n" -#: ../meld/meldapp.py:238 +#: ../meld/meldapp.py:236 msgid "Meld is a file and directory comparison tool." msgstr "Meld je nástroj porovnávající soubory a složky." -#: ../meld/meldapp.py:242 +#: ../meld/meldapp.py:240 msgid "Set label to use instead of file name" msgstr "Nastavit k použití popisek namísto názvu souboru" -#: ../meld/meldapp.py:245 +#: ../meld/meldapp.py:243 msgid "Open a new tab in an already running instance" msgstr "Otevřít novou kartu v již běžící instanci" -#: ../meld/meldapp.py:248 +#: ../meld/meldapp.py:246 msgid "Automatically compare all differing files on startup" msgstr "Automaticky při spuštění porovnat všechny lišící se soubory" -#: ../meld/meldapp.py:251 +#: ../meld/meldapp.py:249 msgid "Ignored for compatibility" msgstr "Ignorováno z důvodu kompatibility" -#: ../meld/meldapp.py:255 +#: ../meld/meldapp.py:253 msgid "Set the target file for saving a merge result" msgstr "Nastavit cílový soubor, do kterého se má uložit výsledek slučování" -#: ../meld/meldapp.py:258 +#: ../meld/meldapp.py:256 msgid "Automatically merge files" msgstr "Automaticky sloučit soubory" -#: ../meld/meldapp.py:262 +#: ../meld/meldapp.py:260 msgid "Load a saved comparison from a Meld comparison file" msgstr "Načíst uložené porovnání ze srovnávacího souboru Meld" -#: ../meld/meldapp.py:266 +#: ../meld/meldapp.py:264 msgid "Create a diff tab for the supplied files or folders" msgstr "Vytvořit kartu s rozdílem pro zadané soubory nebo složky" -#: ../meld/meldapp.py:286 +#: ../meld/meldapp.py:284 #, python-format msgid "too many arguments (wanted 0-3, got %d)" msgstr "příliš mnoho argumentů (požadováno 0 – 3, obdrženo %d)" -#: ../meld/meldapp.py:289 +#: ../meld/meldapp.py:287 msgid "can't auto-merge less than 3 files" msgstr "nelze automaticky sloučit méně než 3 soubory" -#: ../meld/meldapp.py:291 +#: ../meld/meldapp.py:289 msgid "can't auto-merge directories" msgstr "nelze automaticky sloučit složky" -#: ../meld/meldapp.py:305 +#: ../meld/meldapp.py:303 msgid "Error reading saved comparison file" msgstr "Chyba při čtení uloženého srovnávacího souboru" -#: ../meld/meldapp.py:332 +#: ../meld/meldapp.py:330 #, python-format msgid "invalid path or URI \"%s\"" msgstr "neplatná cesta nebo adresa URI „%s“" #. TRANSLATORS: This is the label of a new, currently-unnamed file. -#: ../meld/meldbuffer.py:127 +#: ../meld/meldbuffer.py:131 msgid "" msgstr "" -#: ../meld/melddoc.py:83 ../meld/melddoc.py:84 +#: ../meld/melddoc.py:64 msgid "untitled" msgstr "nepojmenovaný" -#: ../meld/meldwindow.py:49 +#: ../meld/meldwindow.py:48 msgid "_File" msgstr "_Soubor" -#: ../meld/meldwindow.py:50 +#: ../meld/meldwindow.py:49 msgid "_New Comparison..." msgstr "_Nové porovnávání…" -#: ../meld/meldwindow.py:51 +#: ../meld/meldwindow.py:50 msgid "Start a new comparison" msgstr "Spustit nové porovnání" -#: ../meld/meldwindow.py:54 +#: ../meld/meldwindow.py:53 msgid "Save the current file" msgstr "Uložit aktuální soubor" -#: ../meld/meldwindow.py:56 +#: ../meld/meldwindow.py:55 msgid "Save As..." msgstr "Uložit jako…" -#: ../meld/meldwindow.py:57 +#: ../meld/meldwindow.py:56 msgid "Save the current file with a different name" msgstr "Uložit aktuální soubor pod jiným názvem" -#: ../meld/meldwindow.py:60 +#: ../meld/meldwindow.py:59 msgid "Close the current file" msgstr "Zavřít aktuální soubor" -#: ../meld/meldwindow.py:63 +#: ../meld/meldwindow.py:62 msgid "_Edit" msgstr "_Upravit" -#: ../meld/meldwindow.py:65 +#: ../meld/meldwindow.py:64 msgid "Undo the last action" msgstr "Vrátit zpět poslední činnost" -#: ../meld/meldwindow.py:68 +#: ../meld/meldwindow.py:67 msgid "Redo the last undone action" msgstr "Zopakovat poslední činnost vrácenou zpět" -#: ../meld/meldwindow.py:70 +#: ../meld/meldwindow.py:69 msgid "Cut the selection" msgstr "Vyjmout výběr" -#: ../meld/meldwindow.py:72 +#: ../meld/meldwindow.py:71 msgid "Copy the selection" msgstr "Kopírovat výběr" -#: ../meld/meldwindow.py:74 +#: ../meld/meldwindow.py:73 msgid "Paste the clipboard" msgstr "Vložit obsah schránky" -#: ../meld/meldwindow.py:76 +#: ../meld/meldwindow.py:75 msgid "Find..." msgstr "Najít…" -#: ../meld/meldwindow.py:76 +#: ../meld/meldwindow.py:75 msgid "Search for text" msgstr "Hledat text" -#: ../meld/meldwindow.py:78 +#: ../meld/meldwindow.py:77 msgid "Find Ne_xt" msgstr "_Najít následující" -#: ../meld/meldwindow.py:79 +#: ../meld/meldwindow.py:78 msgid "Search forwards for the same text" msgstr "Hledat tentýž text vpřed" -#: ../meld/meldwindow.py:81 +#: ../meld/meldwindow.py:80 msgid "Find _Previous" msgstr "Najít _předchozí" -#: ../meld/meldwindow.py:82 +#: ../meld/meldwindow.py:81 msgid "Search backwards for the same text" msgstr "Hledat nazpět tentýž text" -#: ../meld/meldwindow.py:85 +#: ../meld/meldwindow.py:84 msgid "_Replace..." msgstr "Nah_radit…" -#: ../meld/meldwindow.py:86 +#: ../meld/meldwindow.py:85 msgid "Find and replace text" msgstr "Najít a nahradit text" -#: ../meld/meldwindow.py:89 +#: ../meld/meldwindow.py:88 msgid "_Changes" msgstr "_Změny" -#: ../meld/meldwindow.py:90 +#: ../meld/meldwindow.py:89 msgid "Next Change" msgstr "Následující změna" -#: ../meld/meldwindow.py:91 +#: ../meld/meldwindow.py:90 msgid "Go to the next change" msgstr "Přejít na následující změnu" -#: ../meld/meldwindow.py:93 +#: ../meld/meldwindow.py:92 msgid "Previous Change" msgstr "Předchozí změna" -#: ../meld/meldwindow.py:94 +#: ../meld/meldwindow.py:93 msgid "Go to the previous change" msgstr "Přejít na předchozí změnu" -#: ../meld/meldwindow.py:96 +#: ../meld/meldwindow.py:95 msgid "Open Externally" msgstr "Otevřít externě" -#: ../meld/meldwindow.py:97 +#: ../meld/meldwindow.py:96 msgid "Open selected file or directory in the default external application" msgstr "Otevřít vybraný soubor nebo složku ve výchozí externí aplikaci" -#: ../meld/meldwindow.py:101 +#: ../meld/meldwindow.py:100 msgid "_View" msgstr "_Zobrazit" -#: ../meld/meldwindow.py:102 +#: ../meld/meldwindow.py:101 msgid "File Status" msgstr "Stav souboru" -#: ../meld/meldwindow.py:103 +#: ../meld/meldwindow.py:102 msgid "Version Status" msgstr "Stav verze" -#: ../meld/meldwindow.py:106 +#: ../meld/meldwindow.py:105 msgid "Stop the current action" msgstr "Zastavit aktuální činnost" -#: ../meld/meldwindow.py:109 +#: ../meld/meldwindow.py:108 msgid "Refresh the view" msgstr "Obnovit zobrazení" #: ../meld/meldwindow.py:112 -msgid "_Tabs" -msgstr "Kar_ty" - -#: ../meld/meldwindow.py:113 -msgid "_Previous Tab" -msgstr "_Předchozí karta" - -#: ../meld/meldwindow.py:114 -msgid "Activate previous tab" -msgstr "Přejít na předchozí kartu" - -#: ../meld/meldwindow.py:116 -msgid "_Next Tab" -msgstr "_Následující karta" - -#: ../meld/meldwindow.py:117 -msgid "Activate next tab" -msgstr "Aktivovat následující kartu" - -#: ../meld/meldwindow.py:120 -msgid "Move Tab _Left" -msgstr "Přesunout kartu do_leva" - -#: ../meld/meldwindow.py:121 -msgid "Move current tab to left" -msgstr "Přesunout aktuální kartu doleva" - -#: ../meld/meldwindow.py:124 -msgid "Move Tab _Right" -msgstr "Přesunout kartu dop_rava" - -#: ../meld/meldwindow.py:125 -msgid "Move current tab to right" -msgstr "Přesunout aktuální kartu doprava" - -#: ../meld/meldwindow.py:129 msgid "Fullscreen" msgstr "Celá obrazovka" -#: ../meld/meldwindow.py:130 +#: ../meld/meldwindow.py:113 msgid "View the comparison in fullscreen" msgstr "Zobrazit porovnání na celou obrazovku" -#: ../meld/meldwindow.py:132 +#: ../meld/meldwindow.py:115 msgid "_Toolbar" msgstr "Nástrojová _lišta" -#: ../meld/meldwindow.py:133 +#: ../meld/meldwindow.py:116 msgid "Show or hide the toolbar" msgstr "Zobrazit nebo skrýt nástrojovou lištu" -#: ../meld/meldwindow.py:143 +#: ../meld/meldwindow.py:126 msgid "Open Recent" msgstr "Otevřít nedávné" -#: ../meld/meldwindow.py:144 +#: ../meld/meldwindow.py:127 msgid "Open recent files" msgstr "Otevřít nedávné soubory" -#: ../meld/meldwindow.py:166 +#: ../meld/meldwindow.py:149 msgid "_Meld" msgstr "_Meld" -#: ../meld/meldwindow.py:167 +#: ../meld/meldwindow.py:150 msgid "Quit the program" msgstr "Ukončit program" -#: ../meld/meldwindow.py:169 +#: ../meld/meldwindow.py:152 msgid "Prefere_nces" msgstr "_Předvolby" -#: ../meld/meldwindow.py:170 +#: ../meld/meldwindow.py:153 msgid "Configure the application" msgstr "Nastavit aplikaci" -#: ../meld/meldwindow.py:172 +#: ../meld/meldwindow.py:155 msgid "_Contents" msgstr "O_bsah" -#: ../meld/meldwindow.py:173 +#: ../meld/meldwindow.py:156 msgid "Open the Meld manual" msgstr "Otevřít příručku aplikace Meld" -#: ../meld/meldwindow.py:175 +#: ../meld/meldwindow.py:158 msgid "About this application" msgstr "O této aplikaci" -#: ../meld/meldwindow.py:587 -msgid "Switch to this tab" -msgstr "Přepnout na tuto kartu" - -#: ../meld/meldwindow.py:702 +#: ../meld/meldwindow.py:604 #, python-format msgid "Need three files to auto-merge, got: %r" msgstr "Pro automatické sloučení jsou zapotřebí tři soubory, obdržen: %r" -#: ../meld/meldwindow.py:716 +#: ../meld/meldwindow.py:618 msgid "Cannot compare a mixture of files and directories" msgstr "Nelze porovnávat směs souborů a složek" -#: ../meld/misc.py:179 +#: ../meld/misc.py:203 #, python-format msgid "Couldn't find colour scheme details for %s-%s; this is a bad install" msgstr "" "Ve schématu barev nelze najít údaj pro %s-%s. Jedná se o chybnou instalaci" #. no common path. empty names get changed to "[None]" -#: ../meld/misc.py:264 +#: ../meld/misc.py:263 msgid "[None]" msgstr "[Žádný]" @@ -2348,7 +2309,7 @@ msgstr "popisek" msgid "pattern" msgstr "vzorek" -#: ../meld/recent.py:115 +#: ../meld/recent.py:114 msgid "Version control:" msgstr "Správa verzí:" @@ -2356,20 +2317,20 @@ msgstr "Správa verzí:" msgid "Close tab" msgstr "Zavřít kartu" -#: ../meld/ui/vcdialogs.py:50 +#: ../meld/ui/vcdialogs.py:48 msgid "No files will be committed" msgstr "Žádné soubory nebudou zařazeny" #. Translators: First %s is replaced by translated "%d unpushed #. commits", second %s is replaced by translated "%d branches" -#: ../meld/vc/git.py:95 +#: ../meld/vc/git.py:94 #, python-format msgid "%s in %s" msgstr "%s v %s" #. Translators: These messages cover the case where there is #. only one branch, and are not part of another message. -#: ../meld/vc/git.py:96 ../meld/vc/git.py:103 +#: ../meld/vc/git.py:95 ../meld/vc/git.py:102 #, python-format msgid "%d unpushed commit" msgid_plural "%d unpushed commits" @@ -2377,7 +2338,7 @@ msgstr[0] "%d zařazená neodeslaná" msgstr[1] "%d zařazené neodeslané" msgstr[2] "%d zařazených neodeslaných" -#: ../meld/vc/git.py:98 +#: ../meld/vc/git.py:97 #, python-format msgid "%d branch" msgid_plural "%d branches" @@ -2385,16 +2346,16 @@ msgstr[0] "%d větvi" msgstr[1] "%d větvích" msgstr[2] "%d větvích" -#: ../meld/vc/git.py:352 +#: ../meld/vc/git.py:330 #, python-format msgid "Mode changed from %s to %s" msgstr "Režim změněn z %s na %s" -#: ../meld/vc/git.py:360 +#: ../meld/vc/git.py:338 msgid "Partially staged" msgstr "Částečně připraven" -#: ../meld/vc/git.py:360 +#: ../meld/vc/git.py:338 msgid "Staged" msgstr "Připraven" @@ -2404,140 +2365,140 @@ msgstr "Připraven" msgid "None" msgstr "Žádný" -#: ../meld/vc/svn.py:216 +#: ../meld/vc/svn.py:204 #, python-format msgid "Rev %s" msgstr "Revize %s" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Merged" msgstr "sloučené" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Base" msgstr "základní" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Local" msgstr "místní" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Remote" msgstr "vzdálené" -#: ../meld/vc/_vc.py:68 +#: ../meld/vc/_vc.py:70 msgid "Unversioned" msgstr "Neverzováno" -#: ../meld/vc/_vc.py:71 +#: ../meld/vc/_vc.py:73 msgid "Error" msgstr "Chyba" -#: ../meld/vc/_vc.py:73 +#: ../meld/vc/_vc.py:75 msgid "Newly added" msgstr "Nově přidáno" -#: ../meld/vc/_vc.py:75 +#: ../meld/vc/_vc.py:77 msgid "Renamed" msgstr "Přejmenováno" -#: ../meld/vc/_vc.py:76 +#: ../meld/vc/_vc.py:78 msgid "Conflict" msgstr "Konflikt" -#: ../meld/vc/_vc.py:77 +#: ../meld/vc/_vc.py:79 msgid "Removed" msgstr "Odstraněno" -#: ../meld/vc/_vc.py:78 +#: ../meld/vc/_vc.py:80 msgid "Missing" msgstr "Schází" -#: ../meld/vc/_vc.py:79 +#: ../meld/vc/_vc.py:81 msgid "Not present" msgstr "Není přítomno" #. Translators: This error message is shown when a version #. control binary isn't installed. -#: ../meld/vcview.py:255 +#: ../meld/vcview.py:251 #, python-format msgid "%(name)s (%(cmd)s not installed)" msgstr "%(name)s (%(cmd)s není nainstalováno)" #. Translators: This error message is shown when a version #. controlled repository is invalid. -#: ../meld/vcview.py:259 +#: ../meld/vcview.py:255 #, python-format msgid "%(name)s (Invalid repository)" msgstr "%(name)s (neplatný repozitář)" -#: ../meld/vcview.py:280 +#: ../meld/vcview.py:276 msgid "No valid version control system found in this folder" msgstr "V této složce nebyl nalezen žádný platný systém správy verzí" -#: ../meld/vcview.py:282 +#: ../meld/vcview.py:278 msgid "Only one version control system found in this folder" msgstr "V této složce byl nalezen jen jeden systém správy verzí" -#: ../meld/vcview.py:284 +#: ../meld/vcview.py:280 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:337 +#: ../meld/vcview.py:332 #, python-format msgid "%s: %s" msgstr "%s: %s" -#: ../meld/vcview.py:357 +#: ../meld/vcview.py:352 #, python-format msgid "Scanning %s" msgstr "Prochází se %s" -#: ../meld/vcview.py:396 +#: ../meld/vcview.py:391 msgid "(Empty)" msgstr "(Prázdný)" -#: ../meld/vcview.py:440 +#: ../meld/vcview.py:435 #, python-format msgid "%s — local" msgstr "%s — místní" -#: ../meld/vcview.py:441 +#: ../meld/vcview.py:436 #, python-format msgid "%s — remote" msgstr "%s — vzdálený" -#: ../meld/vcview.py:449 +#: ../meld/vcview.py:444 #, python-format msgid "%s (local, merge, remote)" msgstr "%s (místní, sloučený, vzdálený)" -#: ../meld/vcview.py:454 +#: ../meld/vcview.py:449 #, python-format msgid "%s (remote, merge, local)" msgstr "%s (vzdálený, sloučený, místní)" -#: ../meld/vcview.py:465 +#: ../meld/vcview.py:460 #, python-format msgid "%s — repository" msgstr "%s — repozitář" -#: ../meld/vcview.py:471 +#: ../meld/vcview.py:466 #, python-format msgid "%s (working, repository)" msgstr "%s (pracovní, repozitář)" -#: ../meld/vcview.py:475 +#: ../meld/vcview.py:470 #, python-format msgid "%s (repository, working)" msgstr "%s (repozitář, pracovní)" -#: ../meld/vcview.py:643 +#: ../meld/vcview.py:638 msgid "Remove folder and all its files?" msgstr "Odstranit složku a všechny soubory v ní?" -#: ../meld/vcview.py:645 +#: ../meld/vcview.py:640 msgid "" "This will remove all selected files and folders, and all files within any " "selected folders, from version control." @@ -2545,11 +2506,44 @@ 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:670 +#: ../meld/vcview.py:665 #, python-format msgid "Error removing %s" msgstr "Chyba při odstraňování %s" -#: ../meld/vcview.py:750 +#: ../meld/vcview.py:745 msgid "Clear" msgstr "Vymazat" + +#~ msgid "Meld does not support Python 3." +#~ msgstr "Meld nepodporuje Python 3." + +#~ msgid "_Tabs" +#~ msgstr "Kar_ty" + +#~ msgid "_Previous Tab" +#~ msgstr "_Předchozí karta" + +#~ msgid "Activate previous tab" +#~ msgstr "Přejít na předchozí kartu" + +#~ msgid "_Next Tab" +#~ msgstr "_Následující karta" + +#~ msgid "Activate next tab" +#~ msgstr "Aktivovat následující kartu" + +#~ msgid "Move Tab _Left" +#~ msgstr "Přesunout kartu do_leva" + +#~ msgid "Move current tab to left" +#~ msgstr "Přesunout aktuální kartu doleva" + +#~ msgid "Move Tab _Right" +#~ msgstr "Přesunout kartu dop_rava" + +#~ msgid "Move current tab to right" +#~ msgstr "Přesunout aktuální kartu doprava" + +#~ msgid "Switch to this tab" +#~ msgstr "Přepnout na tuto kartu" From c9a4420e40a4dd39bc74ea1425d8326ea5815449 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B8=D1=80=D0=BE=D1=81=D0=BB=D0=B0=D0=B2=20=D0=9D?= =?UTF-8?q?=D0=B8=D0=BA=D0=BE=D0=BB=D0=B8=D1=9B?= Date: Sun, 21 Aug 2016 14:04:14 +0200 Subject: [PATCH 0012/1316] Updated Serbian translation --- po/sr.po | 484 ++++++++++++++++++++++++------------------------ po/sr@latin.po | 486 ++++++++++++++++++++++++------------------------- 2 files changed, 475 insertions(+), 495 deletions(-) diff --git a/po/sr.po b/po/sr.po index 9c71b093..f4acd2c1 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,8 +1,7 @@ # Serbian translation of meld # Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2016. # This file is distributed under the same license as the meld package. -# -# Translators: +# Translators: # Данило Шеган # Мирослав Николић , 2011—2016. msgid "" @@ -10,10 +9,10 @@ msgstr "" "Project-Id-Version: meld\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=meld&ke" "ywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-03-08 13:36+0000\n" -"PO-Revision-Date: 2016-03-09 09:19+0200\n" +"POT-Creation-Date: 2016-08-20 21:39+0000\n" +"PO-Revision-Date: 2016-08-21 14:01+0200\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" @@ -22,20 +21,16 @@ msgstr "" "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Project-Style: gnome\n" -#: ../bin/meld:144 +#: ../bin/meld:142 msgid "Cannot import: " msgstr "Не могу да увезем: " -#: ../bin/meld:147 +#: ../bin/meld:145 #, c-format msgid "Meld requires %s or higher." msgstr "Мелд захтева %s или новији." -#: ../bin/meld:151 -msgid "Meld does not support Python 3." -msgstr "Мелд не подржава Питона 3." - -#: ../bin/meld:200 +#: ../bin/meld:194 #, c-format msgid "" "Couldn't load Meld-specific CSS (%s)\n" @@ -87,6 +82,10 @@ msgstr "" "Мелд вам помаже да прегледате измене у коду, да разумете закрпе, и огромне " "сукобе стапања чини мање болним." +#: ../data/meld.appdata.xml.in.h:5 +msgid "The GNOME Project" +msgstr "Гномов пројекат" + #: ../data/mime/meld.xml.in.h:1 msgid "Meld comparison description" msgstr "Опис Мелдовог поређења" @@ -564,7 +563,7 @@ msgstr "Умножите десно" msgid "Delete selected" msgstr "Обриши изабрано" -#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:858 ../meld/filediff.py:1381 +#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:859 ../meld/filediff.py:1384 msgid "Hide" msgstr "Сакриј" @@ -600,7 +599,7 @@ msgstr "Нови" msgid "Show new" msgstr "Прикажи нове" -#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:74 +#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:76 msgid "Modified" msgstr "Измењени" @@ -633,7 +632,7 @@ msgid "_Add" msgstr "_Додај" #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11 -#: ../meld/vcview.py:649 +#: ../meld/vcview.py:644 msgid "_Remove" msgstr "_Уклони" @@ -655,7 +654,7 @@ msgstr "Премести _доле" #. Create icon and filename CellRenderer #: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35 -#: ../meld/dirdiff.py:372 +#: ../meld/dirdiff.py:373 msgid "Name" msgstr "Назив" @@ -855,8 +854,8 @@ msgstr "Ако не сачувате, измене ће бити трајно и msgid "Close _without Saving" msgstr "Затвори _без чувања" -#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:940 ../meld/filediff.py:1447 -#: ../meld/filediff.py:1515 +#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:941 ../meld/filediff.py:1450 +#: ../meld/filediff.py:1518 msgid "_Cancel" msgstr "_Откажи" @@ -893,7 +892,7 @@ msgstr "Да повратим несачуване измене у докуме msgid "Changes made to the following documents will be permanently lost:\n" msgstr "Измене начињене над следећим документима ће бити трајно изгубљене:\n" -#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:941 ../meld/filediff.py:1448 +#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:942 ../meld/filediff.py:1451 msgid "_Replace" msgstr "_Замени" @@ -941,7 +940,7 @@ msgstr "Обликуј као исправку" msgid "Copy to Clipboard" msgstr "Умножи у оставу" -#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:149 +#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:144 msgid "Save Patch" msgstr "Сачувај исправку" @@ -1131,7 +1130,7 @@ msgstr "" "према називу. Сваки образац је списак џокера у стилу конзоле раздвојених " "размаком." -#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:104 +#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:103 msgid "File Filters" msgstr "Пропусници датотека" @@ -1409,7 +1408,8 @@ msgctxt "shortcut window" msgid "Show/hide console output" msgstr "Приказује/скрива излаз конзоле" -#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:668 +#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:570 +#: ../meld/newdifftab.py:38 msgid "New comparison" msgstr "Ново поређење" @@ -1557,7 +1557,7 @@ msgstr "_Необрађено" msgid "Show unversioned files" msgstr "Прикажите необрађене датотеке" -#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:67 +#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69 msgid "Ignored" msgstr "Занемарене" @@ -1585,7 +1585,7 @@ msgstr "Претходни дневници:" msgid "Co_mmit" msgstr "У_гради" -#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:337 +#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:332 msgid "Location" msgstr "Путања" @@ -1627,44 +1627,44 @@ msgid "Mac OS (CR)" msgstr "Мек ОС (CR)" #. Create file size CellRenderer -#: ../meld/dirdiff.py:390 ../meld/preferences.py:82 +#: ../meld/dirdiff.py:391 ../meld/preferences.py:82 msgid "Size" msgstr "Величина" #. Create date-time CellRenderer -#: ../meld/dirdiff.py:398 ../meld/preferences.py:83 +#: ../meld/dirdiff.py:399 ../meld/preferences.py:83 msgid "Modification time" msgstr "Време измене" #. Create permissions CellRenderer -#: ../meld/dirdiff.py:406 ../meld/preferences.py:84 +#: ../meld/dirdiff.py:407 ../meld/preferences.py:84 msgid "Permissions" msgstr "Овлашћења" -#: ../meld/dirdiff.py:536 +#: ../meld/dirdiff.py:537 #, python-format msgid "Hide %s" msgstr "Сакриј „%s“" -#: ../meld/dirdiff.py:668 ../meld/dirdiff.py:692 +#: ../meld/dirdiff.py:669 ../meld/dirdiff.py:693 #, python-format msgid "[%s] Scanning %s" msgstr "[%s] прегледам „%s“" -#: ../meld/dirdiff.py:825 +#: ../meld/dirdiff.py:826 #, python-format msgid "[%s] Done" msgstr "[%s] Готово" -#: ../meld/dirdiff.py:833 +#: ../meld/dirdiff.py:834 msgid "Folders have no differences" msgstr "Фасцикле се не разликују" -#: ../meld/dirdiff.py:835 +#: ../meld/dirdiff.py:836 msgid "Contents of scanned files in folders are identical." msgstr "Садржаји прегледаних датотека у фасциклама су исти." -#: ../meld/dirdiff.py:837 +#: ../meld/dirdiff.py:838 msgid "" "Scanned files in folders appear identical, but contents have not been " "scanned." @@ -1672,38 +1672,38 @@ msgstr "" "Прегледане датотеке у фасциклама изгледа да су исте, али садржај није " "прегледан." -#: ../meld/dirdiff.py:840 +#: ../meld/dirdiff.py:841 msgid "File filters are in use, so not all files have been scanned." msgstr "Филтери датотека су у употреби, тако да нису све датотеке прегледане." -#: ../meld/dirdiff.py:842 +#: ../meld/dirdiff.py:843 msgid "Text filters are in use and may be masking content differences." msgstr "Филтери текста су у употреби и можда су замаскирали разлике садржаја." -#: ../meld/dirdiff.py:860 ../meld/filediff.py:1383 ../meld/filediff.py:1413 -#: ../meld/filediff.py:1415 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 +#: ../meld/dirdiff.py:861 ../meld/filediff.py:1386 ../meld/filediff.py:1416 +#: ../meld/filediff.py:1418 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 msgid "Hi_de" msgstr "_Сакриј" -#: ../meld/dirdiff.py:870 +#: ../meld/dirdiff.py:871 msgid "Multiple errors occurred while scanning this folder" msgstr "Дошло је до више грешака за време претраживања ове фасцикле" -#: ../meld/dirdiff.py:871 +#: ../meld/dirdiff.py:872 msgid "Files with invalid encodings found" msgstr "Пронађене су датотеке са неисправним кодирањем" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:873 +#: ../meld/dirdiff.py:874 msgid "Some files were in an incorrect encoding. The names are something like:" msgstr "Неке датотеке бејаху у неисправном кодирању. Називи су нешто као:" -#: ../meld/dirdiff.py:875 +#: ../meld/dirdiff.py:876 msgid "Files hidden by case insensitive comparison" msgstr "Датотеке скривене поређењем неосетљивим на величину слова" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:877 +#: ../meld/dirdiff.py:878 msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. The following files in this folder are hidden:" @@ -1711,17 +1711,17 @@ msgstr "" "Покренули сте поређење независно од величине слова на систему датотека где " "је она битна. Неке датотеке нису видљиве:" -#: ../meld/dirdiff.py:888 +#: ../meld/dirdiff.py:889 #, python-format msgid "'%s' hidden by '%s'" msgstr "„%s“ сакривено од стране „%s“" -#: ../meld/dirdiff.py:944 +#: ../meld/dirdiff.py:945 #, python-format msgid "Replace folder “%s”?" msgstr "Да заменим фасциклу „%s“?" -#: ../meld/dirdiff.py:946 +#: ../meld/dirdiff.py:947 #, python-format msgid "" "Another folder with the same name already exists in “%s”.\n" @@ -1730,11 +1730,11 @@ msgstr "" "Фасцикла са истим називом већ постоји у „%s“.\n" "Ако замените постојећу фасциклу, све датотеке у њој биће изгубљене." -#: ../meld/dirdiff.py:959 +#: ../meld/dirdiff.py:960 msgid "Error copying file" msgstr "Грешка умножавања датотеке" -#: ../meld/dirdiff.py:960 +#: ../meld/dirdiff.py:961 #, python-format msgid "" "Couldn't copy %s\n" @@ -1747,38 +1747,35 @@ msgstr "" "\n" "%s" -#: ../meld/dirdiff.py:983 +#: ../meld/dirdiff.py:984 #, python-format msgid "Error deleting %s" msgstr "Грешка брисања „%s“" -#: ../meld/dirdiff.py:1488 +#: ../meld/dirdiff.py:1489 msgid "No folder" msgstr "Нема фасцикле" #. Abbreviations for insert and overwrite that fit in the status bar -#: ../meld/filediff.py:359 +#: ../meld/filediff.py:354 msgid "INS" msgstr "УМЕТ" -#: ../meld/filediff.py:359 +#: ../meld/filediff.py:354 msgid "OVR" msgstr "ПРЕП" #. Abbreviation for line, column so that it will fit in the status bar -#: ../meld/filediff.py:361 +#: ../meld/filediff.py:356 #, python-format msgid "Ln %i, Col %i" msgstr "Ред %i, место %i" -#: ../meld/filediff.py:794 +#: ../meld/filediff.py:781 msgid "Comparison results will be inaccurate" msgstr "Резултати поређења биће нетачни" -#: ../meld/filediff.py:796 -#| msgid "" -#| "Filter “%s” changed the number of lines in the file, which is " -#| "unsupported. The comparison will not be accurate." +#: ../meld/filediff.py:783 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1786,64 +1783,64 @@ msgstr "" "Филтер је изменио број редова у датотеци, а то није подржано. Поређење неће " "бити тачно." -#: ../meld/filediff.py:854 +#: ../meld/filediff.py:841 msgid "Mark conflict as resolved?" msgstr "Да означим сукоб решеним?" -#: ../meld/filediff.py:856 +#: ../meld/filediff.py:843 msgid "" "If the conflict was resolved successfully, you may mark it as resolved now." msgstr "Ако је сукоб успешно решен, сада га можете означити решеним." -#: ../meld/filediff.py:858 +#: ../meld/filediff.py:845 msgid "Cancel" msgstr "Откажи" -#: ../meld/filediff.py:859 +#: ../meld/filediff.py:846 msgid "Mark _Resolved" msgstr "Означи _решеним" -#: ../meld/filediff.py:1099 +#: ../meld/filediff.py:1095 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Дошло је до проблема отварања датотеке „%s“." -#: ../meld/filediff.py:1107 +#: ../meld/filediff.py:1103 #, python-format msgid "File %s appears to be a binary file." msgstr "Изгледа да је „%s“ извршна датотека." -#: ../meld/filediff.py:1109 +#: ../meld/filediff.py:1105 msgid "Do you want to open the file using the default application?" msgstr "Да ли желите да отворите датотеку користећи основни програм?" -#: ../meld/filediff.py:1111 +#: ../meld/filediff.py:1107 msgid "Open" msgstr "Отвори" -#: ../meld/filediff.py:1127 +#: ../meld/filediff.py:1123 #, python-format msgid "[%s] Computing differences" msgstr "Срачунавам разлике [%s]" -#: ../meld/filediff.py:1192 +#: ../meld/filediff.py:1188 #, python-format msgid "File %s has changed on disk" msgstr "Датотека „%s“ је измењена на диску" -#: ../meld/filediff.py:1193 +#: ../meld/filediff.py:1189 msgid "Do you want to reload the file?" msgstr "Да ли желите поново да учитате датотеку?" -#: ../meld/filediff.py:1195 +#: ../meld/filediff.py:1191 msgid "_Reload" msgstr "_Учитај поново" -#: ../meld/filediff.py:1346 +#: ../meld/filediff.py:1349 msgid "Files are identical" msgstr "Датотеке су истоветне" -#: ../meld/filediff.py:1359 +#: ../meld/filediff.py:1362 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1851,11 +1848,11 @@ msgstr "" "Коришћени су филтери текста, а могу постојати и замаскиране разлике између " "датотека. Да ли желите да поредите неиздвојене датотеке?" -#: ../meld/filediff.py:1364 +#: ../meld/filediff.py:1367 msgid "Files differ in line endings only" msgstr "Датотеке се разликују само по завршецима редова" -#: ../meld/filediff.py:1366 +#: ../meld/filediff.py:1369 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1864,15 +1861,15 @@ msgstr "" "Датотеке су истоветне али се разликују само по завршецима редова:\n" "%s" -#: ../meld/filediff.py:1386 +#: ../meld/filediff.py:1389 msgid "Show without filters" msgstr "Приказује без филтера" -#: ../meld/filediff.py:1408 +#: ../meld/filediff.py:1411 msgid "Change highlighting incomplete" msgstr "Истицање измена није довршено" -#: ../meld/filediff.py:1409 +#: ../meld/filediff.py:1412 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." @@ -1880,20 +1877,20 @@ msgstr "" "Неке измене нису истакнуте зато што су превелике. Можете да приморате Мелд " "да продужи са истицањем већих измена, иако то може бити споро." -#: ../meld/filediff.py:1417 +#: ../meld/filediff.py:1420 msgid "Keep highlighting" msgstr "Задржите истицање" -#: ../meld/filediff.py:1419 +#: ../meld/filediff.py:1422 msgid "_Keep highlighting" msgstr "_Задржи истицање" -#: ../meld/filediff.py:1451 +#: ../meld/filediff.py:1454 #, python-format msgid "Replace file “%s”?" msgstr "Да заменим датотеку „%s“?" -#: ../meld/filediff.py:1453 +#: ../meld/filediff.py:1456 #, python-format msgid "" "A file with this name already exists in “%s”.\n" @@ -1902,45 +1899,45 @@ msgstr "" "Датотека са овим називом већ постоји у „%s“.\n" "Ако замените постојећу датотеку, њен садржај биће изгубљен." -#: ../meld/filediff.py:1470 +#: ../meld/filediff.py:1473 msgid "Save Left Pane As" msgstr "Сачувај леву површ као" -#: ../meld/filediff.py:1472 +#: ../meld/filediff.py:1475 msgid "Save Middle Pane As" msgstr "Сачувај средњу површ као" -#: ../meld/filediff.py:1474 +#: ../meld/filediff.py:1477 msgid "Save Right Pane As" msgstr "Сачувај десну површ као" -#: ../meld/filediff.py:1488 +#: ../meld/filediff.py:1491 #, python-format msgid "File %s has changed on disk since it was opened" msgstr "Датотека „%s“ је измењена на диску након отварања" -#: ../meld/filediff.py:1490 +#: ../meld/filediff.py:1493 msgid "If you save it, any external changes will be lost." msgstr "Ако је сачувате, све спољне измене ће бити изгубљене." -#: ../meld/filediff.py:1493 +#: ../meld/filediff.py:1496 msgid "Save Anyway" msgstr "Ипак сачувај" -#: ../meld/filediff.py:1494 +#: ../meld/filediff.py:1497 msgid "Don't Save" msgstr "Немој чувати" -#: ../meld/filediff.py:1516 +#: ../meld/filediff.py:1519 msgid "_Save as UTF-8" msgstr "_Сачувај као УТФ-8" -#: ../meld/filediff.py:1519 +#: ../meld/filediff.py:1522 #, python-format msgid "Couldn't encode text as “%s”" msgstr "Не могу да кодирам текст као „%s“" -#: ../meld/filediff.py:1521 +#: ../meld/filediff.py:1524 #, python-format msgid "" "File “%s” contains characters that can't be encoded using encoding “%s”.\n" @@ -1949,12 +1946,12 @@ msgstr "" "„%s“ садржи знакове који се не могу кодирати употребом кодирања „%s“\n" "Да ли желите да сачувате као УТФ-8?" -#: ../meld/filediff.py:1558 ../meld/patchdialog.py:125 +#: ../meld/filediff.py:1564 ../meld/patchdialog.py:120 #, python-format msgid "Could not save file %s." msgstr "Не могу да сачувам датотеку „%s“." -#: ../meld/filediff.py:1559 ../meld/patchdialog.py:126 +#: ../meld/filediff.py:1565 ../meld/patchdialog.py:121 #, python-format msgid "" "Couldn't save file due to:\n" @@ -1963,11 +1960,11 @@ msgstr "" "Не могу да сачувам датотеку због следећег:\n" "%s" -#: ../meld/filediff.py:1905 +#: ../meld/filediff.py:1910 msgid "Live comparison updating disabled" msgstr "Искључено је живо ажурирање поређења" -#: ../meld/filediff.py:1906 +#: ../meld/filediff.py:1911 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -1990,348 +1987,308 @@ msgstr "Умножи _горе" msgid "Copy _down" msgstr "Умножи _доле" -#: ../meld/meldapp.py:177 +#: ../meld/meldapp.py:175 msgid "wrong number of arguments supplied to --diff" msgstr "погрешан број аргумената придодат уз „--diff“" -#: ../meld/meldapp.py:182 +#: ../meld/meldapp.py:180 msgid "Start with an empty window" msgstr "Отвара један празан прозор" # bug: string composition is bad i18n, and will make l10n hard -#: ../meld/meldapp.py:183 ../meld/meldapp.py:185 +#: ../meld/meldapp.py:181 ../meld/meldapp.py:183 msgid "file" msgstr "датотека" -#: ../meld/meldapp.py:183 ../meld/meldapp.py:187 +#: ../meld/meldapp.py:181 ../meld/meldapp.py:185 msgid "folder" msgstr "фасцикла" -#: ../meld/meldapp.py:184 +#: ../meld/meldapp.py:182 msgid "Start a version control comparison" msgstr "Покреће поређење контроле верзије" -#: ../meld/meldapp.py:186 +#: ../meld/meldapp.py:184 msgid "Start a 2- or 3-way file comparison" msgstr "Покреће поређење 2 или 3 датотеке" -#: ../meld/meldapp.py:188 +#: ../meld/meldapp.py:186 msgid "Start a 2- or 3-way folder comparison" msgstr "Покреће поређење 2 или 3 фасцикле" -#: ../meld/meldapp.py:231 +#: ../meld/meldapp.py:229 #, python-format msgid "Error: %s\n" msgstr "Грешка: %s\n" -#: ../meld/meldapp.py:238 +#: ../meld/meldapp.py:236 msgid "Meld is a file and directory comparison tool." msgstr "Мелд је алат за поређење датотека и фасцикли." -#: ../meld/meldapp.py:242 +#: ../meld/meldapp.py:240 msgid "Set label to use instead of file name" msgstr "Подешава ознаку за коришћење уместо назива датотеке" -#: ../meld/meldapp.py:245 +#: ../meld/meldapp.py:243 msgid "Open a new tab in an already running instance" msgstr "Отвара нови језичак у једном већ отвореном примерку" -#: ../meld/meldapp.py:248 +#: ../meld/meldapp.py:246 msgid "Automatically compare all differing files on startup" msgstr "Самостално пореди све разликујуће датотеке приликом покретања" -#: ../meld/meldapp.py:251 +#: ../meld/meldapp.py:249 msgid "Ignored for compatibility" msgstr "Занемарено због сагласности" -#: ../meld/meldapp.py:255 +#: ../meld/meldapp.py:253 msgid "Set the target file for saving a merge result" msgstr "Подешава циљну датотеку за чување резултата стапања" -#: ../meld/meldapp.py:258 +#: ../meld/meldapp.py:256 msgid "Automatically merge files" msgstr "Самостално стапа датотеке" -#: ../meld/meldapp.py:262 +#: ../meld/meldapp.py:260 msgid "Load a saved comparison from a Meld comparison file" msgstr "Учитава сачувано поређење из Мелдове датотеке поређења" -#: ../meld/meldapp.py:266 +#: ../meld/meldapp.py:264 msgid "Create a diff tab for the supplied files or folders" msgstr "Прави језичак разлика придодате датотеке или фасцикле" -#: ../meld/meldapp.py:286 +#: ../meld/meldapp.py:284 #, python-format msgid "too many arguments (wanted 0-3, got %d)" msgstr "превише аргумената (тражено је 0-3, добих %d)" -#: ../meld/meldapp.py:289 +#: ../meld/meldapp.py:287 msgid "can't auto-merge less than 3 files" msgstr "не могу самостално да стопим мање од 3 датотеке" -#: ../meld/meldapp.py:291 +#: ../meld/meldapp.py:289 msgid "can't auto-merge directories" msgstr "не могу самостално да стопим директоријуме" -#: ../meld/meldapp.py:305 +#: ../meld/meldapp.py:303 msgid "Error reading saved comparison file" msgstr "Грешка читања сачуване датотеке поређења" -#: ../meld/meldapp.py:332 +#: ../meld/meldapp.py:330 #, python-format msgid "invalid path or URI \"%s\"" msgstr "неисправна путања или адреса „%s“" #. TRANSLATORS: This is the label of a new, currently-unnamed file. -#: ../meld/meldbuffer.py:127 +#: ../meld/meldbuffer.py:131 msgid "" msgstr "<неименован>" -#: ../meld/melddoc.py:83 ../meld/melddoc.py:84 +#: ../meld/melddoc.py:64 msgid "untitled" msgstr "безимени" -#: ../meld/meldwindow.py:49 +#: ../meld/meldwindow.py:48 msgid "_File" msgstr "_Датотека" -#: ../meld/meldwindow.py:50 +#: ../meld/meldwindow.py:49 msgid "_New Comparison..." msgstr "_Ново поређење..." -#: ../meld/meldwindow.py:51 +#: ../meld/meldwindow.py:50 msgid "Start a new comparison" msgstr "Започните ново поређење" -#: ../meld/meldwindow.py:54 +#: ../meld/meldwindow.py:53 msgid "Save the current file" msgstr "Сачувајте тренутну датотеку" -#: ../meld/meldwindow.py:56 +#: ../meld/meldwindow.py:55 msgid "Save As..." msgstr "Сачувај као..." -#: ../meld/meldwindow.py:57 +#: ../meld/meldwindow.py:56 msgid "Save the current file with a different name" msgstr "Сачувајте текућу датотеку под другим називом" -#: ../meld/meldwindow.py:60 +#: ../meld/meldwindow.py:59 msgid "Close the current file" msgstr "Затворите тренутну датотеку" -#: ../meld/meldwindow.py:63 +#: ../meld/meldwindow.py:62 msgid "_Edit" msgstr "_Уређивање" -#: ../meld/meldwindow.py:65 +#: ../meld/meldwindow.py:64 msgid "Undo the last action" msgstr "Опозовите последњу радњу" -#: ../meld/meldwindow.py:68 +#: ../meld/meldwindow.py:67 msgid "Redo the last undone action" msgstr "Поновите последњу опозвану радњу" -#: ../meld/meldwindow.py:70 +#: ../meld/meldwindow.py:69 msgid "Cut the selection" msgstr "Исеците избор" -#: ../meld/meldwindow.py:72 +#: ../meld/meldwindow.py:71 msgid "Copy the selection" msgstr "Умножите избор" -#: ../meld/meldwindow.py:74 +#: ../meld/meldwindow.py:73 msgid "Paste the clipboard" msgstr "Убаците оставу" -#: ../meld/meldwindow.py:76 +#: ../meld/meldwindow.py:75 msgid "Find..." msgstr "Пронађи..." -#: ../meld/meldwindow.py:76 +#: ../meld/meldwindow.py:75 msgid "Search for text" msgstr "Тражите текст" -#: ../meld/meldwindow.py:78 +#: ../meld/meldwindow.py:77 msgid "Find Ne_xt" msgstr "Нађи с_ледеће" -#: ../meld/meldwindow.py:79 +#: ../meld/meldwindow.py:78 msgid "Search forwards for the same text" msgstr "Тражите унапред исти текст" -#: ../meld/meldwindow.py:81 +#: ../meld/meldwindow.py:80 msgid "Find _Previous" msgstr "Нађи пре_тходно" -#: ../meld/meldwindow.py:82 +#: ../meld/meldwindow.py:81 msgid "Search backwards for the same text" msgstr "Тражите уназад исти текст" -#: ../meld/meldwindow.py:85 +#: ../meld/meldwindow.py:84 msgid "_Replace..." msgstr "_Замени..." -#: ../meld/meldwindow.py:86 +#: ../meld/meldwindow.py:85 msgid "Find and replace text" msgstr "Пронађите и замените текст" -#: ../meld/meldwindow.py:89 +#: ../meld/meldwindow.py:88 msgid "_Changes" msgstr "_Измене" -#: ../meld/meldwindow.py:90 +#: ../meld/meldwindow.py:89 msgid "Next Change" msgstr "Следећа измена" -#: ../meld/meldwindow.py:91 +#: ../meld/meldwindow.py:90 msgid "Go to the next change" msgstr "Идите на следећу измену" -#: ../meld/meldwindow.py:93 +#: ../meld/meldwindow.py:92 msgid "Previous Change" msgstr "Претходна измена" -#: ../meld/meldwindow.py:94 +#: ../meld/meldwindow.py:93 msgid "Go to the previous change" msgstr "Идите на претходну измену" -#: ../meld/meldwindow.py:96 +#: ../meld/meldwindow.py:95 msgid "Open Externally" msgstr "Отвори спољним" -#: ../meld/meldwindow.py:97 +#: ../meld/meldwindow.py:96 msgid "Open selected file or directory in the default external application" msgstr "Отворите изабрану датотеку или фасциклу у основном спољном програму" -#: ../meld/meldwindow.py:101 +#: ../meld/meldwindow.py:100 msgid "_View" msgstr "П_реглед" -#: ../meld/meldwindow.py:102 +#: ../meld/meldwindow.py:101 msgid "File Status" msgstr "Стање датотеке" -#: ../meld/meldwindow.py:103 +#: ../meld/meldwindow.py:102 msgid "Version Status" msgstr "Стање издања" -#: ../meld/meldwindow.py:106 +#: ../meld/meldwindow.py:105 msgid "Stop the current action" msgstr "Зауставите тренутну радњу" -#: ../meld/meldwindow.py:109 +#: ../meld/meldwindow.py:108 msgid "Refresh the view" msgstr "Освежите преглед" #: ../meld/meldwindow.py:112 -msgid "_Tabs" -msgstr "_Језичци" - -#: ../meld/meldwindow.py:113 -msgid "_Previous Tab" -msgstr "Пре_тходни језичак" - -#: ../meld/meldwindow.py:114 -msgid "Activate previous tab" -msgstr "Идите на претходни језичак" - -#: ../meld/meldwindow.py:116 -msgid "_Next Tab" -msgstr "Сле_дећи језичак" - -#: ../meld/meldwindow.py:117 -msgid "Activate next tab" -msgstr "Идите на наредни језичак" - -#: ../meld/meldwindow.py:120 -msgid "Move Tab _Left" -msgstr "Премести језичак _лево" - -#: ../meld/meldwindow.py:121 -msgid "Move current tab to left" -msgstr "Преместите тренутни језичак на лево" - -#: ../meld/meldwindow.py:124 -msgid "Move Tab _Right" -msgstr "Премести језичак _десно" - -#: ../meld/meldwindow.py:125 -msgid "Move current tab to right" -msgstr "Преместите тренутни језичак на десно" - -#: ../meld/meldwindow.py:129 msgid "Fullscreen" msgstr "Преко целог екрана" -#: ../meld/meldwindow.py:130 +#: ../meld/meldwindow.py:113 msgid "View the comparison in fullscreen" msgstr "Прегледајте поређење преко целог екрана" -#: ../meld/meldwindow.py:132 +#: ../meld/meldwindow.py:115 msgid "_Toolbar" msgstr "_Трака алата" -#: ../meld/meldwindow.py:133 +#: ../meld/meldwindow.py:116 msgid "Show or hide the toolbar" msgstr "Прикажите или сакријте траку алата" -#: ../meld/meldwindow.py:143 +#: ../meld/meldwindow.py:126 msgid "Open Recent" msgstr "Отвори скорашње" -#: ../meld/meldwindow.py:144 +#: ../meld/meldwindow.py:127 msgid "Open recent files" msgstr "Отворите скорашње датотеке" -#: ../meld/meldwindow.py:166 +#: ../meld/meldwindow.py:149 msgid "_Meld" msgstr "_Мелд" -#: ../meld/meldwindow.py:167 +#: ../meld/meldwindow.py:150 msgid "Quit the program" msgstr "Затворите програм" -#: ../meld/meldwindow.py:169 +#: ../meld/meldwindow.py:152 msgid "Prefere_nces" msgstr "_Поставке" -#: ../meld/meldwindow.py:170 +#: ../meld/meldwindow.py:153 msgid "Configure the application" msgstr "Подесите програм" -#: ../meld/meldwindow.py:172 +#: ../meld/meldwindow.py:155 msgid "_Contents" msgstr "_Садржај" -#: ../meld/meldwindow.py:173 +#: ../meld/meldwindow.py:156 msgid "Open the Meld manual" msgstr "Отворите упутство Мелда" -#: ../meld/meldwindow.py:175 +#: ../meld/meldwindow.py:158 msgid "About this application" msgstr "О овом програму" -#: ../meld/meldwindow.py:587 -msgid "Switch to this tab" -msgstr "Пребаците се на овај језичак" - -#: ../meld/meldwindow.py:702 +#: ../meld/meldwindow.py:604 #, python-format msgid "Need three files to auto-merge, got: %r" msgstr "Потребне су три датотеке за само-спајање, добих: %r" -#: ../meld/meldwindow.py:716 +#: ../meld/meldwindow.py:618 msgid "Cannot compare a mixture of files and directories" msgstr "Не могу да поредим мешавину датотека и фасцикли" -#: ../meld/misc.py:179 +#: ../meld/misc.py:203 #, python-format msgid "Couldn't find colour scheme details for %s-%s; this is a bad install" msgstr "" "Не могу да нађем појединости шеме боје за „%s-%s“; јер је лоше инсталирана" #. no common path. empty names get changed to "[None]" -#: ../meld/misc.py:264 +#: ../meld/misc.py:263 msgid "[None]" msgstr "[ништа]" @@ -2343,7 +2300,7 @@ msgstr "натпис" msgid "pattern" msgstr "образац" -#: ../meld/recent.py:115 +#: ../meld/recent.py:114 msgid "Version control:" msgstr "Управљање издањем:" @@ -2351,20 +2308,20 @@ msgstr "Управљање издањем:" msgid "Close tab" msgstr "Затворите језичак" -#: ../meld/ui/vcdialogs.py:50 +#: ../meld/ui/vcdialogs.py:48 msgid "No files will be committed" msgstr "Ниједна датотека неће бити уграђена" #. Translators: First %s is replaced by translated "%d unpushed #. commits", second %s is replaced by translated "%d branches" -#: ../meld/vc/git.py:95 +#: ../meld/vc/git.py:94 #, python-format msgid "%s in %s" msgstr "%s у %s" #. Translators: These messages cover the case where there is #. only one branch, and are not part of another message. -#: ../meld/vc/git.py:96 ../meld/vc/git.py:103 +#: ../meld/vc/git.py:95 ../meld/vc/git.py:102 #, python-format msgid "%d unpushed commit" msgid_plural "%d unpushed commits" @@ -2373,7 +2330,7 @@ msgstr[1] "%d непогуране предаје" msgstr[2] "%d непогураних предаја" msgstr[3] "%d непогурана предаја" -#: ../meld/vc/git.py:98 +#: ../meld/vc/git.py:97 #, python-format msgid "%d branch" msgid_plural "%d branches" @@ -2382,16 +2339,16 @@ msgstr[1] "%d гране" msgstr[2] "%d грана" msgstr[3] "%d грани" -#: ../meld/vc/git.py:352 +#: ../meld/vc/git.py:330 #, python-format msgid "Mode changed from %s to %s" msgstr "Режим је измењен из „%s“ у „%s“" -#: ../meld/vc/git.py:360 +#: ../meld/vc/git.py:338 msgid "Partially staged" msgstr "Делимично уштекано" -#: ../meld/vc/git.py:360 +#: ../meld/vc/git.py:338 msgid "Staged" msgstr "Уштекано" @@ -2401,140 +2358,140 @@ msgstr "Уштекано" msgid "None" msgstr "Ништа" -#: ../meld/vc/svn.py:216 +#: ../meld/vc/svn.py:204 #, python-format msgid "Rev %s" msgstr "Рев %s" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Merged" msgstr "Стопљено" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Base" msgstr "Основа" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Local" msgstr "Месно" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Remote" msgstr "Удаљено" -#: ../meld/vc/_vc.py:68 +#: ../meld/vc/_vc.py:70 msgid "Unversioned" msgstr "Необрађено" -#: ../meld/vc/_vc.py:71 +#: ../meld/vc/_vc.py:73 msgid "Error" msgstr "Грeшкa" -#: ../meld/vc/_vc.py:73 +#: ../meld/vc/_vc.py:75 msgid "Newly added" msgstr "Ново додата" -#: ../meld/vc/_vc.py:75 +#: ../meld/vc/_vc.py:77 msgid "Renamed" msgstr "Преименована" -#: ../meld/vc/_vc.py:76 +#: ../meld/vc/_vc.py:78 msgid "Conflict" msgstr "Сукоб" -#: ../meld/vc/_vc.py:77 +#: ../meld/vc/_vc.py:79 msgid "Removed" msgstr "Уклоњено" -#: ../meld/vc/_vc.py:78 +#: ../meld/vc/_vc.py:80 msgid "Missing" msgstr "Недостаје" -#: ../meld/vc/_vc.py:79 +#: ../meld/vc/_vc.py:81 msgid "Not present" msgstr "Није присутно" #. Translators: This error message is shown when a version #. control binary isn't installed. -#: ../meld/vcview.py:255 +#: ../meld/vcview.py:251 #, 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:259 +#: ../meld/vcview.py:255 #, python-format msgid "%(name)s (Invalid repository)" msgstr "%(name)s (Неисправна ризница)" -#: ../meld/vcview.py:280 +#: ../meld/vcview.py:276 msgid "No valid version control system found in this folder" msgstr "У овој фасцикли није пронађен исправан систем управљања издањем" -#: ../meld/vcview.py:282 +#: ../meld/vcview.py:278 msgid "Only one version control system found in this folder" msgstr "У овој фасцикли је пронађен само један систем управљања издањем" -#: ../meld/vcview.py:284 +#: ../meld/vcview.py:280 msgid "Choose which version control system to use" msgstr "Изаберите који систем управљања издањем ће бити коришћен" #. TRANSLATORS: This is the location of the directory being viewed -#: ../meld/vcview.py:337 +#: ../meld/vcview.py:332 #, python-format msgid "%s: %s" msgstr "%s: %s" -#: ../meld/vcview.py:357 +#: ../meld/vcview.py:352 #, python-format msgid "Scanning %s" msgstr "Прегледам „%s“" -#: ../meld/vcview.py:396 +#: ../meld/vcview.py:391 msgid "(Empty)" msgstr "(Празно)" -#: ../meld/vcview.py:440 +#: ../meld/vcview.py:435 #, python-format msgid "%s — local" msgstr "%s — месна" -#: ../meld/vcview.py:441 +#: ../meld/vcview.py:436 #, python-format msgid "%s — remote" msgstr "%s — удаљена" -#: ../meld/vcview.py:449 +#: ../meld/vcview.py:444 #, python-format msgid "%s (local, merge, remote)" msgstr "%s (месна, спојена, удаљена)" -#: ../meld/vcview.py:454 +#: ../meld/vcview.py:449 #, python-format msgid "%s (remote, merge, local)" msgstr "%s (удаљена, спојена, месна)" -#: ../meld/vcview.py:465 +#: ../meld/vcview.py:460 #, python-format msgid "%s — repository" msgstr "%s — ризница" -#: ../meld/vcview.py:471 +#: ../meld/vcview.py:466 #, python-format msgid "%s (working, repository)" msgstr "%s (радна, ризница)" -#: ../meld/vcview.py:475 +#: ../meld/vcview.py:470 #, python-format msgid "%s (repository, working)" msgstr "%s (ризница, радна)" -#: ../meld/vcview.py:643 +#: ../meld/vcview.py:638 msgid "Remove folder and all its files?" msgstr "Да уклоним фасциклу и све њене датотеке?" -#: ../meld/vcview.py:645 +#: ../meld/vcview.py:640 msgid "" "This will remove all selected files and folders, and all files within any " "selected folders, from version control." @@ -2542,15 +2499,48 @@ msgstr "" "Ово ће уклонити све изабране датотеке и фасцикле, и све датотеке унутар свих " "изабраних фасцикли, из управљања издањем." -#: ../meld/vcview.py:670 +#: ../meld/vcview.py:665 #, python-format msgid "Error removing %s" msgstr "Грешка при уклањању „%s“" -#: ../meld/vcview.py:750 +#: ../meld/vcview.py:745 msgid "Clear" msgstr "Очисти" +#~ msgid "Meld does not support Python 3." +#~ msgstr "Мелд не подржава Питона 3." + +#~ msgid "_Tabs" +#~ msgstr "_Језичци" + +#~ msgid "_Previous Tab" +#~ msgstr "Пре_тходни језичак" + +#~ msgid "Activate previous tab" +#~ msgstr "Идите на претходни језичак" + +#~ msgid "_Next Tab" +#~ msgstr "Сле_дећи језичак" + +#~ msgid "Activate next tab" +#~ msgstr "Идите на наредни језичак" + +#~ msgid "Move Tab _Left" +#~ msgstr "Премести језичак _лево" + +#~ msgid "Move current tab to left" +#~ msgstr "Преместите тренутни језичак на лево" + +#~ msgid "Move Tab _Right" +#~ msgstr "Премести језичак _десно" + +#~ msgid "Move current tab to right" +#~ msgstr "Преместите тренутни језичак на десно" + +#~ msgid "Switch to this tab" +#~ msgstr "Пребаците се на овај језичак" + #~ msgid "" #~ "These text encodings will be automatically used (in order) to try to " #~ "decode loaded text files." diff --git a/po/sr@latin.po b/po/sr@latin.po index eb3fd05e..fb916c88 100644 --- a/po/sr@latin.po +++ b/po/sr@latin.po @@ -1,8 +1,7 @@ # Serbian translation of meld # Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2016. # This file is distributed under the same license as the meld package. -# -# Translators: +# Translators: # Danilo Šegan # Miroslav Nikolić , 2011—2016. msgid "" @@ -10,11 +9,11 @@ msgstr "" "Project-Id-Version: meld\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=meld&ke" "ywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-03-08 13:36+0000\n" -"PO-Revision-Date: 2016-03-09 09:19+0200\n" +"POT-Creation-Date: 2016-08-20 21:39+0000\n" +"PO-Revision-Date: 2016-08-21 14:01+0200\n" "Last-Translator: Miroslav Nikolić \n" -"Language-Team: Serbian <(nothing)>\n" -"Language: sr@latin\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" @@ -22,20 +21,16 @@ msgstr "" "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Project-Style: gnome\n" -#: ../bin/meld:144 +#: ../bin/meld:142 msgid "Cannot import: " msgstr "Ne mogu da uvezem: " -#: ../bin/meld:147 +#: ../bin/meld:145 #, c-format msgid "Meld requires %s or higher." msgstr "Meld zahteva %s ili noviji." -#: ../bin/meld:151 -msgid "Meld does not support Python 3." -msgstr "Meld ne podržava Pitona 3." - -#: ../bin/meld:200 +#: ../bin/meld:194 #, c-format msgid "" "Couldn't load Meld-specific CSS (%s)\n" @@ -87,6 +82,10 @@ msgstr "" "Meld vam pomaže da pregledate izmene u kodu, da razumete zakrpe, i ogromne " "sukobe stapanja čini manje bolnim." +#: ../data/meld.appdata.xml.in.h:5 +msgid "The GNOME Project" +msgstr "Gnomov projekat" + #: ../data/mime/meld.xml.in.h:1 msgid "Meld comparison description" msgstr "Opis Meldovog poređenja" @@ -564,7 +563,7 @@ msgstr "Umnožite desno" msgid "Delete selected" msgstr "Obriši izabrano" -#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:858 ../meld/filediff.py:1381 +#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:859 ../meld/filediff.py:1384 msgid "Hide" msgstr "Sakrij" @@ -600,7 +599,7 @@ msgstr "Novi" msgid "Show new" msgstr "Prikaži nove" -#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:74 +#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:76 msgid "Modified" msgstr "Izmenjeni" @@ -633,7 +632,7 @@ msgid "_Add" msgstr "_Dodaj" #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11 -#: ../meld/vcview.py:649 +#: ../meld/vcview.py:644 msgid "_Remove" msgstr "_Ukloni" @@ -655,7 +654,7 @@ msgstr "Premesti _dole" #. Create icon and filename CellRenderer #: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35 -#: ../meld/dirdiff.py:372 +#: ../meld/dirdiff.py:373 msgid "Name" msgstr "Naziv" @@ -855,8 +854,8 @@ msgstr "Ako ne sačuvate, izmene će biti trajno izgubljene." msgid "Close _without Saving" msgstr "Zatvori _bez čuvanja" -#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:940 ../meld/filediff.py:1447 -#: ../meld/filediff.py:1515 +#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:941 ../meld/filediff.py:1450 +#: ../meld/filediff.py:1518 msgid "_Cancel" msgstr "_Otkaži" @@ -893,7 +892,7 @@ msgstr "Da povratim nesačuvane izmene u dokumentima?" msgid "Changes made to the following documents will be permanently lost:\n" msgstr "Izmene načinjene nad sledećim dokumentima će biti trajno izgubljene:\n" -#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:941 ../meld/filediff.py:1448 +#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:942 ../meld/filediff.py:1451 msgid "_Replace" msgstr "_Zameni" @@ -941,7 +940,7 @@ msgstr "Oblikuj kao ispravku" msgid "Copy to Clipboard" msgstr "Umnoži u ostavu" -#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:149 +#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:144 msgid "Save Patch" msgstr "Sačuvaj ispravku" @@ -1131,7 +1130,7 @@ msgstr "" "prema nazivu. Svaki obrazac je spisak džokera u stilu konzole razdvojenih " "razmakom." -#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:104 +#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:103 msgid "File Filters" msgstr "Propusnici datoteka" @@ -1409,7 +1408,8 @@ msgctxt "shortcut window" msgid "Show/hide console output" msgstr "Prikazuje/skriva izlaz konzole" -#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:668 +#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:570 +#: ../meld/newdifftab.py:38 msgid "New comparison" msgstr "Novo poređenje" @@ -1557,7 +1557,7 @@ msgstr "_Neobrađeno" msgid "Show unversioned files" msgstr "Prikažite neobrađene datoteke" -#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:67 +#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69 msgid "Ignored" msgstr "Zanemarene" @@ -1585,7 +1585,7 @@ msgstr "Prethodni dnevnici:" msgid "Co_mmit" msgstr "U_gradi" -#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:337 +#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:332 msgid "Location" msgstr "Putanja" @@ -1627,44 +1627,44 @@ msgid "Mac OS (CR)" msgstr "Mek OS (CR)" #. Create file size CellRenderer -#: ../meld/dirdiff.py:390 ../meld/preferences.py:82 +#: ../meld/dirdiff.py:391 ../meld/preferences.py:82 msgid "Size" msgstr "Veličina" #. Create date-time CellRenderer -#: ../meld/dirdiff.py:398 ../meld/preferences.py:83 +#: ../meld/dirdiff.py:399 ../meld/preferences.py:83 msgid "Modification time" msgstr "Vreme izmene" #. Create permissions CellRenderer -#: ../meld/dirdiff.py:406 ../meld/preferences.py:84 +#: ../meld/dirdiff.py:407 ../meld/preferences.py:84 msgid "Permissions" msgstr "Ovlašćenja" -#: ../meld/dirdiff.py:536 +#: ../meld/dirdiff.py:537 #, python-format msgid "Hide %s" msgstr "Sakrij „%s“" -#: ../meld/dirdiff.py:668 ../meld/dirdiff.py:692 +#: ../meld/dirdiff.py:669 ../meld/dirdiff.py:693 #, python-format msgid "[%s] Scanning %s" msgstr "[%s] pregledam „%s“" -#: ../meld/dirdiff.py:825 +#: ../meld/dirdiff.py:826 #, python-format msgid "[%s] Done" msgstr "[%s] Gotovo" -#: ../meld/dirdiff.py:833 +#: ../meld/dirdiff.py:834 msgid "Folders have no differences" msgstr "Fascikle se ne razlikuju" -#: ../meld/dirdiff.py:835 +#: ../meld/dirdiff.py:836 msgid "Contents of scanned files in folders are identical." msgstr "Sadržaji pregledanih datoteka u fasciklama su isti." -#: ../meld/dirdiff.py:837 +#: ../meld/dirdiff.py:838 msgid "" "Scanned files in folders appear identical, but contents have not been " "scanned." @@ -1672,38 +1672,38 @@ msgstr "" "Pregledane datoteke u fasciklama izgleda da su iste, ali sadržaj nije " "pregledan." -#: ../meld/dirdiff.py:840 +#: ../meld/dirdiff.py:841 msgid "File filters are in use, so not all files have been scanned." msgstr "Filteri datoteka su u upotrebi, tako da nisu sve datoteke pregledane." -#: ../meld/dirdiff.py:842 +#: ../meld/dirdiff.py:843 msgid "Text filters are in use and may be masking content differences." msgstr "Filteri teksta su u upotrebi i možda su zamaskirali razlike sadržaja." -#: ../meld/dirdiff.py:860 ../meld/filediff.py:1383 ../meld/filediff.py:1413 -#: ../meld/filediff.py:1415 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 +#: ../meld/dirdiff.py:861 ../meld/filediff.py:1386 ../meld/filediff.py:1416 +#: ../meld/filediff.py:1418 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 msgid "Hi_de" msgstr "_Sakrij" -#: ../meld/dirdiff.py:870 +#: ../meld/dirdiff.py:871 msgid "Multiple errors occurred while scanning this folder" msgstr "Došlo je do više grešaka za vreme pretraživanja ove fascikle" -#: ../meld/dirdiff.py:871 +#: ../meld/dirdiff.py:872 msgid "Files with invalid encodings found" msgstr "Pronađene su datoteke sa neispravnim kodiranjem" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:873 +#: ../meld/dirdiff.py:874 msgid "Some files were in an incorrect encoding. The names are something like:" msgstr "Neke datoteke bejahu u neispravnom kodiranju. Nazivi su nešto kao:" -#: ../meld/dirdiff.py:875 +#: ../meld/dirdiff.py:876 msgid "Files hidden by case insensitive comparison" msgstr "Datoteke skrivene poređenjem neosetljivim na veličinu slova" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:877 +#: ../meld/dirdiff.py:878 msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. The following files in this folder are hidden:" @@ -1711,17 +1711,17 @@ msgstr "" "Pokrenuli ste poređenje nezavisno od veličine slova na sistemu datoteka gde " "je ona bitna. Neke datoteke nisu vidljive:" -#: ../meld/dirdiff.py:888 +#: ../meld/dirdiff.py:889 #, python-format msgid "'%s' hidden by '%s'" msgstr "„%s“ sakriveno od strane „%s“" -#: ../meld/dirdiff.py:944 +#: ../meld/dirdiff.py:945 #, python-format msgid "Replace folder “%s”?" msgstr "Da zamenim fasciklu „%s“?" -#: ../meld/dirdiff.py:946 +#: ../meld/dirdiff.py:947 #, python-format msgid "" "Another folder with the same name already exists in “%s”.\n" @@ -1730,11 +1730,11 @@ msgstr "" "Fascikla sa istim nazivom već postoji u „%s“.\n" "Ako zamenite postojeću fasciklu, sve datoteke u njoj biće izgubljene." -#: ../meld/dirdiff.py:959 +#: ../meld/dirdiff.py:960 msgid "Error copying file" msgstr "Greška umnožavanja datoteke" -#: ../meld/dirdiff.py:960 +#: ../meld/dirdiff.py:961 #, python-format msgid "" "Couldn't copy %s\n" @@ -1747,38 +1747,35 @@ msgstr "" "\n" "%s" -#: ../meld/dirdiff.py:983 +#: ../meld/dirdiff.py:984 #, python-format msgid "Error deleting %s" msgstr "Greška brisanja „%s“" -#: ../meld/dirdiff.py:1488 +#: ../meld/dirdiff.py:1489 msgid "No folder" msgstr "Nema fascikle" #. Abbreviations for insert and overwrite that fit in the status bar -#: ../meld/filediff.py:359 +#: ../meld/filediff.py:354 msgid "INS" msgstr "UMET" -#: ../meld/filediff.py:359 +#: ../meld/filediff.py:354 msgid "OVR" msgstr "PREP" #. Abbreviation for line, column so that it will fit in the status bar -#: ../meld/filediff.py:361 +#: ../meld/filediff.py:356 #, python-format msgid "Ln %i, Col %i" msgstr "Red %i, mesto %i" -#: ../meld/filediff.py:794 +#: ../meld/filediff.py:781 msgid "Comparison results will be inaccurate" msgstr "Rezultati poređenja biće netačni" -#: ../meld/filediff.py:796 -#| msgid "" -#| "Filter “%s” changed the number of lines in the file, which is " -#| "unsupported. The comparison will not be accurate." +#: ../meld/filediff.py:783 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1786,64 +1783,64 @@ msgstr "" "Filter je izmenio broj redova u datoteci, a to nije podržano. Poređenje neće " "biti tačno." -#: ../meld/filediff.py:854 +#: ../meld/filediff.py:841 msgid "Mark conflict as resolved?" msgstr "Da označim sukob rešenim?" -#: ../meld/filediff.py:856 +#: ../meld/filediff.py:843 msgid "" "If the conflict was resolved successfully, you may mark it as resolved now." msgstr "Ako je sukob uspešno rešen, sada ga možete označiti rešenim." -#: ../meld/filediff.py:858 +#: ../meld/filediff.py:845 msgid "Cancel" msgstr "Otkaži" -#: ../meld/filediff.py:859 +#: ../meld/filediff.py:846 msgid "Mark _Resolved" msgstr "Označi _rešenim" -#: ../meld/filediff.py:1099 +#: ../meld/filediff.py:1095 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Došlo je do problema otvaranja datoteke „%s“." -#: ../meld/filediff.py:1107 +#: ../meld/filediff.py:1103 #, python-format msgid "File %s appears to be a binary file." msgstr "Izgleda da je „%s“ izvršna datoteka." -#: ../meld/filediff.py:1109 +#: ../meld/filediff.py:1105 msgid "Do you want to open the file using the default application?" msgstr "Da li želite da otvorite datoteku koristeći osnovni program?" -#: ../meld/filediff.py:1111 +#: ../meld/filediff.py:1107 msgid "Open" msgstr "Otvori" -#: ../meld/filediff.py:1127 +#: ../meld/filediff.py:1123 #, python-format msgid "[%s] Computing differences" msgstr "Sračunavam razlike [%s]" -#: ../meld/filediff.py:1192 +#: ../meld/filediff.py:1188 #, python-format msgid "File %s has changed on disk" msgstr "Datoteka „%s“ je izmenjena na disku" -#: ../meld/filediff.py:1193 +#: ../meld/filediff.py:1189 msgid "Do you want to reload the file?" msgstr "Da li želite ponovo da učitate datoteku?" -#: ../meld/filediff.py:1195 +#: ../meld/filediff.py:1191 msgid "_Reload" msgstr "_Učitaj ponovo" -#: ../meld/filediff.py:1346 +#: ../meld/filediff.py:1349 msgid "Files are identical" msgstr "Datoteke su istovetne" -#: ../meld/filediff.py:1359 +#: ../meld/filediff.py:1362 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1851,11 +1848,11 @@ msgstr "" "Korišćeni su filteri teksta, a mogu postojati i zamaskirane razlike između " "datoteka. Da li želite da poredite neizdvojene datoteke?" -#: ../meld/filediff.py:1364 +#: ../meld/filediff.py:1367 msgid "Files differ in line endings only" msgstr "Datoteke se razlikuju samo po završecima redova" -#: ../meld/filediff.py:1366 +#: ../meld/filediff.py:1369 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1864,15 +1861,15 @@ msgstr "" "Datoteke su istovetne ali se razlikuju samo po završecima redova:\n" "%s" -#: ../meld/filediff.py:1386 +#: ../meld/filediff.py:1389 msgid "Show without filters" msgstr "Prikazuje bez filtera" -#: ../meld/filediff.py:1408 +#: ../meld/filediff.py:1411 msgid "Change highlighting incomplete" msgstr "Isticanje izmena nije dovršeno" -#: ../meld/filediff.py:1409 +#: ../meld/filediff.py:1412 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." @@ -1880,20 +1877,20 @@ msgstr "" "Neke izmene nisu istaknute zato što su prevelike. Možete da primorate Meld " "da produži sa isticanjem većih izmena, iako to može biti sporo." -#: ../meld/filediff.py:1417 +#: ../meld/filediff.py:1420 msgid "Keep highlighting" msgstr "Zadržite isticanje" -#: ../meld/filediff.py:1419 +#: ../meld/filediff.py:1422 msgid "_Keep highlighting" msgstr "_Zadrži isticanje" -#: ../meld/filediff.py:1451 +#: ../meld/filediff.py:1454 #, python-format msgid "Replace file “%s”?" msgstr "Da zamenim datoteku „%s“?" -#: ../meld/filediff.py:1453 +#: ../meld/filediff.py:1456 #, python-format msgid "" "A file with this name already exists in “%s”.\n" @@ -1902,45 +1899,45 @@ msgstr "" "Datoteka sa ovim nazivom već postoji u „%s“.\n" "Ako zamenite postojeću datoteku, njen sadržaj biće izgubljen." -#: ../meld/filediff.py:1470 +#: ../meld/filediff.py:1473 msgid "Save Left Pane As" msgstr "Sačuvaj levu površ kao" -#: ../meld/filediff.py:1472 +#: ../meld/filediff.py:1475 msgid "Save Middle Pane As" msgstr "Sačuvaj srednju površ kao" -#: ../meld/filediff.py:1474 +#: ../meld/filediff.py:1477 msgid "Save Right Pane As" msgstr "Sačuvaj desnu površ kao" -#: ../meld/filediff.py:1488 +#: ../meld/filediff.py:1491 #, python-format msgid "File %s has changed on disk since it was opened" msgstr "Datoteka „%s“ je izmenjena na disku nakon otvaranja" -#: ../meld/filediff.py:1490 +#: ../meld/filediff.py:1493 msgid "If you save it, any external changes will be lost." msgstr "Ako je sačuvate, sve spoljne izmene će biti izgubljene." -#: ../meld/filediff.py:1493 +#: ../meld/filediff.py:1496 msgid "Save Anyway" msgstr "Ipak sačuvaj" -#: ../meld/filediff.py:1494 +#: ../meld/filediff.py:1497 msgid "Don't Save" msgstr "Nemoj čuvati" -#: ../meld/filediff.py:1516 +#: ../meld/filediff.py:1519 msgid "_Save as UTF-8" msgstr "_Sačuvaj kao UTF-8" -#: ../meld/filediff.py:1519 +#: ../meld/filediff.py:1522 #, python-format msgid "Couldn't encode text as “%s”" msgstr "Ne mogu da kodiram tekst kao „%s“" -#: ../meld/filediff.py:1521 +#: ../meld/filediff.py:1524 #, python-format msgid "" "File “%s” contains characters that can't be encoded using encoding “%s”.\n" @@ -1949,12 +1946,12 @@ msgstr "" "„%s“ sadrži znakove koji se ne mogu kodirati upotrebom kodiranja „%s“\n" "Da li želite da sačuvate kao UTF-8?" -#: ../meld/filediff.py:1558 ../meld/patchdialog.py:125 +#: ../meld/filediff.py:1564 ../meld/patchdialog.py:120 #, python-format msgid "Could not save file %s." msgstr "Ne mogu da sačuvam datoteku „%s“." -#: ../meld/filediff.py:1559 ../meld/patchdialog.py:126 +#: ../meld/filediff.py:1565 ../meld/patchdialog.py:121 #, python-format msgid "" "Couldn't save file due to:\n" @@ -1963,11 +1960,11 @@ msgstr "" "Ne mogu da sačuvam datoteku zbog sledećeg:\n" "%s" -#: ../meld/filediff.py:1905 +#: ../meld/filediff.py:1910 msgid "Live comparison updating disabled" msgstr "Isključeno je živo ažuriranje poređenja" -#: ../meld/filediff.py:1906 +#: ../meld/filediff.py:1911 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -1990,348 +1987,308 @@ msgstr "Umnoži _gore" msgid "Copy _down" msgstr "Umnoži _dole" -#: ../meld/meldapp.py:177 +#: ../meld/meldapp.py:175 msgid "wrong number of arguments supplied to --diff" msgstr "pogrešan broj argumenata pridodat uz „--diff“" -#: ../meld/meldapp.py:182 +#: ../meld/meldapp.py:180 msgid "Start with an empty window" msgstr "Otvara jedan prazan prozor" # bug: string composition is bad i18n, and will make l10n hard -#: ../meld/meldapp.py:183 ../meld/meldapp.py:185 +#: ../meld/meldapp.py:181 ../meld/meldapp.py:183 msgid "file" msgstr "datoteka" -#: ../meld/meldapp.py:183 ../meld/meldapp.py:187 +#: ../meld/meldapp.py:181 ../meld/meldapp.py:185 msgid "folder" msgstr "fascikla" -#: ../meld/meldapp.py:184 +#: ../meld/meldapp.py:182 msgid "Start a version control comparison" msgstr "Pokreće poređenje kontrole verzije" -#: ../meld/meldapp.py:186 +#: ../meld/meldapp.py:184 msgid "Start a 2- or 3-way file comparison" msgstr "Pokreće poređenje 2 ili 3 datoteke" -#: ../meld/meldapp.py:188 +#: ../meld/meldapp.py:186 msgid "Start a 2- or 3-way folder comparison" msgstr "Pokreće poređenje 2 ili 3 fascikle" -#: ../meld/meldapp.py:231 +#: ../meld/meldapp.py:229 #, python-format msgid "Error: %s\n" msgstr "Greška: %s\n" -#: ../meld/meldapp.py:238 +#: ../meld/meldapp.py:236 msgid "Meld is a file and directory comparison tool." msgstr "Meld je alat za poređenje datoteka i fascikli." -#: ../meld/meldapp.py:242 +#: ../meld/meldapp.py:240 msgid "Set label to use instead of file name" msgstr "Podešava oznaku za korišćenje umesto naziva datoteke" -#: ../meld/meldapp.py:245 +#: ../meld/meldapp.py:243 msgid "Open a new tab in an already running instance" msgstr "Otvara novi jezičak u jednom već otvorenom primerku" -#: ../meld/meldapp.py:248 +#: ../meld/meldapp.py:246 msgid "Automatically compare all differing files on startup" msgstr "Samostalno poredi sve razlikujuće datoteke prilikom pokretanja" -#: ../meld/meldapp.py:251 +#: ../meld/meldapp.py:249 msgid "Ignored for compatibility" msgstr "Zanemareno zbog saglasnosti" -#: ../meld/meldapp.py:255 +#: ../meld/meldapp.py:253 msgid "Set the target file for saving a merge result" msgstr "Podešava ciljnu datoteku za čuvanje rezultata stapanja" -#: ../meld/meldapp.py:258 +#: ../meld/meldapp.py:256 msgid "Automatically merge files" msgstr "Samostalno stapa datoteke" -#: ../meld/meldapp.py:262 +#: ../meld/meldapp.py:260 msgid "Load a saved comparison from a Meld comparison file" msgstr "Učitava sačuvano poređenje iz Meldove datoteke poređenja" -#: ../meld/meldapp.py:266 +#: ../meld/meldapp.py:264 msgid "Create a diff tab for the supplied files or folders" msgstr "Pravi jezičak razlika pridodate datoteke ili fascikle" -#: ../meld/meldapp.py:286 +#: ../meld/meldapp.py:284 #, python-format msgid "too many arguments (wanted 0-3, got %d)" msgstr "previše argumenata (traženo je 0-3, dobih %d)" -#: ../meld/meldapp.py:289 +#: ../meld/meldapp.py:287 msgid "can't auto-merge less than 3 files" msgstr "ne mogu samostalno da stopim manje od 3 datoteke" -#: ../meld/meldapp.py:291 +#: ../meld/meldapp.py:289 msgid "can't auto-merge directories" msgstr "ne mogu samostalno da stopim direktorijume" -#: ../meld/meldapp.py:305 +#: ../meld/meldapp.py:303 msgid "Error reading saved comparison file" msgstr "Greška čitanja sačuvane datoteke poređenja" -#: ../meld/meldapp.py:332 +#: ../meld/meldapp.py:330 #, python-format msgid "invalid path or URI \"%s\"" msgstr "neispravna putanja ili adresa „%s“" #. TRANSLATORS: This is the label of a new, currently-unnamed file. -#: ../meld/meldbuffer.py:127 +#: ../meld/meldbuffer.py:131 msgid "" msgstr "" -#: ../meld/melddoc.py:83 ../meld/melddoc.py:84 +#: ../meld/melddoc.py:64 msgid "untitled" msgstr "bezimeni" -#: ../meld/meldwindow.py:49 +#: ../meld/meldwindow.py:48 msgid "_File" msgstr "_Datoteka" -#: ../meld/meldwindow.py:50 +#: ../meld/meldwindow.py:49 msgid "_New Comparison..." msgstr "_Novo poređenje..." -#: ../meld/meldwindow.py:51 +#: ../meld/meldwindow.py:50 msgid "Start a new comparison" msgstr "Započnite novo poređenje" -#: ../meld/meldwindow.py:54 +#: ../meld/meldwindow.py:53 msgid "Save the current file" msgstr "Sačuvajte trenutnu datoteku" -#: ../meld/meldwindow.py:56 +#: ../meld/meldwindow.py:55 msgid "Save As..." msgstr "Sačuvaj kao..." -#: ../meld/meldwindow.py:57 +#: ../meld/meldwindow.py:56 msgid "Save the current file with a different name" msgstr "Sačuvajte tekuću datoteku pod drugim nazivom" -#: ../meld/meldwindow.py:60 +#: ../meld/meldwindow.py:59 msgid "Close the current file" msgstr "Zatvorite trenutnu datoteku" -#: ../meld/meldwindow.py:63 +#: ../meld/meldwindow.py:62 msgid "_Edit" msgstr "_Uređivanje" -#: ../meld/meldwindow.py:65 +#: ../meld/meldwindow.py:64 msgid "Undo the last action" msgstr "Opozovite poslednju radnju" -#: ../meld/meldwindow.py:68 +#: ../meld/meldwindow.py:67 msgid "Redo the last undone action" msgstr "Ponovite poslednju opozvanu radnju" -#: ../meld/meldwindow.py:70 +#: ../meld/meldwindow.py:69 msgid "Cut the selection" msgstr "Isecite izbor" -#: ../meld/meldwindow.py:72 +#: ../meld/meldwindow.py:71 msgid "Copy the selection" msgstr "Umnožite izbor" -#: ../meld/meldwindow.py:74 +#: ../meld/meldwindow.py:73 msgid "Paste the clipboard" msgstr "Ubacite ostavu" -#: ../meld/meldwindow.py:76 +#: ../meld/meldwindow.py:75 msgid "Find..." msgstr "Pronađi..." -#: ../meld/meldwindow.py:76 +#: ../meld/meldwindow.py:75 msgid "Search for text" msgstr "Tražite tekst" -#: ../meld/meldwindow.py:78 +#: ../meld/meldwindow.py:77 msgid "Find Ne_xt" msgstr "Nađi s_ledeće" -#: ../meld/meldwindow.py:79 +#: ../meld/meldwindow.py:78 msgid "Search forwards for the same text" msgstr "Tražite unapred isti tekst" -#: ../meld/meldwindow.py:81 +#: ../meld/meldwindow.py:80 msgid "Find _Previous" msgstr "Nađi pre_thodno" -#: ../meld/meldwindow.py:82 +#: ../meld/meldwindow.py:81 msgid "Search backwards for the same text" msgstr "Tražite unazad isti tekst" -#: ../meld/meldwindow.py:85 +#: ../meld/meldwindow.py:84 msgid "_Replace..." msgstr "_Zameni..." -#: ../meld/meldwindow.py:86 +#: ../meld/meldwindow.py:85 msgid "Find and replace text" msgstr "Pronađite i zamenite tekst" -#: ../meld/meldwindow.py:89 +#: ../meld/meldwindow.py:88 msgid "_Changes" msgstr "_Izmene" -#: ../meld/meldwindow.py:90 +#: ../meld/meldwindow.py:89 msgid "Next Change" msgstr "Sledeća izmena" -#: ../meld/meldwindow.py:91 +#: ../meld/meldwindow.py:90 msgid "Go to the next change" msgstr "Idite na sledeću izmenu" -#: ../meld/meldwindow.py:93 +#: ../meld/meldwindow.py:92 msgid "Previous Change" msgstr "Prethodna izmena" -#: ../meld/meldwindow.py:94 +#: ../meld/meldwindow.py:93 msgid "Go to the previous change" msgstr "Idite na prethodnu izmenu" -#: ../meld/meldwindow.py:96 +#: ../meld/meldwindow.py:95 msgid "Open Externally" msgstr "Otvori spoljnim" -#: ../meld/meldwindow.py:97 +#: ../meld/meldwindow.py:96 msgid "Open selected file or directory in the default external application" msgstr "Otvorite izabranu datoteku ili fasciklu u osnovnom spoljnom programu" -#: ../meld/meldwindow.py:101 +#: ../meld/meldwindow.py:100 msgid "_View" msgstr "P_regled" -#: ../meld/meldwindow.py:102 +#: ../meld/meldwindow.py:101 msgid "File Status" msgstr "Stanje datoteke" -#: ../meld/meldwindow.py:103 +#: ../meld/meldwindow.py:102 msgid "Version Status" msgstr "Stanje izdanja" -#: ../meld/meldwindow.py:106 +#: ../meld/meldwindow.py:105 msgid "Stop the current action" msgstr "Zaustavite trenutnu radnju" -#: ../meld/meldwindow.py:109 +#: ../meld/meldwindow.py:108 msgid "Refresh the view" msgstr "Osvežite pregled" #: ../meld/meldwindow.py:112 -msgid "_Tabs" -msgstr "_Jezičci" - -#: ../meld/meldwindow.py:113 -msgid "_Previous Tab" -msgstr "Pre_thodni jezičak" - -#: ../meld/meldwindow.py:114 -msgid "Activate previous tab" -msgstr "Idite na prethodni jezičak" - -#: ../meld/meldwindow.py:116 -msgid "_Next Tab" -msgstr "Sle_deći jezičak" - -#: ../meld/meldwindow.py:117 -msgid "Activate next tab" -msgstr "Idite na naredni jezičak" - -#: ../meld/meldwindow.py:120 -msgid "Move Tab _Left" -msgstr "Premesti jezičak _levo" - -#: ../meld/meldwindow.py:121 -msgid "Move current tab to left" -msgstr "Premestite trenutni jezičak na levo" - -#: ../meld/meldwindow.py:124 -msgid "Move Tab _Right" -msgstr "Premesti jezičak _desno" - -#: ../meld/meldwindow.py:125 -msgid "Move current tab to right" -msgstr "Premestite trenutni jezičak na desno" - -#: ../meld/meldwindow.py:129 msgid "Fullscreen" msgstr "Preko celog ekrana" -#: ../meld/meldwindow.py:130 +#: ../meld/meldwindow.py:113 msgid "View the comparison in fullscreen" msgstr "Pregledajte poređenje preko celog ekrana" -#: ../meld/meldwindow.py:132 +#: ../meld/meldwindow.py:115 msgid "_Toolbar" msgstr "_Traka alata" -#: ../meld/meldwindow.py:133 +#: ../meld/meldwindow.py:116 msgid "Show or hide the toolbar" msgstr "Prikažite ili sakrijte traku alata" -#: ../meld/meldwindow.py:143 +#: ../meld/meldwindow.py:126 msgid "Open Recent" msgstr "Otvori skorašnje" -#: ../meld/meldwindow.py:144 +#: ../meld/meldwindow.py:127 msgid "Open recent files" msgstr "Otvorite skorašnje datoteke" -#: ../meld/meldwindow.py:166 +#: ../meld/meldwindow.py:149 msgid "_Meld" msgstr "_Meld" -#: ../meld/meldwindow.py:167 +#: ../meld/meldwindow.py:150 msgid "Quit the program" msgstr "Zatvorite program" -#: ../meld/meldwindow.py:169 +#: ../meld/meldwindow.py:152 msgid "Prefere_nces" msgstr "_Postavke" -#: ../meld/meldwindow.py:170 +#: ../meld/meldwindow.py:153 msgid "Configure the application" msgstr "Podesite program" -#: ../meld/meldwindow.py:172 +#: ../meld/meldwindow.py:155 msgid "_Contents" msgstr "_Sadržaj" -#: ../meld/meldwindow.py:173 +#: ../meld/meldwindow.py:156 msgid "Open the Meld manual" msgstr "Otvorite uputstvo Melda" -#: ../meld/meldwindow.py:175 +#: ../meld/meldwindow.py:158 msgid "About this application" msgstr "O ovom programu" -#: ../meld/meldwindow.py:587 -msgid "Switch to this tab" -msgstr "Prebacite se na ovaj jezičak" - -#: ../meld/meldwindow.py:702 +#: ../meld/meldwindow.py:604 #, python-format msgid "Need three files to auto-merge, got: %r" msgstr "Potrebne su tri datoteke za samo-spajanje, dobih: %r" -#: ../meld/meldwindow.py:716 +#: ../meld/meldwindow.py:618 msgid "Cannot compare a mixture of files and directories" msgstr "Ne mogu da poredim mešavinu datoteka i fascikli" -#: ../meld/misc.py:179 +#: ../meld/misc.py:203 #, python-format msgid "Couldn't find colour scheme details for %s-%s; this is a bad install" msgstr "" "Ne mogu da nađem pojedinosti šeme boje za „%s-%s“; jer je loše instalirana" #. no common path. empty names get changed to "[None]" -#: ../meld/misc.py:264 +#: ../meld/misc.py:263 msgid "[None]" msgstr "[ništa]" @@ -2343,7 +2300,7 @@ msgstr "natpis" msgid "pattern" msgstr "obrazac" -#: ../meld/recent.py:115 +#: ../meld/recent.py:114 msgid "Version control:" msgstr "Upravljanje izdanjem:" @@ -2351,20 +2308,20 @@ msgstr "Upravljanje izdanjem:" msgid "Close tab" msgstr "Zatvorite jezičak" -#: ../meld/ui/vcdialogs.py:50 +#: ../meld/ui/vcdialogs.py:48 msgid "No files will be committed" msgstr "Nijedna datoteka neće biti ugrađena" #. Translators: First %s is replaced by translated "%d unpushed #. commits", second %s is replaced by translated "%d branches" -#: ../meld/vc/git.py:95 +#: ../meld/vc/git.py:94 #, python-format msgid "%s in %s" msgstr "%s u %s" #. Translators: These messages cover the case where there is #. only one branch, and are not part of another message. -#: ../meld/vc/git.py:96 ../meld/vc/git.py:103 +#: ../meld/vc/git.py:95 ../meld/vc/git.py:102 #, python-format msgid "%d unpushed commit" msgid_plural "%d unpushed commits" @@ -2373,7 +2330,7 @@ msgstr[1] "%d nepogurane predaje" msgstr[2] "%d nepoguranih predaja" msgstr[3] "%d nepogurana predaja" -#: ../meld/vc/git.py:98 +#: ../meld/vc/git.py:97 #, python-format msgid "%d branch" msgid_plural "%d branches" @@ -2382,16 +2339,16 @@ msgstr[1] "%d grane" msgstr[2] "%d grana" msgstr[3] "%d grani" -#: ../meld/vc/git.py:352 +#: ../meld/vc/git.py:330 #, python-format msgid "Mode changed from %s to %s" msgstr "Režim je izmenjen iz „%s“ u „%s“" -#: ../meld/vc/git.py:360 +#: ../meld/vc/git.py:338 msgid "Partially staged" msgstr "Delimično uštekano" -#: ../meld/vc/git.py:360 +#: ../meld/vc/git.py:338 msgid "Staged" msgstr "Uštekano" @@ -2401,140 +2358,140 @@ msgstr "Uštekano" msgid "None" msgstr "Ništa" -#: ../meld/vc/svn.py:216 +#: ../meld/vc/svn.py:204 #, python-format msgid "Rev %s" msgstr "Rev %s" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Merged" msgstr "Stopljeno" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Base" msgstr "Osnova" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Local" msgstr "Mesno" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Remote" msgstr "Udaljeno" -#: ../meld/vc/_vc.py:68 +#: ../meld/vc/_vc.py:70 msgid "Unversioned" msgstr "Neobrađeno" -#: ../meld/vc/_vc.py:71 +#: ../meld/vc/_vc.py:73 msgid "Error" msgstr "Greška" -#: ../meld/vc/_vc.py:73 +#: ../meld/vc/_vc.py:75 msgid "Newly added" msgstr "Novo dodata" -#: ../meld/vc/_vc.py:75 +#: ../meld/vc/_vc.py:77 msgid "Renamed" msgstr "Preimenovana" -#: ../meld/vc/_vc.py:76 +#: ../meld/vc/_vc.py:78 msgid "Conflict" msgstr "Sukob" -#: ../meld/vc/_vc.py:77 +#: ../meld/vc/_vc.py:79 msgid "Removed" msgstr "Uklonjeno" -#: ../meld/vc/_vc.py:78 +#: ../meld/vc/_vc.py:80 msgid "Missing" msgstr "Nedostaje" -#: ../meld/vc/_vc.py:79 +#: ../meld/vc/_vc.py:81 msgid "Not present" msgstr "Nije prisutno" #. Translators: This error message is shown when a version #. control binary isn't installed. -#: ../meld/vcview.py:255 +#: ../meld/vcview.py:251 #, python-format msgid "%(name)s (%(cmd)s not installed)" msgstr "%(name)s („%(cmd)s“ nije instalirana)" #. Translators: This error message is shown when a version #. controlled repository is invalid. -#: ../meld/vcview.py:259 +#: ../meld/vcview.py:255 #, python-format msgid "%(name)s (Invalid repository)" msgstr "%(name)s (Neispravna riznica)" -#: ../meld/vcview.py:280 +#: ../meld/vcview.py:276 msgid "No valid version control system found in this folder" msgstr "U ovoj fascikli nije pronađen ispravan sistem upravljanja izdanjem" -#: ../meld/vcview.py:282 +#: ../meld/vcview.py:278 msgid "Only one version control system found in this folder" msgstr "U ovoj fascikli je pronađen samo jedan sistem upravljanja izdanjem" -#: ../meld/vcview.py:284 +#: ../meld/vcview.py:280 msgid "Choose which version control system to use" msgstr "Izaberite koji sistem upravljanja izdanjem će biti korišćen" #. TRANSLATORS: This is the location of the directory being viewed -#: ../meld/vcview.py:337 +#: ../meld/vcview.py:332 #, python-format msgid "%s: %s" msgstr "%s: %s" -#: ../meld/vcview.py:357 +#: ../meld/vcview.py:352 #, python-format msgid "Scanning %s" msgstr "Pregledam „%s“" -#: ../meld/vcview.py:396 +#: ../meld/vcview.py:391 msgid "(Empty)" msgstr "(Prazno)" -#: ../meld/vcview.py:440 +#: ../meld/vcview.py:435 #, python-format msgid "%s — local" msgstr "%s — mesna" -#: ../meld/vcview.py:441 +#: ../meld/vcview.py:436 #, python-format msgid "%s — remote" msgstr "%s — udaljena" -#: ../meld/vcview.py:449 +#: ../meld/vcview.py:444 #, python-format msgid "%s (local, merge, remote)" msgstr "%s (mesna, spojena, udaljena)" -#: ../meld/vcview.py:454 +#: ../meld/vcview.py:449 #, python-format msgid "%s (remote, merge, local)" msgstr "%s (udaljena, spojena, mesna)" -#: ../meld/vcview.py:465 +#: ../meld/vcview.py:460 #, python-format msgid "%s — repository" msgstr "%s — riznica" -#: ../meld/vcview.py:471 +#: ../meld/vcview.py:466 #, python-format msgid "%s (working, repository)" msgstr "%s (radna, riznica)" -#: ../meld/vcview.py:475 +#: ../meld/vcview.py:470 #, python-format msgid "%s (repository, working)" msgstr "%s (riznica, radna)" -#: ../meld/vcview.py:643 +#: ../meld/vcview.py:638 msgid "Remove folder and all its files?" msgstr "Da uklonim fasciklu i sve njene datoteke?" -#: ../meld/vcview.py:645 +#: ../meld/vcview.py:640 msgid "" "This will remove all selected files and folders, and all files within any " "selected folders, from version control." @@ -2542,15 +2499,48 @@ msgstr "" "Ovo će ukloniti sve izabrane datoteke i fascikle, i sve datoteke unutar svih " "izabranih fascikli, iz upravljanja izdanjem." -#: ../meld/vcview.py:670 +#: ../meld/vcview.py:665 #, python-format msgid "Error removing %s" msgstr "Greška pri uklanjanju „%s“" -#: ../meld/vcview.py:750 +#: ../meld/vcview.py:745 msgid "Clear" msgstr "Očisti" +#~ msgid "Meld does not support Python 3." +#~ msgstr "Meld ne podržava Pitona 3." + +#~ msgid "_Tabs" +#~ msgstr "_Jezičci" + +#~ msgid "_Previous Tab" +#~ msgstr "Pre_thodni jezičak" + +#~ msgid "Activate previous tab" +#~ msgstr "Idite na prethodni jezičak" + +#~ msgid "_Next Tab" +#~ msgstr "Sle_deći jezičak" + +#~ msgid "Activate next tab" +#~ msgstr "Idite na naredni jezičak" + +#~ msgid "Move Tab _Left" +#~ msgstr "Premesti jezičak _levo" + +#~ msgid "Move current tab to left" +#~ msgstr "Premestite trenutni jezičak na levo" + +#~ msgid "Move Tab _Right" +#~ msgstr "Premesti jezičak _desno" + +#~ msgid "Move current tab to right" +#~ msgstr "Premestite trenutni jezičak na desno" + +#~ msgid "Switch to this tab" +#~ msgstr "Prebacite se na ovaj jezičak" + #~ msgid "" #~ "These text encodings will be automatically used (in order) to try to " #~ "decode loaded text files." From 278558509c74b7a4d24ef8dd5d1488cc3332a235 Mon Sep 17 00:00:00 2001 From: Anders Jonsson Date: Sun, 21 Aug 2016 20:38:16 +0000 Subject: [PATCH 0013/1316] Updated Swedish translation --- po/sv.po | 482 +++++++++++++++++++++++++++---------------------------- 1 file changed, 239 insertions(+), 243 deletions(-) diff --git a/po/sv.po b/po/sv.po index 1f8312b6..6f1af32d 100644 --- a/po/sv.po +++ b/po/sv.po @@ -4,37 +4,35 @@ # Daniel Nylander , 2006, 2007, 2008, 2009, 2011. # Sebastian Rasmussen , 2015. # Josef Andersson , 2014, 2015, 2016. +# Anders Jonsson , 2016. +# msgid "" msgstr "" "Project-Id-Version: meld\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=meld&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-04-15 22:51+0000\n" -"PO-Revision-Date: 2016-03-17 17:04+0100\n" -"Last-Translator: Josef Andersson \n" +"POT-Creation-Date: 2016-08-20 21:39+0000\n" +"PO-Revision-Date: 2016-08-21 22:37+0200\n" +"Last-Translator: Anders Jonsson \n" "Language-Team: Swedish \n" "Language: sv\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 1.8.4\n" +"X-Generator: Poedit 1.8.8\n" "X-Project-Style: gnome\n" -#: ../bin/meld:144 +#: ../bin/meld:142 msgid "Cannot import: " msgstr "Kan inte importera: " -#: ../bin/meld:147 +#: ../bin/meld:145 #, c-format msgid "Meld requires %s or higher." msgstr "Meld kräver %s eller högre." -#: ../bin/meld:151 -msgid "Meld does not support Python 3." -msgstr "Meld stöder inte Python 3." - -#: ../bin/meld:200 +#: ../bin/meld:194 #, c-format msgid "" "Couldn't load Meld-specific CSS (%s)\n" @@ -86,6 +84,10 @@ msgstr "" "Meld hjälper dig att granska kodändringar, förstå programfixar och göra " "enorma sammanfogningskonflikter något mindre smärtsamma." +#: ../data/meld.appdata.xml.in.h:5 +msgid "The GNOME Project" +msgstr "GNOME-projektet" + #: ../data/mime/meld.xml.in.h:1 msgid "Meld comparison description" msgstr "Meld jämförelsebeskrivning" @@ -565,7 +567,7 @@ msgstr "Kopiera till höger" msgid "Delete selected" msgstr "Ta bort markerade" -#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:860 ../meld/filediff.py:1366 +#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:859 ../meld/filediff.py:1384 msgid "Hide" msgstr "Dölj" @@ -600,7 +602,7 @@ msgstr "Nya" msgid "Show new" msgstr "Visa nya" -#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:74 +#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:76 msgid "Modified" msgstr "Ändrade" @@ -633,7 +635,7 @@ msgid "_Add" msgstr "_Lägg till" #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11 -#: ../meld/vcview.py:649 +#: ../meld/vcview.py:644 msgid "_Remove" msgstr "_Ta bort" @@ -655,7 +657,7 @@ msgstr "Flytta _nedåt" #. Create icon and filename CellRenderer #: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35 -#: ../meld/dirdiff.py:374 +#: ../meld/dirdiff.py:373 msgid "Name" msgstr "Namn" @@ -856,8 +858,8 @@ msgstr "Sparar du inte kommer ändringar att gå förlorade för alltid." msgid "Close _without Saving" msgstr "Stäng _utan att spara" -#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:942 ../meld/filediff.py:1432 -#: ../meld/filediff.py:1500 +#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:941 ../meld/filediff.py:1450 +#: ../meld/filediff.py:1518 msgid "_Cancel" msgstr "_Avbryt" @@ -894,7 +896,7 @@ msgid "Changes made to the following documents will be permanently lost:\n" msgstr "" "Ändringar utförda i följande dokument kommer att gå förlorade för alltid:\n" -#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:943 ../meld/filediff.py:1433 +#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:942 ../meld/filediff.py:1451 msgid "_Replace" msgstr "_Ersätt" @@ -942,7 +944,7 @@ msgstr "Formatera som programfix" msgid "Copy to Clipboard" msgstr "Kopiera till Urklipp" -#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:149 +#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:144 msgid "Save Patch" msgstr "Spara programfix" @@ -1132,7 +1134,7 @@ msgstr "" "deras namn. Varje mönster är en lista med jokertecken i skalstil, åtskilda " "med blanksteg." -#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:104 +#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:103 msgid "File Filters" msgstr "Filfilter" @@ -1411,7 +1413,8 @@ msgctxt "shortcut window" msgid "Show/hide console output" msgstr "Visa/dölj konsolutskrift" -#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:668 +#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:570 +#: ../meld/newdifftab.py:38 msgid "New comparison" msgstr "Ny jämförelse" @@ -1559,7 +1562,7 @@ msgstr "O_versionerade" msgid "Show unversioned files" msgstr "Visa filer som inte versionshanteras" -#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:67 +#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69 msgid "Ignored" msgstr "Ignorerade" @@ -1587,7 +1590,7 @@ msgstr "Föregående loggar:" msgid "Co_mmit" msgstr "Che_cka in" -#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:337 +#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:332 msgid "Location" msgstr "Plats" @@ -1628,82 +1631,82 @@ msgid "Mac OS (CR)" msgstr "Mac OS (CR)" #. Create file size CellRenderer -#: ../meld/dirdiff.py:392 ../meld/preferences.py:82 +#: ../meld/dirdiff.py:391 ../meld/preferences.py:82 msgid "Size" msgstr "Storlek" #. Create date-time CellRenderer -#: ../meld/dirdiff.py:400 ../meld/preferences.py:83 +#: ../meld/dirdiff.py:399 ../meld/preferences.py:83 msgid "Modification time" msgstr "Ändringstid" #. Create permissions CellRenderer -#: ../meld/dirdiff.py:408 ../meld/preferences.py:84 +#: ../meld/dirdiff.py:407 ../meld/preferences.py:84 msgid "Permissions" msgstr "Rättigheter" -#: ../meld/dirdiff.py:538 +#: ../meld/dirdiff.py:537 #, python-format msgid "Hide %s" msgstr "Dölj %s" -#: ../meld/dirdiff.py:670 ../meld/dirdiff.py:694 +#: ../meld/dirdiff.py:669 ../meld/dirdiff.py:693 #, python-format msgid "[%s] Scanning %s" msgstr "[%s] Söker igenom %s" -#: ../meld/dirdiff.py:827 +#: ../meld/dirdiff.py:826 #, python-format msgid "[%s] Done" msgstr "[%s] Klar" -#: ../meld/dirdiff.py:835 +#: ../meld/dirdiff.py:834 msgid "Folders have no differences" msgstr "Mapparna skiljer sig inte åt" -#: ../meld/dirdiff.py:837 +#: ../meld/dirdiff.py:836 msgid "Contents of scanned files in folders are identical." msgstr "Innehållet i mapparnas avsökta filer är identiskt." -#: ../meld/dirdiff.py:839 +#: ../meld/dirdiff.py:838 msgid "" "Scanned files in folders appear identical, but contents have not been " "scanned." msgstr "" "Mapparnas avsökta filer verkar identiska, men innehållet har inte genomsökts." -#: ../meld/dirdiff.py:842 +#: ../meld/dirdiff.py:841 msgid "File filters are in use, so not all files have been scanned." msgstr "Filfilter används, och därför har inte alla filer genomsökts." -#: ../meld/dirdiff.py:844 +#: ../meld/dirdiff.py:843 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:862 ../meld/filediff.py:1368 ../meld/filediff.py:1398 -#: ../meld/filediff.py:1400 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 +#: ../meld/dirdiff.py:861 ../meld/filediff.py:1386 ../meld/filediff.py:1416 +#: ../meld/filediff.py:1418 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 msgid "Hi_de" msgstr "_Dölj" -#: ../meld/dirdiff.py:872 +#: ../meld/dirdiff.py:871 msgid "Multiple errors occurred while scanning this folder" msgstr "Flera fel inträffade vid avsökning av denna mapp" -#: ../meld/dirdiff.py:873 +#: ../meld/dirdiff.py:872 msgid "Files with invalid encodings found" msgstr "Filer med ogiltiga teckenkodningar hittades" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:875 +#: ../meld/dirdiff.py:874 msgid "Some files were in an incorrect encoding. The names are something like:" msgstr "En del filer hade en felaktig kodning. Namnen är ungefär:" -#: ../meld/dirdiff.py:877 +#: ../meld/dirdiff.py:876 msgid "Files hidden by case insensitive comparison" msgstr "Filer dolda av skiftlägeskänslig jämförelse" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:879 +#: ../meld/dirdiff.py:878 msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. The following files in this folder are hidden:" @@ -1711,17 +1714,17 @@ msgstr "" "Du gör en skiftlägesokänslig jämförelse på ett skiftlägeskänsligt filsystem. " "En del filer syns inte:" -#: ../meld/dirdiff.py:890 +#: ../meld/dirdiff.py:889 #, python-format msgid "'%s' hidden by '%s'" msgstr "”%s” dolda av ”%s”" -#: ../meld/dirdiff.py:946 +#: ../meld/dirdiff.py:945 #, python-format msgid "Replace folder “%s”?" msgstr "Ersätt mappen ”%s”?" -#: ../meld/dirdiff.py:948 +#: ../meld/dirdiff.py:947 #, python-format msgid "" "Another folder with the same name already exists in “%s”.\n" @@ -1730,11 +1733,11 @@ msgstr "" "En annan mapp med samma namn existerar redan i ”%s”.\n" "Om du ersätter befintlig mapp kommer alla filer att förloras." -#: ../meld/dirdiff.py:961 +#: ../meld/dirdiff.py:960 msgid "Error copying file" msgstr "Fel vid filkopiering" -#: ../meld/dirdiff.py:962 +#: ../meld/dirdiff.py:961 #, python-format msgid "" "Couldn't copy %s\n" @@ -1747,35 +1750,35 @@ msgstr "" "\n" "%s" -#: ../meld/dirdiff.py:985 +#: ../meld/dirdiff.py:984 #, python-format msgid "Error deleting %s" msgstr "Fel vid borttagning av %s" -#: ../meld/dirdiff.py:1492 +#: ../meld/dirdiff.py:1489 msgid "No folder" msgstr "Ingen mapp" #. Abbreviations for insert and overwrite that fit in the status bar -#: ../meld/filediff.py:357 +#: ../meld/filediff.py:354 msgid "INS" msgstr "INF" -#: ../meld/filediff.py:357 +#: ../meld/filediff.py:354 msgid "OVR" msgstr "ÖVR" #. Abbreviation for line, column so that it will fit in the status bar -#: ../meld/filediff.py:359 +#: ../meld/filediff.py:356 #, python-format msgid "Ln %i, Col %i" msgstr "Rad %i, kolumn %i" -#: ../meld/filediff.py:774 +#: ../meld/filediff.py:781 msgid "Comparison results will be inaccurate" msgstr "Jämförelseresultat kommer att bli osäkra" -#: ../meld/filediff.py:776 +#: ../meld/filediff.py:783 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1783,64 +1786,64 @@ msgstr "" "Ett filter ändrade antalet rader i filen vilket inte stöds. Jämförelsen " "kommer att vara osäker." -#: ../meld/filediff.py:834 +#: ../meld/filediff.py:841 msgid "Mark conflict as resolved?" msgstr "Markera konflikten som löst?" -#: ../meld/filediff.py:836 +#: ../meld/filediff.py:843 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:838 +#: ../meld/filediff.py:845 msgid "Cancel" msgstr "Avbryt" -#: ../meld/filediff.py:839 +#: ../meld/filediff.py:846 msgid "Mark _Resolved" msgstr "Markera som _löst" -#: ../meld/filediff.py:1084 +#: ../meld/filediff.py:1095 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Det uppstod ett problem vid öppnandet av filen ”%s”." -#: ../meld/filediff.py:1092 +#: ../meld/filediff.py:1103 #, python-format msgid "File %s appears to be a binary file." msgstr "Filen %s verkar vara en binärfil." -#: ../meld/filediff.py:1094 +#: ../meld/filediff.py:1105 msgid "Do you want to open the file using the default application?" msgstr "Vill du öppna filen med standardprogrammet?" -#: ../meld/filediff.py:1096 +#: ../meld/filediff.py:1107 msgid "Open" msgstr "Öppna" -#: ../meld/filediff.py:1112 +#: ../meld/filediff.py:1123 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Beräknar skillnader" -#: ../meld/filediff.py:1177 +#: ../meld/filediff.py:1188 #, python-format msgid "File %s has changed on disk" msgstr "Filen %s har ändrats på disk" -#: ../meld/filediff.py:1178 +#: ../meld/filediff.py:1189 msgid "Do you want to reload the file?" msgstr "Vill du läsa om filen?" -#: ../meld/filediff.py:1180 +#: ../meld/filediff.py:1191 msgid "_Reload" msgstr "_Läs om" -#: ../meld/filediff.py:1331 +#: ../meld/filediff.py:1349 msgid "Files are identical" msgstr "Filerna är identiska" -#: ../meld/filediff.py:1344 +#: ../meld/filediff.py:1362 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1848,11 +1851,11 @@ msgstr "" "Textfilter används och kan dölja skillnader mellan filer. Vill du jämföra de " "ofiltrerade filerna?" -#: ../meld/filediff.py:1349 +#: ../meld/filediff.py:1367 msgid "Files differ in line endings only" msgstr "Filer skiljer sig endast vad gäller radslut" -#: ../meld/filediff.py:1351 +#: ../meld/filediff.py:1369 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1861,15 +1864,15 @@ msgstr "" "Filerna är identiska förutom radavsluten:\n" "%s" -#: ../meld/filediff.py:1371 +#: ../meld/filediff.py:1389 msgid "Show without filters" msgstr "Visa utan filer" -#: ../meld/filediff.py:1393 +#: ../meld/filediff.py:1411 msgid "Change highlighting incomplete" msgstr "Ändra markering av ofärdiga" -#: ../meld/filediff.py:1394 +#: ../meld/filediff.py:1412 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." @@ -1878,20 +1881,20 @@ msgstr "" "Meld till att längre tid på sig att markera större ändringar, men det kan " "bli långsamt." -#: ../meld/filediff.py:1402 +#: ../meld/filediff.py:1420 msgid "Keep highlighting" msgstr "Använd markering" -#: ../meld/filediff.py:1404 +#: ../meld/filediff.py:1422 msgid "_Keep highlighting" msgstr "_Använd markering" -#: ../meld/filediff.py:1436 +#: ../meld/filediff.py:1454 #, python-format msgid "Replace file “%s”?" msgstr "Ersätt filen ”%s”?" -#: ../meld/filediff.py:1438 +#: ../meld/filediff.py:1456 #, python-format msgid "" "A file with this name already exists in “%s”.\n" @@ -1900,45 +1903,45 @@ msgstr "" "En fil med detta namn existerar redan i ”%s”.\n" "Om du ersätter befintlig fil kommer dess innehåll att gå förlorat." -#: ../meld/filediff.py:1455 +#: ../meld/filediff.py:1473 msgid "Save Left Pane As" msgstr "Spara vänsterpanel som" -#: ../meld/filediff.py:1457 +#: ../meld/filediff.py:1475 msgid "Save Middle Pane As" msgstr "Spara mittenpanel som" -#: ../meld/filediff.py:1459 +#: ../meld/filediff.py:1477 msgid "Save Right Pane As" msgstr "Spara högerpanel som" -#: ../meld/filediff.py:1473 +#: ../meld/filediff.py:1491 #, 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:1475 +#: ../meld/filediff.py:1493 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:1478 +#: ../meld/filediff.py:1496 msgid "Save Anyway" msgstr "Spara ändå" -#: ../meld/filediff.py:1479 +#: ../meld/filediff.py:1497 msgid "Don't Save" msgstr "Spara inte" -#: ../meld/filediff.py:1501 +#: ../meld/filediff.py:1519 msgid "_Save as UTF-8" msgstr "_Spara som UTF-8" -#: ../meld/filediff.py:1504 +#: ../meld/filediff.py:1522 #, python-format msgid "Couldn't encode text as “%s”" msgstr "Kunde inte koda text som ”%s”" -#: ../meld/filediff.py:1506 +#: ../meld/filediff.py:1524 #, python-format msgid "" "File “%s” contains characters that can't be encoded using encoding “%s”.\n" @@ -1947,12 +1950,12 @@ msgstr "" "Filen ”%s” innehåller tecken som inte kan kodas med kodningen ”%s”\n" "Vill du spara som UTF-8?" -#: ../meld/filediff.py:1543 ../meld/patchdialog.py:125 +#: ../meld/filediff.py:1564 ../meld/patchdialog.py:120 #, python-format msgid "Could not save file %s." msgstr "Kunde inte spara filen %s." -#: ../meld/filediff.py:1544 ../meld/patchdialog.py:126 +#: ../meld/filediff.py:1565 ../meld/patchdialog.py:121 #, python-format msgid "" "Couldn't save file due to:\n" @@ -1961,11 +1964,11 @@ msgstr "" "Kunde in spara fil beroende på:\n" "%s" -#: ../meld/filediff.py:1890 +#: ../meld/filediff.py:1910 msgid "Live comparison updating disabled" msgstr "Inaktivera realtidsuppdateringar av jämförelser" -#: ../meld/filediff.py:1891 +#: ../meld/filediff.py:1911 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -1989,340 +1992,300 @@ msgstr "Kopiera _upp" msgid "Copy _down" msgstr "Kopiera _ned" -#: ../meld/meldapp.py:177 +#: ../meld/meldapp.py:175 msgid "wrong number of arguments supplied to --diff" msgstr "felaktigt antal argument angavs för --diff" -#: ../meld/meldapp.py:182 +#: ../meld/meldapp.py:180 msgid "Start with an empty window" msgstr "Starta med ett tomt fönster" -#: ../meld/meldapp.py:183 ../meld/meldapp.py:185 +#: ../meld/meldapp.py:181 ../meld/meldapp.py:183 msgid "file" msgstr "fil" -#: ../meld/meldapp.py:183 ../meld/meldapp.py:187 +#: ../meld/meldapp.py:181 ../meld/meldapp.py:185 msgid "folder" msgstr "mapp" -#: ../meld/meldapp.py:184 +#: ../meld/meldapp.py:182 msgid "Start a version control comparison" msgstr "Starta en versionshanterad jämförelse" -#: ../meld/meldapp.py:186 +#: ../meld/meldapp.py:184 msgid "Start a 2- or 3-way file comparison" msgstr "Starta med en två- eller trevägs filjämförelse" -#: ../meld/meldapp.py:188 +#: ../meld/meldapp.py:186 msgid "Start a 2- or 3-way folder comparison" msgstr "Starta med en två- eller trevägs mappjämförelse" -#: ../meld/meldapp.py:231 +#: ../meld/meldapp.py:229 #, python-format msgid "Error: %s\n" msgstr "Fel: %s\n" -#: ../meld/meldapp.py:238 +#: ../meld/meldapp.py:236 msgid "Meld is a file and directory comparison tool." msgstr "Meld är ett verktyg för att jämföra filer och kataloger." -#: ../meld/meldapp.py:242 +#: ../meld/meldapp.py:240 msgid "Set label to use instead of file name" msgstr "Sätt etikett att använda istället för filnamn" -#: ../meld/meldapp.py:245 +#: ../meld/meldapp.py:243 msgid "Open a new tab in an already running instance" msgstr "Öppna en ny flik i en redan körande instans" -#: ../meld/meldapp.py:248 +#: ../meld/meldapp.py:246 msgid "Automatically compare all differing files on startup" msgstr "Jämför automatiskt alla filer som skiljer sig vid uppstart" -#: ../meld/meldapp.py:251 +#: ../meld/meldapp.py:249 msgid "Ignored for compatibility" msgstr "Ignorerad för kompatibilitet" -#: ../meld/meldapp.py:255 +#: ../meld/meldapp.py:253 msgid "Set the target file for saving a merge result" msgstr "Ställ in målfilen för att spara sammanfogat resultat" -#: ../meld/meldapp.py:258 +#: ../meld/meldapp.py:256 msgid "Automatically merge files" msgstr "Sammanfoga automatiskt filer" -#: ../meld/meldapp.py:262 +#: ../meld/meldapp.py:260 msgid "Load a saved comparison from a Meld comparison file" msgstr "Läs in en sparad jämförelse från en Meld jämförelsefil" -#: ../meld/meldapp.py:266 +#: ../meld/meldapp.py:264 msgid "Create a diff tab for the supplied files or folders" msgstr "Skapar en diff-tabell för angivna filer eller mappar" -#: ../meld/meldapp.py:286 +#: ../meld/meldapp.py:284 #, python-format msgid "too many arguments (wanted 0-3, got %d)" msgstr "för många argument (ville ha 0-3, fick %d)" -#: ../meld/meldapp.py:289 +#: ../meld/meldapp.py:287 msgid "can't auto-merge less than 3 files" msgstr "kan inte auto-sammanfoga mindre är tre filer" -#: ../meld/meldapp.py:291 +#: ../meld/meldapp.py:289 msgid "can't auto-merge directories" msgstr "kan inte auto-sammanfoga kataloger" -#: ../meld/meldapp.py:305 +#: ../meld/meldapp.py:303 msgid "Error reading saved comparison file" msgstr "Fel vid läsning av den sparade konfigurationsfilen" -#: ../meld/meldapp.py:332 +#: ../meld/meldapp.py:330 #, python-format msgid "invalid path or URI \"%s\"" msgstr "ogiltig sökväg eller URI ”%s”" #. TRANSLATORS: This is the label of a new, currently-unnamed file. -#: ../meld/meldbuffer.py:132 +#: ../meld/meldbuffer.py:131 msgid "" msgstr "" -#: ../meld/melddoc.py:83 ../meld/melddoc.py:84 +#: ../meld/melddoc.py:64 msgid "untitled" msgstr "namnlös" -#: ../meld/meldwindow.py:49 +#: ../meld/meldwindow.py:48 msgid "_File" msgstr "_Arkiv" -#: ../meld/meldwindow.py:50 +#: ../meld/meldwindow.py:49 msgid "_New Comparison..." msgstr "_Ny jämförelse…" -#: ../meld/meldwindow.py:51 +#: ../meld/meldwindow.py:50 msgid "Start a new comparison" msgstr "Starta en ny jämförelse" -#: ../meld/meldwindow.py:54 +#: ../meld/meldwindow.py:53 msgid "Save the current file" msgstr "Spara den aktuella filen" -#: ../meld/meldwindow.py:56 +#: ../meld/meldwindow.py:55 msgid "Save As..." msgstr "Spara som…" -#: ../meld/meldwindow.py:57 +#: ../meld/meldwindow.py:56 msgid "Save the current file with a different name" msgstr "Spara den aktuella filen med ett annat namn" -#: ../meld/meldwindow.py:60 +#: ../meld/meldwindow.py:59 msgid "Close the current file" msgstr "Stäng den aktuella filen" -#: ../meld/meldwindow.py:63 +#: ../meld/meldwindow.py:62 msgid "_Edit" msgstr "_Redigera" -#: ../meld/meldwindow.py:65 +#: ../meld/meldwindow.py:64 msgid "Undo the last action" msgstr "Ångra den senaste åtgärden" -#: ../meld/meldwindow.py:68 +#: ../meld/meldwindow.py:67 msgid "Redo the last undone action" msgstr "Gör om den senaste ångrade åtgärden" -#: ../meld/meldwindow.py:70 +#: ../meld/meldwindow.py:69 msgid "Cut the selection" msgstr "Klipp ut markering" -#: ../meld/meldwindow.py:72 +#: ../meld/meldwindow.py:71 msgid "Copy the selection" msgstr "Kopiera markering" -#: ../meld/meldwindow.py:74 +#: ../meld/meldwindow.py:73 msgid "Paste the clipboard" msgstr "Klistra in Urklipp" -#: ../meld/meldwindow.py:76 +#: ../meld/meldwindow.py:75 msgid "Find..." msgstr "Sök…" -#: ../meld/meldwindow.py:76 +#: ../meld/meldwindow.py:75 msgid "Search for text" msgstr "Sök efter text" -#: ../meld/meldwindow.py:78 +#: ../meld/meldwindow.py:77 msgid "Find Ne_xt" msgstr "Sök _nästa" -#: ../meld/meldwindow.py:79 +#: ../meld/meldwindow.py:78 msgid "Search forwards for the same text" msgstr "Sök framåt efter samma text" -#: ../meld/meldwindow.py:81 +#: ../meld/meldwindow.py:80 msgid "Find _Previous" msgstr "Sök _Föregående" -#: ../meld/meldwindow.py:82 +#: ../meld/meldwindow.py:81 msgid "Search backwards for the same text" msgstr "Sök bakåt efter samma text" -#: ../meld/meldwindow.py:85 +#: ../meld/meldwindow.py:84 msgid "_Replace..." msgstr "_Ersätt…" -#: ../meld/meldwindow.py:86 +#: ../meld/meldwindow.py:85 msgid "Find and replace text" msgstr "Sök och ersätt text" -#: ../meld/meldwindow.py:89 +#: ../meld/meldwindow.py:88 msgid "_Changes" msgstr "Än_dringar" -#: ../meld/meldwindow.py:90 +#: ../meld/meldwindow.py:89 msgid "Next Change" msgstr "Nästa ändring" -#: ../meld/meldwindow.py:91 +#: ../meld/meldwindow.py:90 msgid "Go to the next change" msgstr "Gå till nästa ändring" -#: ../meld/meldwindow.py:93 +#: ../meld/meldwindow.py:92 msgid "Previous Change" msgstr "Föregående ändring" -#: ../meld/meldwindow.py:94 +#: ../meld/meldwindow.py:93 msgid "Go to the previous change" msgstr "Gå till föregående ändring" -#: ../meld/meldwindow.py:96 +#: ../meld/meldwindow.py:95 msgid "Open Externally" msgstr "Öppna externt" -#: ../meld/meldwindow.py:97 +#: ../meld/meldwindow.py:96 msgid "Open selected file or directory in the default external application" msgstr "Öppna markerad fil eller katalog i det externa standardprogrammet" -#: ../meld/meldwindow.py:101 +#: ../meld/meldwindow.py:100 msgid "_View" msgstr "_Visa" -#: ../meld/meldwindow.py:102 +#: ../meld/meldwindow.py:101 msgid "File Status" msgstr "Filstatus" -#: ../meld/meldwindow.py:103 +#: ../meld/meldwindow.py:102 msgid "Version Status" msgstr "Versionsstatus" -#: ../meld/meldwindow.py:106 +#: ../meld/meldwindow.py:105 msgid "Stop the current action" msgstr "Stoppa den aktuella åtgärden" -#: ../meld/meldwindow.py:109 +#: ../meld/meldwindow.py:108 msgid "Refresh the view" msgstr "Uppdatera vyn" #: ../meld/meldwindow.py:112 -msgid "_Tabs" -msgstr "_Flikar" - -#: ../meld/meldwindow.py:113 -msgid "_Previous Tab" -msgstr "För_egående flik" - -#: ../meld/meldwindow.py:114 -msgid "Activate previous tab" -msgstr "Aktivera föregående flik" - -#: ../meld/meldwindow.py:116 -msgid "_Next Tab" -msgstr "_Nästa flik" - -#: ../meld/meldwindow.py:117 -msgid "Activate next tab" -msgstr "Aktivera nästa flik" - -#: ../meld/meldwindow.py:120 -msgid "Move Tab _Left" -msgstr "Flytta flik åt _vänster" - -#: ../meld/meldwindow.py:121 -msgid "Move current tab to left" -msgstr "Flytta aktuell flik åt vänster" - -#: ../meld/meldwindow.py:124 -msgid "Move Tab _Right" -msgstr "Flytta flik åt _höger" - -#: ../meld/meldwindow.py:125 -msgid "Move current tab to right" -msgstr "Flytta aktuell flik åt höger" - -#: ../meld/meldwindow.py:129 msgid "Fullscreen" msgstr "Helskärm" -#: ../meld/meldwindow.py:130 +#: ../meld/meldwindow.py:113 msgid "View the comparison in fullscreen" msgstr "Visa jämförelsen i helskärmsläge" -#: ../meld/meldwindow.py:132 +#: ../meld/meldwindow.py:115 msgid "_Toolbar" msgstr "Ver_ktygsfält" -#: ../meld/meldwindow.py:133 +#: ../meld/meldwindow.py:116 msgid "Show or hide the toolbar" msgstr "Visa eller dölj verktygsfältet" -#: ../meld/meldwindow.py:143 +#: ../meld/meldwindow.py:126 msgid "Open Recent" msgstr "Öppna senaste" -#: ../meld/meldwindow.py:144 +#: ../meld/meldwindow.py:127 msgid "Open recent files" msgstr "Öppna senaste filer" -#: ../meld/meldwindow.py:166 +#: ../meld/meldwindow.py:149 msgid "_Meld" msgstr "_Meld" -#: ../meld/meldwindow.py:167 +#: ../meld/meldwindow.py:150 msgid "Quit the program" msgstr "Avsluta programmet" -#: ../meld/meldwindow.py:169 +#: ../meld/meldwindow.py:152 msgid "Prefere_nces" msgstr "Inställ_ningar" -#: ../meld/meldwindow.py:170 +#: ../meld/meldwindow.py:153 msgid "Configure the application" msgstr "Konfigurera programmet" -#: ../meld/meldwindow.py:172 +#: ../meld/meldwindow.py:155 msgid "_Contents" msgstr "_Innehåll" -#: ../meld/meldwindow.py:173 +#: ../meld/meldwindow.py:156 msgid "Open the Meld manual" msgstr "Öppna handboken för Meld" -#: ../meld/meldwindow.py:175 +#: ../meld/meldwindow.py:158 msgid "About this application" msgstr "Om detta program" -#: ../meld/meldwindow.py:587 -msgid "Switch to this tab" -msgstr "Växla till denna flik" - -#: ../meld/meldwindow.py:702 +#: ../meld/meldwindow.py:604 #, python-format msgid "Need three files to auto-merge, got: %r" msgstr "Behöver tre filer för att auto-sammanfoga, fick: %r" -#: ../meld/meldwindow.py:716 +#: ../meld/meldwindow.py:618 msgid "Cannot compare a mixture of files and directories" msgstr "Kan inte jämföra en blandning av filer och kataloger" -#: ../meld/misc.py:202 +#: ../meld/misc.py:203 #, python-format msgid "Couldn't find colour scheme details for %s-%s; this is a bad install" msgstr "" @@ -2330,7 +2293,7 @@ msgstr "" "installation" #. no common path. empty names get changed to "[None]" -#: ../meld/misc.py:287 +#: ../meld/misc.py:263 msgid "[None]" msgstr "[Ingen]" @@ -2342,7 +2305,7 @@ msgstr "etikett" msgid "pattern" msgstr "mönster" -#: ../meld/recent.py:115 +#: ../meld/recent.py:114 msgid "Version control:" msgstr "Versionshantering:" @@ -2350,43 +2313,43 @@ msgstr "Versionshantering:" msgid "Close tab" msgstr "Stäng flik" -#: ../meld/ui/vcdialogs.py:50 +#: ../meld/ui/vcdialogs.py:48 msgid "No files will be committed" msgstr "Inga filer kommer att checkas in" #. Translators: First %s is replaced by translated "%d unpushed #. commits", second %s is replaced by translated "%d branches" -#: ../meld/vc/git.py:95 +#: ../meld/vc/git.py:94 #, python-format msgid "%s in %s" msgstr "%s i %s" #. Translators: These messages cover the case where there is #. only one branch, and are not part of another message. -#: ../meld/vc/git.py:96 ../meld/vc/git.py:103 +#: ../meld/vc/git.py:95 ../meld/vc/git.py:102 #, python-format msgid "%d unpushed commit" msgid_plural "%d unpushed commits" msgstr[0] "%d ej tryckt incheckning" msgstr[1] "%d ej tryckta incheckningar" -#: ../meld/vc/git.py:98 +#: ../meld/vc/git.py:97 #, python-format msgid "%d branch" msgid_plural "%d branches" msgstr[0] "%d gren" msgstr[1] "%d grenar" -#: ../meld/vc/git.py:352 +#: ../meld/vc/git.py:330 #, python-format msgid "Mode changed from %s to %s" msgstr "Läge ändrat från %s till %s" -#: ../meld/vc/git.py:360 +#: ../meld/vc/git.py:338 msgid "Partially staged" msgstr "Delvis köad" -#: ../meld/vc/git.py:360 +#: ../meld/vc/git.py:338 msgid "Staged" msgstr "Köad" @@ -2396,140 +2359,140 @@ msgstr "Köad" msgid "None" msgstr "Ingen" -#: ../meld/vc/svn.py:216 +#: ../meld/vc/svn.py:204 #, python-format msgid "Rev %s" msgstr "Rev %s" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Merged" msgstr "Sammanfogade" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Base" msgstr "Bas" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Local" msgstr "Lokal" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Remote" msgstr "Fjärr" -#: ../meld/vc/_vc.py:68 +#: ../meld/vc/_vc.py:70 msgid "Unversioned" msgstr "Oversionerad" -#: ../meld/vc/_vc.py:71 +#: ../meld/vc/_vc.py:73 msgid "Error" msgstr "Fel" -#: ../meld/vc/_vc.py:73 +#: ../meld/vc/_vc.py:75 msgid "Newly added" msgstr "Nyligen tillagt" -#: ../meld/vc/_vc.py:75 +#: ../meld/vc/_vc.py:77 msgid "Renamed" msgstr "Bytt namn" -#: ../meld/vc/_vc.py:76 +#: ../meld/vc/_vc.py:78 msgid "Conflict" msgstr "Konflikt" -#: ../meld/vc/_vc.py:77 +#: ../meld/vc/_vc.py:79 msgid "Removed" msgstr "Borttagen" -#: ../meld/vc/_vc.py:78 +#: ../meld/vc/_vc.py:80 msgid "Missing" msgstr "Saknas" -#: ../meld/vc/_vc.py:79 +#: ../meld/vc/_vc.py:81 msgid "Not present" msgstr "Inte närvarande" #. Translators: This error message is shown when a version #. control binary isn't installed. -#: ../meld/vcview.py:255 +#: ../meld/vcview.py:251 #, python-format msgid "%(name)s (%(cmd)s not installed)" msgstr "%(name)s (%(cmd)s inte installerad)" #. Translators: This error message is shown when a version #. controlled repository is invalid. -#: ../meld/vcview.py:259 +#: ../meld/vcview.py:255 #, python-format msgid "%(name)s (Invalid repository)" msgstr "%(name)s (Ogiltigt förråd)" -#: ../meld/vcview.py:280 +#: ../meld/vcview.py:276 msgid "No valid version control system found in this folder" msgstr "Inget giltigt versionshanteringssystem hittades i denna mapp" -#: ../meld/vcview.py:282 +#: ../meld/vcview.py:278 msgid "Only one version control system found in this folder" msgstr "Endast ett versionshanteringssystem hittades i denna mapp" -#: ../meld/vcview.py:284 +#: ../meld/vcview.py:280 msgid "Choose which version control system to use" msgstr "Välj vilket versionshanteringssystem som ska användas" #. TRANSLATORS: This is the location of the directory being viewed -#: ../meld/vcview.py:337 +#: ../meld/vcview.py:332 #, python-format msgid "%s: %s" msgstr "%s: %s" -#: ../meld/vcview.py:357 +#: ../meld/vcview.py:352 #, python-format msgid "Scanning %s" msgstr "Söker igenom %s" -#: ../meld/vcview.py:396 +#: ../meld/vcview.py:391 msgid "(Empty)" msgstr "(Tom)" -#: ../meld/vcview.py:440 +#: ../meld/vcview.py:435 #, python-format msgid "%s — local" msgstr "%s — lokal" -#: ../meld/vcview.py:441 +#: ../meld/vcview.py:436 #, python-format msgid "%s — remote" msgstr "%s — fjärr" -#: ../meld/vcview.py:449 +#: ../meld/vcview.py:444 #, python-format msgid "%s (local, merge, remote)" msgstr "%s (lokal, sammanfoga, fjärr)" -#: ../meld/vcview.py:454 +#: ../meld/vcview.py:449 #, python-format msgid "%s (remote, merge, local)" msgstr "%s (fjärr, sammanfoga, lokal)" -#: ../meld/vcview.py:465 +#: ../meld/vcview.py:460 #, python-format msgid "%s — repository" msgstr "%s — förråd" -#: ../meld/vcview.py:471 +#: ../meld/vcview.py:466 #, python-format msgid "%s (working, repository)" msgstr "%s (arbetskopia, förråd)" -#: ../meld/vcview.py:475 +#: ../meld/vcview.py:470 #, python-format msgid "%s (repository, working)" msgstr "%s (förråd, arbetskopia)" -#: ../meld/vcview.py:643 +#: ../meld/vcview.py:638 msgid "Remove folder and all its files?" msgstr "Ta bort mapp och dess filer?" -#: ../meld/vcview.py:645 +#: ../meld/vcview.py:640 msgid "" "This will remove all selected files and folders, and all files within any " "selected folders, from version control." @@ -2537,15 +2500,48 @@ msgstr "" "Det här kommer att ta bort alla markerade filer och mappar samt alla filer i " "markerade mappar från versionshantering." -#: ../meld/vcview.py:670 +#: ../meld/vcview.py:665 #, python-format msgid "Error removing %s" msgstr "Fel vid borttagning av %s" -#: ../meld/vcview.py:750 +#: ../meld/vcview.py:745 msgid "Clear" msgstr "Töm" +#~ msgid "Meld does not support Python 3." +#~ msgstr "Meld stöder inte Python 3." + +#~ msgid "_Tabs" +#~ msgstr "_Flikar" + +#~ msgid "_Previous Tab" +#~ msgstr "För_egående flik" + +#~ msgid "Activate previous tab" +#~ msgstr "Aktivera föregående flik" + +#~ msgid "_Next Tab" +#~ msgstr "_Nästa flik" + +#~ msgid "Activate next tab" +#~ msgstr "Aktivera nästa flik" + +#~ msgid "Move Tab _Left" +#~ msgstr "Flytta flik åt _vänster" + +#~ msgid "Move current tab to left" +#~ msgstr "Flytta aktuell flik åt vänster" + +#~ msgid "Move Tab _Right" +#~ msgstr "Flytta flik åt _höger" + +#~ msgid "Move current tab to right" +#~ msgstr "Flytta aktuell flik åt höger" + +#~ msgid "Switch to this tab" +#~ msgstr "Växla till denna flik" + #~ msgid "" #~ "These text encodings will be automatically used (in order) to try to " #~ "decode loaded text files." From 1dd87af8417f4f3918c21626a542044374699c18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bal=C3=A1zs=20Mesk=C3=B3?= Date: Mon, 22 Aug 2016 12:25:50 +0000 Subject: [PATCH 0014/1316] Updated Hungarian translation --- po/hu.po | 489 +++++++++++++++++++++++++++---------------------------- 1 file changed, 240 insertions(+), 249 deletions(-) diff --git a/po/hu.po b/po/hu.po index 796375a4..783388ac 100644 --- a/po/hu.po +++ b/po/hu.po @@ -9,31 +9,27 @@ msgstr "" "Project-Id-Version: meld master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=meld&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-03-07 23:25+0000\n" -"PO-Revision-Date: 2016-03-08 00:30+0100\n" -"Last-Translator: Gabor Kelemen \n" +"POT-Creation-Date: 2016-08-20 21:39+0000\n" +"PO-Revision-Date: 2016-08-22 13:51+0200\n" +"Last-Translator: Meskó Balázs \n" "Language-Team: Hungarian \n" "Language: hu\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: Lokalize 1.5\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 1.8.8\n" -#: ../bin/meld:144 +#: ../bin/meld:142 msgid "Cannot import: " msgstr "Nem importálható: " -#: ../bin/meld:147 +#: ../bin/meld:145 #, c-format msgid "Meld requires %s or higher." msgstr "A Meld futásához %s vagy újabb szükséges." -#: ../bin/meld:151 -msgid "Meld does not support Python 3." -msgstr "A Meld nem támogatja a Python 3-at." - -#: ../bin/meld:200 +#: ../bin/meld:194 #, c-format msgid "" "Couldn't load Meld-specific CSS (%s)\n" @@ -85,6 +81,10 @@ msgstr "" "A Meld segít kódváltozások áttekintésében, foltok megértésében és a hatalmas " "összefésülési ütközéseket valamivel fájdalommentesebbé teszi." +#: ../data/meld.appdata.xml.in.h:5 +msgid "The GNOME Project" +msgstr "A GNOME projekt" + #: ../data/mime/meld.xml.in.h:1 msgid "Meld comparison description" msgstr "Meld összehasonlítás-leírás" @@ -561,7 +561,7 @@ msgstr "Másolás a jobb oldalra" msgid "Delete selected" msgstr "Kijelölt törlése" -#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:858 ../meld/filediff.py:1381 +#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:859 ../meld/filediff.py:1384 msgid "Hide" msgstr "Elrejtés" @@ -597,7 +597,7 @@ msgstr "Új" msgid "Show new" msgstr "Újak megjelenítése" -#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:74 +#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:76 msgid "Modified" msgstr "Módosítva" @@ -630,7 +630,7 @@ msgid "_Add" msgstr "Hozzá_adás" #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11 -#: ../meld/vcview.py:649 +#: ../meld/vcview.py:644 msgid "_Remove" msgstr "_Eltávolítás" @@ -652,7 +652,7 @@ msgstr "Mozgatás _le" #. Create icon and filename CellRenderer #: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35 -#: ../meld/dirdiff.py:372 +#: ../meld/dirdiff.py:373 msgid "Name" msgstr "Név" @@ -852,8 +852,8 @@ 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" -#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:940 ../meld/filediff.py:1447 -#: ../meld/filediff.py:1515 +#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:941 ../meld/filediff.py:1450 +#: ../meld/filediff.py:1518 msgid "_Cancel" msgstr "Mé_gse" @@ -889,7 +889,7 @@ msgstr "Visszavonja a dokumentumok mentetlen változtatásait?" msgid "Changes made to the following documents will be permanently lost:\n" msgstr "A következő dokumentumok változásai véglegesen elvesznek:\n" -#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:941 ../meld/filediff.py:1448 +#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:942 ../meld/filediff.py:1451 msgid "_Replace" msgstr "_Csere" @@ -937,7 +937,7 @@ msgstr "Formázás foltként" msgid "Copy to Clipboard" msgstr "Másolás vágólapra" -#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:149 +#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:144 msgid "Save Patch" msgstr "Folt mentése" @@ -1127,7 +1127,7 @@ msgstr "" "alapján. Minden minta egy shell-stílusú helyettesítőkarakter-lista " "szóközökkel elválasztva." -#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:104 +#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:103 msgid "File Filters" msgstr "Fájlszűrők" @@ -1406,7 +1406,8 @@ msgctxt "shortcut window" msgid "Show/hide console output" msgstr "Konzolkimenet megjelenítése/elrejtése" -#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:668 +#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:570 +#: ../meld/newdifftab.py:38 msgid "New comparison" msgstr "Új összehasonlítás" @@ -1554,7 +1555,7 @@ msgstr "Ver_zió nélküli" msgid "Show unversioned files" msgstr "Verzió nélküli fájlok megjelenítése" -#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:67 +#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69 msgid "Ignored" msgstr "Mellőzve" @@ -1582,7 +1583,7 @@ msgstr "Előző naplók:" msgid "Co_mmit" msgstr "_Kommit" -#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:337 +#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:332 msgid "Location" msgstr "Hely" @@ -1623,44 +1624,44 @@ msgid "Mac OS (CR)" msgstr "Mac OS (CR)" #. Create file size CellRenderer -#: ../meld/dirdiff.py:390 ../meld/preferences.py:82 +#: ../meld/dirdiff.py:391 ../meld/preferences.py:82 msgid "Size" msgstr "Méret" #. Create date-time CellRenderer -#: ../meld/dirdiff.py:398 ../meld/preferences.py:83 +#: ../meld/dirdiff.py:399 ../meld/preferences.py:83 msgid "Modification time" msgstr "Módosítási idő" #. Create permissions CellRenderer -#: ../meld/dirdiff.py:406 ../meld/preferences.py:84 +#: ../meld/dirdiff.py:407 ../meld/preferences.py:84 msgid "Permissions" msgstr "Jogosultságok" -#: ../meld/dirdiff.py:536 +#: ../meld/dirdiff.py:537 #, python-format msgid "Hide %s" msgstr "%s elrejtése" -#: ../meld/dirdiff.py:668 ../meld/dirdiff.py:692 +#: ../meld/dirdiff.py:669 ../meld/dirdiff.py:693 #, python-format msgid "[%s] Scanning %s" msgstr "[%s] %s beolvasása" -#: ../meld/dirdiff.py:825 +#: ../meld/dirdiff.py:826 #, python-format msgid "[%s] Done" msgstr "[%s] Kész" -#: ../meld/dirdiff.py:833 +#: ../meld/dirdiff.py:834 msgid "Folders have no differences" msgstr "A mappák közt nincs eltérés" -#: ../meld/dirdiff.py:835 +#: ../meld/dirdiff.py:836 msgid "Contents of scanned files in folders are identical." msgstr "A mappákban vizsgált fájlok tartalma azonos." -#: ../meld/dirdiff.py:837 +#: ../meld/dirdiff.py:838 msgid "" "Scanned files in folders appear identical, but contents have not been " "scanned." @@ -1668,42 +1669,42 @@ msgstr "" "A mappákban vizsgált fájlok azonosnak tűnnek, de a tartalom nem lett " "vizsgálva." -#: ../meld/dirdiff.py:840 +#: ../meld/dirdiff.py:841 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:842 +#: ../meld/dirdiff.py:843 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:860 ../meld/filediff.py:1383 ../meld/filediff.py:1413 -#: ../meld/filediff.py:1415 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 +#: ../meld/dirdiff.py:861 ../meld/filediff.py:1386 ../meld/filediff.py:1416 +#: ../meld/filediff.py:1418 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 msgid "Hi_de" msgstr "_Elrejtés" -#: ../meld/dirdiff.py:870 +#: ../meld/dirdiff.py:871 msgid "Multiple errors occurred while scanning this folder" msgstr "Több hiba történt a mappa vizsgálatakor" -#: ../meld/dirdiff.py:871 +#: ../meld/dirdiff.py:872 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:873 +#: ../meld/dirdiff.py:874 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:875 +#: ../meld/dirdiff.py:876 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:877 +#: ../meld/dirdiff.py:878 msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. The following files in this folder are hidden:" @@ -1711,17 +1712,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:888 +#: ../meld/dirdiff.py:889 #, python-format msgid "'%s' hidden by '%s'" msgstr "„%s” rejtve „%s” által" -#: ../meld/dirdiff.py:944 +#: ../meld/dirdiff.py:945 #, python-format msgid "Replace folder “%s”?" msgstr "Cseréli ezt a mappát: „%s”?" -#: ../meld/dirdiff.py:946 +#: ../meld/dirdiff.py:947 #, python-format msgid "" "Another folder with the same name already exists in “%s”.\n" @@ -1730,11 +1731,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:959 +#: ../meld/dirdiff.py:960 msgid "Error copying file" msgstr "Hiba a fájl másolásakor" -#: ../meld/dirdiff.py:960 +#: ../meld/dirdiff.py:961 #, python-format msgid "" "Couldn't copy %s\n" @@ -1747,104 +1748,101 @@ msgstr "" "\n" "%s" -#: ../meld/dirdiff.py:983 +#: ../meld/dirdiff.py:984 #, python-format msgid "Error deleting %s" msgstr "Hiba %s törlésekor" -#: ../meld/dirdiff.py:1488 +#: ../meld/dirdiff.py:1489 msgid "No folder" msgstr "Nincs mappa" #. Abbreviations for insert and overwrite that fit in the status bar -#: ../meld/filediff.py:359 +#: ../meld/filediff.py:354 msgid "INS" msgstr "BESZ" -#: ../meld/filediff.py:359 +#: ../meld/filediff.py:354 msgid "OVR" msgstr "ÁTÍR" #. Abbreviation for line, column so that it will fit in the status bar -#: ../meld/filediff.py:361 +#: ../meld/filediff.py:356 #, python-format msgid "Ln %i, Col %i" msgstr "%i. sor, %i. oszlop" -#: ../meld/filediff.py:794 +#: ../meld/filediff.py:781 msgid "Comparison results will be inaccurate" msgstr "Az összehasonlítás eredményei pontatlanok lesznek" -#: ../meld/filediff.py:796 -#| msgid "" -#| "Filter “%s” changed the number of lines in the file, which is " -#| "unsupported. The comparison will not be accurate." +#: ../meld/filediff.py:783 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." msgstr "" -"Egy szűrő megváltoztatta a fájl sorainak számát, ami nem támogatott. " -"Az összehasonlítás pontatlan lesz." +"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:854 +#: ../meld/filediff.py:841 msgid "Mark conflict as resolved?" msgstr "Megjelöli az ütközést feloldottként?" -#: ../meld/filediff.py:856 +#: ../meld/filediff.py:843 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:858 +#: ../meld/filediff.py:845 msgid "Cancel" msgstr "Mégse" -#: ../meld/filediff.py:859 +#: ../meld/filediff.py:846 msgid "Mark _Resolved" msgstr "Megjelölés _feloldottként" -#: ../meld/filediff.py:1099 +#: ../meld/filediff.py:1095 #, 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:1107 +#: ../meld/filediff.py:1103 #, python-format msgid "File %s appears to be a binary file." msgstr "%s bináris fájlnak tűnik." -#: ../meld/filediff.py:1109 +#: ../meld/filediff.py:1105 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:1111 +#: ../meld/filediff.py:1107 msgid "Open" msgstr "Megnyitás" -#: ../meld/filediff.py:1127 +#: ../meld/filediff.py:1123 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Eltérések számítása" -#: ../meld/filediff.py:1192 +#: ../meld/filediff.py:1188 #, python-format msgid "File %s has changed on disk" msgstr "%s fájl megváltozott a lemezen" -#: ../meld/filediff.py:1193 +#: ../meld/filediff.py:1189 msgid "Do you want to reload the file?" msgstr "Újratölti a fájlt?" -#: ../meld/filediff.py:1195 +#: ../meld/filediff.py:1191 msgid "_Reload" msgstr "Új_ratöltés" -#: ../meld/filediff.py:1346 +#: ../meld/filediff.py:1349 msgid "Files are identical" msgstr "A fájlok azonosak" -#: ../meld/filediff.py:1359 +#: ../meld/filediff.py:1362 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1852,11 +1850,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:1364 +#: ../meld/filediff.py:1367 msgid "Files differ in line endings only" msgstr "A fájlok csak a sorvégekben térnek el" -#: ../meld/filediff.py:1366 +#: ../meld/filediff.py:1369 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1865,15 +1863,15 @@ msgstr "" "A fájlok azonosak a sorvégjelektől eltekintve:\n" "%s" -#: ../meld/filediff.py:1386 +#: ../meld/filediff.py:1389 msgid "Show without filters" msgstr "Megjelenítés szűrők nélkül" -#: ../meld/filediff.py:1408 +#: ../meld/filediff.py:1411 msgid "Change highlighting incomplete" msgstr "Részleges kiemelés módosítása" -#: ../meld/filediff.py:1409 +#: ../meld/filediff.py:1412 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." @@ -1881,20 +1879,20 @@ 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:1417 +#: ../meld/filediff.py:1420 msgid "Keep highlighting" msgstr "Kiemelés továbbra is" -#: ../meld/filediff.py:1419 +#: ../meld/filediff.py:1422 msgid "_Keep highlighting" msgstr "_Kiemelés továbbra is" -#: ../meld/filediff.py:1451 +#: ../meld/filediff.py:1454 #, python-format msgid "Replace file “%s”?" msgstr "Cseréli a fájlt: „%s”?" -#: ../meld/filediff.py:1453 +#: ../meld/filediff.py:1456 #, python-format msgid "" "A file with this name already exists in “%s”.\n" @@ -1903,45 +1901,45 @@ msgstr "" "Már létezik ilyen nevű fájl itt: „%s”.\n" "Ha lecseréli a meglévő fájlt, akkor a tartalma elvész." -#: ../meld/filediff.py:1470 +#: ../meld/filediff.py:1473 msgid "Save Left Pane As" msgstr "Bal ablaktábla mentése másként" -#: ../meld/filediff.py:1472 +#: ../meld/filediff.py:1475 msgid "Save Middle Pane As" msgstr "Középső ablaktábla mentése másként" -#: ../meld/filediff.py:1474 +#: ../meld/filediff.py:1477 msgid "Save Right Pane As" msgstr "Jobb ablaktábla mentése másként" -#: ../meld/filediff.py:1488 +#: ../meld/filediff.py:1491 #, 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:1490 +#: ../meld/filediff.py:1493 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:1493 +#: ../meld/filediff.py:1496 msgid "Save Anyway" msgstr "Mentés mindenképp" -#: ../meld/filediff.py:1494 +#: ../meld/filediff.py:1497 msgid "Don't Save" msgstr "Ne mentse" -#: ../meld/filediff.py:1516 +#: ../meld/filediff.py:1519 msgid "_Save as UTF-8" msgstr "Mentés _UTF-8-ként" -#: ../meld/filediff.py:1519 +#: ../meld/filediff.py:1522 #, python-format msgid "Couldn't encode text as “%s”" msgstr "Nem kódolható a szöveg mint „%s”" -#: ../meld/filediff.py:1521 +#: ../meld/filediff.py:1524 #, python-format msgid "" "File “%s” contains characters that can't be encoded using encoding “%s”.\n" @@ -1950,12 +1948,12 @@ msgstr "" "„%s” a(z) „%s” használatával kódolhatatlan karaktereket tartalmaz.\n" "Szeretné UTF-8 kódolással menteni?" -#: ../meld/filediff.py:1558 ../meld/patchdialog.py:125 +#: ../meld/filediff.py:1564 ../meld/patchdialog.py:120 #, python-format msgid "Could not save file %s." msgstr "A fájl (%s) nem menthető." -#: ../meld/filediff.py:1559 ../meld/patchdialog.py:126 +#: ../meld/filediff.py:1565 ../meld/patchdialog.py:121 #, python-format msgid "" "Couldn't save file due to:\n" @@ -1964,11 +1962,11 @@ msgstr "" "A fájl nem menthető. Ok:\n" "%s" -#: ../meld/filediff.py:1905 +#: ../meld/filediff.py:1910 msgid "Live comparison updating disabled" msgstr "Az élő összehasonlítás-frissítés kikapcsolva" -#: ../meld/filediff.py:1906 +#: ../meld/filediff.py:1911 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -1991,347 +1989,307 @@ msgstr "Másolás _fel" msgid "Copy _down" msgstr "Másolás _le" -#: ../meld/meldapp.py:177 +#: ../meld/meldapp.py:175 msgid "wrong number of arguments supplied to --diff" msgstr "Hibás számú argumentum a --diff kapcsolóhoz" -#: ../meld/meldapp.py:182 +#: ../meld/meldapp.py:180 msgid "Start with an empty window" msgstr "Indítás üres ablakkal" -#: ../meld/meldapp.py:183 ../meld/meldapp.py:185 +#: ../meld/meldapp.py:181 ../meld/meldapp.py:183 msgid "file" msgstr "fájl" -#: ../meld/meldapp.py:183 ../meld/meldapp.py:187 +#: ../meld/meldapp.py:181 ../meld/meldapp.py:185 msgid "folder" msgstr "mappa" -#: ../meld/meldapp.py:184 +#: ../meld/meldapp.py:182 msgid "Start a version control comparison" msgstr "Verziókövető-összehasonlítás indítása" -#: ../meld/meldapp.py:186 +#: ../meld/meldapp.py:184 msgid "Start a 2- or 3-way file comparison" msgstr "2 vagy 3 utas fájl-összehasonlítás indítása" -#: ../meld/meldapp.py:188 +#: ../meld/meldapp.py:186 msgid "Start a 2- or 3-way folder comparison" msgstr "2 vagy 3 utas mappa-összehasonlítás indítása" -#: ../meld/meldapp.py:231 +#: ../meld/meldapp.py:229 #, python-format msgid "Error: %s\n" msgstr "Hiba: %s\n" -#: ../meld/meldapp.py:238 +#: ../meld/meldapp.py:236 msgid "Meld is a file and directory comparison tool." msgstr "A Meld egy fájl- és könyvtár-összehasonlító eszköz." -#: ../meld/meldapp.py:242 +#: ../meld/meldapp.py:240 msgid "Set label to use instead of file name" msgstr "A fájlnevek helyett használandó címke beállítása" -#: ../meld/meldapp.py:245 +#: ../meld/meldapp.py:243 msgid "Open a new tab in an already running instance" msgstr "Új lap megnyitása már futó példányban" -#: ../meld/meldapp.py:248 +#: ../meld/meldapp.py:246 msgid "Automatically compare all differing files on startup" msgstr "Minden eltérő fájl automatikus összehasonlítása indításkor" -#: ../meld/meldapp.py:251 +#: ../meld/meldapp.py:249 msgid "Ignored for compatibility" msgstr "Mellőzve a kompatibilitás érdekében" -#: ../meld/meldapp.py:255 +#: ../meld/meldapp.py:253 msgid "Set the target file for saving a merge result" msgstr "Célfájl beállítása összefésülés eredményének mentéséhez" -#: ../meld/meldapp.py:258 +#: ../meld/meldapp.py:256 msgid "Automatically merge files" msgstr "Fájlok automatikus összefésülése" -#: ../meld/meldapp.py:262 +#: ../meld/meldapp.py:260 msgid "Load a saved comparison from a Meld comparison file" msgstr "Mentett összehasonlítás betöltése Meld összehasonlítás-fájlból" -#: ../meld/meldapp.py:266 +#: ../meld/meldapp.py:264 msgid "Create a diff tab for the supplied files or folders" msgstr "Különbséglap létrehozása a megadott fájlokhoz vagy mappákhoz" -#: ../meld/meldapp.py:286 +#: ../meld/meldapp.py:284 #, python-format msgid "too many arguments (wanted 0-3, got %d)" msgstr "túl sok argumentum (0-3 helyett %d)" -#: ../meld/meldapp.py:289 +#: ../meld/meldapp.py:287 msgid "can't auto-merge less than 3 files" msgstr "nem lehet 3-nál kevesebb fájlt automatikusan összefésülni" -#: ../meld/meldapp.py:291 +#: ../meld/meldapp.py:289 msgid "can't auto-merge directories" msgstr "könyvtárak nem fésülhetők össze automatikusan" -#: ../meld/meldapp.py:305 +#: ../meld/meldapp.py:303 msgid "Error reading saved comparison file" msgstr "Hiba az elmentett összehasonlítás-fájl olvasása közben" -#: ../meld/meldapp.py:332 +#: ../meld/meldapp.py:330 #, python-format msgid "invalid path or URI \"%s\"" msgstr "érvénytelen útvonal vagy URI: „%s”" #. TRANSLATORS: This is the label of a new, currently-unnamed file. -#: ../meld/meldbuffer.py:127 +#: ../meld/meldbuffer.py:131 msgid "" msgstr "" -#: ../meld/melddoc.py:83 ../meld/melddoc.py:84 +#: ../meld/melddoc.py:64 msgid "untitled" msgstr "névtelen" -#: ../meld/meldwindow.py:49 +#: ../meld/meldwindow.py:48 msgid "_File" msgstr "_Fájl" -#: ../meld/meldwindow.py:50 +#: ../meld/meldwindow.py:49 msgid "_New Comparison..." msgstr "Új össze_hasonlítás…" -#: ../meld/meldwindow.py:51 +#: ../meld/meldwindow.py:50 msgid "Start a new comparison" msgstr "Új összehasonlítás indítása" -#: ../meld/meldwindow.py:54 +#: ../meld/meldwindow.py:53 msgid "Save the current file" msgstr "A jelenlegi fájl mentése" -#: ../meld/meldwindow.py:56 +#: ../meld/meldwindow.py:55 msgid "Save As..." msgstr "Mentés másként…" -#: ../meld/meldwindow.py:57 +#: ../meld/meldwindow.py:56 msgid "Save the current file with a different name" msgstr "A jelenlegi fájl mentése más néven" -#: ../meld/meldwindow.py:60 +#: ../meld/meldwindow.py:59 msgid "Close the current file" msgstr "A jelenlegi fájl bezárása" -#: ../meld/meldwindow.py:63 +#: ../meld/meldwindow.py:62 msgid "_Edit" msgstr "S_zerkesztés" -#: ../meld/meldwindow.py:65 +#: ../meld/meldwindow.py:64 msgid "Undo the last action" msgstr "Az utolsó művelet visszavonása" -#: ../meld/meldwindow.py:68 +#: ../meld/meldwindow.py:67 msgid "Redo the last undone action" msgstr "A visszavont művelet ismételt végrehajtása" -#: ../meld/meldwindow.py:70 +#: ../meld/meldwindow.py:69 msgid "Cut the selection" msgstr "A kijelölés kivágása" -#: ../meld/meldwindow.py:72 +#: ../meld/meldwindow.py:71 msgid "Copy the selection" msgstr "A kijelölés másolása" -#: ../meld/meldwindow.py:74 +#: ../meld/meldwindow.py:73 msgid "Paste the clipboard" msgstr "A vágólap tartalmának beillesztése" -#: ../meld/meldwindow.py:76 +#: ../meld/meldwindow.py:75 msgid "Find..." msgstr "Keresés…" -#: ../meld/meldwindow.py:76 +#: ../meld/meldwindow.py:75 msgid "Search for text" msgstr "Szöveg keresése" -#: ../meld/meldwindow.py:78 +#: ../meld/meldwindow.py:77 msgid "Find Ne_xt" msgstr "Kö_vetkező találat" -#: ../meld/meldwindow.py:79 +#: ../meld/meldwindow.py:78 msgid "Search forwards for the same text" msgstr "Keresés előre ugyanarra a szövegre" -#: ../meld/meldwindow.py:81 +#: ../meld/meldwindow.py:80 msgid "Find _Previous" msgstr "_Előző találat" -#: ../meld/meldwindow.py:82 +#: ../meld/meldwindow.py:81 msgid "Search backwards for the same text" msgstr "Keresés visszafelé ugyanarra a szövegre" -#: ../meld/meldwindow.py:85 +#: ../meld/meldwindow.py:84 msgid "_Replace..." msgstr "_Csere…" -#: ../meld/meldwindow.py:86 +#: ../meld/meldwindow.py:85 msgid "Find and replace text" msgstr "Szöveg keresése és cseréje" -#: ../meld/meldwindow.py:89 +#: ../meld/meldwindow.py:88 msgid "_Changes" msgstr "Válto_zások" -#: ../meld/meldwindow.py:90 +#: ../meld/meldwindow.py:89 msgid "Next Change" msgstr "Következő változás" -#: ../meld/meldwindow.py:91 +#: ../meld/meldwindow.py:90 msgid "Go to the next change" msgstr "Ugrás a következő változásra" -#: ../meld/meldwindow.py:93 +#: ../meld/meldwindow.py:92 msgid "Previous Change" msgstr "Előző változás" -#: ../meld/meldwindow.py:94 +#: ../meld/meldwindow.py:93 msgid "Go to the previous change" msgstr "Ugrás az előző változásra" -#: ../meld/meldwindow.py:96 +#: ../meld/meldwindow.py:95 msgid "Open Externally" msgstr "Megnyitás alkalmazással" -#: ../meld/meldwindow.py:97 +#: ../meld/meldwindow.py:96 msgid "Open selected file or directory in the default external application" msgstr "" "Kijelölt fájl vagy könyvtár megnyitása az alapértelmezett külső alkalmazással" -#: ../meld/meldwindow.py:101 +#: ../meld/meldwindow.py:100 msgid "_View" msgstr "_Nézet" -#: ../meld/meldwindow.py:102 +#: ../meld/meldwindow.py:101 msgid "File Status" msgstr "Fájlállapot" -#: ../meld/meldwindow.py:103 +#: ../meld/meldwindow.py:102 msgid "Version Status" msgstr "Verzióállapot" -#: ../meld/meldwindow.py:106 +#: ../meld/meldwindow.py:105 msgid "Stop the current action" msgstr "Jelenlegi művelet leállítása" -#: ../meld/meldwindow.py:109 +#: ../meld/meldwindow.py:108 msgid "Refresh the view" msgstr "A nézet frissítése" #: ../meld/meldwindow.py:112 -msgid "_Tabs" -msgstr "_Lapok" - -#: ../meld/meldwindow.py:113 -msgid "_Previous Tab" -msgstr "_Előző lap" - -#: ../meld/meldwindow.py:114 -msgid "Activate previous tab" -msgstr "Előző lap aktiválása" - -#: ../meld/meldwindow.py:116 -msgid "_Next Tab" -msgstr "_Következő lap" - -#: ../meld/meldwindow.py:117 -msgid "Activate next tab" -msgstr "Következő lap aktiválása" - -#: ../meld/meldwindow.py:120 -msgid "Move Tab _Left" -msgstr "Lap _balra" - -#: ../meld/meldwindow.py:121 -msgid "Move current tab to left" -msgstr "A jelenlegi lap mozgatása balra" - -#: ../meld/meldwindow.py:124 -msgid "Move Tab _Right" -msgstr "Lap mozgatása j_obbra" - -#: ../meld/meldwindow.py:125 -msgid "Move current tab to right" -msgstr "A jelenlegi lap mozgatása jobbra" - -#: ../meld/meldwindow.py:129 msgid "Fullscreen" msgstr "Teljes képernyő" -#: ../meld/meldwindow.py:130 +#: ../meld/meldwindow.py:113 msgid "View the comparison in fullscreen" msgstr "Az összehasonlítás megjelenítése teljes képernyőn" -#: ../meld/meldwindow.py:132 +#: ../meld/meldwindow.py:115 msgid "_Toolbar" msgstr "_Eszköztár" -#: ../meld/meldwindow.py:133 +#: ../meld/meldwindow.py:116 msgid "Show or hide the toolbar" msgstr "Eszköztár megjelenítése vagy elrejtése" -#: ../meld/meldwindow.py:143 +#: ../meld/meldwindow.py:126 msgid "Open Recent" msgstr "Legutóbbi megnyitása" -#: ../meld/meldwindow.py:144 +#: ../meld/meldwindow.py:127 msgid "Open recent files" msgstr "Legutóbbi fájlok megnyitása" -#: ../meld/meldwindow.py:166 +#: ../meld/meldwindow.py:149 msgid "_Meld" msgstr "_Meld" -#: ../meld/meldwindow.py:167 +#: ../meld/meldwindow.py:150 msgid "Quit the program" msgstr "Kilépés a programból" -#: ../meld/meldwindow.py:169 +#: ../meld/meldwindow.py:152 msgid "Prefere_nces" msgstr "B_eállítások" -#: ../meld/meldwindow.py:170 +#: ../meld/meldwindow.py:153 msgid "Configure the application" msgstr "Az alkalmazás beállítása" -#: ../meld/meldwindow.py:172 +#: ../meld/meldwindow.py:155 msgid "_Contents" msgstr "_Tartalom" -#: ../meld/meldwindow.py:173 +#: ../meld/meldwindow.py:156 msgid "Open the Meld manual" msgstr "A Meld kézikönyvének megnyitása" -#: ../meld/meldwindow.py:175 +#: ../meld/meldwindow.py:158 msgid "About this application" msgstr "Az alkalmazás névjegye" -#: ../meld/meldwindow.py:587 -msgid "Switch to this tab" -msgstr "Váltás erre a lapra" - -#: ../meld/meldwindow.py:702 +#: ../meld/meldwindow.py:604 #, python-format msgid "Need three files to auto-merge, got: %r" msgstr "Az automatikus összefésüléshez három fájl kell, érkezett: %r" -#: ../meld/meldwindow.py:716 +#: ../meld/meldwindow.py:618 msgid "Cannot compare a mixture of files and directories" msgstr "Fájlok és könyvtárak keveréke nem hasonlítható össze." -#: ../meld/misc.py:179 +#: ../meld/misc.py:203 #, python-format msgid "Couldn't find colour scheme details for %s-%s; this is a bad install" msgstr "Nem találhatók a színséma adatai ehhez: %s-%s, ez telepítési hiba" #. no common path. empty names get changed to "[None]" -#: ../meld/misc.py:264 +#: ../meld/misc.py:263 msgid "[None]" msgstr "[Semmi]" @@ -2343,7 +2301,7 @@ msgstr "címke" msgid "pattern" msgstr "minta" -#: ../meld/recent.py:115 +#: ../meld/recent.py:114 msgid "Version control:" msgstr "Verziókövetés:" @@ -2351,43 +2309,43 @@ msgstr "Verziókövetés:" msgid "Close tab" msgstr "Lap bezárása" -#: ../meld/ui/vcdialogs.py:50 +#: ../meld/ui/vcdialogs.py:48 msgid "No files will be committed" msgstr "Nem lesznek fájlok kommitolva" #. Translators: First %s is replaced by translated "%d unpushed #. commits", second %s is replaced by translated "%d branches" -#: ../meld/vc/git.py:95 +#: ../meld/vc/git.py:94 #, python-format msgid "%s in %s" msgstr "%s %s" #. Translators: These messages cover the case where there is #. only one branch, and are not part of another message. -#: ../meld/vc/git.py:96 ../meld/vc/git.py:103 +#: ../meld/vc/git.py:95 ../meld/vc/git.py:102 #, python-format msgid "%d unpushed commit" msgid_plural "%d unpushed commits" msgstr[0] "%d nem továbbított kommit" msgstr[1] "%d nem továbbított kommit" -#: ../meld/vc/git.py:98 +#: ../meld/vc/git.py:97 #, python-format msgid "%d branch" msgid_plural "%d branches" msgstr[0] "%d ágban" msgstr[1] "%d ágban" -#: ../meld/vc/git.py:352 +#: ../meld/vc/git.py:330 #, python-format msgid "Mode changed from %s to %s" msgstr "Mód megváltoztatva: %s -> %s" -#: ../meld/vc/git.py:360 +#: ../meld/vc/git.py:338 msgid "Partially staged" msgstr "Részben sorba állítva" -#: ../meld/vc/git.py:360 +#: ../meld/vc/git.py:338 msgid "Staged" msgstr "Sorba állítva" @@ -2397,140 +2355,140 @@ msgstr "Sorba állítva" msgid "None" msgstr "Nincs" -#: ../meld/vc/svn.py:216 +#: ../meld/vc/svn.py:204 #, python-format msgid "Rev %s" msgstr "%s rev" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Merged" msgstr "Egyesítve" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Base" msgstr "Alap" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Local" msgstr "Helyi" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Remote" msgstr "Távoli" -#: ../meld/vc/_vc.py:68 +#: ../meld/vc/_vc.py:70 msgid "Unversioned" msgstr "Verziózatlan" -#: ../meld/vc/_vc.py:71 +#: ../meld/vc/_vc.py:73 msgid "Error" msgstr "Hiba" -#: ../meld/vc/_vc.py:73 +#: ../meld/vc/_vc.py:75 msgid "Newly added" msgstr "Újonnan hozzáadott" -#: ../meld/vc/_vc.py:75 +#: ../meld/vc/_vc.py:77 msgid "Renamed" msgstr "Átnevezve" -#: ../meld/vc/_vc.py:76 +#: ../meld/vc/_vc.py:78 msgid "Conflict" msgstr "Ütközés" -#: ../meld/vc/_vc.py:77 +#: ../meld/vc/_vc.py:79 msgid "Removed" msgstr "Eltávolítva" -#: ../meld/vc/_vc.py:78 +#: ../meld/vc/_vc.py:80 msgid "Missing" msgstr "Hiányzó" -#: ../meld/vc/_vc.py:79 +#: ../meld/vc/_vc.py:81 msgid "Not present" msgstr "Nincs jelen" #. Translators: This error message is shown when a version #. control binary isn't installed. -#: ../meld/vcview.py:255 +#: ../meld/vcview.py:251 #, python-format msgid "%(name)s (%(cmd)s not installed)" msgstr "%(name)s (%(cmd)s nincs telepítve)" #. Translators: This error message is shown when a version #. controlled repository is invalid. -#: ../meld/vcview.py:259 +#: ../meld/vcview.py:255 #, python-format msgid "%(name)s (Invalid repository)" msgstr "%(name)s (Érvénytelen tároló)" -#: ../meld/vcview.py:280 +#: ../meld/vcview.py:276 msgid "No valid version control system found in this folder" msgstr "Nem található használható verziókövető rendszer ebben a mappában" -#: ../meld/vcview.py:282 +#: ../meld/vcview.py:278 msgid "Only one version control system found in this folder" msgstr "Csak egy verziókövető rendszer található ebben a mappában" -#: ../meld/vcview.py:284 +#: ../meld/vcview.py:280 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:337 +#: ../meld/vcview.py:332 #, python-format msgid "%s: %s" msgstr "%s: %s" -#: ../meld/vcview.py:357 +#: ../meld/vcview.py:352 #, python-format msgid "Scanning %s" msgstr "%s vizsgálata" -#: ../meld/vcview.py:396 +#: ../meld/vcview.py:391 msgid "(Empty)" msgstr "(Üres)" -#: ../meld/vcview.py:440 +#: ../meld/vcview.py:435 #, python-format msgid "%s — local" msgstr "%s – helyi" -#: ../meld/vcview.py:441 +#: ../meld/vcview.py:436 #, python-format msgid "%s — remote" msgstr "%s – távoli" -#: ../meld/vcview.py:449 +#: ../meld/vcview.py:444 #, python-format msgid "%s (local, merge, remote)" msgstr "%s (helyi, összefésült, távoli)" -#: ../meld/vcview.py:454 +#: ../meld/vcview.py:449 #, python-format msgid "%s (remote, merge, local)" msgstr "%s (távoli, összefésült, helyi)" -#: ../meld/vcview.py:465 +#: ../meld/vcview.py:460 #, python-format msgid "%s — repository" msgstr "%s – tároló" -#: ../meld/vcview.py:471 +#: ../meld/vcview.py:466 #, python-format msgid "%s (working, repository)" msgstr "%s (munka, tároló)" -#: ../meld/vcview.py:475 +#: ../meld/vcview.py:470 #, python-format msgid "%s (repository, working)" msgstr "%s (tároló, munka)" -#: ../meld/vcview.py:643 +#: ../meld/vcview.py:638 msgid "Remove folder and all its files?" msgstr "Eltávolítja a mappát és benne minden fájlt?" -#: ../meld/vcview.py:645 +#: ../meld/vcview.py:640 msgid "" "This will remove all selected files and folders, and all files within any " "selected folders, from version control." @@ -2538,15 +2496,48 @@ 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:670 +#: ../meld/vcview.py:665 #, python-format msgid "Error removing %s" msgstr "Hiba %s eltávolításakor" -#: ../meld/vcview.py:750 +#: ../meld/vcview.py:745 msgid "Clear" msgstr "Törlés" +#~ msgid "Meld does not support Python 3." +#~ msgstr "A Meld nem támogatja a Python 3-at." + +#~ msgid "_Tabs" +#~ msgstr "_Lapok" + +#~ msgid "_Previous Tab" +#~ msgstr "_Előző lap" + +#~ msgid "Activate previous tab" +#~ msgstr "Előző lap aktiválása" + +#~ msgid "_Next Tab" +#~ msgstr "_Következő lap" + +#~ msgid "Activate next tab" +#~ msgstr "Következő lap aktiválása" + +#~ msgid "Move Tab _Left" +#~ msgstr "Lap _balra" + +#~ msgid "Move current tab to left" +#~ msgstr "A jelenlegi lap mozgatása balra" + +#~ msgid "Move Tab _Right" +#~ msgstr "Lap mozgatása j_obbra" + +#~ msgid "Move current tab to right" +#~ msgstr "A jelenlegi lap mozgatása jobbra" + +#~ msgid "Switch to this tab" +#~ msgstr "Váltás erre a lapra" + #~ msgid "" #~ "These text encodings will be automatically used (in order) to try to " #~ "decode loaded text files." From 6e09439ae83222863ab17d7e6d847f71224295f6 Mon Sep 17 00:00:00 2001 From: Tiago Santos Date: Tue, 23 Aug 2016 17:04:04 +0000 Subject: [PATCH 0015/1316] Updated Portuguese translation --- po/pt.po | 526 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 276 insertions(+), 250 deletions(-) diff --git a/po/pt.po b/po/pt.po index 4760cac3..f1c22302 100644 --- a/po/pt.po +++ b/po/pt.po @@ -10,27 +10,31 @@ msgstr "" "Project-Id-Version: 2.6\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=meld&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-07-29 22:12+0000\n" -"PO-Revision-Date: 2016-05-04 20:37+0100\n" +"POT-Creation-Date: 2016-08-22 15:35+0000\n" +"PO-Revision-Date: 2016-08-23 17:58+0100\n" "Last-Translator: Tiago Santos \n" "Language-Team: Duarte Loreto \n" "Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.5.4\n" +"X-Generator: Poedit 1.8.7.1\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../bin/meld:142 +#: ../bin/meld:144 msgid "Cannot import: " msgstr "Impossível importar:" -#: ../bin/meld:145 +#: ../bin/meld:147 #, c-format msgid "Meld requires %s or higher." msgstr "O Meld requer o %s ou superior." -#: ../bin/meld:194 +#: ../bin/meld:151 +msgid "Meld does not support Python 3." +msgstr "O Meld não suporta Python 3." + +#: ../bin/meld:200 #, c-format msgid "" "Couldn't load Meld-specific CSS (%s)\n" @@ -82,6 +86,10 @@ msgstr "" "O Meld ajuda-o a rever alterações de código, a compreender patches e a " "tornar enormes conflitos de união em algo menos doloroso." +#: ../data/meld.appdata.xml.in.h:5 +msgid "The GNOME Project" +msgstr "O Projeto GNOME" + #: ../data/mime/meld.xml.in.h:1 msgid "Meld comparison description" msgstr "Descrição da comparação do Meld" @@ -520,7 +528,7 @@ msgstr "_Preferências" #: ../data/ui/application.ui.h:7 msgid "_Help" -msgstr "Aj_Uda" +msgstr "Aj_uda" #: ../data/ui/application.ui.h:8 msgid "Keyboard Shortcuts" @@ -544,7 +552,7 @@ msgstr "Comparar ficheiros selecionados" #: ../data/ui/dirdiff.ui.h:3 msgid "Copy to _Left" -msgstr "Copiar para a _Esquerda" +msgstr "Copiar para a _esquerda" #: ../data/ui/dirdiff.ui.h:4 msgid "Copy to left" @@ -552,7 +560,7 @@ msgstr "Copiar para a esquerda" #: ../data/ui/dirdiff.ui.h:5 msgid "Copy to _Right" -msgstr "Copiar para a _Direita" +msgstr "Copiar para a _direita" #: ../data/ui/dirdiff.ui.h:6 msgid "Copy to right" @@ -562,7 +570,7 @@ msgstr "Copiar para a direita" msgid "Delete selected" msgstr "Apagar selecção" -#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:859 ../meld/filediff.py:1384 +#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:860 ../meld/filediff.py:1368 msgid "Hide" msgstr "Ocultar %s" @@ -598,7 +606,7 @@ msgstr "Novo" msgid "Show new" msgstr "Apresentar novo" -#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:76 +#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:74 msgid "Modified" msgstr "Alterado" @@ -631,7 +639,7 @@ msgid "_Add" msgstr "_Adicionar" #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11 -#: ../meld/vcview.py:638 +#: ../meld/vcview.py:655 msgid "_Remove" msgstr "_Remover" @@ -641,7 +649,7 @@ msgstr "Mover item para cima" #: ../data/ui/EditableList.ui.h:7 msgid "Move _Up" -msgstr "Mover para _Cima" +msgstr "Mover para _cima" #: ../data/ui/EditableList.ui.h:8 msgid "Move item down" @@ -649,11 +657,11 @@ msgstr "Mover item para baixo" #: ../data/ui/EditableList.ui.h:9 msgid "Move _Down" -msgstr "Mover para _Baixo" +msgstr "Mover para _baixo" #. Create icon and filename CellRenderer #: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35 -#: ../meld/dirdiff.py:373 +#: ../meld/dirdiff.py:374 msgid "Name" msgstr "Nome" @@ -853,10 +861,10 @@ msgstr "Se não gravar, as alterações serão irremediavelmente perdidas." #: ../data/ui/filediff.ui.h:46 msgid "Close _without Saving" -msgstr "Fechar sem gra_Var" +msgstr "Fechar sem gra_var" -#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:941 ../meld/filediff.py:1450 -#: ../meld/filediff.py:1518 +#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:942 ../meld/filediff.py:1434 +#: ../meld/filediff.py:1502 msgid "_Cancel" msgstr "_Cancelar" @@ -894,7 +902,7 @@ msgstr "" "Alterações feitas aos seguintes documentos serão irremediavelmente " "perdidas:\n" -#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:942 ../meld/filediff.py:1451 +#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:943 ../meld/filediff.py:1435 msgid "_Replace" msgstr "Substitui_R" @@ -924,11 +932,11 @@ msgstr "_Comparar maiúsculas" #: ../data/ui/findbar.ui.h:8 msgid "Who_le word" -msgstr "Pa_Lavra completa" +msgstr "Pa_lavra completa" #: ../data/ui/findbar.ui.h:9 msgid "Regular e_xpression" -msgstr "E_Xpressão regular" +msgstr "E_xpressão regular" #: ../data/ui/findbar.ui.h:10 msgid "Wrapped" @@ -942,7 +950,7 @@ msgstr "Formatar como patch" msgid "Copy to Clipboard" msgstr "Copiar para a área de transferência" -#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:144 +#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:149 msgid "Save Patch" msgstr "Gravar patch" @@ -1008,7 +1016,7 @@ msgstr "_Usar a letra de largura fixa do sistema" #: ../data/ui/preferences.ui.h:12 msgid "_Editor font:" -msgstr "Letra do _Editor" +msgstr "Letra do _editor" #: ../data/ui/preferences.ui.h:13 msgid "Display" @@ -1016,7 +1024,7 @@ msgstr "Ecrã" #: ../data/ui/preferences.ui.h:14 msgid "_Tab width:" -msgstr "Largura do se_Parador:" +msgstr "Largura do se_parador:" #: ../data/ui/preferences.ui.h:15 msgid "_Insert spaces instead of tabs" @@ -1024,11 +1032,11 @@ msgstr "_Inserir espaços em vez de tabulações" #: ../data/ui/preferences.ui.h:16 msgid "Enable text _wrapping" -msgstr "Permitir ajuste de _Texto" +msgstr "Permitir ajuste de _texto" #: ../data/ui/preferences.ui.h:17 msgid "Do not _split words over two lines" -msgstr "Não dividir palavra_S em duas linhas" +msgstr "Não dividir palavra_s em duas linhas" #: ../data/ui/preferences.ui.h:18 msgid "Highlight _current line" @@ -1036,11 +1044,11 @@ msgstr "Realçar _Linha atual" #: ../data/ui/preferences.ui.h:19 msgid "Show _line numbers" -msgstr "Mostrar _Números de linha" +msgstr "Mostrar _números de linha" #: ../data/ui/preferences.ui.h:20 msgid "Show w_hitespace" -msgstr "Mostrar símbolos nos espaços em _Branco" +msgstr "Mostrar símbolos nos espaços em _branco" #: ../data/ui/preferences.ui.h:21 msgid "Use s_yntax highlighting" @@ -1060,7 +1068,7 @@ msgstr "Usar editor pre_Definido do sistema" #: ../data/ui/preferences.ui.h:25 msgid "Edito_r command:" -msgstr "Comando do edito_R:" +msgstr "Comando do edito_r:" #: ../data/ui/preferences.ui.h:26 msgid "Editor" @@ -1072,7 +1080,7 @@ msgstr "Comparação rasa" #: ../data/ui/preferences.ui.h:28 msgid "C_ompare files based only on size and timestamp" -msgstr "C_Omparar ficheiros baseado só em data e timestamp" +msgstr "C_omparar ficheiros baseado só em data e timestamp" #: ../data/ui/preferences.ui.h:29 msgid "_Timestamp resolution:" @@ -1100,7 +1108,7 @@ msgstr "_Ordem ao comparar revisões de ficheiros:" #: ../data/ui/preferences.ui.h:37 msgid "Order when _merging files:" -msgstr "Orde_M ao unir ficheiros:" +msgstr "Orde_m ao unir ficheiros:" #: ../data/ui/preferences.ui.h:38 msgid "Commit Messages" @@ -1108,11 +1116,11 @@ msgstr "Mensagens de commit" #: ../data/ui/preferences.ui.h:39 msgid "Show _right margin at:" -msgstr "Mostrar margem di_Reita em:" +msgstr "Mostrar margem di_reita em:" #: ../data/ui/preferences.ui.h:40 msgid "Automatically _break lines at right margin on commit" -msgstr "Que_Brar linhas automaticamente na margem direita" +msgstr "Que_brar linhas automaticamente na margem direita" #: ../data/ui/preferences.ui.h:41 msgid "Version Control" @@ -1132,7 +1140,7 @@ msgstr "" "Cada padrão é uma lista de descritores estilo linha de comandos, separados " "por espaços." -#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:103 +#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:104 msgid "File Filters" msgstr "Filtros de Ficheiros" @@ -1411,8 +1419,7 @@ msgctxt "shortcut window" msgid "Show/hide console output" msgstr "Alternar saída da consola" -#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:570 -#: ../meld/newdifftab.py:38 +#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:668 msgid "New comparison" msgstr "Nova comparação" @@ -1470,7 +1477,7 @@ msgstr "C_omparar" #: ../data/ui/vcview.ui.h:3 msgid "Co_mmit..." -msgstr "Co_Mmit..." +msgstr "Co_mmit..." #: ../data/ui/vcview.ui.h:4 msgid "Commit changes to version control" @@ -1486,7 +1493,7 @@ msgstr "Atualizar cópia de trabalho a partir do controlo de versão" #: ../data/ui/vcview.ui.h:7 msgid "_Push" -msgstr "Em_Purrar" +msgstr "Em_purrar" #: ../data/ui/vcview.ui.h:8 msgid "Push local changes to remote" @@ -1502,7 +1509,7 @@ msgstr "Remover ao controlo de versão" #: ../data/ui/vcview.ui.h:13 msgid "Mar_k as Resolved" -msgstr "Mar_Car como resolvido" +msgstr "Mar_car como resolvido" #: ../data/ui/vcview.ui.h:14 msgid "Mark as resolved in version control" @@ -1560,7 +1567,7 @@ msgstr "Sem _Versão" msgid "Show unversioned files" msgstr "Mostrar ficheiros sem versão" -#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69 +#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:67 msgid "Ignored" msgstr "Ignorado" @@ -1586,9 +1593,9 @@ msgstr "Diários anteriores:" #: ../data/ui/vcview.ui.h:34 msgid "Co_mmit" -msgstr "Co_Mmit" +msgstr "Co_mmit" -#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:326 +#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:343 msgid "Location" msgstr "Localização" @@ -1616,7 +1623,7 @@ msgstr "" #: ../data/ui/vcview.ui.h:42 msgid "_Push commits" -msgstr "Em_Purrar commits" +msgstr "Em_purrar commits" #: ../meld/const.py:12 msgid "UNIX (LF)" @@ -1631,44 +1638,44 @@ msgid "Mac OS (CR)" msgstr "Mac OS (CR)" #. Create file size CellRenderer -#: ../meld/dirdiff.py:391 ../meld/preferences.py:82 +#: ../meld/dirdiff.py:392 ../meld/preferences.py:82 msgid "Size" msgstr "Tamanho" #. Create date-time CellRenderer -#: ../meld/dirdiff.py:399 ../meld/preferences.py:83 +#: ../meld/dirdiff.py:400 ../meld/preferences.py:83 msgid "Modification time" msgstr "Hora de modificação" #. Create permissions CellRenderer -#: ../meld/dirdiff.py:407 ../meld/preferences.py:84 +#: ../meld/dirdiff.py:408 ../meld/preferences.py:84 msgid "Permissions" msgstr "Permissões" -#: ../meld/dirdiff.py:537 +#: ../meld/dirdiff.py:538 #, python-format msgid "Hide %s" msgstr "Esconder %s" -#: ../meld/dirdiff.py:669 ../meld/dirdiff.py:693 +#: ../meld/dirdiff.py:670 ../meld/dirdiff.py:694 #, python-format msgid "[%s] Scanning %s" msgstr "[%s] A analizar %s" -#: ../meld/dirdiff.py:826 +#: ../meld/dirdiff.py:827 #, python-format msgid "[%s] Done" msgstr "[%s] Terminado" -#: ../meld/dirdiff.py:834 +#: ../meld/dirdiff.py:835 msgid "Folders have no differences" msgstr "As pastas não têm diferenças" -#: ../meld/dirdiff.py:836 +#: ../meld/dirdiff.py:837 msgid "Contents of scanned files in folders are identical." msgstr "Os conteúdos de ficheiros pesquisados nas pastas são idênticos." -#: ../meld/dirdiff.py:838 +#: ../meld/dirdiff.py:839 msgid "" "Scanned files in folders appear identical, but contents have not been " "scanned." @@ -1676,43 +1683,43 @@ msgstr "" "Os ficheiros pesquisados nas pastas parecem idênticos, mas os conteúdos não " "foram pesquisados." -#: ../meld/dirdiff.py:841 +#: ../meld/dirdiff.py:842 msgid "File filters are in use, so not all files have been scanned." msgstr "" "Os filtros de ficheiros estão em uso, pelo que nem todos os ficheiros foram " "pesquisados." -#: ../meld/dirdiff.py:843 +#: ../meld/dirdiff.py:844 msgid "Text filters are in use and may be masking content differences." msgstr "" "Os filtros de texto estão em uso e podem estar a mascarar diferenças de " "conteúdo." -#: ../meld/dirdiff.py:861 ../meld/filediff.py:1386 ../meld/filediff.py:1416 -#: ../meld/filediff.py:1418 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 +#: ../meld/dirdiff.py:862 ../meld/filediff.py:1370 ../meld/filediff.py:1400 +#: ../meld/filediff.py:1402 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 msgid "Hi_de" msgstr "_Ocultar" -#: ../meld/dirdiff.py:871 +#: ../meld/dirdiff.py:872 msgid "Multiple errors occurred while scanning this folder" msgstr "Ocorreram múltiplos erros ao pesquisar esta pasta" -#: ../meld/dirdiff.py:872 +#: ../meld/dirdiff.py:873 msgid "Files with invalid encodings found" msgstr "Encontrados ficheiros com codificação inválida" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:874 +#: ../meld/dirdiff.py:875 msgid "Some files were in an incorrect encoding. The names are something like:" msgstr "" "Alguns ficheiros tinham uma codificação incorreta. Os nomes são algo como:" -#: ../meld/dirdiff.py:876 +#: ../meld/dirdiff.py:877 msgid "Files hidden by case insensitive comparison" msgstr "Ficheiros ocultos por comparação insensível a maiúsculas" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:878 +#: ../meld/dirdiff.py:879 msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. The following files in this folder are hidden:" @@ -1721,17 +1728,17 @@ msgstr "" "ficheiros sensível a maiúsculas. Os seguintes ficheiros nesta pasta estão " "ocultos:" -#: ../meld/dirdiff.py:889 +#: ../meld/dirdiff.py:890 #, python-format msgid "'%s' hidden by '%s'" msgstr "'%s' escondido por '%s'" -#: ../meld/dirdiff.py:945 +#: ../meld/dirdiff.py:946 #, python-format msgid "Replace folder “%s”?" msgstr "Substituir pasta “%s”?" -#: ../meld/dirdiff.py:947 +#: ../meld/dirdiff.py:948 #, python-format msgid "" "Another folder with the same name already exists in “%s”.\n" @@ -1741,11 +1748,11 @@ msgstr "" "Se substituir a pasta existente, todos os ficheiros nela contidos serão " "perdidos." -#: ../meld/dirdiff.py:960 +#: ../meld/dirdiff.py:961 msgid "Error copying file" msgstr "Erro ao copiar o ficheiro" -#: ../meld/dirdiff.py:961 +#: ../meld/dirdiff.py:962 #, python-format msgid "" "Couldn't copy %s\n" @@ -1758,35 +1765,35 @@ msgstr "" "\n" "%s." -#: ../meld/dirdiff.py:984 +#: ../meld/dirdiff.py:985 #, python-format msgid "Error deleting %s" msgstr "Erro ao eliminar %s" -#: ../meld/dirdiff.py:1489 +#: ../meld/dirdiff.py:1492 msgid "No folder" msgstr "Sem pasta" #. Abbreviations for insert and overwrite that fit in the status bar -#: ../meld/filediff.py:354 +#: ../meld/filediff.py:357 msgid "INS" msgstr "INS" -#: ../meld/filediff.py:354 +#: ../meld/filediff.py:357 msgid "OVR" msgstr "SUBS" #. Abbreviation for line, column so that it will fit in the status bar -#: ../meld/filediff.py:356 +#: ../meld/filediff.py:359 #, python-format msgid "Ln %i, Col %i" msgstr "Lin %i, Col %i" -#: ../meld/filediff.py:781 +#: ../meld/filediff.py:771 msgid "Comparison results will be inaccurate" msgstr "Os resultados da comparação serão imprecisos" -#: ../meld/filediff.py:783 +#: ../meld/filediff.py:773 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1794,65 +1801,65 @@ msgstr "" "O filtro alterou o número de linhas no ficheiro, o que não é suportado. A " "comparação será imprecisa." -#: ../meld/filediff.py:841 +#: ../meld/filediff.py:831 msgid "Mark conflict as resolved?" msgstr "Marcar conflito como resolvido?" -#: ../meld/filediff.py:843 +#: ../meld/filediff.py:833 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:845 +#: ../meld/filediff.py:835 msgid "Cancel" msgstr "Cancelar" -#: ../meld/filediff.py:846 +#: ../meld/filediff.py:836 msgid "Mark _Resolved" -msgstr "Marcar _Resolvido" +msgstr "Marcar _resolvido" -#: ../meld/filediff.py:1095 +#: ../meld/filediff.py:1086 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Houve um problema ao abrir o ficheiro \"%s\"." -#: ../meld/filediff.py:1103 +#: ../meld/filediff.py:1094 #, python-format msgid "File %s appears to be a binary file." msgstr "%s parece ser um ficheiro binário." -#: ../meld/filediff.py:1105 +#: ../meld/filediff.py:1096 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:1107 +#: ../meld/filediff.py:1098 msgid "Open" msgstr "Abrir" -#: ../meld/filediff.py:1123 +#: ../meld/filediff.py:1114 #, python-format msgid "[%s] Computing differences" msgstr "[%s] A calcular diferenças" -#: ../meld/filediff.py:1188 +#: ../meld/filediff.py:1179 #, python-format msgid "File %s has changed on disk" msgstr "O ficheiro %s foi alterado no disco" -#: ../meld/filediff.py:1189 +#: ../meld/filediff.py:1180 msgid "Do you want to reload the file?" msgstr "Quer recarregar o ficheiro?" -#: ../meld/filediff.py:1191 +#: ../meld/filediff.py:1182 msgid "_Reload" msgstr "_Recarregar" -#: ../meld/filediff.py:1349 +#: ../meld/filediff.py:1333 msgid "Files are identical" msgstr "Os ficheiros são idênticos" -#: ../meld/filediff.py:1362 +#: ../meld/filediff.py:1346 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1860,11 +1867,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:1367 +#: ../meld/filediff.py:1351 msgid "Files differ in line endings only" msgstr "Os ficheiros só diferem nos fins de linha" -#: ../meld/filediff.py:1369 +#: ../meld/filediff.py:1353 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1873,15 +1880,15 @@ msgstr "" "Os ficheiros são idênticos, exceto por diferentes fins de linha:\n" "%s" -#: ../meld/filediff.py:1389 +#: ../meld/filediff.py:1373 msgid "Show without filters" msgstr "Mostrar sem filtros" -#: ../meld/filediff.py:1411 +#: ../meld/filediff.py:1395 msgid "Change highlighting incomplete" msgstr "Alterar realce incompleto" -#: ../meld/filediff.py:1412 +#: ../meld/filediff.py:1396 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." @@ -1890,20 +1897,20 @@ msgstr "" "forçar o Meld para demorar mais a realçar alterações grandes, mas pode ser " "lento." -#: ../meld/filediff.py:1420 +#: ../meld/filediff.py:1404 msgid "Keep highlighting" msgstr "Manter realce" -#: ../meld/filediff.py:1422 +#: ../meld/filediff.py:1406 msgid "_Keep highlighting" msgstr "_Manter realce" -#: ../meld/filediff.py:1454 +#: ../meld/filediff.py:1438 #, python-format msgid "Replace file “%s”?" msgstr "Substituir ficheiro “%s”?" -#: ../meld/filediff.py:1456 +#: ../meld/filediff.py:1440 #, python-format msgid "" "A file with this name already exists in “%s”.\n" @@ -1912,45 +1919,45 @@ msgstr "" "Um ficheiro com este nome já existe em \"%s\".\n" "Se substituir o ficheiro existente, o seu conteúdo será perdido." -#: ../meld/filediff.py:1473 +#: ../meld/filediff.py:1457 msgid "Save Left Pane As" msgstr "Gravar painel esquerdo como" -#: ../meld/filediff.py:1475 +#: ../meld/filediff.py:1459 msgid "Save Middle Pane As" msgstr "Gravar painel central como" -#: ../meld/filediff.py:1477 +#: ../meld/filediff.py:1461 msgid "Save Right Pane As" msgstr "Gravar painel direito como" -#: ../meld/filediff.py:1491 +#: ../meld/filediff.py:1475 #, 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:1493 +#: ../meld/filediff.py:1477 msgid "If you save it, any external changes will be lost." msgstr "Se o gravar, todas as alterações externas serão perdidas." -#: ../meld/filediff.py:1496 +#: ../meld/filediff.py:1480 msgid "Save Anyway" msgstr "Gravar mesmo assim" -#: ../meld/filediff.py:1497 +#: ../meld/filediff.py:1481 msgid "Don't Save" msgstr "Não gravar" -#: ../meld/filediff.py:1519 +#: ../meld/filediff.py:1503 msgid "_Save as UTF-8" msgstr "Gravar como UTF-8" -#: ../meld/filediff.py:1522 +#: ../meld/filediff.py:1506 #, python-format msgid "Couldn't encode text as “%s”" msgstr "Impossível codificar texto como \"%s\"" -#: ../meld/filediff.py:1524 +#: ../meld/filediff.py:1508 #, python-format msgid "" "File “%s” contains characters that can't be encoded using encoding “%s”.\n" @@ -1960,12 +1967,12 @@ msgstr "" "\".\n" "Quer gravar como UTF-8?" -#: ../meld/filediff.py:1561 ../meld/patchdialog.py:120 +#: ../meld/filediff.py:1545 ../meld/patchdialog.py:125 #, python-format msgid "Could not save file %s." msgstr "Impossível gravar o ficheiro %s." -#: ../meld/filediff.py:1562 ../meld/patchdialog.py:121 +#: ../meld/filediff.py:1546 ../meld/patchdialog.py:126 #, python-format msgid "" "Couldn't save file due to:\n" @@ -1974,11 +1981,11 @@ msgstr "" "Impossível gravar o ficheiro porque:\n" "%s" -#: ../meld/filediff.py:1908 +#: ../meld/filediff.py:1892 msgid "Live comparison updating disabled" msgstr "Atualização ao vivo da comparação desativada" -#: ../meld/filediff.py:1909 +#: ../meld/filediff.py:1893 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -1995,302 +2002,342 @@ msgstr "[%s] A unir ficheiros" #: ../meld/gutterrendererchunk.py:159 msgid "Copy _up" -msgstr "Copiar a_Cima" +msgstr "Copiar a_cima" #: ../meld/gutterrendererchunk.py:160 msgid "Copy _down" -msgstr "Copiar a_Baixo" +msgstr "Copiar a_baixo" -#: ../meld/meldapp.py:175 +#: ../meld/meldapp.py:177 msgid "wrong number of arguments supplied to --diff" msgstr "número errado de argumentos fornecidos a --diff" -#: ../meld/meldapp.py:180 +#: ../meld/meldapp.py:182 msgid "Start with an empty window" msgstr "Começar com uma janela vazia" -#: ../meld/meldapp.py:181 ../meld/meldapp.py:183 +#: ../meld/meldapp.py:183 ../meld/meldapp.py:185 msgid "file" msgstr "ficheiro" -#: ../meld/meldapp.py:181 ../meld/meldapp.py:185 +#: ../meld/meldapp.py:183 ../meld/meldapp.py:187 msgid "folder" msgstr "pasta" -#: ../meld/meldapp.py:182 +#: ../meld/meldapp.py:184 msgid "Start a version control comparison" msgstr "Começar uma comparação de controlo de versão" -#: ../meld/meldapp.py:184 +#: ../meld/meldapp.py:186 msgid "Start a 2- or 3-way file comparison" msgstr "Começar uma comparação de ficheiros de duas ou três vias" -#: ../meld/meldapp.py:186 +#: ../meld/meldapp.py:188 msgid "Start a 2- or 3-way folder comparison" msgstr "Começar uma comparação de pastas de duas ou três vias" -#: ../meld/meldapp.py:229 +#: ../meld/meldapp.py:231 #, python-format msgid "Error: %s\n" msgstr "Erro: %s\n" -#: ../meld/meldapp.py:236 +#: ../meld/meldapp.py:238 msgid "Meld is a file and directory comparison tool." msgstr "O Meld é uma ferramenta de comparação de ficheiros e pastas." -#: ../meld/meldapp.py:240 +#: ../meld/meldapp.py:242 msgid "Set label to use instead of file name" msgstr "Definir rótulo a usar em vez do nome de ficheiro" -#: ../meld/meldapp.py:243 +#: ../meld/meldapp.py:245 msgid "Open a new tab in an already running instance" msgstr "Abrir novo separador numa instância já em execução" -#: ../meld/meldapp.py:246 +#: ../meld/meldapp.py:248 msgid "Automatically compare all differing files on startup" msgstr "Comparar automaticamente todos os ficheiros diferentes no arranque" -#: ../meld/meldapp.py:249 +#: ../meld/meldapp.py:251 msgid "Ignored for compatibility" msgstr "Ignorado para compatibilidade" -#: ../meld/meldapp.py:253 +#: ../meld/meldapp.py:255 msgid "Set the target file for saving a merge result" msgstr "Definir ficheiro destino para gravar o resultado de uma união" -#: ../meld/meldapp.py:256 +#: ../meld/meldapp.py:258 msgid "Automatically merge files" msgstr "Unir ficheiros automaticamente" -#: ../meld/meldapp.py:260 +#: ../meld/meldapp.py:262 msgid "Load a saved comparison from a Meld comparison file" msgstr "Carregar uma comparação gravada de um ficheiro do Meld" -#: ../meld/meldapp.py:264 +#: ../meld/meldapp.py:266 msgid "Create a diff tab for the supplied files or folders" msgstr "Criar um separador Diff para os ficheiros/pastas selecionados" -#: ../meld/meldapp.py:284 +#: ../meld/meldapp.py:286 #, python-format msgid "too many arguments (wanted 0-3, got %d)" msgstr "demasiados argumentos (desejados 0-3, obtidos %d)" -#: ../meld/meldapp.py:287 +#: ../meld/meldapp.py:289 msgid "can't auto-merge less than 3 files" msgstr "impossível unir automaticamente menos de 3 ficheiros" -#: ../meld/meldapp.py:289 +#: ../meld/meldapp.py:291 msgid "can't auto-merge directories" msgstr "impossível unir automaticamente pastas" -#: ../meld/meldapp.py:303 +#: ../meld/meldapp.py:305 msgid "Error reading saved comparison file" msgstr "Erro ao ler ficheiro de comparação gravado" -#: ../meld/meldapp.py:330 +#: ../meld/meldapp.py:332 #, python-format msgid "invalid path or URI \"%s\"" msgstr "Caminho ou URI inválido \"%s\"" #. TRANSLATORS: This is the label of a new, currently-unnamed file. -#: ../meld/meldbuffer.py:131 +#: ../meld/meldbuffer.py:132 msgid "" msgstr "" -#: ../meld/melddoc.py:64 +#: ../meld/melddoc.py:83 ../meld/melddoc.py:84 msgid "untitled" msgstr "sem título" -#: ../meld/meldwindow.py:48 +#: ../meld/meldwindow.py:49 msgid "_File" msgstr "_Ficheiro" -#: ../meld/meldwindow.py:49 +#: ../meld/meldwindow.py:50 msgid "_New Comparison..." msgstr "_Nova comparação..." -#: ../meld/meldwindow.py:50 +#: ../meld/meldwindow.py:51 msgid "Start a new comparison" msgstr "Iniciar uma nova comparação" -#: ../meld/meldwindow.py:53 +#: ../meld/meldwindow.py:54 msgid "Save the current file" msgstr "Gravar o ficheiro atual" -#: ../meld/meldwindow.py:55 +#: ../meld/meldwindow.py:56 msgid "Save As..." msgstr "Gravar como..." -#: ../meld/meldwindow.py:56 +#: ../meld/meldwindow.py:57 msgid "Save the current file with a different name" msgstr "Gravar o ficheiro atual com um nome diferente" -#: ../meld/meldwindow.py:59 +#: ../meld/meldwindow.py:60 msgid "Close the current file" msgstr "Fechar o ficheiro atual" -#: ../meld/meldwindow.py:62 +#: ../meld/meldwindow.py:63 msgid "_Edit" msgstr "_Editar" -#: ../meld/meldwindow.py:64 +#: ../meld/meldwindow.py:65 msgid "Undo the last action" msgstr "Desfazer a última ação" -#: ../meld/meldwindow.py:67 +#: ../meld/meldwindow.py:68 msgid "Redo the last undone action" msgstr "Refazer a última ação desfeita" -#: ../meld/meldwindow.py:69 +#: ../meld/meldwindow.py:70 msgid "Cut the selection" msgstr "Cortar a seleção" -#: ../meld/meldwindow.py:71 +#: ../meld/meldwindow.py:72 msgid "Copy the selection" msgstr "Copiar a seleção" -#: ../meld/meldwindow.py:73 +#: ../meld/meldwindow.py:74 msgid "Paste the clipboard" msgstr "Colar a área de transferência" -#: ../meld/meldwindow.py:75 +#: ../meld/meldwindow.py:76 msgid "Find..." msgstr "Localizar..." -#: ../meld/meldwindow.py:75 +#: ../meld/meldwindow.py:76 msgid "Search for text" msgstr "Procurar texto" -#: ../meld/meldwindow.py:77 +#: ../meld/meldwindow.py:78 msgid "Find Ne_xt" -msgstr "Localizar segui_Nte" +msgstr "Localizar segui_nte" -#: ../meld/meldwindow.py:78 +#: ../meld/meldwindow.py:79 msgid "Search forwards for the same text" msgstr "Procura o mesmo texto para a frente" -#: ../meld/meldwindow.py:80 +#: ../meld/meldwindow.py:81 msgid "Find _Previous" -msgstr "Localizar _Anterior" +msgstr "Localizar _anterior" -#: ../meld/meldwindow.py:81 +#: ../meld/meldwindow.py:82 msgid "Search backwards for the same text" msgstr "Procura o mesmo texto para trás" -#: ../meld/meldwindow.py:84 +#: ../meld/meldwindow.py:85 msgid "_Replace..." msgstr "Substitui_R..." -#: ../meld/meldwindow.py:85 +#: ../meld/meldwindow.py:86 msgid "Find and replace text" msgstr "Localizar e substituir texto" -#: ../meld/meldwindow.py:88 +#: ../meld/meldwindow.py:89 msgid "_Changes" msgstr "_Alterações" -#: ../meld/meldwindow.py:89 +#: ../meld/meldwindow.py:90 msgid "Next Change" msgstr "Alteração seguinte" -#: ../meld/meldwindow.py:90 +#: ../meld/meldwindow.py:91 msgid "Go to the next change" msgstr "Ir para a alteração seguinte" -#: ../meld/meldwindow.py:92 +#: ../meld/meldwindow.py:93 msgid "Previous Change" msgstr "Alteração anterior" -#: ../meld/meldwindow.py:93 +#: ../meld/meldwindow.py:94 msgid "Go to the previous change" msgstr "Ir para a alteração anterior" -#: ../meld/meldwindow.py:95 +#: ../meld/meldwindow.py:96 msgid "Open Externally" msgstr "Abrir externamente" -#: ../meld/meldwindow.py:96 +#: ../meld/meldwindow.py:97 msgid "Open selected file or directory in the default external application" msgstr "Abrir ficheiro ou pasta selecionados na aplicação externa predefinida" -#: ../meld/meldwindow.py:100 +#: ../meld/meldwindow.py:101 msgid "_View" msgstr "_Ver" -#: ../meld/meldwindow.py:101 +#: ../meld/meldwindow.py:102 msgid "File Status" msgstr "Estado do ficheiro" -#: ../meld/meldwindow.py:102 +#: ../meld/meldwindow.py:103 msgid "Version Status" msgstr "Estado da versão" -#: ../meld/meldwindow.py:105 +#: ../meld/meldwindow.py:106 msgid "Stop the current action" msgstr "Parar a ação atual" -#: ../meld/meldwindow.py:108 +#: ../meld/meldwindow.py:109 msgid "Refresh the view" msgstr "Atualizar a vista" #: ../meld/meldwindow.py:112 +msgid "_Tabs" +msgstr "_Separadores" + +#: ../meld/meldwindow.py:113 +msgid "_Previous Tab" +msgstr "Se_Parador anterior" + +#: ../meld/meldwindow.py:114 +msgid "Activate previous tab" +msgstr "Ativar separador anterior" + +#: ../meld/meldwindow.py:116 +msgid "_Next Tab" +msgstr "Separador segui_Nte" + +#: ../meld/meldwindow.py:117 +msgid "Activate next tab" +msgstr "Ativar separador seguinte" + +#: ../meld/meldwindow.py:120 +msgid "Move Tab _Left" +msgstr "Mover separador à es_querda" + +#: ../meld/meldwindow.py:121 +msgid "Move current tab to left" +msgstr "Mover o separador atual para a esquerda" + +#: ../meld/meldwindow.py:124 +msgid "Move Tab _Right" +msgstr "Mover separador à di_reita" + +#: ../meld/meldwindow.py:125 +msgid "Move current tab to right" +msgstr "Mover o separador atual para a direita" + +#: ../meld/meldwindow.py:129 msgid "Fullscreen" msgstr "Ecrã completo" -#: ../meld/meldwindow.py:113 +#: ../meld/meldwindow.py:130 msgid "View the comparison in fullscreen" msgstr "Ver a comparação em ecrã completo" -#: ../meld/meldwindow.py:115 +#: ../meld/meldwindow.py:132 msgid "_Toolbar" -msgstr "Barra de ferramen_Tas" +msgstr "Barra de ferramen_tas" -#: ../meld/meldwindow.py:116 +#: ../meld/meldwindow.py:133 msgid "Show or hide the toolbar" msgstr "Mostrar ou ocultar a barra de ferramentas" -#: ../meld/meldwindow.py:126 +#: ../meld/meldwindow.py:143 msgid "Open Recent" msgstr "Abrir recentes" -#: ../meld/meldwindow.py:127 +#: ../meld/meldwindow.py:144 msgid "Open recent files" msgstr "Abrir ficheiros recentes" -#: ../meld/meldwindow.py:149 +#: ../meld/meldwindow.py:166 msgid "_Meld" msgstr "_Meld" -#: ../meld/meldwindow.py:150 +#: ../meld/meldwindow.py:167 msgid "Quit the program" msgstr "Sair do programa" -#: ../meld/meldwindow.py:152 +#: ../meld/meldwindow.py:169 msgid "Prefere_nces" -msgstr "Preferê_Ncias" +msgstr "Preferê_ncias" -#: ../meld/meldwindow.py:153 +#: ../meld/meldwindow.py:170 msgid "Configure the application" msgstr "Configurar a aplicação" -#: ../meld/meldwindow.py:155 +#: ../meld/meldwindow.py:172 msgid "_Contents" msgstr "_Conteúdo" -#: ../meld/meldwindow.py:156 +#: ../meld/meldwindow.py:173 msgid "Open the Meld manual" msgstr "Abrir o manual do Meld" -#: ../meld/meldwindow.py:158 +#: ../meld/meldwindow.py:175 msgid "About this application" msgstr "Acerca desta aplicação" -#: ../meld/meldwindow.py:604 +#: ../meld/meldwindow.py:587 +msgid "Switch to this tab" +msgstr "Mudar para este separador" + +#: ../meld/meldwindow.py:702 #, python-format msgid "Need three files to auto-merge, got: %r" msgstr "Necessários três ficheiros para união automática, obtidos %r" -#: ../meld/meldwindow.py:618 +#: ../meld/meldwindow.py:716 msgid "Cannot compare a mixture of files and directories" msgstr "Impossível comparar uma mistura de ficheiros e pastas" @@ -2301,7 +2348,7 @@ msgstr "" "Impossível encontrar detalhes do esquema de cores para %s-%s; má instalação" #. no common path. empty names get changed to "[None]" -#: ../meld/misc.py:263 +#: ../meld/misc.py:288 msgid "[None]" msgstr "[Nenhum]" @@ -2313,7 +2360,7 @@ msgstr "rótulo" msgid "pattern" msgstr "padrão" -#: ../meld/recent.py:114 +#: ../meld/recent.py:115 msgid "Version control:" msgstr "Controlo de versão:" @@ -2321,43 +2368,43 @@ msgstr "Controlo de versão:" msgid "Close tab" msgstr "Fechar separador" -#: ../meld/ui/vcdialogs.py:48 +#: ../meld/ui/vcdialogs.py:50 msgid "No files will be committed" msgstr "Não serão submetidos nenhuns ficheiros" #. Translators: First %s is replaced by translated "%d unpushed #. commits", second %s is replaced by translated "%d branches" -#: ../meld/vc/git.py:94 +#: ../meld/vc/git.py:95 #, python-format msgid "%s in %s" msgstr "%s commits não submetidos em %s ramos" #. Translators: These messages cover the case where there is #. only one branch, and are not part of another message. -#: ../meld/vc/git.py:95 ../meld/vc/git.py:102 +#: ../meld/vc/git.py:96 ../meld/vc/git.py:103 #, python-format msgid "%d unpushed commit" msgid_plural "%d unpushed commits" msgstr[0] "%d commit não empurrado" msgstr[1] "%d commits não empurrados" -#: ../meld/vc/git.py:97 +#: ../meld/vc/git.py:98 #, python-format msgid "%d branch" msgid_plural "%d branches" msgstr[0] "%d ramo" msgstr[1] "%d ramos" -#: ../meld/vc/git.py:330 +#: ../meld/vc/git.py:352 #, python-format msgid "Mode changed from %s to %s" msgstr "Modo alterado de %s para %s" -#: ../meld/vc/git.py:338 +#: ../meld/vc/git.py:360 msgid "Partially staged" msgstr "Parcialmente em estágio" -#: ../meld/vc/git.py:338 +#: ../meld/vc/git.py:360 msgid "Staged" msgstr "Em estágio" @@ -2367,140 +2414,140 @@ msgstr "Em estágio" msgid "None" msgstr "Nenhum" -#: ../meld/vc/svn.py:204 +#: ../meld/vc/svn.py:216 #, python-format msgid "Rev %s" msgstr "Rev %s" -#: ../meld/vc/_vc.py:54 +#: ../meld/vc/_vc.py:52 msgid "Merged" msgstr "Unidos" -#: ../meld/vc/_vc.py:54 +#: ../meld/vc/_vc.py:52 msgid "Base" msgstr "Base" -#: ../meld/vc/_vc.py:54 +#: ../meld/vc/_vc.py:52 msgid "Local" msgstr "Local" -#: ../meld/vc/_vc.py:54 +#: ../meld/vc/_vc.py:52 msgid "Remote" msgstr "Remoto" -#: ../meld/vc/_vc.py:70 +#: ../meld/vc/_vc.py:68 msgid "Unversioned" msgstr "Sem versão" -#: ../meld/vc/_vc.py:73 +#: ../meld/vc/_vc.py:71 msgid "Error" msgstr "Erro" -#: ../meld/vc/_vc.py:75 +#: ../meld/vc/_vc.py:73 msgid "Newly added" msgstr "Recentemente adicionados" -#: ../meld/vc/_vc.py:77 +#: ../meld/vc/_vc.py:75 msgid "Renamed" msgstr "Renomeados" -#: ../meld/vc/_vc.py:78 +#: ../meld/vc/_vc.py:76 msgid "Conflict" msgstr "Conflito" -#: ../meld/vc/_vc.py:79 +#: ../meld/vc/_vc.py:77 msgid "Removed" msgstr "Removido" -#: ../meld/vc/_vc.py:80 +#: ../meld/vc/_vc.py:78 msgid "Missing" msgstr "Em falta" -#: ../meld/vc/_vc.py:81 +#: ../meld/vc/_vc.py:79 msgid "Not present" msgstr "Não presentes" #. Translators: This error message is shown when a version #. control binary isn't installed. -#: ../meld/vcview.py:245 +#: ../meld/vcview.py:261 #, python-format msgid "%(name)s (%(cmd)s not installed)" msgstr "%(name)s (%(cmd)s não instalado)" #. Translators: This error message is shown when a version #. controlled repository is invalid. -#: ../meld/vcview.py:249 +#: ../meld/vcview.py:265 #, python-format msgid "%(name)s (Invalid repository)" msgstr "%(name)s (repositório inválido)" -#: ../meld/vcview.py:270 +#: ../meld/vcview.py:286 msgid "No valid version control system found in this folder" msgstr "Não se encontrou um sistema de controlo de versão válido nesta pasta" -#: ../meld/vcview.py:272 +#: ../meld/vcview.py:288 msgid "Only one version control system found in this folder" msgstr "Só se encontrou um sistema de controlo de versão válido nesta pasta" -#: ../meld/vcview.py:274 +#: ../meld/vcview.py:290 msgid "Choose which version control system to use" msgstr "Escolha qual o sistema de controlo de versão a usar" #. TRANSLATORS: This is the location of the directory being viewed -#: ../meld/vcview.py:326 +#: ../meld/vcview.py:343 #, python-format msgid "%s: %s" msgstr "%s: %s" -#: ../meld/vcview.py:346 +#: ../meld/vcview.py:363 #, python-format msgid "Scanning %s" msgstr "A analisar %s" -#: ../meld/vcview.py:385 +#: ../meld/vcview.py:402 msgid "(Empty)" msgstr "(Vazio)" -#: ../meld/vcview.py:429 +#: ../meld/vcview.py:446 #, python-format msgid "%s — local" msgstr "%s — local" -#: ../meld/vcview.py:430 +#: ../meld/vcview.py:447 #, python-format msgid "%s — remote" msgstr "%s — remoto" -#: ../meld/vcview.py:438 +#: ../meld/vcview.py:455 #, python-format msgid "%s (local, merge, remote)" msgstr "%s (local, unir, remoto)" -#: ../meld/vcview.py:443 +#: ../meld/vcview.py:460 #, python-format msgid "%s (remote, merge, local)" msgstr "%s (remoto, unir, local)" -#: ../meld/vcview.py:454 +#: ../meld/vcview.py:471 #, python-format msgid "%s — repository" msgstr "%s — repositório" -#: ../meld/vcview.py:460 +#: ../meld/vcview.py:477 #, python-format msgid "%s (working, repository)" msgstr "%s (trabalho, repositório)" -#: ../meld/vcview.py:464 +#: ../meld/vcview.py:481 #, python-format msgid "%s (repository, working)" msgstr "%s (repositório, trabalho)" -#: ../meld/vcview.py:632 +#: ../meld/vcview.py:649 msgid "Remove folder and all its files?" msgstr "Remover pasta e todos os ficheiros?" -#: ../meld/vcview.py:634 +#: ../meld/vcview.py:651 msgid "" "This will remove all selected files and folders, and all files within any " "selected folders, from version control." @@ -2508,36 +2555,15 @@ msgstr "" "Isto vai remover todos os ficheiros e pastas selecionados e todos os " "ficheiros dentro das pastas selecionadas do controlo de versão." -#: ../meld/vcview.py:659 +#: ../meld/vcview.py:676 #, python-format msgid "Error removing %s" msgstr "Erro ao remover %s" -#: ../meld/vcview.py:739 +#: ../meld/vcview.py:756 msgid "Clear" msgstr "Limpar" -#~ msgid "Meld does not support Python 3." -#~ msgstr "O Meld não suporta Python 3." - -#~ msgid "_Previous Tab" -#~ msgstr "Se_Parador anterior" - -#~ msgid "Activate previous tab" -#~ msgstr "Ativar separador anterior" - -#~ msgid "_Next Tab" -#~ msgstr "Separador segui_Nte" - -#~ msgid "Activate next tab" -#~ msgstr "Ativar separador seguinte" - -#~ msgid "Move current tab to left" -#~ msgstr "Mover o separador atual para a esquerda" - -#~ msgid "Move current tab to right" -#~ msgstr "Mover o separador atual para a direita" - #~ msgid "" #~ "These text encodings will be automatically used (in order) to try to " #~ "decode loaded text files." From f15ad70846bb14ffdddeb97b95e9ceb87223368d Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sat, 27 Aug 2016 07:45:08 +1000 Subject: [PATCH 0016/1316] patchdialog: Fix patch creation for missing newline (bgo#770336) The patch formatted by our patch dialog ends up weirdly joining together the two parts of a changed chunk if the left hand side of the chunk doesn't end in a newline. This will only be the case if the chunk in question covers the last line of a file, and the file doesn't end in a newline. The workaround here is more annoying than it should have to be, because Python doesn't expose what it considers to be a newline character anywhere. --- meld/patchdialog.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/meld/patchdialog.py b/meld/patchdialog.py index d42fadae..5f513ee0 100644 --- a/meld/patchdialog.py +++ b/meld/patchdialog.py @@ -85,6 +85,17 @@ def update_patch(self): start, end = b.get_bounds() text = b.get_text(start, end, False) lines = text.splitlines(True) + + # Ensure that the last line ends in a newline + barelines = text.splitlines(False) + if barelines and lines and barelines[-1] == lines[-1]: + # Final line lacks a line-break; add in a best guess + if len(lines) > 1: + previous_linebreak = lines[-2][len(barelines[-2]):] + else: + previous_linebreak = "\n" + lines[-1] += previous_linebreak + texts.append(lines) names = [self.filediff.textbuffer[i].data.label for i in range(3)] From 638ffd36e7acc2b07c39e7aa7db62e03d7485860 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 31 Jul 2016 08:01:47 +1000 Subject: [PATCH 0017/1316] filediff: Clean up pending-line-removal variable use --- meld/filediff.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/meld/filediff.py b/meld/filediff.py index f1888f81..89daf41d 100644 --- a/meld/filediff.py +++ b/meld/filediff.py @@ -176,7 +176,7 @@ def __init__(self, num_panes): self.warned_bad_comparison = False self._keymask = 0 self.meta = {} - self.deleted_lines_pending = -1 + self.lines_removed = 0 self.textview_overwrite = 0 self.focus_pane = None self.textview_overwrite_handlers = [ t.connect("toggle-overwrite", self.on_textview_toggle_overwrite) for t in self.textview ] @@ -795,12 +795,10 @@ def after_text_insert_text(self, buf, it, newtext, textlen): lines_added = it.get_line() - starting_at self._after_text_modified(buf, starting_at, lines_added) - def after_text_delete_range(self, buffer, it0, it1): + def after_text_delete_range(self, buf, it0, it1): starting_at = it0.get_line() - assert self.deleted_lines_pending != -1 - self._after_text_modified(buffer, starting_at, -self.deleted_lines_pending) - self.deleted_lines_pending = -1 - + self._after_text_modified(buf, starting_at, -self.lines_removed) + self.lines_removed = 0 def check_save_modified(self): response = Gtk.ResponseType.OK @@ -893,8 +891,7 @@ def on_text_insert_text(self, buf, it, text, textlen): def on_text_delete_range(self, buf, it0, it1): text = buf.get_text(it0, it1, False) - assert self.deleted_lines_pending == -1 - self.deleted_lines_pending = it1.get_line() - it0.get_line() + self.lines_removed = it1.get_line() - it0.get_line() self.undosequence.add_action( meldbuffer.BufferDeletionAction(buf, it0.get_offset(), text)) From 354979a49691d54190dc856b7a1d9f4f4cfe1f61 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 31 Jul 2016 08:03:45 +1000 Subject: [PATCH 0018/1316] filediff: Stop using buffer builtin name --- meld/filediff.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meld/filediff.py b/meld/filediff.py index 89daf41d..20ad86d6 100644 --- a/meld/filediff.py +++ b/meld/filediff.py @@ -748,9 +748,9 @@ def on_textview_focus_out_event(self, view, event): self._set_merge_action_sensitivity() self._set_external_action_sensitivity() - def _after_text_modified(self, buffer, startline, sizechange): + def _after_text_modified(self, buf, startline, sizechange): if self.num_panes > 1: - pane = self.textbuffer.index(buffer) + pane = self.textbuffer.index(buf) if not self.linediffer.syncpoints: self.linediffer.change_sequence(pane, startline, sizechange, self.buffer_filtered) From 831cce89e90ac6120422fd209ce1fdb1c88d0a71 Mon Sep 17 00:00:00 2001 From: Daniel Mustieles Date: Mon, 29 Aug 2016 12:25:06 +0000 Subject: [PATCH 0019/1316] Updated Spanish translation (cherry picked from commit 2318d9ffaede0da18e6c7b9b6c866be9c6bd43ce) --- po/es.po | 203 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 102 insertions(+), 101 deletions(-) diff --git a/po/es.po b/po/es.po index 89607b1a..fcb8bcf2 100644 --- a/po/es.po +++ b/po/es.po @@ -15,8 +15,8 @@ msgstr "" "Project-Id-Version: meld.master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=meld&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-03-16 13:30+0000\n" -"PO-Revision-Date: 2016-03-17 10:01+0100\n" +"POT-Creation-Date: 2016-08-20 21:39+0000\n" +"PO-Revision-Date: 2016-08-29 14:20+0200\n" "Last-Translator: Daniel Mustieles \n" "Language-Team: Español; Castellano \n" "Language: es\n" @@ -91,6 +91,10 @@ msgstr "" "Meld le ayuda a revisar cambios en el código, entender parches y resolver " "problemas de mezcla de archivos de manera sencilla." +#: ../data/meld.appdata.xml.in.h:5 +msgid "The GNOME Project" +msgstr "El proyecto GNOME" + #: ../data/mime/meld.xml.in.h:1 msgid "Meld comparison description" msgstr "Descripción de la comparación de Meld" @@ -579,7 +583,7 @@ msgstr "Copiar a la derecha" msgid "Delete selected" msgstr "Eliminar seleccionados" -#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:859 ../meld/filediff.py:1363 +#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:860 ../meld/filediff.py:1368 msgid "Hide" msgstr "Ocultar" @@ -648,7 +652,7 @@ msgid "_Add" msgstr "_Añadir" #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11 -#: ../meld/vcview.py:649 +#: ../meld/vcview.py:655 msgid "_Remove" msgstr "_Eliminar" @@ -670,7 +674,7 @@ msgstr "_Bajar" #. Create icon and filename CellRenderer #: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35 -#: ../meld/dirdiff.py:373 +#: ../meld/dirdiff.py:374 msgid "Name" msgstr "Nombre" @@ -873,8 +877,8 @@ msgstr "Los cambios se perderán permanentemente si no los guarda." msgid "Close _without Saving" msgstr "Cerrar _sin guardar" -#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:941 ../meld/filediff.py:1429 -#: ../meld/filediff.py:1497 +#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:942 ../meld/filediff.py:1434 +#: ../meld/filediff.py:1502 msgid "_Cancel" msgstr "_Cancelar" @@ -913,7 +917,7 @@ msgstr "" "Los cambios realizados a los siguientes documentos se perderán para " "siempre:\n" -#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:942 ../meld/filediff.py:1430 +#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:943 ../meld/filediff.py:1435 msgid "_Replace" msgstr "_Reemplazar" @@ -1609,7 +1613,7 @@ msgstr "Registros anteriores:" msgid "Co_mmit" msgstr "E_fectuar" -#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:337 +#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:343 msgid "Location" msgstr "Lugar" @@ -1651,44 +1655,44 @@ msgid "Mac OS (CR)" msgstr "Mac OS (CR)" #. Create file size CellRenderer -#: ../meld/dirdiff.py:391 ../meld/preferences.py:82 +#: ../meld/dirdiff.py:392 ../meld/preferences.py:82 msgid "Size" msgstr "Tamaño" #. Create date-time CellRenderer -#: ../meld/dirdiff.py:399 ../meld/preferences.py:83 +#: ../meld/dirdiff.py:400 ../meld/preferences.py:83 msgid "Modification time" msgstr "Hora de modificación" #. Create permissions CellRenderer -#: ../meld/dirdiff.py:407 ../meld/preferences.py:84 +#: ../meld/dirdiff.py:408 ../meld/preferences.py:84 msgid "Permissions" msgstr "Permisos" -#: ../meld/dirdiff.py:537 +#: ../meld/dirdiff.py:538 #, python-format msgid "Hide %s" msgstr "Ocultar %s" -#: ../meld/dirdiff.py:669 ../meld/dirdiff.py:693 +#: ../meld/dirdiff.py:670 ../meld/dirdiff.py:694 #, python-format msgid "[%s] Scanning %s" msgstr "[%s] Buscando %s" -#: ../meld/dirdiff.py:826 +#: ../meld/dirdiff.py:827 #, python-format msgid "[%s] Done" msgstr "[%s] Hecho" -#: ../meld/dirdiff.py:834 +#: ../meld/dirdiff.py:835 msgid "Folders have no differences" msgstr "No hay diferencias entre las carpetas" -#: ../meld/dirdiff.py:836 +#: ../meld/dirdiff.py:837 msgid "Contents of scanned files in folders are identical." msgstr "El contenido de los archivos analizados en carpetas es idéntico." -#: ../meld/dirdiff.py:838 +#: ../meld/dirdiff.py:839 msgid "" "Scanned files in folders appear identical, but contents have not been " "scanned." @@ -1696,45 +1700,45 @@ msgstr "" "Los archivos analizados en las carpetas parecen idénticos, pero no se ha " "analizado el contenido." -#: ../meld/dirdiff.py:841 +#: ../meld/dirdiff.py:842 msgid "File filters are in use, so not all files have been scanned." msgstr "" "Se están usando filtros de archivos, por lo que no se han analizado todos " "los archivos." -#: ../meld/dirdiff.py:843 +#: ../meld/dirdiff.py:844 msgid "Text filters are in use and may be masking content differences." msgstr "" "Se están usando filtros de texto, y pueden estar ocultando diferencias entre " "archivos." -#: ../meld/dirdiff.py:861 ../meld/filediff.py:1365 ../meld/filediff.py:1395 -#: ../meld/filediff.py:1397 ../meld/ui/msgarea.py:109 +#: ../meld/dirdiff.py:862 ../meld/filediff.py:1370 ../meld/filediff.py:1400 +#: ../meld/filediff.py:1402 ../meld/ui/msgarea.py:109 #: ../meld/ui/msgarea.py:122 msgid "Hi_de" msgstr "_Ocultar" -#: ../meld/dirdiff.py:871 +#: ../meld/dirdiff.py:872 msgid "Multiple errors occurred while scanning this folder" msgstr "Ocurrieron varios errores al escanear esta carpeta" -#: ../meld/dirdiff.py:872 +#: ../meld/dirdiff.py:873 msgid "Files with invalid encodings found" msgstr "Se encontraron archivos con codificaciones no válidas" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:874 +#: ../meld/dirdiff.py:875 msgid "Some files were in an incorrect encoding. The names are something like:" msgstr "" "Algunos archivos tienen una codificación incorrecta. Los nombres son como " "esto:" -#: ../meld/dirdiff.py:876 +#: ../meld/dirdiff.py:877 msgid "Files hidden by case insensitive comparison" msgstr "Archivos ocultos por una comparación no sensible a capitalización" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:878 +#: ../meld/dirdiff.py:879 msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. The following files in this folder are hidden:" @@ -1743,17 +1747,17 @@ msgstr "" "sensible a capitalización. Los siguientes archivos de esta carpeta archivos " "están ocultos:" -#: ../meld/dirdiff.py:889 +#: ../meld/dirdiff.py:890 #, python-format msgid "'%s' hidden by '%s'" msgstr "«%s» oculto por «%s»" -#: ../meld/dirdiff.py:945 +#: ../meld/dirdiff.py:946 #, python-format msgid "Replace folder “%s”?" msgstr "¿Reemplazar la carpeta «%s»?" -#: ../meld/dirdiff.py:947 +#: ../meld/dirdiff.py:948 #, python-format msgid "" "Another folder with the same name already exists in “%s”.\n" @@ -1762,11 +1766,11 @@ msgstr "" "Ya existe otra carpeta con el mismo nombre en «%s».\n" "Si reemplaza la carpeta existente, se perderán todos sus archivos." -#: ../meld/dirdiff.py:960 +#: ../meld/dirdiff.py:961 msgid "Error copying file" msgstr "Error al copiar el archivo" -#: ../meld/dirdiff.py:961 +#: ../meld/dirdiff.py:962 #, python-format msgid "" "Couldn't copy %s\n" @@ -1779,38 +1783,35 @@ msgstr "" "\n" "%s" -#: ../meld/dirdiff.py:984 +#: ../meld/dirdiff.py:985 #, python-format msgid "Error deleting %s" msgstr "Error al eliminar %s" -#: ../meld/dirdiff.py:1489 +#: ../meld/dirdiff.py:1492 msgid "No folder" msgstr "No hay ninguna carpeta" #. Abbreviations for insert and overwrite that fit in the status bar -#: ../meld/filediff.py:359 +#: ../meld/filediff.py:357 msgid "INS" msgstr "INS" -#: ../meld/filediff.py:359 +#: ../meld/filediff.py:357 msgid "OVR" msgstr "SOB" #. Abbreviation for line, column so that it will fit in the status bar -#: ../meld/filediff.py:361 +#: ../meld/filediff.py:359 #, python-format msgid "Ln %i, Col %i" msgstr "Lín %i, Col %i" -#: ../meld/filediff.py:776 +#: ../meld/filediff.py:771 msgid "Comparison results will be inaccurate" msgstr "Los resultados de la comparación pueden no ser precisos" -#: ../meld/filediff.py:778 -#| msgid "" -#| "Filter “%s” changed the number of lines in the file, which is " -#| "unsupported. The comparison will not be accurate." +#: ../meld/filediff.py:773 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1818,65 +1819,65 @@ msgstr "" "Un filtro cambia el número de líneas en el archivo, lo que no está " "soportado. La comparación no será exacta." -#: ../meld/filediff.py:836 +#: ../meld/filediff.py:831 msgid "Mark conflict as resolved?" msgstr "¿Marcar conflicto como resuelto?" -#: ../meld/filediff.py:838 +#: ../meld/filediff.py:833 msgid "" "If the conflict was resolved successfully, you may mark it as resolved now." msgstr "" "Si el conflicto se ha resuelto con éxito, debe marcarlo como resuelto ahora." -#: ../meld/filediff.py:840 +#: ../meld/filediff.py:835 msgid "Cancel" msgstr "Cancelar" -#: ../meld/filediff.py:841 +#: ../meld/filediff.py:836 msgid "Mark _Resolved" msgstr "Mar_car como resuelto" -#: ../meld/filediff.py:1081 +#: ../meld/filediff.py:1086 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Ha habido un problema al abrir el archivo «%s»." -#: ../meld/filediff.py:1089 +#: ../meld/filediff.py:1094 #, python-format msgid "File %s appears to be a binary file." msgstr "El archivo %s parece ser un archivo binario." -#: ../meld/filediff.py:1091 +#: ../meld/filediff.py:1096 msgid "Do you want to open the file using the default application?" msgstr "¿Quiere abrir el archivo usando la aplicación predeterminada?" -#: ../meld/filediff.py:1093 +#: ../meld/filediff.py:1098 msgid "Open" msgstr "Abrir" -#: ../meld/filediff.py:1109 +#: ../meld/filediff.py:1114 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Calculando las diferencias" -#: ../meld/filediff.py:1174 +#: ../meld/filediff.py:1179 #, python-format msgid "File %s has changed on disk" msgstr "El archivo %s ha cambiado en el disco" -#: ../meld/filediff.py:1175 +#: ../meld/filediff.py:1180 msgid "Do you want to reload the file?" msgstr "¿Quiere recargar el archivo?" -#: ../meld/filediff.py:1177 +#: ../meld/filediff.py:1182 msgid "_Reload" msgstr "_Recargar" -#: ../meld/filediff.py:1328 +#: ../meld/filediff.py:1333 msgid "Files are identical" msgstr "Los campos son idénticos" -#: ../meld/filediff.py:1341 +#: ../meld/filediff.py:1346 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1884,11 +1885,11 @@ msgstr "" "Se están usando filtros de texto, y pueden estar ocultando diferencias entre " "archivos. ¿Quiere comprar los archivos no filtrados?" -#: ../meld/filediff.py:1346 +#: ../meld/filediff.py:1351 msgid "Files differ in line endings only" msgstr "Los archivos difieren en los finales de línea" -#: ../meld/filediff.py:1348 +#: ../meld/filediff.py:1353 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1897,15 +1898,15 @@ msgstr "" "Los archivos son idénticos excepto por los finales de línea:\n" "%s" -#: ../meld/filediff.py:1368 +#: ../meld/filediff.py:1373 msgid "Show without filters" msgstr "Mostrar sin filtros" -#: ../meld/filediff.py:1390 +#: ../meld/filediff.py:1395 msgid "Change highlighting incomplete" msgstr "Cambiar el resaltado incompleto" -#: ../meld/filediff.py:1391 +#: ../meld/filediff.py:1396 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." @@ -1914,20 +1915,20 @@ msgstr "" "forzar a Meld para que resalte los cambios largos, aunque esto haga que sea " "más lento." -#: ../meld/filediff.py:1399 +#: ../meld/filediff.py:1404 msgid "Keep highlighting" msgstr "Mantener el resaltado" -#: ../meld/filediff.py:1401 +#: ../meld/filediff.py:1406 msgid "_Keep highlighting" msgstr "_Mantener el resaltado" -#: ../meld/filediff.py:1433 +#: ../meld/filediff.py:1438 #, python-format msgid "Replace file “%s”?" msgstr "¿Reemplazar el archivo «%s»?" -#: ../meld/filediff.py:1435 +#: ../meld/filediff.py:1440 #, python-format msgid "" "A file with this name already exists in “%s”.\n" @@ -1936,45 +1937,45 @@ msgstr "" "Ya existe un archivo con el mismo nombre en «%s».\n" "Si reemplaza el archivo existente, se perderá su contenido." -#: ../meld/filediff.py:1452 +#: ../meld/filediff.py:1457 msgid "Save Left Pane As" msgstr "Guardar panel izquierdo como" -#: ../meld/filediff.py:1454 +#: ../meld/filediff.py:1459 msgid "Save Middle Pane As" msgstr "Guardar el panel central como" -#: ../meld/filediff.py:1456 +#: ../meld/filediff.py:1461 msgid "Save Right Pane As" msgstr "Guardar el panel derecho como" -#: ../meld/filediff.py:1470 +#: ../meld/filediff.py:1475 #, python-format msgid "File %s has changed on disk since it was opened" msgstr "El archivo %s ha cambiado en el disco desde que se abrió" -#: ../meld/filediff.py:1472 +#: ../meld/filediff.py:1477 msgid "If you save it, any external changes will be lost." msgstr "Si lo guarda, los cambios externos se perderán." -#: ../meld/filediff.py:1475 +#: ../meld/filediff.py:1480 msgid "Save Anyway" msgstr "Guardar de todas formas" -#: ../meld/filediff.py:1476 +#: ../meld/filediff.py:1481 msgid "Don't Save" msgstr "No guardar" -#: ../meld/filediff.py:1498 +#: ../meld/filediff.py:1503 msgid "_Save as UTF-8" msgstr "_Guardar como UTF-8" -#: ../meld/filediff.py:1501 +#: ../meld/filediff.py:1506 #, python-format msgid "Couldn't encode text as “%s”" msgstr "No se pudo codificar el texto como «%s»" -#: ../meld/filediff.py:1503 +#: ../meld/filediff.py:1508 #, python-format msgid "" "File “%s” contains characters that can't be encoded using encoding “%s”.\n" @@ -1983,12 +1984,12 @@ msgstr "" "El archivo «%s» contiene caracteres no codificables con «%s».\n" "¿Quiere guardarlos como UTF-8?" -#: ../meld/filediff.py:1540 ../meld/patchdialog.py:125 +#: ../meld/filediff.py:1545 ../meld/patchdialog.py:125 #, python-format msgid "Could not save file %s." msgstr "No se pudo guardar el archivo %s." -#: ../meld/filediff.py:1541 ../meld/patchdialog.py:126 +#: ../meld/filediff.py:1546 ../meld/patchdialog.py:126 #, python-format msgid "" "Couldn't save file due to:\n" @@ -1997,11 +1998,11 @@ msgstr "" "No se pudo guardar el archivo debido a:\n" "%s" -#: ../meld/filediff.py:1887 +#: ../meld/filediff.py:1892 msgid "Live comparison updating disabled" msgstr "Actualización de la comparación en directo desactivada" -#: ../meld/filediff.py:1888 +#: ../meld/filediff.py:1893 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -2119,7 +2120,7 @@ msgid "invalid path or URI \"%s\"" msgstr "ruta u URI «%s» no válido" #. TRANSLATORS: This is the label of a new, currently-unnamed file. -#: ../meld/meldbuffer.py:127 +#: ../meld/meldbuffer.py:132 msgid "" msgstr "" @@ -2362,7 +2363,7 @@ msgstr "Se necesita tres archivos para la mezcla automática, se obtuvieron: %r" msgid "Cannot compare a mixture of files and directories" msgstr "No se puede comparar una mezcla de archivos y carpetas" -#: ../meld/misc.py:179 +#: ../meld/misc.py:203 #, python-format msgid "Couldn't find colour scheme details for %s-%s; this is a bad install" msgstr "" @@ -2370,7 +2371,7 @@ msgstr "" "una instalación incorrecta" #. no common path. empty names get changed to "[None]" -#: ../meld/misc.py:264 +#: ../meld/misc.py:288 msgid "[None]" msgstr "[Ninguno]" @@ -2491,87 +2492,87 @@ msgstr "No presente" #. Translators: This error message is shown when a version #. control binary isn't installed. -#: ../meld/vcview.py:255 +#: ../meld/vcview.py:261 #, python-format msgid "%(name)s (%(cmd)s not installed)" msgstr "%(name)s (%(cmd)s no está instalado)" #. Translators: This error message is shown when a version #. controlled repository is invalid. -#: ../meld/vcview.py:259 +#: ../meld/vcview.py:265 #, python-format msgid "%(name)s (Invalid repository)" msgstr "%(name)s (Repositorio no válido)" -#: ../meld/vcview.py:280 +#: ../meld/vcview.py:286 msgid "No valid version control system found in this folder" msgstr "" "No se ha encontrado un sistema de control de versiones válido en esta carpeta" -#: ../meld/vcview.py:282 +#: ../meld/vcview.py:288 msgid "Only one version control system found in this folder" msgstr "" "Sólo se ha encontrado un sistema de control de versiones en esta carpeta" -#: ../meld/vcview.py:284 +#: ../meld/vcview.py:290 msgid "Choose which version control system to use" msgstr "Elegir qué sistema de control de versiones usar" #. TRANSLATORS: This is the location of the directory being viewed -#: ../meld/vcview.py:337 +#: ../meld/vcview.py:343 #, python-format msgid "%s: %s" msgstr "%s: %s" -#: ../meld/vcview.py:357 +#: ../meld/vcview.py:363 #, python-format msgid "Scanning %s" msgstr "Analizando %s" -#: ../meld/vcview.py:396 +#: ../meld/vcview.py:402 msgid "(Empty)" msgstr "(Vacío)" -#: ../meld/vcview.py:440 +#: ../meld/vcview.py:446 #, python-format msgid "%s — local" msgstr "%s — local" -#: ../meld/vcview.py:441 +#: ../meld/vcview.py:447 #, python-format msgid "%s — remote" msgstr "%s — remoto" -#: ../meld/vcview.py:449 +#: ../meld/vcview.py:455 #, python-format msgid "%s (local, merge, remote)" msgstr "%s (local, mezcla, remoto)" -#: ../meld/vcview.py:454 +#: ../meld/vcview.py:460 #, python-format msgid "%s (remote, merge, local)" msgstr "%s (remoto, mezcla, local)" -#: ../meld/vcview.py:465 +#: ../meld/vcview.py:471 #, python-format msgid "%s — repository" msgstr "%s — repositorio" -#: ../meld/vcview.py:471 +#: ../meld/vcview.py:477 #, python-format msgid "%s (working, repository)" msgstr "%s (funcionando, repositorio)" -#: ../meld/vcview.py:475 +#: ../meld/vcview.py:481 #, python-format msgid "%s (repository, working)" msgstr "%s (repositorio, funcionando)" -#: ../meld/vcview.py:643 +#: ../meld/vcview.py:649 msgid "Remove folder and all its files?" msgstr "¿Quitar la carpeta y todos sus archivos?" -#: ../meld/vcview.py:645 +#: ../meld/vcview.py:651 msgid "" "This will remove all selected files and folders, and all files within any " "selected folders, from version control." @@ -2579,12 +2580,12 @@ msgstr "" "Esto quitará todos los archivos y carpetas seleccionadas, y todos los " "archivos de las carpetas seleccionadas, del control de versiones." -#: ../meld/vcview.py:670 +#: ../meld/vcview.py:676 #, python-format msgid "Error removing %s" msgstr "Error al quitar %s" -#: ../meld/vcview.py:750 +#: ../meld/vcview.py:756 msgid "Clear" msgstr "Limpiar" From bfcf07b36a36164a9a3e40a9b9bab7356fcbfbe7 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Thu, 1 Sep 2016 06:02:59 +1000 Subject: [PATCH 0020/1316] README: Add xmllint to our build requirements --- README | 1 + 1 file changed, 1 insertion(+) diff --git a/README b/README index 50898431..5295dd56 100644 --- a/README +++ b/README @@ -28,6 +28,7 @@ Build requirements * intltool * itstool +* xmllint Running From 4d2886c51a5d213e167ae68a266c9a30918ed60a Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sat, 3 Sep 2016 06:58:24 +1000 Subject: [PATCH 0021/1316] misc: Handle bytes-based filtering for folder comparisons (bgo#770715) --- meld/misc.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/meld/misc.py b/meld/misc.py index a9945c43..65d4d48e 100644 --- a/meld/misc.py +++ b/meld/misc.py @@ -482,10 +482,14 @@ def apply_text_filters(txt, regexes, apply_fn=None): """Apply text filters Text filters "regexes", resolved as regular expressions are applied - to "txt". + to "txt". "txt" may be either strings or bytes, but the supplied + regexes must match the type. "apply_fn" is a callable run for each filtered interval """ + empty_string = b"" if isinstance(txt, bytes) else "" + newline = b"\n" if isinstance(txt, bytes) else "\n" + filter_ranges = [] for r in regexes: for match in r.finditer(txt): @@ -513,8 +517,8 @@ def apply_text_filters(txt, regexes, apply_fn=None): offset = 0 result_txts = [] for (start, end) in filter_ranges: - assert txt[start:end].count("\n") == 0 + assert txt[start:end].count(newline) == 0 result_txts.append(txt[offset:start]) offset = end result_txts.append(txt[offset:]) - return "".join(result_txts) + return empty_string.join(result_txts) From 215a928ee688563bba637433c8ae91fa113e3f78 Mon Sep 17 00:00:00 2001 From: Rafael Fontenelle Date: Sat, 3 Sep 2016 13:24:00 +0000 Subject: [PATCH 0022/1316] Updated Brazilian Portuguese translation (cherry picked from commit 62f56937874492fed50d59733d80678346a5d65f) --- po/pt_BR.po | 211 ++++++++++++++++++++++++++-------------------------- 1 file changed, 106 insertions(+), 105 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 79bc5821..ba93a963 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -13,10 +13,10 @@ msgid "" msgstr "" "Project-Id-Version: meld\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=meld&k" -"eywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-03-18 01:30+0000\n" -"PO-Revision-Date: 2016-03-18 04:06-0200\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=meld&ke" +"ywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2016-08-20 21:39+0000\n" +"PO-Revision-Date: 2016-09-03 10:21-0200\n" "Last-Translator: Rafael Fontenelle \n" "Language-Team: Brazilian Portuguese \n" "Language: pt_BR\n" @@ -92,6 +92,10 @@ msgstr "" "Meld auxilia você a revisar alterações no código, entender patches e tornar " "enormes conflitos de mesclagem um pouco menos dolorosos." +#: ../data/meld.appdata.xml.in.h:5 +msgid "The GNOME Project" +msgstr "O Projeto GNOME" + #: ../data/mime/meld.xml.in.h:1 msgid "Meld comparison description" msgstr "Descrição da comparação do Meld" @@ -207,8 +211,8 @@ msgid "" "('word')." msgstr "" "Linhas nos comparações de arquivos serão quebradas de acordo com essa " -"configuração, seja nenhuma (\"none\"), seja em qualquer caractere (\"char\"), " -"seja apenas ao final das palavras (\"word\")." +"configuração, seja nenhuma (\"none\"), seja em qualquer caractere (\"char" +"\"), seja apenas ao final das palavras (\"word\")." #: ../data/org.gnome.meld.gschema.xml.h:23 msgid "Highlight current line" @@ -580,7 +584,7 @@ msgstr "Copia para a direita" msgid "Delete selected" msgstr "Exclui os selecionados" -#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:859 ../meld/filediff.py:1363 +#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:860 ../meld/filediff.py:1368 msgid "Hide" msgstr "Ocultar" @@ -647,7 +651,7 @@ msgid "_Add" msgstr "_Adicionar" #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11 -#: ../meld/vcview.py:649 +#: ../meld/vcview.py:655 msgid "_Remove" msgstr "_Remover" @@ -669,7 +673,7 @@ msgstr "Mover para _baixo" #. Create icon and filename CellRenderer #: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35 -#: ../meld/dirdiff.py:373 +#: ../meld/dirdiff.py:374 msgid "Name" msgstr "Nome" @@ -870,8 +874,8 @@ msgstr "Se você não salvar, as mudanças serão perdidas permanentemente." msgid "Close _without Saving" msgstr "_Fechar sem salvar" -#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:941 ../meld/filediff.py:1429 -#: ../meld/filediff.py:1497 +#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:942 ../meld/filediff.py:1434 +#: ../meld/filediff.py:1502 msgid "_Cancel" msgstr "_Cancelar" @@ -909,7 +913,7 @@ msgid "Changes made to the following documents will be permanently lost:\n" msgstr "" "Mudanças feitas nos seguintes documentos serão perdidas permanentemente:\n" -#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:942 ../meld/filediff.py:1430 +#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:943 ../meld/filediff.py:1435 msgid "_Replace" msgstr "_Substituir" @@ -1602,7 +1606,7 @@ msgstr "Logs anteriores:" msgid "Co_mmit" msgstr "Sub_meter" -#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:337 +#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:343 msgid "Location" msgstr "Localização" @@ -1645,44 +1649,44 @@ msgid "Mac OS (CR)" msgstr "Mac OS (CR)" #. Create file size CellRenderer -#: ../meld/dirdiff.py:391 ../meld/preferences.py:82 +#: ../meld/dirdiff.py:392 ../meld/preferences.py:82 msgid "Size" msgstr "Tamanho" #. Create date-time CellRenderer -#: ../meld/dirdiff.py:399 ../meld/preferences.py:83 +#: ../meld/dirdiff.py:400 ../meld/preferences.py:83 msgid "Modification time" msgstr "Hora da modificação" #. Create permissions CellRenderer -#: ../meld/dirdiff.py:407 ../meld/preferences.py:84 +#: ../meld/dirdiff.py:408 ../meld/preferences.py:84 msgid "Permissions" msgstr "Permissões" -#: ../meld/dirdiff.py:537 +#: ../meld/dirdiff.py:538 #, python-format msgid "Hide %s" msgstr "Ocultar %s" -#: ../meld/dirdiff.py:669 ../meld/dirdiff.py:693 +#: ../meld/dirdiff.py:670 ../meld/dirdiff.py:694 #, python-format msgid "[%s] Scanning %s" msgstr "[%s] Varrendo %s" -#: ../meld/dirdiff.py:826 +#: ../meld/dirdiff.py:827 #, python-format msgid "[%s] Done" msgstr "[%s] Concluído" -#: ../meld/dirdiff.py:834 +#: ../meld/dirdiff.py:835 msgid "Folders have no differences" msgstr "As pastas têm nenhuma diferença" -#: ../meld/dirdiff.py:836 +#: ../meld/dirdiff.py:837 msgid "Contents of scanned files in folders are identical." msgstr "Conteúdos de arquivos verificados em pastas são idênticos." -#: ../meld/dirdiff.py:838 +#: ../meld/dirdiff.py:839 msgid "" "Scanned files in folders appear identical, but contents have not been " "scanned." @@ -1690,44 +1694,44 @@ msgstr "" "Arquivos verificados em pastas parecem ser idênticos, mas conteúdos não " "foram verificados." -#: ../meld/dirdiff.py:841 +#: ../meld/dirdiff.py:842 msgid "File filters are in use, so not all files have been scanned." msgstr "" "Filtros de arquivo estão em uso, portanto nem todos os arquivos foram " "verificados." -#: ../meld/dirdiff.py:843 +#: ../meld/dirdiff.py:844 msgid "Text filters are in use and may be masking content differences." msgstr "" "Filtros de texto estão sendo usados e podem estar escondendo diferenças no " "conteúdo." -#: ../meld/dirdiff.py:861 ../meld/filediff.py:1365 ../meld/filediff.py:1395 -#: ../meld/filediff.py:1397 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 +#: ../meld/dirdiff.py:862 ../meld/filediff.py:1370 ../meld/filediff.py:1400 +#: ../meld/filediff.py:1402 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 msgid "Hi_de" msgstr "Ocu_ltar" -#: ../meld/dirdiff.py:871 +#: ../meld/dirdiff.py:872 msgid "Multiple errors occurred while scanning this folder" msgstr "Ocorreram vários erros ao varrer este diretório" -#: ../meld/dirdiff.py:872 +#: ../meld/dirdiff.py:873 msgid "Files with invalid encodings found" msgstr "Arquivos com codificações inválidas encontrados" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:874 +#: ../meld/dirdiff.py:875 msgid "Some files were in an incorrect encoding. The names are something like:" msgstr "" "Alguns arquivos estavam com uma codificação incorreta. Os nomes são algo " "como:" -#: ../meld/dirdiff.py:876 +#: ../meld/dirdiff.py:877 msgid "Files hidden by case insensitive comparison" msgstr "Arquivos ocultos pela comparação não sensível a maiusculização" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:878 +#: ../meld/dirdiff.py:879 msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. The following files in this folder are hidden:" @@ -1736,17 +1740,17 @@ msgstr "" "minúsculas em um sistema de arquivos que diferencia. Os seguintes arquivos " "neste diretório ficam ocultos:" -#: ../meld/dirdiff.py:889 +#: ../meld/dirdiff.py:890 #, python-format msgid "'%s' hidden by '%s'" msgstr "\"%s\" ocultado por \"%s\"" -#: ../meld/dirdiff.py:945 +#: ../meld/dirdiff.py:946 #, python-format msgid "Replace folder “%s”?" msgstr "Substituir pasta \"%s\"?" -#: ../meld/dirdiff.py:947 +#: ../meld/dirdiff.py:948 #, python-format msgid "" "Another folder with the same name already exists in “%s”.\n" @@ -1755,11 +1759,11 @@ msgstr "" "Uma outra pasta com o mesmo nome já existe em \"%s\".\n" "Se você substituir a pasta existente, todos os arquivos nela serão perdidos." -#: ../meld/dirdiff.py:960 +#: ../meld/dirdiff.py:961 msgid "Error copying file" msgstr "Erro ao copiar arquivo" -#: ../meld/dirdiff.py:961 +#: ../meld/dirdiff.py:962 #, python-format msgid "" "Couldn't copy %s\n" @@ -1772,38 +1776,35 @@ msgstr "" "\n" "%s" -#: ../meld/dirdiff.py:984 +#: ../meld/dirdiff.py:985 #, python-format msgid "Error deleting %s" msgstr "Erro ao excluir %s" -#: ../meld/dirdiff.py:1489 +#: ../meld/dirdiff.py:1492 msgid "No folder" msgstr "Nenhum pasta" #. Abbreviations for insert and overwrite that fit in the status bar -#: ../meld/filediff.py:359 +#: ../meld/filediff.py:357 msgid "INS" msgstr "INS" -#: ../meld/filediff.py:359 +#: ../meld/filediff.py:357 msgid "OVR" msgstr "SBR" #. Abbreviation for line, column so that it will fit in the status bar -#: ../meld/filediff.py:361 +#: ../meld/filediff.py:359 #, python-format msgid "Ln %i, Col %i" msgstr "Lin %i, Col %i" -#: ../meld/filediff.py:776 +#: ../meld/filediff.py:771 msgid "Comparison results will be inaccurate" msgstr "Resultados da comparação será imprecisa" -#: ../meld/filediff.py:778 -#| msgid "" -#| "Filter “%s” changed the number of lines in the file, which is " -#| "unsupported. The comparison will not be accurate." +#: ../meld/filediff.py:773 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1811,66 +1812,66 @@ 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:836 +#: ../meld/filediff.py:831 msgid "Mark conflict as resolved?" msgstr "Marcar como resolvido?" -#: ../meld/filediff.py:838 +#: ../meld/filediff.py:833 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:840 +#: ../meld/filediff.py:835 msgid "Cancel" msgstr "Cancelar" -#: ../meld/filediff.py:841 +#: ../meld/filediff.py:836 msgid "Mark _Resolved" msgstr "Marcar como _resolvido" -#: ../meld/filediff.py:1081 +#: ../meld/filediff.py:1086 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Ocorreu um problema ao abrir o arquivo \"%s\"." -#: ../meld/filediff.py:1089 +#: ../meld/filediff.py:1094 #, python-format msgid "File %s appears to be a binary file." msgstr "O arquivo %s parece ser um arquivo binário." -#: ../meld/filediff.py:1091 +#: ../meld/filediff.py:1096 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:1093 +#: ../meld/filediff.py:1098 msgid "Open" msgstr "Abrir" -#: ../meld/filediff.py:1109 +#: ../meld/filediff.py:1114 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Analisando diferenças" -#: ../meld/filediff.py:1174 +#: ../meld/filediff.py:1179 #, python-format msgid "File %s has changed on disk" msgstr "O arquivo %s foi alterado em disco" -#: ../meld/filediff.py:1175 +#: ../meld/filediff.py:1180 msgid "Do you want to reload the file?" msgstr "Deseja recarregar o arquivo?" -#: ../meld/filediff.py:1177 +#: ../meld/filediff.py:1182 msgid "_Reload" msgstr "_Recarregar" -#: ../meld/filediff.py:1328 +#: ../meld/filediff.py:1333 msgid "Files are identical" msgstr "Os arquivos são idênticos" -#: ../meld/filediff.py:1341 +#: ../meld/filediff.py:1346 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1878,11 +1879,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:1346 +#: ../meld/filediff.py:1351 msgid "Files differ in line endings only" msgstr "Arquivos se diferenciam nos fins de linha apenas" -#: ../meld/filediff.py:1348 +#: ../meld/filediff.py:1353 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1891,15 +1892,15 @@ msgstr "" "Arquivos são idênticos, exceto pela diferença entre fins de linha:\n" "%s" -#: ../meld/filediff.py:1368 +#: ../meld/filediff.py:1373 msgid "Show without filters" msgstr "Mostrar sem filtros" -#: ../meld/filediff.py:1390 +#: ../meld/filediff.py:1395 msgid "Change highlighting incomplete" msgstr "Alteração de destaque incompleta" -#: ../meld/filediff.py:1391 +#: ../meld/filediff.py:1396 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." @@ -1908,20 +1909,20 @@ 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:1399 +#: ../meld/filediff.py:1404 msgid "Keep highlighting" msgstr "Mantém destaque" -#: ../meld/filediff.py:1401 +#: ../meld/filediff.py:1406 msgid "_Keep highlighting" msgstr "_Manter destaque" -#: ../meld/filediff.py:1433 +#: ../meld/filediff.py:1438 #, python-format msgid "Replace file “%s”?" msgstr "Substituir arquivo \"%s\"?" -#: ../meld/filediff.py:1435 +#: ../meld/filediff.py:1440 #, python-format msgid "" "A file with this name already exists in “%s”.\n" @@ -1930,45 +1931,45 @@ msgstr "" "Um arquivo com esse nome já existe em \"%s\".\n" "Se você substituir o arquivo existente, seu conteúdo será perdido." -#: ../meld/filediff.py:1452 +#: ../meld/filediff.py:1457 msgid "Save Left Pane As" msgstr "Salvar o painel esquerdo como" -#: ../meld/filediff.py:1454 +#: ../meld/filediff.py:1459 msgid "Save Middle Pane As" msgstr "Salvar o painel do meio como" -#: ../meld/filediff.py:1456 +#: ../meld/filediff.py:1461 msgid "Save Right Pane As" msgstr "Salvar o painel direito como" -#: ../meld/filediff.py:1470 +#: ../meld/filediff.py:1475 #, 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:1472 +#: ../meld/filediff.py:1477 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:1475 +#: ../meld/filediff.py:1480 msgid "Save Anyway" msgstr "Salvar mesmo assim" -#: ../meld/filediff.py:1476 +#: ../meld/filediff.py:1481 msgid "Don't Save" msgstr "Não salvar" -#: ../meld/filediff.py:1498 +#: ../meld/filediff.py:1503 msgid "_Save as UTF-8" msgstr "_Salvar como UTF-8" -#: ../meld/filediff.py:1501 +#: ../meld/filediff.py:1506 #, python-format msgid "Couldn't encode text as “%s”" msgstr "Não foi possível codificar o texto como \"%s\"" -#: ../meld/filediff.py:1503 +#: ../meld/filediff.py:1508 #, python-format msgid "" "File “%s” contains characters that can't be encoded using encoding “%s”.\n" @@ -1978,12 +1979,12 @@ msgstr "" "codificação \"%s\"\n" "Você gostaria de salvar como UTF-8?" -#: ../meld/filediff.py:1540 ../meld/patchdialog.py:125 +#: ../meld/filediff.py:1545 ../meld/patchdialog.py:125 #, python-format msgid "Could not save file %s." msgstr "Não foi possível salvar o arquivo %s." -#: ../meld/filediff.py:1541 ../meld/patchdialog.py:126 +#: ../meld/filediff.py:1546 ../meld/patchdialog.py:126 #, python-format msgid "" "Couldn't save file due to:\n" @@ -1992,11 +1993,11 @@ msgstr "" "Não foi possível salvar o arquivo pois:\n" "%s" -#: ../meld/filediff.py:1887 +#: ../meld/filediff.py:1892 msgid "Live comparison updating disabled" msgstr "Atualização em tempo real de comparação desabilitada" -#: ../meld/filediff.py:1888 +#: ../meld/filediff.py:1893 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -2112,7 +2113,7 @@ msgid "invalid path or URI \"%s\"" msgstr "caminho inválido ou URI \"%s\"" #. TRANSLATORS: This is the label of a new, currently-unnamed file. -#: ../meld/meldbuffer.py:127 +#: ../meld/meldbuffer.py:132 msgid "" msgstr "" @@ -2355,7 +2356,7 @@ msgstr "" msgid "Cannot compare a mixture of files and directories" msgstr "Não foi possível comparar uma mistura de arquivos e diretórios" -#: ../meld/misc.py:179 +#: ../meld/misc.py:203 #, python-format msgid "Couldn't find colour scheme details for %s-%s; this is a bad install" msgstr "" @@ -2363,7 +2364,7 @@ msgstr "" "uma instalação ruim" #. no common path. empty names get changed to "[None]" -#: ../meld/misc.py:264 +#: ../meld/misc.py:288 msgid "[None]" msgstr "[Nenhum]" @@ -2484,85 +2485,85 @@ msgstr "Não presente" #. Translators: This error message is shown when a version #. control binary isn't installed. -#: ../meld/vcview.py:255 +#: ../meld/vcview.py:261 #, python-format msgid "%(name)s (%(cmd)s not installed)" msgstr "%(name)s (%(cmd)s não instalado)" #. Translators: This error message is shown when a version #. controlled repository is invalid. -#: ../meld/vcview.py:259 +#: ../meld/vcview.py:265 #, python-format msgid "%(name)s (Invalid repository)" msgstr "%(name)s (Repositório inválido)" -#: ../meld/vcview.py:280 +#: ../meld/vcview.py:286 msgid "No valid version control system found in this folder" msgstr "Nenhum sistema de controle de versão válido localizado nesta pasta" -#: ../meld/vcview.py:282 +#: ../meld/vcview.py:288 msgid "Only one version control system found in this folder" msgstr "Apenas um sistema de controle de versão foi localizado nesta pasta" -#: ../meld/vcview.py:284 +#: ../meld/vcview.py:290 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:337 +#: ../meld/vcview.py:343 #, python-format msgid "%s: %s" msgstr "%s: %s" -#: ../meld/vcview.py:357 +#: ../meld/vcview.py:363 #, python-format msgid "Scanning %s" msgstr "Varrendo %s" -#: ../meld/vcview.py:396 +#: ../meld/vcview.py:402 msgid "(Empty)" msgstr "(Vazio)" -#: ../meld/vcview.py:440 +#: ../meld/vcview.py:446 #, python-format msgid "%s — local" msgstr "%s — local" -#: ../meld/vcview.py:441 +#: ../meld/vcview.py:447 #, python-format msgid "%s — remote" msgstr "%s — remoto" -#: ../meld/vcview.py:449 +#: ../meld/vcview.py:455 #, python-format msgid "%s (local, merge, remote)" msgstr "%s (local, mesclagem, remoto)" -#: ../meld/vcview.py:454 +#: ../meld/vcview.py:460 #, python-format msgid "%s (remote, merge, local)" msgstr "%s (remoto, mesclagem, local)" -#: ../meld/vcview.py:465 +#: ../meld/vcview.py:471 #, python-format msgid "%s — repository" msgstr "%s — repositório" -#: ../meld/vcview.py:471 +#: ../meld/vcview.py:477 #, python-format msgid "%s (working, repository)" msgstr "%s (em trabalho, repositório)" -#: ../meld/vcview.py:475 +#: ../meld/vcview.py:481 #, python-format msgid "%s (repository, working)" msgstr "%s (repositório, em trabalho)" -#: ../meld/vcview.py:643 +#: ../meld/vcview.py:649 msgid "Remove folder and all its files?" msgstr "Remover pasta e todos seus arquivos?" -#: ../meld/vcview.py:645 +#: ../meld/vcview.py:651 msgid "" "This will remove all selected files and folders, and all files within any " "selected folders, from version control." @@ -2570,12 +2571,12 @@ 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:670 +#: ../meld/vcview.py:676 #, python-format msgid "Error removing %s" msgstr "Erro ao remover %s" -#: ../meld/vcview.py:750 +#: ../meld/vcview.py:756 msgid "Clear" msgstr "Limpar" From 8309833a24643ab8a3cfca0b4ffa4eaaff83bd3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jiri=20Gr=C3=B6nroos?= Date: Sun, 4 Sep 2016 13:52:47 +0000 Subject: [PATCH 0023/1316] Updated Finnish translation --- po/fi.po | 529 +++++++++++++++++++++++++------------------------------ 1 file changed, 244 insertions(+), 285 deletions(-) diff --git a/po/fi.po b/po/fi.po index 5ec8dfcf..2a7e06d6 100644 --- a/po/fi.po +++ b/po/fi.po @@ -11,10 +11,10 @@ msgstr "" "Project-Id-Version: meld\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=meld&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-03-13 13:31+0000\n" -"PO-Revision-Date: 2016-03-13 19:32+0200\n" +"POT-Creation-Date: 2016-08-20 21:39+0000\n" +"PO-Revision-Date: 2016-09-04 16:50+0300\n" "Last-Translator: Jiri Grönroos \n" -"Language-Team: suomi \n" +"Language-Team: suomi \n" "Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,25 +22,23 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Gtranslator 2.91.7\n" -#: ../bin/meld:144 +#: ../bin/meld:142 msgid "Cannot import: " msgstr "Tuonti ei onnistu: " -#: ../bin/meld:147 +#: ../bin/meld:145 #, c-format msgid "Meld requires %s or higher." msgstr "Meld vaatii version %s tai uudemman." -#: ../bin/meld:151 -msgid "Meld does not support Python 3." -msgstr "Meld ei tue Python 3:a." - -#: ../bin/meld:200 +#: ../bin/meld:194 #, c-format msgid "" "Couldn't load Meld-specific CSS (%s)\n" "%s" msgstr "" +"Meld-ominaisen CSS:n lataus ei onnistunut (%s)\n" +"%s" #: ../data/meld.desktop.in.h:1 ../data/meld.appdata.xml.in.h:1 #: ../data/ui/meldapp.ui.h:1 @@ -62,7 +60,7 @@ msgstr "Vertaa ja yhdistä tiedostoja" #. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! #: ../data/meld.desktop.in.h:6 msgid "diff;merge;" -msgstr "" +msgstr "diff;merge;yhdistäminen;" #: ../data/meld.appdata.xml.in.h:3 msgid "" @@ -86,6 +84,10 @@ msgstr "" "Meld helpottaa tarkastelemaan koodimuutoksia ja ymmärtämään paikkatiedostoja " "samalla helpottaen mahdollisia suuria yhdistämiseen liittyviä ristiriitoja." +#: ../data/meld.appdata.xml.in.h:5 +msgid "The GNOME Project" +msgstr "Gnome-projekti" + #: ../data/mime/meld.xml.in.h:1 msgid "Meld comparison description" msgstr "Meld-vertailun kuvaus" @@ -513,7 +515,7 @@ msgstr "Kopioi oikealle" msgid "Delete selected" msgstr "Poista valittu" -#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:858 ../meld/filediff.py:1381 +#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:859 ../meld/filediff.py:1384 msgid "Hide" msgstr "Piilota" @@ -549,7 +551,7 @@ msgstr "Uusi" msgid "Show new" msgstr "Näytä uudet" -#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:74 +#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:76 msgid "Modified" msgstr "Muokattu" @@ -582,7 +584,7 @@ msgid "_Add" msgstr "_Lisää" #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11 -#: ../meld/vcview.py:649 +#: ../meld/vcview.py:644 msgid "_Remove" msgstr "_Poista" @@ -604,7 +606,7 @@ msgstr "Siirrä _alas" #. Create icon and filename CellRenderer #: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35 -#: ../meld/dirdiff.py:372 +#: ../meld/dirdiff.py:373 msgid "Name" msgstr "Nimi" @@ -833,8 +835,8 @@ msgstr "Jos et tallenna, muutokset häviävät pysyvästi." msgid "Close _without Saving" msgstr "Sulje _tallentamatta" -#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:940 ../meld/filediff.py:1447 -#: ../meld/filediff.py:1515 +#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:941 ../meld/filediff.py:1450 +#: ../meld/filediff.py:1518 msgid "_Cancel" msgstr "_Peru" @@ -871,7 +873,7 @@ msgstr "Perutaanko tallentamattomat muutokset asiakirjoihin?" msgid "Changes made to the following documents will be permanently lost:\n" msgstr "Seuraaviin asiakirjoihin tehdyt muutokset häviävät pysyvästi:\n" -#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:941 ../meld/filediff.py:1448 +#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:942 ../meld/filediff.py:1451 msgid "_Replace" msgstr "_Korvaa" @@ -919,12 +921,11 @@ msgstr "Muotoile paikkatiedostoksi" msgid "Copy to Clipboard" msgstr "Kopioi leikepöydälle" -#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:149 +#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:144 msgid "Save Patch" msgstr "Tallenna paikkatiedosto" #: ../data/ui/patch-dialog.ui.h:4 -#| msgid "No differences found." msgid "Use differences between:" msgstr "Käytä eroja:" @@ -1110,7 +1111,7 @@ msgstr "" "suoritettaessa hakemistojen vertailuja. Kukin malli on lista komentorivin " "tapaisia jokerimerkkejä erotettuna välilyönneillä." -#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:104 +#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:103 msgid "File Filters" msgstr "Tiedostosuodattimet" @@ -1150,97 +1151,81 @@ msgid "General" msgstr "Yleiset" #: ../data/ui/shortcuts.ui.h:2 -#| msgid "New comparison" msgctxt "shortcut window" msgid "New comparison" msgstr "Uusi vertailu" #: ../data/ui/shortcuts.ui.h:3 -#| msgid "File comparison" msgctxt "shortcut window" msgid "Close a comparison" msgstr "Sulje vertailu" #: ../data/ui/shortcuts.ui.h:4 -#| msgid "About Meld" msgctxt "shortcut window" msgid "Quit Meld" msgstr "Lopeta Meld" #: ../data/ui/shortcuts.ui.h:5 -#| msgid "Stop the current action" msgctxt "shortcut window" msgid "Stop the current action" msgstr "Pysäytä nykyinen toiminto" #: ../data/ui/shortcuts.ui.h:6 -#| msgid "New comparison" msgctxt "shortcut window" msgid "Refresh comparison" msgstr "Päivitä vertailu" #: ../data/ui/shortcuts.ui.h:7 -#| msgid "Fullscreen" msgctxt "shortcut window" msgid "Fullscreen" msgstr "Koko näyttö" #: ../data/ui/shortcuts.ui.h:8 -#| msgid "_Tabs" msgctxt "shortcut window" msgid "Tabs" msgstr "Välilehdet" #: ../data/ui/shortcuts.ui.h:9 -#| msgid "Go to the previous change" msgctxt "shortcut window" msgid "Go to previous tab" msgstr "Siirry edelliseen välilehteen" #: ../data/ui/shortcuts.ui.h:10 -#| msgid "Go to the next change" msgctxt "shortcut window" msgid "Go to next tab" msgstr "Siirry seuraavaan välilehteen" #: ../data/ui/shortcuts.ui.h:11 -#| msgid "Switch to this tab" msgctxt "shortcut window" msgid "Switch to tab" msgstr "Vaihda välilehteen" #: ../data/ui/shortcuts.ui.h:12 -#| msgid "Move Tab _Left" msgctxt "shortcut window" msgid "Move tab left" msgstr "Siirrä välilehti vasemmalle" #: ../data/ui/shortcuts.ui.h:13 -#| msgid "Move Tab _Right" msgctxt "shortcut window" msgid "Move tab right" msgstr "Siirrä välilehti oikealle" #: ../data/ui/shortcuts.ui.h:14 -#| msgid "_Changes" msgctxt "shortcut window" msgid "Changes" msgstr "Muutokset" #: ../data/ui/shortcuts.ui.h:15 -#| msgid "Go to the previous change" msgctxt "shortcut window" msgid "Go to previous change" msgstr "Siirry edelliseen muutokseen" #: ../data/ui/shortcuts.ui.h:16 -#| msgid "Go to the next change" msgctxt "shortcut window" msgid "Go to next change" msgstr "Siirry seuraavaan muutokseen" #: ../data/ui/shortcuts.ui.h:17 -#| msgid "_Edit" msgctxt "shortcut window" msgid "Editing" msgstr "Muokkaaminen" @@ -1261,7 +1246,6 @@ msgid "Cut" msgstr "Leikkaa" #: ../data/ui/shortcuts.ui.h:21 -#| msgid "Copy _Left" msgctxt "shortcut window" msgid "Copy" msgstr "Kopioi" @@ -1272,61 +1256,51 @@ msgid "Paste" msgstr "Liitä" #: ../data/ui/shortcuts.ui.h:23 -#| msgid "Find:" msgctxt "shortcut window" msgid "Find" msgstr "Etsi" #: ../data/ui/shortcuts.ui.h:24 -#| msgid "Find Ne_xt" msgctxt "shortcut window" msgid "Find Next" msgstr "Etsi seuraava" #: ../data/ui/shortcuts.ui.h:25 -#| msgid "Find _Previous" msgctxt "shortcut window" msgid "Find Previous" msgstr "Etsi edellinen" #: ../data/ui/shortcuts.ui.h:26 -#| msgid "_Replace" msgctxt "shortcut window" msgid "Replace" msgstr "Korvaa" #: ../data/ui/shortcuts.ui.h:27 -#| msgid "File comparison" msgctxt "shortcut window" msgid "File comparison" msgstr "Tiedostojen vertailu" #: ../data/ui/shortcuts.ui.h:28 -#| msgid "Save the current file" msgctxt "shortcut window" msgid "Save current file" msgstr "Tallenna nykyinen tiedosto" #: ../data/ui/shortcuts.ui.h:29 -#| msgid "Save the current file" msgctxt "shortcut window" msgid "Save current file to new path" msgstr "Tallenna nykyinen tiedosto uuteen polkuun" #: ../data/ui/shortcuts.ui.h:30 -#| msgid "Save all files in the current comparison" msgctxt "shortcut window" msgid "Save all files in comparison" msgstr "Tallenna kaikki tiedostot nykyisestä vertailusta" #: ../data/ui/shortcuts.ui.h:31 -#| msgid "Previous Conflict" msgctxt "shortcut window" msgid "Previous conflict" msgstr "Edellinen ristiriita" #: ../data/ui/shortcuts.ui.h:32 -#| msgid "Next Conflict" msgctxt "shortcut window" msgid "Next conflict" msgstr "Seuraava ristiriita" @@ -1388,7 +1362,6 @@ msgid "Copy change below right" msgstr "Kopioi kaikki muutokset vasemmasta paneelista oikeaan" #: ../data/ui/shortcuts.ui.h:41 -#| msgid "Delete change" msgctxt "shortcut window" msgid "Delete change" msgstr "Poista muutos" @@ -1408,42 +1381,37 @@ msgid "Next comparison pane" msgstr "Uusi vertalu" #: ../data/ui/shortcuts.ui.h:44 -#| msgid "Folder Comparisons" msgctxt "shortcut window" msgid "Folder comparison" msgstr "Kansiovertailu" #: ../data/ui/shortcuts.ui.h:45 -#| msgid "Copy to left" msgctxt "shortcut window" msgid "Copy to left" msgstr "Kopioi vasemmalle" #: ../data/ui/shortcuts.ui.h:46 -#| msgid "Copy to right" msgctxt "shortcut window" msgid "Copy to right" msgstr "Kopioi oikealle" #: ../data/ui/shortcuts.ui.h:47 -#| msgid "Start a version control comparison" msgctxt "shortcut window" msgid "Version control comparison" msgstr "Versionhallinnan vertailu" #: ../data/ui/shortcuts.ui.h:48 -#| msgid "Commit changes to version control" msgctxt "shortcut window" msgid "Commit to version control" msgstr "Tee commit muutoksista versionhallintaan" #: ../data/ui/shortcuts.ui.h:49 -#| msgid "Choose which version control system to use" msgctxt "shortcut window" msgid "Show/hide console output" msgstr "Näytä/piilota konsolin tuloste" -#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:668 +#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:570 +#: ../meld/newdifftab.py:38 msgid "New comparison" msgstr "Uusi vertailu" @@ -1593,7 +1561,7 @@ msgstr "_Versioimattomat" msgid "Show unversioned files" msgstr "Näytä versioimattomat tiedostot" -#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:67 +#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69 msgid "Ignored" msgstr "Huomiotta jätetyt" @@ -1621,7 +1589,7 @@ msgstr "Edelliset lokit:" msgid "Co_mmit" msgstr "Tee p_ysyvä muutos" -#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:337 +#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:332 msgid "Location" msgstr "Sijainti" @@ -1662,83 +1630,83 @@ msgid "Mac OS (CR)" msgstr "Mac OS (CR)" #. Create file size CellRenderer -#: ../meld/dirdiff.py:390 ../meld/preferences.py:82 +#: ../meld/dirdiff.py:391 ../meld/preferences.py:82 msgid "Size" msgstr "Koko" #. Create date-time CellRenderer -#: ../meld/dirdiff.py:398 ../meld/preferences.py:83 +#: ../meld/dirdiff.py:399 ../meld/preferences.py:83 msgid "Modification time" msgstr "Muokkausaika" #. Create permissions CellRenderer -#: ../meld/dirdiff.py:406 ../meld/preferences.py:84 +#: ../meld/dirdiff.py:407 ../meld/preferences.py:84 msgid "Permissions" msgstr "Oikeudet" -#: ../meld/dirdiff.py:536 +#: ../meld/dirdiff.py:537 #, python-format msgid "Hide %s" msgstr "Piilota %s" -#: ../meld/dirdiff.py:668 ../meld/dirdiff.py:692 +#: ../meld/dirdiff.py:669 ../meld/dirdiff.py:693 #, python-format msgid "[%s] Scanning %s" msgstr "[%s] Tutkitaan %s" -#: ../meld/dirdiff.py:825 +#: ../meld/dirdiff.py:826 #, python-format msgid "[%s] Done" msgstr "[%s] Valmis" -#: ../meld/dirdiff.py:833 +#: ../meld/dirdiff.py:834 msgid "Folders have no differences" msgstr "Kansioilla ei ole eroja" -#: ../meld/dirdiff.py:835 +#: ../meld/dirdiff.py:836 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:837 +#: ../meld/dirdiff.py:838 msgid "" "Scanned files in folders appear identical, but contents have not been " "scanned." msgstr "" -#: ../meld/dirdiff.py:840 +#: ../meld/dirdiff.py:841 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:842 +#: ../meld/dirdiff.py:843 msgid "Text filters are in use and may be masking content differences." msgstr "" -#: ../meld/dirdiff.py:860 ../meld/filediff.py:1383 ../meld/filediff.py:1413 -#: ../meld/filediff.py:1415 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 +#: ../meld/dirdiff.py:861 ../meld/filediff.py:1386 ../meld/filediff.py:1416 +#: ../meld/filediff.py:1418 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 msgid "Hi_de" msgstr "_Piilota" -#: ../meld/dirdiff.py:870 +#: ../meld/dirdiff.py:871 msgid "Multiple errors occurred while scanning this folder" msgstr "Tätä kansiota tutkittaessa tapahtui lukuisia virheitä" -#: ../meld/dirdiff.py:871 +#: ../meld/dirdiff.py:872 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:873 +#: ../meld/dirdiff.py:874 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:875 +#: ../meld/dirdiff.py:876 msgid "Files hidden by case insensitive comparison" msgstr "" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:877 +#: ../meld/dirdiff.py:878 msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. The following files in this folder are hidden:" @@ -1746,17 +1714,17 @@ msgstr "" "Suoritat kirjainkoosta riippumatonta vertailua kirjainkoon huomioivassa " "tiedostojärjestelmässä. Seuraavat tiedostot tässä hakemistossa on piilotettu:" -#: ../meld/dirdiff.py:888 +#: ../meld/dirdiff.py:889 #, python-format msgid "'%s' hidden by '%s'" msgstr "\"%s\" piilottanut \"%s\"" -#: ../meld/dirdiff.py:944 +#: ../meld/dirdiff.py:945 #, python-format msgid "Replace folder “%s”?" msgstr "Korvataanko kansio “%s”?" -#: ../meld/dirdiff.py:946 +#: ../meld/dirdiff.py:947 #, python-format msgid "" "Another folder with the same name already exists in “%s”.\n" @@ -1765,11 +1733,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:959 +#: ../meld/dirdiff.py:960 msgid "Error copying file" msgstr "Virhe tiedostoa kopioitaessa" -#: ../meld/dirdiff.py:960 +#: ../meld/dirdiff.py:961 #, python-format msgid "" "Couldn't copy %s\n" @@ -1782,39 +1750,39 @@ msgstr "" "\n" "%s" -#: ../meld/dirdiff.py:983 +#: ../meld/dirdiff.py:984 #, python-format msgid "Error deleting %s" msgstr "Virhe poistettaessa %s" -#: ../meld/dirdiff.py:1488 +#: ../meld/dirdiff.py:1489 msgid "No folder" msgstr "Ei kansiota" #. Abbreviations for insert and overwrite that fit in the status bar -#: ../meld/filediff.py:359 +#: ../meld/filediff.py:354 #, fuzzy #| msgid "INS,OVR" msgid "INS" msgstr "INS, OVR" -#: ../meld/filediff.py:359 +#: ../meld/filediff.py:354 #, fuzzy #| msgid "INS,OVR" msgid "OVR" msgstr "INS, OVR" #. Abbreviation for line, column so that it will fit in the status bar -#: ../meld/filediff.py:361 +#: ../meld/filediff.py:356 #, python-format msgid "Ln %i, Col %i" msgstr "Rv %i, sar %i" -#: ../meld/filediff.py:794 +#: ../meld/filediff.py:781 msgid "Comparison results will be inaccurate" msgstr "Vertailutulokset tulevat olemaan epätarkkoja" -#: ../meld/filediff.py:796 +#: ../meld/filediff.py:783 #, fuzzy #| msgid "" #| "Regular expression '%s' changed the number of lines in the file. " @@ -1826,77 +1794,75 @@ msgstr "" "Säännöllinen lauseke \"%s\" muutti tiedoston rivien määrää, joten vertailu " "on nyt virheellinen. Katso opaskirjasta lisätietoja." -#: ../meld/filediff.py:854 +#: ../meld/filediff.py:841 msgid "Mark conflict as resolved?" msgstr "Merkitäänkö ristiriita selvitetyksi?" -#: ../meld/filediff.py:856 +#: ../meld/filediff.py:843 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:858 +#: ../meld/filediff.py:845 msgid "Cancel" msgstr "Peru" -#: ../meld/filediff.py:859 +#: ../meld/filediff.py:846 msgid "Mark _Resolved" msgstr "Merkitse _selvitetyksi" -#: ../meld/filediff.py:1099 +#: ../meld/filediff.py:1095 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Ongelma avatessa tiedostoa “%s”." -#: ../meld/filediff.py:1107 +#: ../meld/filediff.py:1103 #, python-format -#| msgid "%s appears to be a binary file." msgid "File %s appears to be a binary file." msgstr "%s vaikuttaa binääritiedostolta." -#: ../meld/filediff.py:1109 -#| msgid "Open selected file or directory in the default external application" +#: ../meld/filediff.py:1105 msgid "Do you want to open the file using the default application?" msgstr "Haluatko avata tiedoston käyttäen oletussovellusta?" -#: ../meld/filediff.py:1111 +#: ../meld/filediff.py:1107 msgid "Open" msgstr "Avaa" -#: ../meld/filediff.py:1127 +#: ../meld/filediff.py:1123 #, python-format msgid "[%s] Computing differences" msgstr "[%s] lasketaan eroja" -#: ../meld/filediff.py:1192 +#: ../meld/filediff.py:1188 #, python-format msgid "File %s has changed on disk" msgstr "Tiedosto %s on muuttunut levyllä" -#: ../meld/filediff.py:1193 +#: ../meld/filediff.py:1189 msgid "Do you want to reload the file?" msgstr "Haluatko ladata tiedoston uudelleen?" -#: ../meld/filediff.py:1195 +#: ../meld/filediff.py:1191 msgid "_Reload" msgstr "_Lataa uudestaan" -#: ../meld/filediff.py:1346 +#: ../meld/filediff.py:1349 msgid "Files are identical" msgstr "Tiedostot ovat identtiset" -#: ../meld/filediff.py:1359 +#: ../meld/filediff.py:1362 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:1364 +#: ../meld/filediff.py:1367 msgid "Files differ in line endings only" msgstr "Tiedostot eroavat toisistaan ainoastaan riviloppujen osalta" -#: ../meld/filediff.py:1366 +#: ../meld/filediff.py:1369 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1905,15 +1871,15 @@ msgstr "" "Tiedostot ovat identtisiä riviloppuja lukuun ottamatta:\n" "%s" -#: ../meld/filediff.py:1386 +#: ../meld/filediff.py:1389 msgid "Show without filters" msgstr "Näytä ilman suodattimia" -#: ../meld/filediff.py:1408 +#: ../meld/filediff.py:1411 msgid "Change highlighting incomplete" msgstr "Muutosten korostaminen vaillinaista" -#: ../meld/filediff.py:1409 +#: ../meld/filediff.py:1412 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." @@ -1922,20 +1888,20 @@ msgstr "" "pakottaa Meldin korostamaan myös suuret muutokset, mutta siinä saattaa " "kestää hetki." -#: ../meld/filediff.py:1417 +#: ../meld/filediff.py:1420 msgid "Keep highlighting" msgstr "Säilytä korostus" -#: ../meld/filediff.py:1419 +#: ../meld/filediff.py:1422 msgid "_Keep highlighting" msgstr "_Säilytä korostus" -#: ../meld/filediff.py:1451 +#: ../meld/filediff.py:1454 #, python-format msgid "Replace file “%s”?" msgstr "Korvataanko tiedosto “%s”?" -#: ../meld/filediff.py:1453 +#: ../meld/filediff.py:1456 #, python-format msgid "" "A file with this name already exists in “%s”.\n" @@ -1944,46 +1910,46 @@ msgstr "" "Tiedosto samalla nimellä on jo olemassa sijainnissa “%s”.\n" "Jos korvaat olemassa olevan tiedoston, sen sisältöä häviää." -#: ../meld/filediff.py:1470 +#: ../meld/filediff.py:1473 msgid "Save Left Pane As" msgstr "" -#: ../meld/filediff.py:1472 +#: ../meld/filediff.py:1475 msgid "Save Middle Pane As" msgstr "" -#: ../meld/filediff.py:1474 +#: ../meld/filediff.py:1477 msgid "Save Right Pane As" msgstr "" -#: ../meld/filediff.py:1488 +#: ../meld/filediff.py:1491 #, 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:1490 +#: ../meld/filediff.py:1493 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:1493 +#: ../meld/filediff.py:1496 msgid "Save Anyway" msgstr "Tallenna silti" -#: ../meld/filediff.py:1494 +#: ../meld/filediff.py:1497 msgid "Don't Save" msgstr "Älä tallenna" -#: ../meld/filediff.py:1516 +#: ../meld/filediff.py:1519 msgid "_Save as UTF-8" msgstr "_Tallenna UTF-8-muodossa" -#: ../meld/filediff.py:1519 +#: ../meld/filediff.py:1522 #, python-format msgid "Couldn't encode text as “%s”" msgstr "" -#: ../meld/filediff.py:1521 -#, fuzzy, python-format +#: ../meld/filediff.py:1524 +#, python-format #| msgid "" #| "'%s' contains characters not encodable with '%s'\n" #| "Would you like to save as UTF-8?" @@ -1991,26 +1957,26 @@ msgid "" "File “%s” contains characters that can't be encoded using encoding “%s”.\n" "Would you like to save as UTF-8?" msgstr "" -"\"%s\" sisältää merkkejä, joita ei voi esittää merkistössä \"%s\".\n" -"Haluatko tallentaa UTF-8 -muodossa?" +"Tiedosto \"%s\" sisältää merkkejä, joita ei voi esittää merkistössä \"%s\".\n" +"Haluatko tallentaa UTF-8 muodossa?" -#: ../meld/filediff.py:1558 ../meld/patchdialog.py:125 +#: ../meld/filediff.py:1564 ../meld/patchdialog.py:120 #, python-format msgid "Could not save file %s." msgstr "Tiedoston %s tallentaminen epäonnistui." -#: ../meld/filediff.py:1559 ../meld/patchdialog.py:126 +#: ../meld/filediff.py:1565 ../meld/patchdialog.py:121 #, python-format msgid "" "Couldn't save file due to:\n" "%s" msgstr "" -#: ../meld/filediff.py:1905 +#: ../meld/filediff.py:1910 msgid "Live comparison updating disabled" msgstr "Reaaliaikainen vertailupäivitys poistettu käytöstä" -#: ../meld/filediff.py:1906 +#: ../meld/filediff.py:1911 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -2018,10 +1984,10 @@ msgid "" msgstr "" #: ../meld/filemerge.py:37 -#, fuzzy, python-format +#, python-format #| msgid "[%s] Opening files" msgid "[%s] Merging files" -msgstr "[%s] avataan tiedostoja" +msgstr "[%s] Yhdistetään tiedostoja" #: ../meld/gutterrendererchunk.py:159 #, fuzzy @@ -2035,350 +2001,310 @@ msgstr "Kopioi _vasemmalle" msgid "Copy _down" msgstr "Kopioi _vasemmalle" -#: ../meld/meldapp.py:177 +#: ../meld/meldapp.py:175 #, fuzzy #| msgid "Wrong number of arguments (Got %i)" msgid "wrong number of arguments supplied to --diff" msgstr "Virheellinen määrä argumentteja (saatiin %i)" -#: ../meld/meldapp.py:182 +#: ../meld/meldapp.py:180 msgid "Start with an empty window" msgstr "Aloita tyhjällä ikkunalla" -#: ../meld/meldapp.py:183 ../meld/meldapp.py:185 +#: ../meld/meldapp.py:181 ../meld/meldapp.py:183 msgid "file" msgstr "tiedosto" -#: ../meld/meldapp.py:183 ../meld/meldapp.py:187 +#: ../meld/meldapp.py:181 ../meld/meldapp.py:185 msgid "folder" msgstr "kansio" -#: ../meld/meldapp.py:184 +#: ../meld/meldapp.py:182 msgid "Start a version control comparison" msgstr "Aloita versionhallinnan vertailu" -#: ../meld/meldapp.py:186 +#: ../meld/meldapp.py:184 msgid "Start a 2- or 3-way file comparison" msgstr "Aloita 2- tai 3-osainen tiedostovertailu" -#: ../meld/meldapp.py:188 +#: ../meld/meldapp.py:186 msgid "Start a 2- or 3-way folder comparison" msgstr "Aloita 2- tai 3-osainen kansiovertailu" -#: ../meld/meldapp.py:231 +#: ../meld/meldapp.py:229 #, python-format msgid "Error: %s\n" msgstr "Virhe: %s\n" -#: ../meld/meldapp.py:238 +#: ../meld/meldapp.py:236 msgid "Meld is a file and directory comparison tool." msgstr "Meld on työkalu tiedostojen ja kansioiden vertailuun." -#: ../meld/meldapp.py:242 +#: ../meld/meldapp.py:240 msgid "Set label to use instead of file name" msgstr "Aseta käytettävä otsikko tiedostonimen sijasta" -#: ../meld/meldapp.py:245 +#: ../meld/meldapp.py:243 msgid "Open a new tab in an already running instance" msgstr "Avaa uusi välilehti jo avoinna olevassa ikkunassa" -#: ../meld/meldapp.py:248 +#: ../meld/meldapp.py:246 msgid "Automatically compare all differing files on startup" msgstr "" -#: ../meld/meldapp.py:251 +#: ../meld/meldapp.py:249 msgid "Ignored for compatibility" msgstr "Jätetty huomioimatta yhteensopivuuden takaamiseksi" -#: ../meld/meldapp.py:255 +#: ../meld/meldapp.py:253 msgid "Set the target file for saving a merge result" msgstr "" -#: ../meld/meldapp.py:258 +#: ../meld/meldapp.py:256 msgid "Automatically merge files" msgstr "Yhdistä tiedostot automaattisesti" -#: ../meld/meldapp.py:262 +#: ../meld/meldapp.py:260 msgid "Load a saved comparison from a Meld comparison file" msgstr "Lataa tallennettu vertailu Meld-vertailutiedostosta" -#: ../meld/meldapp.py:266 +#: ../meld/meldapp.py:264 msgid "Create a diff tab for the supplied files or folders" msgstr "" -#: ../meld/meldapp.py:286 +#: ../meld/meldapp.py:284 #, python-format msgid "too many arguments (wanted 0-3, got %d)" msgstr "" -#: ../meld/meldapp.py:289 +#: ../meld/meldapp.py:287 msgid "can't auto-merge less than 3 files" msgstr "" -#: ../meld/meldapp.py:291 +#: ../meld/meldapp.py:289 #, fuzzy #| msgid "Flatten directories" msgid "can't auto-merge directories" msgstr "Litistä kansiot" -#: ../meld/meldapp.py:305 +#: ../meld/meldapp.py:303 msgid "Error reading saved comparison file" msgstr "Virhe lukiessa tallennettua vertailutiedostoa" -#: ../meld/meldapp.py:332 +#: ../meld/meldapp.py:330 #, python-format msgid "invalid path or URI \"%s\"" msgstr "virheellinen polku tai URI \"%s\"" #. TRANSLATORS: This is the label of a new, currently-unnamed file. -#: ../meld/meldbuffer.py:127 +#: ../meld/meldbuffer.py:131 msgid "" msgstr "" -#: ../meld/melddoc.py:83 ../meld/melddoc.py:84 +#: ../meld/melddoc.py:64 msgid "untitled" msgstr "nimeämätön" -#: ../meld/meldwindow.py:49 +#: ../meld/meldwindow.py:48 msgid "_File" msgstr "_Tiedosto" -#: ../meld/meldwindow.py:50 +#: ../meld/meldwindow.py:49 msgid "_New Comparison..." msgstr "_Uusi vertailu..." -#: ../meld/meldwindow.py:51 +#: ../meld/meldwindow.py:50 msgid "Start a new comparison" msgstr "Aloita uusi vertailu" -#: ../meld/meldwindow.py:54 +#: ../meld/meldwindow.py:53 msgid "Save the current file" msgstr "Tallenna nykyinen tiedosto" -#: ../meld/meldwindow.py:56 +#: ../meld/meldwindow.py:55 msgid "Save As..." msgstr "Tallenna _nimellä..." -#: ../meld/meldwindow.py:57 +#: ../meld/meldwindow.py:56 msgid "Save the current file with a different name" msgstr "Tallenna nykyinen tiedosto toisella nimellä" -#: ../meld/meldwindow.py:60 +#: ../meld/meldwindow.py:59 msgid "Close the current file" msgstr "Sulje nykyinen tiedosto" -#: ../meld/meldwindow.py:63 +#: ../meld/meldwindow.py:62 msgid "_Edit" msgstr "_Muokkaa" -#: ../meld/meldwindow.py:65 +#: ../meld/meldwindow.py:64 msgid "Undo the last action" msgstr "Peru viimeisin toiminto" -#: ../meld/meldwindow.py:68 +#: ../meld/meldwindow.py:67 msgid "Redo the last undone action" msgstr "Tee viimeisin peruttu toiminto uudestaan" -#: ../meld/meldwindow.py:70 +#: ../meld/meldwindow.py:69 msgid "Cut the selection" msgstr "Leikkaa valinta" -#: ../meld/meldwindow.py:72 +#: ../meld/meldwindow.py:71 msgid "Copy the selection" msgstr "Kopioi valinta" -#: ../meld/meldwindow.py:74 +#: ../meld/meldwindow.py:73 msgid "Paste the clipboard" msgstr "Liitä leikepöydältä" -#: ../meld/meldwindow.py:76 +#: ../meld/meldwindow.py:75 msgid "Find..." msgstr "Etsi..." -#: ../meld/meldwindow.py:76 +#: ../meld/meldwindow.py:75 msgid "Search for text" msgstr "Etsi tekstiä" -#: ../meld/meldwindow.py:78 +#: ../meld/meldwindow.py:77 msgid "Find Ne_xt" msgstr "Etsi _seuraava" -#: ../meld/meldwindow.py:79 +#: ../meld/meldwindow.py:78 msgid "Search forwards for the same text" msgstr "Etsi samaa tekstiä eteenpäin" -#: ../meld/meldwindow.py:81 +#: ../meld/meldwindow.py:80 msgid "Find _Previous" msgstr "Etsi e_dellinen" -#: ../meld/meldwindow.py:82 +#: ../meld/meldwindow.py:81 msgid "Search backwards for the same text" msgstr "Etsi samaa tekstiä taaksepäin" -#: ../meld/meldwindow.py:85 +#: ../meld/meldwindow.py:84 msgid "_Replace..." msgstr "_Korvaa..." -#: ../meld/meldwindow.py:86 +#: ../meld/meldwindow.py:85 msgid "Find and replace text" msgstr "Etsi ja korvaa tekstiä" -#: ../meld/meldwindow.py:89 +#: ../meld/meldwindow.py:88 msgid "_Changes" msgstr "_Muutokset" -#: ../meld/meldwindow.py:90 +#: ../meld/meldwindow.py:89 msgid "Next Change" msgstr "Seuraava muutos" -#: ../meld/meldwindow.py:91 +#: ../meld/meldwindow.py:90 msgid "Go to the next change" msgstr "Siirry seuraavaan muutokseen" -#: ../meld/meldwindow.py:93 +#: ../meld/meldwindow.py:92 msgid "Previous Change" msgstr "Edellinen muutos" -#: ../meld/meldwindow.py:94 +#: ../meld/meldwindow.py:93 msgid "Go to the previous change" msgstr "Siirry edelliseen muutokseen" -#: ../meld/meldwindow.py:96 +#: ../meld/meldwindow.py:95 msgid "Open Externally" msgstr "Avaa ulkoisesti" -#: ../meld/meldwindow.py:97 +#: ../meld/meldwindow.py:96 msgid "Open selected file or directory in the default external application" msgstr "Avaa valittu tiedosto tai kansio ulkoisessa oletussovelluksessa" -#: ../meld/meldwindow.py:101 +#: ../meld/meldwindow.py:100 msgid "_View" msgstr "_Näytä" -#: ../meld/meldwindow.py:102 +#: ../meld/meldwindow.py:101 msgid "File Status" msgstr "Tiedoston tila" -#: ../meld/meldwindow.py:103 +#: ../meld/meldwindow.py:102 msgid "Version Status" msgstr "Version tila" -#: ../meld/meldwindow.py:106 +#: ../meld/meldwindow.py:105 msgid "Stop the current action" msgstr "Pysäytä nykyinen toiminto" -#: ../meld/meldwindow.py:109 +#: ../meld/meldwindow.py:108 msgid "Refresh the view" msgstr "Päivitä näkymä" #: ../meld/meldwindow.py:112 -msgid "_Tabs" -msgstr "_Välilehdet" - -#: ../meld/meldwindow.py:113 -msgid "_Previous Tab" -msgstr "_Edellinen välilehti" - -#: ../meld/meldwindow.py:114 -msgid "Activate previous tab" -msgstr "Vaihda edelliseen välilehteen" - -#: ../meld/meldwindow.py:116 -msgid "_Next Tab" -msgstr "_Seuraava välilehti" - -#: ../meld/meldwindow.py:117 -msgid "Activate next tab" -msgstr "Vaihda seuraavaan välilehteen" - -#: ../meld/meldwindow.py:120 -msgid "Move Tab _Left" -msgstr "Sii_rrä välilehti vasemmalle" - -#: ../meld/meldwindow.py:121 -msgid "Move current tab to left" -msgstr "Siirrä nykyinen välilehti vasemmalle" - -#: ../meld/meldwindow.py:124 -msgid "Move Tab _Right" -msgstr "Siirrä välilehti _oikealle" - -#: ../meld/meldwindow.py:125 -msgid "Move current tab to right" -msgstr "Siirrä nykyinen välilehti oikealle" - -#: ../meld/meldwindow.py:129 msgid "Fullscreen" msgstr "Koko näyttö" -#: ../meld/meldwindow.py:130 +#: ../meld/meldwindow.py:113 msgid "View the comparison in fullscreen" msgstr "Näytä vertailu koko näytön tilassa" -#: ../meld/meldwindow.py:132 +#: ../meld/meldwindow.py:115 msgid "_Toolbar" msgstr "_Työkalupalkki" -#: ../meld/meldwindow.py:133 +#: ../meld/meldwindow.py:116 msgid "Show or hide the toolbar" msgstr "Näytä tai piilota työkalupalkki" -#: ../meld/meldwindow.py:143 +#: ../meld/meldwindow.py:126 msgid "Open Recent" msgstr "Avaa viimeisimpiä" -#: ../meld/meldwindow.py:144 +#: ../meld/meldwindow.py:127 msgid "Open recent files" msgstr "Avaa viimeisimpiä tiedostoja" -#: ../meld/meldwindow.py:166 +#: ../meld/meldwindow.py:149 msgid "_Meld" msgstr "_Meld" -#: ../meld/meldwindow.py:167 +#: ../meld/meldwindow.py:150 msgid "Quit the program" msgstr "Lopeta sovellus" -#: ../meld/meldwindow.py:169 +#: ../meld/meldwindow.py:152 msgid "Prefere_nces" msgstr "_Asetukset" -#: ../meld/meldwindow.py:170 +#: ../meld/meldwindow.py:153 msgid "Configure the application" msgstr "Muuta sovelluksen asetuksia" -#: ../meld/meldwindow.py:172 +#: ../meld/meldwindow.py:155 msgid "_Contents" msgstr "_Sisältö" -#: ../meld/meldwindow.py:173 +#: ../meld/meldwindow.py:156 msgid "Open the Meld manual" msgstr "Avaa Meldin ohje" -#: ../meld/meldwindow.py:175 +#: ../meld/meldwindow.py:158 msgid "About this application" msgstr "Tietoja sovelluksesta" -#: ../meld/meldwindow.py:587 -msgid "Switch to this tab" -msgstr "Vaihda tähän välilehteen" - -#: ../meld/meldwindow.py:702 +#: ../meld/meldwindow.py:604 #, python-format msgid "Need three files to auto-merge, got: %r" msgstr "" -#: ../meld/meldwindow.py:716 +#: ../meld/meldwindow.py:618 msgid "Cannot compare a mixture of files and directories" msgstr "Hakemistoja ja tiedostoja ei voi verrata samanaikaisesti" -#: ../meld/misc.py:179 +#: ../meld/misc.py:203 #, python-format msgid "Couldn't find colour scheme details for %s-%s; this is a bad install" msgstr "" #. no common path. empty names get changed to "[None]" -#: ../meld/misc.py:264 +#: ../meld/misc.py:263 msgid "[None]" msgstr "[Ei mitään]" @@ -2390,7 +2316,7 @@ msgstr "otsikko" msgid "pattern" msgstr "malli" -#: ../meld/recent.py:115 +#: ../meld/recent.py:114 msgid "Version control:" msgstr "Versionhallinta:" @@ -2398,43 +2324,43 @@ msgstr "Versionhallinta:" msgid "Close tab" msgstr "Sulje välilehti" -#: ../meld/ui/vcdialogs.py:50 +#: ../meld/ui/vcdialogs.py:48 msgid "No files will be committed" msgstr "Tiedostoja ei viedä pysyviin muutoksiin" #. Translators: First %s is replaced by translated "%d unpushed #. commits", second %s is replaced by translated "%d branches" -#: ../meld/vc/git.py:95 +#: ../meld/vc/git.py:94 #, python-format msgid "%s in %s" msgstr "" #. Translators: These messages cover the case where there is #. only one branch, and are not part of another message. -#: ../meld/vc/git.py:96 ../meld/vc/git.py:103 +#: ../meld/vc/git.py:95 ../meld/vc/git.py:102 #, python-format msgid "%d unpushed commit" msgid_plural "%d unpushed commits" msgstr[0] "%d työntämätön pysyvä muutos" msgstr[1] "%d työntämätöntä pysyvää muutosta" -#: ../meld/vc/git.py:98 +#: ../meld/vc/git.py:97 #, python-format msgid "%d branch" msgid_plural "%d branches" msgstr[0] "%d haara" msgstr[1] "%d haaraa" -#: ../meld/vc/git.py:352 +#: ../meld/vc/git.py:330 #, python-format msgid "Mode changed from %s to %s" msgstr "" -#: ../meld/vc/git.py:360 +#: ../meld/vc/git.py:338 msgid "Partially staged" msgstr "" -#: ../meld/vc/git.py:360 +#: ../meld/vc/git.py:338 msgid "Staged" msgstr "" @@ -2444,140 +2370,140 @@ msgstr "" msgid "None" msgstr "Ei mitään" -#: ../meld/vc/svn.py:216 +#: ../meld/vc/svn.py:204 #, python-format msgid "Rev %s" msgstr "" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Merged" msgstr "Yhdistetty" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Base" msgstr "" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Local" msgstr "Paikallinen" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Remote" msgstr "Etä" -#: ../meld/vc/_vc.py:68 +#: ../meld/vc/_vc.py:70 msgid "Unversioned" msgstr "Versioimaton" -#: ../meld/vc/_vc.py:71 +#: ../meld/vc/_vc.py:73 msgid "Error" msgstr "Virhe" -#: ../meld/vc/_vc.py:73 +#: ../meld/vc/_vc.py:75 msgid "Newly added" msgstr "Äskettäin lisätty" -#: ../meld/vc/_vc.py:75 +#: ../meld/vc/_vc.py:77 msgid "Renamed" msgstr "Nimetty uudelleen" -#: ../meld/vc/_vc.py:76 +#: ../meld/vc/_vc.py:78 msgid "Conflict" msgstr "Ristiriita" -#: ../meld/vc/_vc.py:77 +#: ../meld/vc/_vc.py:79 msgid "Removed" msgstr "Poistettu" -#: ../meld/vc/_vc.py:78 +#: ../meld/vc/_vc.py:80 msgid "Missing" msgstr "Puuttuu" -#: ../meld/vc/_vc.py:79 +#: ../meld/vc/_vc.py:81 msgid "Not present" msgstr "Ei läsnä" #. Translators: This error message is shown when a version #. control binary isn't installed. -#: ../meld/vcview.py:255 +#: ../meld/vcview.py:251 #, python-format msgid "%(name)s (%(cmd)s not installed)" msgstr "%(name)s (%(cmd)s ei ole asennettu)" #. Translators: This error message is shown when a version #. controlled repository is invalid. -#: ../meld/vcview.py:259 +#: ../meld/vcview.py:255 #, python-format msgid "%(name)s (Invalid repository)" msgstr "%(name)s (Virheellinen tietovarasto)" -#: ../meld/vcview.py:280 +#: ../meld/vcview.py:276 msgid "No valid version control system found in this folder" msgstr "Tästä kansiosta ei löytynyt kelvollista versionhallintajärjestelmää" -#: ../meld/vcview.py:282 +#: ../meld/vcview.py:278 msgid "Only one version control system found in this folder" msgstr "Tästä kansiosta löytyi vain yksi versionhallintajärjestelmä" -#: ../meld/vcview.py:284 +#: ../meld/vcview.py:280 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:337 +#: ../meld/vcview.py:332 #, python-format msgid "%s: %s" msgstr "%s: %s" -#: ../meld/vcview.py:357 +#: ../meld/vcview.py:352 #, python-format msgid "Scanning %s" msgstr "Tutkitaan %s" -#: ../meld/vcview.py:396 +#: ../meld/vcview.py:391 msgid "(Empty)" msgstr "(tyhjä)" -#: ../meld/vcview.py:440 +#: ../meld/vcview.py:435 #, python-format msgid "%s — local" msgstr "%s — paikallinen" -#: ../meld/vcview.py:441 +#: ../meld/vcview.py:436 #, python-format msgid "%s — remote" msgstr "%s — etä" -#: ../meld/vcview.py:449 +#: ../meld/vcview.py:444 #, python-format msgid "%s (local, merge, remote)" msgstr "%s (paikallinen, yhdistäminen, etä)" -#: ../meld/vcview.py:454 +#: ../meld/vcview.py:449 #, python-format msgid "%s (remote, merge, local)" msgstr "%s (etä, yhdistäminen, paikallinen)" -#: ../meld/vcview.py:465 +#: ../meld/vcview.py:460 #, python-format msgid "%s — repository" msgstr "%s — tietovarasto" -#: ../meld/vcview.py:471 +#: ../meld/vcview.py:466 #, python-format msgid "%s (working, repository)" msgstr "%s (työskentely, tietovarasto)" -#: ../meld/vcview.py:475 +#: ../meld/vcview.py:470 #, python-format msgid "%s (repository, working)" msgstr "%s (tietovarasto, työskentely)" -#: ../meld/vcview.py:643 +#: ../meld/vcview.py:638 msgid "Remove folder and all its files?" msgstr "Poistetaanko kansio ja kaikki sen tiedostot?" -#: ../meld/vcview.py:645 +#: ../meld/vcview.py:640 msgid "" "This will remove all selected files and folders, and all files within any " "selected folders, from version control." @@ -2585,15 +2511,48 @@ msgstr "" "Tämä poistaa kaikki valitut tiedostot ja kansiot sekä kaikki valituissa " "kansioissa olevat tiedostot versionhallinnasta." -#: ../meld/vcview.py:670 +#: ../meld/vcview.py:665 #, python-format msgid "Error removing %s" msgstr "Virhe kohdetta %s poistaessa" -#: ../meld/vcview.py:750 +#: ../meld/vcview.py:745 msgid "Clear" msgstr "Tyhjennä" +#~ msgid "Meld does not support Python 3." +#~ msgstr "Meld ei tue Python 3:a." + +#~ msgid "_Tabs" +#~ msgstr "_Välilehdet" + +#~ msgid "_Previous Tab" +#~ msgstr "_Edellinen välilehti" + +#~ msgid "Activate previous tab" +#~ msgstr "Vaihda edelliseen välilehteen" + +#~ msgid "_Next Tab" +#~ msgstr "_Seuraava välilehti" + +#~ msgid "Activate next tab" +#~ msgstr "Vaihda seuraavaan välilehteen" + +#~ msgid "Move Tab _Left" +#~ msgstr "Sii_rrä välilehti vasemmalle" + +#~ msgid "Move current tab to left" +#~ msgstr "Siirrä nykyinen välilehti vasemmalle" + +#~ msgid "Move Tab _Right" +#~ msgstr "Siirrä välilehti _oikealle" + +#~ msgid "Move current tab to right" +#~ msgstr "Siirrä nykyinen välilehti oikealle" + +#~ msgid "Switch to this tab" +#~ msgstr "Vaihda tähän välilehteen" + #~ msgid "[%s] Set num panes" #~ msgstr "[%s} aseta paneelien lukumäärä" From beab26212a2c26538339419c4609690f753c21d0 Mon Sep 17 00:00:00 2001 From: Rafael Fontenelle Date: Mon, 5 Sep 2016 00:35:48 +0000 Subject: [PATCH 0024/1316] Updated Brazilian Portuguese translation (cherry picked from commit 1854c679cf5bf67470094050ad3cbd36fb2699ec) --- po/pt_BR.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index ba93a963..a0e3fd0b 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -15,8 +15,8 @@ msgstr "" "Project-Id-Version: meld\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=meld&ke" "ywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-08-20 21:39+0000\n" -"PO-Revision-Date: 2016-09-03 10:21-0200\n" +"POT-Creation-Date: 2016-09-03 13:24+0000\n" +"PO-Revision-Date: 2016-09-04 21:34-0200\n" "Last-Translator: Rafael Fontenelle \n" "Language-Team: Brazilian Portuguese \n" "Language: pt_BR\n" @@ -299,7 +299,7 @@ msgstr "" #: ../data/org.gnome.meld.gschema.xml.h:37 ../data/ui/preferences.ui.h:32 msgid "Ignore symbolic links" -msgstr "Ignora ligações simbólicas" +msgstr "Ignorar ligações simbólicas" #: ../data/org.gnome.meld.gschema.xml.h:38 msgid "" @@ -961,7 +961,7 @@ msgstr "Formatar como patch" msgid "Copy to Clipboard" msgstr "Copiar para a área de transferência" -#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:149 +#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:160 msgid "Save Patch" msgstr "Salvar patch" @@ -1161,7 +1161,7 @@ msgstr "Aparar alterações" #: ../data/ui/preferences.ui.h:46 msgid "Trim blank line differences from the start and end of changes" -msgstr "Apara diferenças de linhas vazias do início e fim de alterações" +msgstr "Aparar diferenças de linhas vazias do início e fim de alterações" #: ../data/ui/preferences.ui.h:47 msgid "Text filters" @@ -1911,7 +1911,7 @@ msgstr "" #: ../meld/filediff.py:1404 msgid "Keep highlighting" -msgstr "Mantém destaque" +msgstr "Manter destaque" #: ../meld/filediff.py:1406 msgid "_Keep highlighting" @@ -1979,12 +1979,12 @@ msgstr "" "codificação \"%s\"\n" "Você gostaria de salvar como UTF-8?" -#: ../meld/filediff.py:1545 ../meld/patchdialog.py:125 +#: ../meld/filediff.py:1545 ../meld/patchdialog.py:136 #, python-format msgid "Could not save file %s." msgstr "Não foi possível salvar o arquivo %s." -#: ../meld/filediff.py:1546 ../meld/patchdialog.py:126 +#: ../meld/filediff.py:1546 ../meld/patchdialog.py:137 #, python-format msgid "" "Couldn't save file due to:\n" From 0635b6fa692ac9191c29d9f6fd3043fd5c073c4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mario=20Bl=C3=A4ttermann?= Date: Fri, 9 Sep 2016 18:40:01 +0000 Subject: [PATCH 0025/1316] Updated German translation --- po/de.po | 432 +++++++++++++++++++++++++++---------------------------- 1 file changed, 213 insertions(+), 219 deletions(-) diff --git a/po/de.po b/po/de.po index fb367325..f3ad6104 100644 --- a/po/de.po +++ b/po/de.po @@ -14,32 +14,28 @@ msgstr "" "Project-Id-Version: meld master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=meld&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-03-15 20:11+0000\n" -"PO-Revision-Date: 2016-03-15 23:33+0100\n" -"Last-Translator: Bernd Homuth \n" +"POT-Creation-Date: 2016-08-20 21:39+0000\n" +"PO-Revision-Date: 2016-09-09 20:39+0200\n" +"Last-Translator: Mario Blättermann \n" "Language-Team: Deutsch \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 1.8.7\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Bookmarks: -1,351,-1,-1,-1,-1,-1,-1,-1,-1\n" -#: ../bin/meld:144 +#: ../bin/meld:142 msgid "Cannot import: " msgstr "Import nicht möglich: " -#: ../bin/meld:147 +#: ../bin/meld:145 #, c-format msgid "Meld requires %s or higher." msgstr "Meld benötigt %s oder aktueller." -#: ../bin/meld:151 -msgid "Meld does not support Python 3." -msgstr "Meld unterstützt Python 3 nicht." - -#: ../bin/meld:200 +#: ../bin/meld:194 #, c-format msgid "" "Couldn't load Meld-specific CSS (%s)\n" @@ -92,6 +88,10 @@ msgstr "" "bereitet Ihnen bei großen Zusammenführungskonflikten etwas wenige " "Kopfschmerzen." +#: ../data/meld.appdata.xml.in.h:5 +msgid "The GNOME Project" +msgstr "Das GNOME-Projekt" + #: ../data/mime/meld.xml.in.h:1 msgid "Meld comparison description" msgstr "Meld Vergleichsbeschreibung" @@ -589,7 +589,7 @@ msgstr "Nach rechts kopieren" msgid "Delete selected" msgstr "Markierte löschen" -#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:859 ../meld/filediff.py:1363 +#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:859 ../meld/filediff.py:1384 msgid "Hide" msgstr "Verbergen" @@ -625,7 +625,7 @@ msgstr "Neu" msgid "Show new" msgstr "Neue anzeigen" -#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:74 +#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:76 msgid "Modified" msgstr "Geändert" @@ -658,7 +658,7 @@ msgid "_Add" msgstr "_Hinzufügen" #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11 -#: ../meld/vcview.py:649 +#: ../meld/vcview.py:644 msgid "_Remove" msgstr "_Löschen" @@ -881,8 +881,8 @@ msgstr "Wenn Sie nicht speichern, gehen die Änderungen verloren." msgid "Close _without Saving" msgstr "Schließen _ohne zu Speichern" -#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:941 ../meld/filediff.py:1429 -#: ../meld/filediff.py:1497 +#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:941 ../meld/filediff.py:1450 +#: ../meld/filediff.py:1518 msgid "_Cancel" msgstr "A_bbrechen" @@ -919,7 +919,7 @@ msgstr "Nicht gespeicherte Dokumentenänderungen zurücknehmen?" msgid "Changes made to the following documents will be permanently lost:\n" msgstr "Änderungen der folgenden Dokumente werden verloren gehen:\n" -#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:942 ../meld/filediff.py:1430 +#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:942 ../meld/filediff.py:1451 msgid "_Replace" msgstr "E_rsetzen" @@ -967,7 +967,7 @@ msgstr "Als Patch formatieren" msgid "Copy to Clipboard" msgstr "In die Zwischenablage kopieren" -#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:149 +#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:144 msgid "Save Patch" msgstr "Patch speichern" @@ -1157,7 +1157,7 @@ msgstr "" "Dateien und Ordner nach Namen herauszufiltern. Jedes Muster ist dabei eine " "durch Leerzeichen getrennte Liste von Befehlszeilenplatzhaltern." -#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:104 +#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:103 msgid "File Filters" msgstr "Dateifilter" @@ -1437,7 +1437,8 @@ msgctxt "shortcut window" msgid "Show/hide console output" msgstr "Konsolenausgabe anzeigen/verbergen" -#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:668 +#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:570 +#: ../meld/newdifftab.py:38 msgid "New comparison" msgstr "Neuer Vergleich" @@ -1585,7 +1586,7 @@ msgstr "Nicht _versioniert" msgid "Show unversioned files" msgstr "Nicht versionierte Dateien anzeigen" -#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:67 +#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69 msgid "Ignored" msgstr "Ignoriert" @@ -1613,7 +1614,7 @@ msgstr "Vorherige Mitteilungen:" msgid "Co_mmit" msgstr "Co_mmit" -#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:337 +#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:332 msgid "Location" msgstr "Ort" @@ -1712,8 +1713,8 @@ msgstr "" "Textfilter werden verwendet, welche Unterschiede zwischen Dateien maskieren " "könnten." -#: ../meld/dirdiff.py:861 ../meld/filediff.py:1365 ../meld/filediff.py:1395 -#: ../meld/filediff.py:1397 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 +#: ../meld/dirdiff.py:861 ../meld/filediff.py:1386 ../meld/filediff.py:1416 +#: ../meld/filediff.py:1418 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 msgid "Hi_de" msgstr "Ver_bergen" @@ -1792,25 +1793,25 @@ msgid "No folder" msgstr "Kein Ordner" #. Abbreviations for insert and overwrite that fit in the status bar -#: ../meld/filediff.py:359 +#: ../meld/filediff.py:354 msgid "INS" msgstr "EINF" -#: ../meld/filediff.py:359 +#: ../meld/filediff.py:354 msgid "OVR" msgstr "ÜBR" #. Abbreviation for line, column so that it will fit in the status bar -#: ../meld/filediff.py:361 +#: ../meld/filediff.py:356 #, python-format msgid "Ln %i, Col %i" msgstr "Zeile %i, Spalte %i" -#: ../meld/filediff.py:776 +#: ../meld/filediff.py:781 msgid "Comparison results will be inaccurate" msgstr "Ergebnisse werden ungenau sein" -#: ../meld/filediff.py:778 +#: ../meld/filediff.py:783 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1819,66 +1820,66 @@ msgstr "" "nicht unterstützt, deshalb wird ein Vergleich keine korrekten Ergebnisse " "liefern." -#: ../meld/filediff.py:836 +#: ../meld/filediff.py:841 msgid "Mark conflict as resolved?" msgstr "Konflikt als _gelöst markieren?" -#: ../meld/filediff.py:838 +#: ../meld/filediff.py:843 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:840 +#: ../meld/filediff.py:845 msgid "Cancel" msgstr "Abbrechen" -#: ../meld/filediff.py:841 +#: ../meld/filediff.py:846 msgid "Mark _Resolved" msgstr "Als _gelöst markieren" -#: ../meld/filediff.py:1081 +#: ../meld/filediff.py:1095 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Beim Öffnen der Datei »%s« ist ein Fehler aufgetreten." -#: ../meld/filediff.py:1089 +#: ../meld/filediff.py:1103 #, python-format msgid "File %s appears to be a binary file." msgstr "Datei %s scheint eine Binärdatei zu sein." -#: ../meld/filediff.py:1091 +#: ../meld/filediff.py:1105 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:1093 +#: ../meld/filediff.py:1107 msgid "Open" msgstr "Öffnen" -#: ../meld/filediff.py:1109 +#: ../meld/filediff.py:1123 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Unterschiede werden berechnet" -#: ../meld/filediff.py:1174 +#: ../meld/filediff.py:1188 #, python-format msgid "File %s has changed on disk" msgstr "Die Datei %s wurde auf dem Datenträger geändert" -#: ../meld/filediff.py:1175 +#: ../meld/filediff.py:1189 msgid "Do you want to reload the file?" msgstr "Möchten Sie die Datei neu laden?" -#: ../meld/filediff.py:1177 +#: ../meld/filediff.py:1191 msgid "_Reload" msgstr "_Neu laden" -#: ../meld/filediff.py:1328 +#: ../meld/filediff.py:1349 msgid "Files are identical" msgstr "Dateien sind identisch" -#: ../meld/filediff.py:1341 +#: ../meld/filediff.py:1362 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1886,11 +1887,11 @@ msgstr "" "Textfilter werden verwendet, welche Unterschiede zwischen Dateien maskieren " "könnten. Wollen Sie die ungefilterten Dateien vergleichen?" -#: ../meld/filediff.py:1346 +#: ../meld/filediff.py:1367 msgid "Files differ in line endings only" msgstr "Dateien unterscheiden sich nur in den Zeilenendungen" -#: ../meld/filediff.py:1348 +#: ../meld/filediff.py:1369 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1899,15 +1900,15 @@ msgstr "" "Dateien sind identisch, abgesehen von unterschiedlichen Zeilenenden:\n" "%s" -#: ../meld/filediff.py:1368 +#: ../meld/filediff.py:1389 msgid "Show without filters" msgstr "Ungefiltert anzeigen" -#: ../meld/filediff.py:1390 +#: ../meld/filediff.py:1411 msgid "Change highlighting incomplete" msgstr "Änderungsmarkierung unvollständig" -#: ../meld/filediff.py:1391 +#: ../meld/filediff.py:1412 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." @@ -1916,20 +1917,20 @@ msgstr "" "Sie können Meld zur Hervorhebung längerer Änderungen zwingen, was jedoch " "langsam sein könnte." -#: ../meld/filediff.py:1399 +#: ../meld/filediff.py:1420 msgid "Keep highlighting" msgstr "Hervorhebung fortführen" -#: ../meld/filediff.py:1401 +#: ../meld/filediff.py:1422 msgid "_Keep highlighting" msgstr "Hervorhebung _fortführen" -#: ../meld/filediff.py:1433 +#: ../meld/filediff.py:1454 #, python-format msgid "Replace file “%s”?" msgstr "Datei »%s« ersetzen?" -#: ../meld/filediff.py:1435 +#: ../meld/filediff.py:1456 #, python-format msgid "" "A file with this name already exists in “%s”.\n" @@ -1938,46 +1939,46 @@ msgstr "" "Eine Datei mit diesem Namen existiert bereits in »%s«.\n" "Wenn Sie die vorhandene Datei ersetzen, geht dessen Inhalt verloren." -#: ../meld/filediff.py:1452 +#: ../meld/filediff.py:1473 msgid "Save Left Pane As" msgstr "Linke Ansicht speichern unter" -#: ../meld/filediff.py:1454 +#: ../meld/filediff.py:1475 msgid "Save Middle Pane As" msgstr "Mittlere Ansicht speichern unter" -#: ../meld/filediff.py:1456 +#: ../meld/filediff.py:1477 msgid "Save Right Pane As" msgstr "Rechte Ansicht speichern unter" -#: ../meld/filediff.py:1470 +#: ../meld/filediff.py:1491 #, 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:1472 +#: ../meld/filediff.py:1493 msgid "If you save it, any external changes will be lost." msgstr "Wenn Sie speichern, gehen externe Änderungen verloren." -#: ../meld/filediff.py:1475 +#: ../meld/filediff.py:1496 msgid "Save Anyway" msgstr "Dennoch speichern" -#: ../meld/filediff.py:1476 +#: ../meld/filediff.py:1497 msgid "Don't Save" msgstr "Nicht Speichern" -#: ../meld/filediff.py:1498 +#: ../meld/filediff.py:1519 msgid "_Save as UTF-8" msgstr "Als UTF-8 _speichern" -#: ../meld/filediff.py:1501 +#: ../meld/filediff.py:1522 #, python-format msgid "Couldn't encode text as “%s”" msgstr "Text konnte nicht als »%s« kodiert werden." -#: ../meld/filediff.py:1503 +#: ../meld/filediff.py:1524 #, python-format msgid "" "File “%s” contains characters that can't be encoded using encoding “%s”.\n" @@ -1986,12 +1987,12 @@ msgstr "" "Die Datei »%s« enthält Zeichen, die mit »%s« nicht kodierbar sind.\n" "Möchten Sie im UTF-8-Format speichern?" -#: ../meld/filediff.py:1540 ../meld/patchdialog.py:125 +#: ../meld/filediff.py:1564 ../meld/patchdialog.py:120 #, python-format msgid "Could not save file %s." msgstr "Datei %s konnte nicht gespeichert werden." -#: ../meld/filediff.py:1541 ../meld/patchdialog.py:126 +#: ../meld/filediff.py:1565 ../meld/patchdialog.py:121 #, python-format msgid "" "Couldn't save file due to:\n" @@ -2000,11 +2001,11 @@ msgstr "" "Datei konnte nicht gespeichert werden:\n" "%s" -#: ../meld/filediff.py:1887 +#: ../meld/filediff.py:1910 msgid "Live comparison updating disabled" msgstr "Direkte Vergleichsaktualisierung deaktiviert" -#: ../meld/filediff.py:1888 +#: ../meld/filediff.py:1911 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -2028,343 +2029,303 @@ msgstr "Nach _oben kopieren" msgid "Copy _down" msgstr "Nach _unten kopieren" -#: ../meld/meldapp.py:177 +#: ../meld/meldapp.py:175 msgid "wrong number of arguments supplied to --diff" msgstr "Falsche Anzahl an Argumenten für --diff." -#: ../meld/meldapp.py:182 +#: ../meld/meldapp.py:180 msgid "Start with an empty window" msgstr "Beim Start kein Fenster öffnen" -#: ../meld/meldapp.py:183 ../meld/meldapp.py:185 +#: ../meld/meldapp.py:181 ../meld/meldapp.py:183 msgid "file" msgstr "Datei" -#: ../meld/meldapp.py:183 ../meld/meldapp.py:187 +#: ../meld/meldapp.py:181 ../meld/meldapp.py:185 msgid "folder" msgstr "Ordner" -#: ../meld/meldapp.py:184 +#: ../meld/meldapp.py:182 msgid "Start a version control comparison" msgstr "Versionskontrollvergleich starten" -#: ../meld/meldapp.py:186 +#: ../meld/meldapp.py:184 msgid "Start a 2- or 3-way file comparison" msgstr "Im Zwei- oder Dreiwegevergleich starten" -#: ../meld/meldapp.py:188 +#: ../meld/meldapp.py:186 msgid "Start a 2- or 3-way folder comparison" msgstr "Einen Zwei- oder Dreiwegevergleich starten" -#: ../meld/meldapp.py:231 +#: ../meld/meldapp.py:229 #, python-format msgid "Error: %s\n" msgstr "Fehler: %s\n" -#: ../meld/meldapp.py:238 +#: ../meld/meldapp.py:236 msgid "Meld is a file and directory comparison tool." msgstr "Meld ist ein Werkzeug zum Vergleichen von Dateien und Ordnern." -#: ../meld/meldapp.py:242 +#: ../meld/meldapp.py:240 msgid "Set label to use instead of file name" msgstr "Zu verwendende Bezeichnung anstelle Dateinamen angeben" -#: ../meld/meldapp.py:245 +#: ../meld/meldapp.py:243 msgid "Open a new tab in an already running instance" msgstr "Einen neuen Reiter in einer bereits laufenden Instanz öffnen" -#: ../meld/meldapp.py:248 +#: ../meld/meldapp.py:246 msgid "Automatically compare all differing files on startup" msgstr "Automatisch alle sich unterscheidenden Dateien beim Start vergleichen" -#: ../meld/meldapp.py:251 +#: ../meld/meldapp.py:249 msgid "Ignored for compatibility" msgstr "Aus Kompatibilitätsgründen ignoriert" -#: ../meld/meldapp.py:255 +#: ../meld/meldapp.py:253 msgid "Set the target file for saving a merge result" msgstr "Zieldatei zum Speichern einer Zusammenführung festlegen" -#: ../meld/meldapp.py:258 +#: ../meld/meldapp.py:256 msgid "Automatically merge files" msgstr "Dateien automatisch zusammenführen" -#: ../meld/meldapp.py:262 +#: ../meld/meldapp.py:260 msgid "Load a saved comparison from a Meld comparison file" msgstr "Einen abgespeicherten Vergleich aus einer Meld-Vergleichsdatei laden" -#: ../meld/meldapp.py:266 +#: ../meld/meldapp.py:264 msgid "Create a diff tab for the supplied files or folders" msgstr "Erzeugt einen Differenz-Reiter für die angegebenen Dateien oder Ordner" -#: ../meld/meldapp.py:286 +#: ../meld/meldapp.py:284 #, python-format msgid "too many arguments (wanted 0-3, got %d)" msgstr "zu viele Argumente (0-3 erforderlich, %d erhalten)" -#: ../meld/meldapp.py:289 +#: ../meld/meldapp.py:287 msgid "can't auto-merge less than 3 files" msgstr "" "kann nicht mit weniger als 3 Dateien eine automatische Zusammenführung " "durchführen" -#: ../meld/meldapp.py:291 +#: ../meld/meldapp.py:289 msgid "can't auto-merge directories" msgstr "kann Ordner nicht automatisch zusammenführen" -#: ../meld/meldapp.py:305 +#: ../meld/meldapp.py:303 msgid "Error reading saved comparison file" msgstr "Fehler beim Lesen der gespeicherten Vergleichsdatei" -#: ../meld/meldapp.py:332 +#: ../meld/meldapp.py:330 #, python-format msgid "invalid path or URI \"%s\"" msgstr "Ungültiger Pfad oder Adresse »%s«." #. TRANSLATORS: This is the label of a new, currently-unnamed file. -#: ../meld/meldbuffer.py:127 +#: ../meld/meldbuffer.py:131 msgid "" msgstr "" -#: ../meld/melddoc.py:83 ../meld/melddoc.py:84 +#: ../meld/melddoc.py:64 msgid "untitled" msgstr "unbenannt" -#: ../meld/meldwindow.py:49 +#: ../meld/meldwindow.py:48 msgid "_File" msgstr "_Datei" -#: ../meld/meldwindow.py:50 +#: ../meld/meldwindow.py:49 msgid "_New Comparison..." msgstr "Neuer _Vergleich …" -#: ../meld/meldwindow.py:51 +#: ../meld/meldwindow.py:50 msgid "Start a new comparison" msgstr "Neuen Vergleich starten" -#: ../meld/meldwindow.py:54 +#: ../meld/meldwindow.py:53 msgid "Save the current file" msgstr "Aktuelle Datei speichern" -#: ../meld/meldwindow.py:56 +#: ../meld/meldwindow.py:55 msgid "Save As..." msgstr "Speichern unter …" -#: ../meld/meldwindow.py:57 +#: ../meld/meldwindow.py:56 msgid "Save the current file with a different name" msgstr "Aktuelle Datei unter einem anderen Namen speichern" -#: ../meld/meldwindow.py:60 +#: ../meld/meldwindow.py:59 msgid "Close the current file" msgstr "Aktuelle Datei schließen" -#: ../meld/meldwindow.py:63 +#: ../meld/meldwindow.py:62 msgid "_Edit" msgstr "_Bearbeiten" -#: ../meld/meldwindow.py:65 +#: ../meld/meldwindow.py:64 msgid "Undo the last action" msgstr "Letzte Aktion rückgängig machen" -#: ../meld/meldwindow.py:68 +#: ../meld/meldwindow.py:67 msgid "Redo the last undone action" msgstr "Letzte Aktion wiederholen" -#: ../meld/meldwindow.py:70 +#: ../meld/meldwindow.py:69 msgid "Cut the selection" msgstr "Auswahl ausschneiden" -#: ../meld/meldwindow.py:72 +#: ../meld/meldwindow.py:71 msgid "Copy the selection" msgstr "Auswahl kopieren" -#: ../meld/meldwindow.py:74 +#: ../meld/meldwindow.py:73 msgid "Paste the clipboard" msgstr "Aus der Zwischenablage einfügen" -#: ../meld/meldwindow.py:76 +#: ../meld/meldwindow.py:75 msgid "Find..." msgstr "Suchen …" -#: ../meld/meldwindow.py:76 +#: ../meld/meldwindow.py:75 msgid "Search for text" msgstr "Nach Text suchen" -#: ../meld/meldwindow.py:78 +#: ../meld/meldwindow.py:77 msgid "Find Ne_xt" msgstr "Nä_chste" -#: ../meld/meldwindow.py:79 +#: ../meld/meldwindow.py:78 msgid "Search forwards for the same text" msgstr "Vorwärts nach dem gleichen Text suchen" -#: ../meld/meldwindow.py:81 +#: ../meld/meldwindow.py:80 msgid "Find _Previous" msgstr "_Rückwärts suchen" -#: ../meld/meldwindow.py:82 +#: ../meld/meldwindow.py:81 msgid "Search backwards for the same text" msgstr "Rückwärts nach dem gleichen Text suchen" -#: ../meld/meldwindow.py:85 +#: ../meld/meldwindow.py:84 msgid "_Replace..." msgstr "Erset_zen …" -#: ../meld/meldwindow.py:86 +#: ../meld/meldwindow.py:85 msgid "Find and replace text" msgstr "Text suchen und ersetzen" -#: ../meld/meldwindow.py:89 +#: ../meld/meldwindow.py:88 msgid "_Changes" msgstr "Än_derungen" -#: ../meld/meldwindow.py:90 +#: ../meld/meldwindow.py:89 msgid "Next Change" msgstr "Nächste Änderung" -#: ../meld/meldwindow.py:91 +#: ../meld/meldwindow.py:90 msgid "Go to the next change" msgstr "Zur nächsten Änderung gehen" -#: ../meld/meldwindow.py:93 +#: ../meld/meldwindow.py:92 msgid "Previous Change" msgstr "Vorherige Änderung" -#: ../meld/meldwindow.py:94 +#: ../meld/meldwindow.py:93 msgid "Go to the previous change" msgstr "Zur vorherigen Änderung gehen" -#: ../meld/meldwindow.py:96 +#: ../meld/meldwindow.py:95 msgid "Open Externally" msgstr "Extern öffnen" -#: ../meld/meldwindow.py:97 +#: ../meld/meldwindow.py:96 msgid "Open selected file or directory in the default external application" msgstr "" "Gewählte Datei oder Ordner in der vorgegebenen externen Anwendung öffnen" -#: ../meld/meldwindow.py:101 +#: ../meld/meldwindow.py:100 msgid "_View" msgstr "_Ansicht" -#: ../meld/meldwindow.py:102 +#: ../meld/meldwindow.py:101 msgid "File Status" msgstr "Dateistatus" -#: ../meld/meldwindow.py:103 +#: ../meld/meldwindow.py:102 msgid "Version Status" msgstr "Versionsstatus" -#: ../meld/meldwindow.py:106 +#: ../meld/meldwindow.py:105 msgid "Stop the current action" msgstr "Aktuelle Aktion abbrechen" -#: ../meld/meldwindow.py:109 +#: ../meld/meldwindow.py:108 msgid "Refresh the view" msgstr "Ansicht aktualisieren" #: ../meld/meldwindow.py:112 -msgid "_Tabs" -msgstr "Rei_ter" - -#: ../meld/meldwindow.py:113 -msgid "_Previous Tab" -msgstr "_Vorheriger Reiter" - -#: ../meld/meldwindow.py:114 -msgid "Activate previous tab" -msgstr "Vorherigen Reiter aktivieren" - -#: ../meld/meldwindow.py:116 -msgid "_Next Tab" -msgstr "_Nächster Reiter" - -#: ../meld/meldwindow.py:117 -msgid "Activate next tab" -msgstr "Nächsten Reiter aktivieren" - -#: ../meld/meldwindow.py:120 -msgid "Move Tab _Left" -msgstr "Reiter nach _links verschieben" - -#: ../meld/meldwindow.py:121 -msgid "Move current tab to left" -msgstr "Aktuellen Reiter nach links verschieben" - -#: ../meld/meldwindow.py:124 -msgid "Move Tab _Right" -msgstr "Reiter nach _rechts verschieben" - -#: ../meld/meldwindow.py:125 -msgid "Move current tab to right" -msgstr "Aktuellen Reiter nach rechts verschieben" - -#: ../meld/meldwindow.py:129 msgid "Fullscreen" msgstr "Vollbild" -#: ../meld/meldwindow.py:130 +#: ../meld/meldwindow.py:113 msgid "View the comparison in fullscreen" msgstr "Den Vergleich im Vollbildmodus anzeigen" -#: ../meld/meldwindow.py:132 +#: ../meld/meldwindow.py:115 msgid "_Toolbar" msgstr "_Werkzeugleiste" -#: ../meld/meldwindow.py:133 +#: ../meld/meldwindow.py:116 msgid "Show or hide the toolbar" msgstr "Werkzeugleiste anzeigen oder verbergen" -#: ../meld/meldwindow.py:143 +#: ../meld/meldwindow.py:126 msgid "Open Recent" msgstr "Zuletzt verwendete Dateien öffnen" -#: ../meld/meldwindow.py:144 +#: ../meld/meldwindow.py:127 msgid "Open recent files" msgstr "Zuletzt verwendete Dateien öffnen" -#: ../meld/meldwindow.py:166 +#: ../meld/meldwindow.py:149 msgid "_Meld" msgstr "_Meld" -#: ../meld/meldwindow.py:167 +#: ../meld/meldwindow.py:150 msgid "Quit the program" msgstr "Anwendung beenden" -#: ../meld/meldwindow.py:169 +#: ../meld/meldwindow.py:152 msgid "Prefere_nces" msgstr "_Einstellungen" -#: ../meld/meldwindow.py:170 +#: ../meld/meldwindow.py:153 msgid "Configure the application" msgstr "Anwendung konfigurieren" -#: ../meld/meldwindow.py:172 +#: ../meld/meldwindow.py:155 msgid "_Contents" msgstr "I_nhalt" -#: ../meld/meldwindow.py:173 +#: ../meld/meldwindow.py:156 msgid "Open the Meld manual" msgstr "Handbuch öffnen" -#: ../meld/meldwindow.py:175 +#: ../meld/meldwindow.py:158 msgid "About this application" msgstr "Info zu dieser Anwendung" -#: ../meld/meldwindow.py:587 -msgid "Switch to this tab" -msgstr "Zu diesem Reiter wechseln" - -#: ../meld/meldwindow.py:702 +#: ../meld/meldwindow.py:604 #, python-format msgid "Need three files to auto-merge, got: %r" msgstr "Drei Dateien zum automatischen Zusammenführen benötigt, %r erhalten." -#: ../meld/meldwindow.py:716 +#: ../meld/meldwindow.py:618 msgid "Cannot compare a mixture of files and directories" msgstr "Es kann keine Mischung aus Dateien und Ordnern verglichen werden" -#: ../meld/misc.py:179 +#: ../meld/misc.py:203 #, python-format msgid "Couldn't find colour scheme details for %s-%s; this is a bad install" msgstr "" @@ -2372,7 +2333,7 @@ msgstr "" "ist fehlerhaft." #. no common path. empty names get changed to "[None]" -#: ../meld/misc.py:264 +#: ../meld/misc.py:263 msgid "[None]" msgstr "[Nichts]" @@ -2384,7 +2345,7 @@ msgstr "Bezeichnung" msgid "pattern" msgstr "Muster" -#: ../meld/recent.py:115 +#: ../meld/recent.py:114 msgid "Version control:" msgstr "Versionskontrolle:" @@ -2392,43 +2353,43 @@ msgstr "Versionskontrolle:" msgid "Close tab" msgstr "Reiter schließen" -#: ../meld/ui/vcdialogs.py:50 +#: ../meld/ui/vcdialogs.py:48 msgid "No files will be committed" msgstr "Keine Dateien zum Einspielen" #. Translators: First %s is replaced by translated "%d unpushed #. commits", second %s is replaced by translated "%d branches" -#: ../meld/vc/git.py:95 +#: ../meld/vc/git.py:94 #, python-format msgid "%s in %s" msgstr "%s in %s" #. Translators: These messages cover the case where there is #. only one branch, and are not part of another message. -#: ../meld/vc/git.py:96 ../meld/vc/git.py:103 +#: ../meld/vc/git.py:95 ../meld/vc/git.py:102 #, python-format msgid "%d unpushed commit" msgid_plural "%d unpushed commits" msgstr[0] "%d nicht geschobene Einbringung" msgstr[1] "%d nicht geschobene Einbringungen" -#: ../meld/vc/git.py:98 +#: ../meld/vc/git.py:97 #, python-format msgid "%d branch" msgid_plural "%d branches" msgstr[0] "%d Zweig" msgstr[1] "%d Zweige" -#: ../meld/vc/git.py:352 +#: ../meld/vc/git.py:330 #, python-format msgid "Mode changed from %s to %s" msgstr "Modus wechselte von %s zu %s" -#: ../meld/vc/git.py:360 +#: ../meld/vc/git.py:338 msgid "Partially staged" msgstr "Teilweise bereitgestellt" -#: ../meld/vc/git.py:360 +#: ../meld/vc/git.py:338 msgid "Staged" msgstr "Bereitgestellt" @@ -2438,140 +2399,140 @@ msgstr "Bereitgestellt" msgid "None" msgstr "Nichts" -#: ../meld/vc/svn.py:216 +#: ../meld/vc/svn.py:204 #, python-format msgid "Rev %s" msgstr "Rev %s" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Merged" msgstr "Zusammengefügt" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Base" msgstr "Basis" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Local" msgstr "Lokal" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Remote" msgstr "Entfernt" -#: ../meld/vc/_vc.py:68 +#: ../meld/vc/_vc.py:70 msgid "Unversioned" msgstr "Nicht versioniert" -#: ../meld/vc/_vc.py:71 +#: ../meld/vc/_vc.py:73 msgid "Error" msgstr "Fehler" -#: ../meld/vc/_vc.py:73 +#: ../meld/vc/_vc.py:75 msgid "Newly added" msgstr "Kürzlich hinzugefügt" -#: ../meld/vc/_vc.py:75 +#: ../meld/vc/_vc.py:77 msgid "Renamed" msgstr "Umbenannt" -#: ../meld/vc/_vc.py:76 +#: ../meld/vc/_vc.py:78 msgid "Conflict" msgstr "Konflikt" -#: ../meld/vc/_vc.py:77 +#: ../meld/vc/_vc.py:79 msgid "Removed" msgstr "Entfernt" -#: ../meld/vc/_vc.py:78 +#: ../meld/vc/_vc.py:80 msgid "Missing" msgstr "Fehlend" -#: ../meld/vc/_vc.py:79 +#: ../meld/vc/_vc.py:81 msgid "Not present" msgstr "Nicht vorhanden" #. Translators: This error message is shown when a version #. control binary isn't installed. -#: ../meld/vcview.py:255 +#: ../meld/vcview.py:251 #, python-format msgid "%(name)s (%(cmd)s not installed)" msgstr "%(name)s (%(cmd)s ist nicht installiert" #. Translators: This error message is shown when a version #. controlled repository is invalid. -#: ../meld/vcview.py:259 +#: ../meld/vcview.py:255 #, python-format msgid "%(name)s (Invalid repository)" msgstr "%(name)s (ungültiger Softwarebestand)" -#: ../meld/vcview.py:280 +#: ../meld/vcview.py:276 msgid "No valid version control system found in this folder" msgstr "Kein gültiges Versionskontrollsystem in diesem Verzeichnis gefunden" -#: ../meld/vcview.py:282 +#: ../meld/vcview.py:278 msgid "Only one version control system found in this folder" msgstr "Nur eine Versionskontrolle in diesem Ordner gefunden" -#: ../meld/vcview.py:284 +#: ../meld/vcview.py:280 msgid "Choose which version control system to use" msgstr "Wählen Sie die zu verwendende Versionskontrolle" #. TRANSLATORS: This is the location of the directory being viewed -#: ../meld/vcview.py:337 +#: ../meld/vcview.py:332 #, python-format msgid "%s: %s" msgstr "%s: %s" -#: ../meld/vcview.py:357 +#: ../meld/vcview.py:352 #, python-format msgid "Scanning %s" msgstr "%s wird durchsucht" -#: ../meld/vcview.py:396 +#: ../meld/vcview.py:391 msgid "(Empty)" msgstr "(Leer)" -#: ../meld/vcview.py:440 +#: ../meld/vcview.py:435 #, python-format msgid "%s — local" msgstr "%s — lokal" -#: ../meld/vcview.py:441 +#: ../meld/vcview.py:436 #, python-format msgid "%s — remote" msgstr "%s — entfernt" -#: ../meld/vcview.py:449 +#: ../meld/vcview.py:444 #, python-format msgid "%s (local, merge, remote)" msgstr "%s (lokal, zusammengeführt, entfernt)" -#: ../meld/vcview.py:454 +#: ../meld/vcview.py:449 #, python-format msgid "%s (remote, merge, local)" msgstr "%s (entfernt, zusammengeführt, lokal)" -#: ../meld/vcview.py:465 +#: ../meld/vcview.py:460 #, python-format msgid "%s — repository" msgstr "%s — Softwarebestand" -#: ../meld/vcview.py:471 +#: ../meld/vcview.py:466 #, python-format msgid "%s (working, repository)" msgstr "%s (Arbeitskopie, Softwarebestand)" -#: ../meld/vcview.py:475 +#: ../meld/vcview.py:470 #, python-format msgid "%s (repository, working)" msgstr "%s (Softwarebestand, Arbeitskopie)" -#: ../meld/vcview.py:643 +#: ../meld/vcview.py:638 msgid "Remove folder and all its files?" msgstr "Den Ordner und alle Dateien entfernen?" -#: ../meld/vcview.py:645 +#: ../meld/vcview.py:640 msgid "" "This will remove all selected files and folders, and all files within any " "selected folders, from version control." @@ -2579,11 +2540,44 @@ msgstr "" "Dadurch werden alle gewählten Dateien, Ordner und deren Inhalte aus der " "Versionskontrolle entfernt." -#: ../meld/vcview.py:670 +#: ../meld/vcview.py:665 #, python-format msgid "Error removing %s" msgstr "Fehler beim Entfernen von %s" -#: ../meld/vcview.py:750 +#: ../meld/vcview.py:745 msgid "Clear" msgstr "Leeren" + +#~ msgid "Meld does not support Python 3." +#~ msgstr "Meld unterstützt Python 3 nicht." + +#~ msgid "_Tabs" +#~ msgstr "Rei_ter" + +#~ msgid "_Previous Tab" +#~ msgstr "_Vorheriger Reiter" + +#~ msgid "Activate previous tab" +#~ msgstr "Vorherigen Reiter aktivieren" + +#~ msgid "_Next Tab" +#~ msgstr "_Nächster Reiter" + +#~ msgid "Activate next tab" +#~ msgstr "Nächsten Reiter aktivieren" + +#~ msgid "Move Tab _Left" +#~ msgstr "Reiter nach _links verschieben" + +#~ msgid "Move current tab to left" +#~ msgstr "Aktuellen Reiter nach links verschieben" + +#~ msgid "Move Tab _Right" +#~ msgstr "Reiter nach _rechts verschieben" + +#~ msgid "Move current tab to right" +#~ msgstr "Aktuellen Reiter nach rechts verschieben" + +#~ msgid "Switch to this tab" +#~ msgstr "Zu diesem Reiter wechseln" From df8bc160cae22421766177f6dac26dd574d624ad Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sat, 10 Sep 2016 07:42:52 +1000 Subject: [PATCH 0026/1316] dirdiff: Fix showing identical folder message when no files were shown --- meld/dirdiff.py | 1 - 1 file changed, 1 deletion(-) diff --git a/meld/dirdiff.py b/meld/dirdiff.py index 708d3b08..db53951c 100644 --- a/meld/dirdiff.py +++ b/meld/dirdiff.py @@ -797,7 +797,6 @@ def _search_recursively_iter(self, rootpath): # no siblings. If we're here, we have an empty tree. if parent is None: self.model.add_empty(it) - expanded.add(tuple_tree_path(rootpath)) break # Remove the current row, and then revalidate all From 4458d9b9c4de81e421ccd6ff243312511c1d615f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Dr=C4=85g?= Date: Fri, 9 Sep 2016 23:48:22 +0200 Subject: [PATCH 0027/1316] Updated Polish translation --- po/pl.po | 118 +++++++++++++++++++++++++++---------------------------- 1 file changed, 59 insertions(+), 59 deletions(-) diff --git a/po/pl.po b/po/pl.po index c69d6072..82a7ecfe 100644 --- a/po/pl.po +++ b/po/pl.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: meld\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-21 09:50+0200\n" -"PO-Revision-Date: 2016-08-21 09:51+0200\n" +"POT-Creation-Date: 2016-09-09 23:45+0200\n" +"PO-Revision-Date: 2016-09-09 23:47+0200\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "Language: pl\n" @@ -310,8 +310,8 @@ msgid "" "considering files to be identical if their size and mtime match, and " "different otherwise." msgstr "" -"Jeśli wynosi „true”, to porównania katalogów będą porównywały pliki " -"w oparciu wyłącznie o rozmiar i czas modyfikacji. Pliki o identycznym " +"Jeśli wynosi „true”, to porównania katalogów będą porównywały pliki na " +"podstawie wyłącznie rozmiaru i czasu modyfikacji. Pliki o identycznym " "rozmiarze i czasie modyfikacji będą uznawane za identyczne." #: ../data/org.gnome.meld.gschema.xml.h:41 @@ -325,10 +325,10 @@ msgid "" "is useful when comparing files between filesystems with different timestamp " "resolution." msgstr "" -"Podczas porównywania opartego o czas modyfikacji jest to minimalna różnica " -"w nanosekundach między dwoma plikami, aby zostały uznane za różne. Jest to " -"przydatne podczas porównywania plików między systemami plików z różnym " -"rozwiązywaniem czasu modyfikacji." +"Podczas porównywania na podstawie czasu modyfikacji jest to minimalna " +"różnica w nanosekundach między dwoma plikami, aby zostały uznane za różne. " +"Jest to przydatne podczas porównywania plików między systemami plików " +"z różnym rozwiązywaniem czasu modyfikacji." #: ../data/org.gnome.meld.gschema.xml.h:43 ../data/ui/preferences.ui.h:30 msgid "Apply text filters during folder comparisons" @@ -461,19 +461,19 @@ msgstr "" #: ../data/org.gnome.meld.gschema.xml.h:63 msgid "Filename-based filters" -msgstr "Filtry oparte o nazwy plików" +msgstr "Filtry na podstawie nazw plików" #: ../data/org.gnome.meld.gschema.xml.h:64 msgid "" "List of predefined filename-based filters that, if active, will remove " "matching files from a folder comparison." msgstr "" -"Lista uprzednio podanych filtrów opartych o nazwy plików które, jeśli są " +"Lista uprzednio podanych filtrów na podstawie nazw plików, które jeśli są " "aktywne, będą usuwały pasujące pliki z porównania katalogów." #: ../data/org.gnome.meld.gschema.xml.h:65 msgid "Text-based filters" -msgstr "Filtry oparte na tekście" +msgstr "Filtry na podstawie tekstu" #: ../data/org.gnome.meld.gschema.xml.h:66 msgid "" @@ -481,9 +481,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 "" -"Lista uprzednio podanych filtrów wyrażeń regularnych opartych o tekst które, " -"jeśli są aktywne, będą usuwały tekst z porównania plików. Tekst będzie nadal " -"wyświetlany, ale nie będzie zawarty w samym porównaniu." +"Lista uprzednio podanych filtrów wyrażeń regularnych na podstawie tekstu, " +"które jeśli są aktywne, będą usuwały tekst z porównania plików. Tekst będzie " +"nadal wyświetlany, ale nie będzie zawarty w samym porównaniu." #: ../data/styles/meld-base.xml.h:1 msgid "Meld base scheme" @@ -576,7 +576,7 @@ msgstr "Kopiuje element na prawo" msgid "Delete selected" msgstr "Usuwa zaznaczone" -#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:859 ../meld/filediff.py:1384 +#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:859 ../meld/filediff.py:1381 msgid "Hide" msgstr "Ukryj" @@ -866,8 +866,8 @@ msgstr "" msgid "Close _without Saving" msgstr "Zamknij _bez zapisywania" -#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:941 ../meld/filediff.py:1450 -#: ../meld/filediff.py:1518 +#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:941 ../meld/filediff.py:1447 +#: ../meld/filediff.py:1515 msgid "_Cancel" msgstr "_Anuluj" @@ -904,7 +904,7 @@ msgid "Changes made to the following documents will be permanently lost:\n" msgstr "" "Zmiany naniesione do poniższych dokumentów zostaną bezpowrotnie utracone:\n" -#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:942 ../meld/filediff.py:1451 +#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:942 ../meld/filediff.py:1448 msgid "_Replace" msgstr "Z_amień" @@ -952,7 +952,7 @@ msgstr "Sformatowanie jako poprawka" msgid "Copy to Clipboard" msgstr "Skopiuj do schowka" -#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:144 +#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:155 msgid "Save Patch" msgstr "Zapisz poprawkę" @@ -1082,7 +1082,7 @@ msgstr "Płytkie porównanie" #: ../data/ui/preferences.ui.h:28 msgid "C_ompare files based only on size and timestamp" -msgstr "P_orównywanie plików w oparciu tylko o rozmiar i czas modyfikacji" +msgstr "P_orównywanie plików tylko na podstawie rozmiaru i czasu modyfikacji" #: ../data/ui/preferences.ui.h:29 msgid "_Timestamp resolution:" @@ -1694,8 +1694,8 @@ 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:861 ../meld/filediff.py:1386 ../meld/filediff.py:1416 -#: ../meld/filediff.py:1418 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 +#: ../meld/dirdiff.py:861 ../meld/filediff.py:1383 ../meld/filediff.py:1413 +#: ../meld/filediff.py:1415 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 msgid "Hi_de" msgstr "_Ukryj" @@ -1800,66 +1800,66 @@ msgstr "" "Filtr zmienił liczbę wierszy w pliku, co nie jest obsługiwane. Porównanie " "będzie niepoprawne." -#: ../meld/filediff.py:841 +#: ../meld/filediff.py:839 msgid "Mark conflict as resolved?" msgstr "Oznaczyć konflikt jako rozwiązany?" -#: ../meld/filediff.py:843 +#: ../meld/filediff.py:841 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:845 +#: ../meld/filediff.py:843 msgid "Cancel" msgstr "Anuluj" -#: ../meld/filediff.py:846 +#: ../meld/filediff.py:844 msgid "Mark _Resolved" msgstr "Oznacz jako _rozwiązane" -#: ../meld/filediff.py:1095 +#: ../meld/filediff.py:1092 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Wystąpił problem podczas otwierania pliku „%s”." -#: ../meld/filediff.py:1103 +#: ../meld/filediff.py:1100 #, python-format msgid "File %s appears to be a binary file." msgstr "Plik %s wygląda na plik binarny." -#: ../meld/filediff.py:1105 +#: ../meld/filediff.py:1102 msgid "Do you want to open the file using the default application?" msgstr "Otworzyć go w domyślnym programie?" -#: ../meld/filediff.py:1107 +#: ../meld/filediff.py:1104 msgid "Open" msgstr "Otwórz" -#: ../meld/filediff.py:1123 +#: ../meld/filediff.py:1120 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Analizowanie różnic" -#: ../meld/filediff.py:1188 +#: ../meld/filediff.py:1185 #, python-format msgid "File %s has changed on disk" msgstr "Plik %s został zmieniony na dysku" -#: ../meld/filediff.py:1189 +#: ../meld/filediff.py:1186 msgid "Do you want to reload the file?" msgstr "Ponownie wczytać plik?" -#: ../meld/filediff.py:1191 +#: ../meld/filediff.py:1188 msgid "_Reload" msgstr "_Wczytaj ponownie" -#: ../meld/filediff.py:1349 +#: ../meld/filediff.py:1346 msgid "Files are identical" msgstr "Pliki są identyczne" -#: ../meld/filediff.py:1362 +#: ../meld/filediff.py:1359 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1867,11 +1867,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:1367 +#: ../meld/filediff.py:1364 msgid "Files differ in line endings only" msgstr "Pliki różnią się tylko znacznikami końca wierszy" -#: ../meld/filediff.py:1369 +#: ../meld/filediff.py:1366 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1880,15 +1880,15 @@ msgstr "" "Pliki są identyczne, z wyjątkiem różnych znaczników końca wierszy:\n" "%s" -#: ../meld/filediff.py:1389 +#: ../meld/filediff.py:1386 msgid "Show without filters" msgstr "Wyświetl bez filtrów" -#: ../meld/filediff.py:1411 +#: ../meld/filediff.py:1408 msgid "Change highlighting incomplete" msgstr "Wyróżnianie zmian jest niepełne" -#: ../meld/filediff.py:1412 +#: ../meld/filediff.py:1409 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." @@ -1896,20 +1896,20 @@ 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:1420 +#: ../meld/filediff.py:1417 msgid "Keep highlighting" msgstr "Wyróżniaj dalej" -#: ../meld/filediff.py:1422 +#: ../meld/filediff.py:1419 msgid "_Keep highlighting" msgstr "_Wyróżniaj dalej" -#: ../meld/filediff.py:1454 +#: ../meld/filediff.py:1451 #, python-format msgid "Replace file “%s”?" msgstr "Zastąpić plik „%s”?" -#: ../meld/filediff.py:1456 +#: ../meld/filediff.py:1453 #, python-format msgid "" "A file with this name already exists in “%s”.\n" @@ -1918,47 +1918,47 @@ msgstr "" "Plik o tej samej nazwie już istnieje w „%s”.\n" "Zastąpienie istniejącego pliku spowoduje utratę jego zawartości." -#: ../meld/filediff.py:1473 +#: ../meld/filediff.py:1470 msgid "Save Left Pane As" msgstr "Zapis lewego panelu jako" -#: ../meld/filediff.py:1475 +#: ../meld/filediff.py:1472 msgid "Save Middle Pane As" msgstr "Zapis środkowego panelu jako" -#: ../meld/filediff.py:1477 +#: ../meld/filediff.py:1474 msgid "Save Right Pane As" msgstr "Zapis prawego panelu jako" -#: ../meld/filediff.py:1491 +#: ../meld/filediff.py:1488 #, 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:1493 +#: ../meld/filediff.py:1490 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:1496 +#: ../meld/filediff.py:1493 msgid "Save Anyway" msgstr "Zapisz mimo to" -#: ../meld/filediff.py:1497 +#: ../meld/filediff.py:1494 msgid "Don't Save" msgstr "Nie zapisuj" -#: ../meld/filediff.py:1519 +#: ../meld/filediff.py:1516 msgid "_Save as UTF-8" msgstr "_Zapisz za pomocą UTF-8" -#: ../meld/filediff.py:1522 +#: ../meld/filediff.py:1519 #, python-format msgid "Couldn't encode text as “%s”" msgstr "Nie można zakodować tekstu za pomocą „%s”" -#: ../meld/filediff.py:1524 +#: ../meld/filediff.py:1521 #, python-format msgid "" "File “%s” contains characters that can't be encoded using encoding “%s”.\n" @@ -1968,12 +1968,12 @@ msgstr "" "„%s”.\n" "Zapisać za pomocą kodowania UTF-8?" -#: ../meld/filediff.py:1564 ../meld/patchdialog.py:120 +#: ../meld/filediff.py:1561 ../meld/patchdialog.py:131 #, python-format msgid "Could not save file %s." msgstr "Nie można zapisać pliku %s." -#: ../meld/filediff.py:1565 ../meld/patchdialog.py:121 +#: ../meld/filediff.py:1562 ../meld/patchdialog.py:132 #, python-format msgid "" "Couldn't save file due to:\n" @@ -1982,11 +1982,11 @@ msgstr "" "Nie można zapisać pliku z powodu:\n" "%s" -#: ../meld/filediff.py:1910 +#: ../meld/filediff.py:1907 msgid "Live comparison updating disabled" msgstr "Wyłączono aktualizowanie porównań na żywo" -#: ../meld/filediff.py:1911 +#: ../meld/filediff.py:1908 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " From 9ffbdba8d5c671552234598f43ff1d6b15beba9a Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sat, 10 Sep 2016 08:31:54 +1000 Subject: [PATCH 0028/1316] bin/meld: Fix requirements change from Python 3 branch merge This just brings our requirements back up to the same point that they were at for the 3.16 release series. --- bin/meld | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/meld b/bin/meld index f982782f..1151bc67 100755 --- a/bin/meld +++ b/bin/meld @@ -133,9 +133,9 @@ except WindowsError as e: def check_requirements(): pyver = (3, 3) - gtk_requirement = (3, 6) - glib_requirement = (2, 34, 0) - gtksourceview_requirement = (3, 6, 0) + gtk_requirement = (3, 14) + glib_requirement = (2, 36, 0) + gtksourceview_requirement = (3, 14, 0) def missing_reqs(mod, ver, exception=None): if isinstance(exception, ImportError): From d2f51fe061d358769a2ac509dac8ea2325898ec7 Mon Sep 17 00:00:00 2001 From: Daniel Mustieles Date: Tue, 13 Sep 2016 20:22:16 +0200 Subject: [PATCH 0029/1316] Updated Spanish translation --- po/es.po | 491 +++++++++++++++++++++++++++---------------------------- 1 file changed, 240 insertions(+), 251 deletions(-) diff --git a/po/es.po b/po/es.po index fcb8bcf2..e593b482 100644 --- a/po/es.po +++ b/po/es.po @@ -1,21 +1,21 @@ -# translation of meld.master.po to Español -# Spanish translation for Meld -# Traducción de Meld al español -# This file is distributed under the same license as the PACKAGE package. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. -# -# Francisco Javier F. Serrador , 2004, 2006. -# Jorge González , 2004, 2005, 2007, 2008, 2009, 2010, 2011. -# +# translation of meld.master.po to Español +# Spanish translation for Meld +# Traducción de Meld al español +# This file is distributed under the same license as the PACKAGE package. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. +# +# Francisco Javier F. Serrador , 2004, 2006. +# Jorge González , 2004, 2005, 2007, 2008, 2009, 2010, 2011. +# # Luisa Ceron , 2016. -# Daniel Mustieles , 2011, 2012, 2013, 2014, 2015. , 2016. +# Daniel Mustieles , 2011, 2012, 2013, 2014, 2015, 2016. # msgid "" msgstr "" "Project-Id-Version: meld.master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=meld&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-08-20 21:39+0000\n" +"POT-Creation-Date: 2016-08-29 12:25+0000\n" "PO-Revision-Date: 2016-08-29 14:20+0200\n" "Last-Translator: Daniel Mustieles \n" "Language-Team: Español; Castellano \n" @@ -26,20 +26,16 @@ msgstr "" "X-Generator: Gtranslator 2.91.6\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../bin/meld:144 +#: ../bin/meld:142 msgid "Cannot import: " msgstr "No se pudo importar: " -#: ../bin/meld:147 +#: ../bin/meld:145 #, c-format msgid "Meld requires %s or higher." msgstr "Meld requiere %s o superior." -#: ../bin/meld:151 -msgid "Meld does not support Python 3." -msgstr "Meld no soporta Python 3." - -#: ../bin/meld:200 +#: ../bin/meld:194 #, c-format msgid "" "Couldn't load Meld-specific CSS (%s)\n" @@ -452,7 +448,7 @@ msgstr "Recortar automáticamente los mensajes de «commit»" #: ../data/org.gnome.meld.gschema.xml.h:60 msgid "" -"If true, the version control commit message editor will hard-wrap (i.e., " +"If true, the version control commit message editor will hard-wrap (i.e, " "insert line breaks) at the commit margin before commit." msgstr "" "Si es cierto, el editor de mensajes de «commit» del control de versiones " @@ -583,7 +579,7 @@ msgstr "Copiar a la derecha" msgid "Delete selected" msgstr "Eliminar seleccionados" -#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:860 ../meld/filediff.py:1368 +#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:859 ../meld/filediff.py:1381 msgid "Hide" msgstr "Ocultar" @@ -619,7 +615,7 @@ msgstr "Nuevo" msgid "Show new" msgstr "Mostrar nuevos" -#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:74 +#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:76 msgid "Modified" msgstr "Modificado" @@ -652,7 +648,7 @@ msgid "_Add" msgstr "_Añadir" #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11 -#: ../meld/vcview.py:655 +#: ../meld/vcview.py:644 msgid "_Remove" msgstr "_Eliminar" @@ -674,7 +670,7 @@ msgstr "_Bajar" #. Create icon and filename CellRenderer #: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35 -#: ../meld/dirdiff.py:374 +#: ../meld/dirdiff.py:373 msgid "Name" msgstr "Nombre" @@ -877,8 +873,8 @@ msgstr "Los cambios se perderán permanentemente si no los guarda." msgid "Close _without Saving" msgstr "Cerrar _sin guardar" -#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:942 ../meld/filediff.py:1434 -#: ../meld/filediff.py:1502 +#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:941 ../meld/filediff.py:1447 +#: ../meld/filediff.py:1515 msgid "_Cancel" msgstr "_Cancelar" @@ -917,7 +913,7 @@ msgstr "" "Los cambios realizados a los siguientes documentos se perderán para " "siempre:\n" -#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:943 ../meld/filediff.py:1435 +#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:942 ../meld/filediff.py:1448 msgid "_Replace" msgstr "_Reemplazar" @@ -965,7 +961,7 @@ msgstr "Formatear como parche" msgid "Copy to Clipboard" msgstr "Copiar al portapapeles" -#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:149 +#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:155 msgid "Save Patch" msgstr "Guardar parche" @@ -1155,7 +1151,7 @@ msgstr "" "carpetas por nombre. Cada patrón es una lista de comodines al estilo shell " "separados por espacios." -#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:104 +#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:103 msgid "File Filters" msgstr "Filtros de archivos" @@ -1436,7 +1432,8 @@ msgctxt "shortcut window" msgid "Show/hide console output" msgstr "Mostrar/ocultar la salida de la consola" -#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:668 +#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:570 +#: ../meld/newdifftab.py:38 msgid "New comparison" msgstr "Nueva comparación" @@ -1585,7 +1582,7 @@ msgstr "Sin _versión" msgid "Show unversioned files" msgstr "Mostrar archivos sin versión" -#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:67 +#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69 msgid "Ignored" msgstr "Ignorado" @@ -1613,7 +1610,7 @@ msgstr "Registros anteriores:" msgid "Co_mmit" msgstr "E_fectuar" -#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:343 +#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:332 msgid "Location" msgstr "Lugar" @@ -1655,44 +1652,44 @@ msgid "Mac OS (CR)" msgstr "Mac OS (CR)" #. Create file size CellRenderer -#: ../meld/dirdiff.py:392 ../meld/preferences.py:82 +#: ../meld/dirdiff.py:391 ../meld/preferences.py:82 msgid "Size" msgstr "Tamaño" #. Create date-time CellRenderer -#: ../meld/dirdiff.py:400 ../meld/preferences.py:83 +#: ../meld/dirdiff.py:399 ../meld/preferences.py:83 msgid "Modification time" msgstr "Hora de modificación" #. Create permissions CellRenderer -#: ../meld/dirdiff.py:408 ../meld/preferences.py:84 +#: ../meld/dirdiff.py:407 ../meld/preferences.py:84 msgid "Permissions" msgstr "Permisos" -#: ../meld/dirdiff.py:538 +#: ../meld/dirdiff.py:537 #, python-format msgid "Hide %s" msgstr "Ocultar %s" -#: ../meld/dirdiff.py:670 ../meld/dirdiff.py:694 +#: ../meld/dirdiff.py:669 ../meld/dirdiff.py:693 #, python-format msgid "[%s] Scanning %s" msgstr "[%s] Buscando %s" -#: ../meld/dirdiff.py:827 +#: ../meld/dirdiff.py:826 #, python-format msgid "[%s] Done" msgstr "[%s] Hecho" -#: ../meld/dirdiff.py:835 +#: ../meld/dirdiff.py:834 msgid "Folders have no differences" msgstr "No hay diferencias entre las carpetas" -#: ../meld/dirdiff.py:837 +#: ../meld/dirdiff.py:836 msgid "Contents of scanned files in folders are identical." msgstr "El contenido de los archivos analizados en carpetas es idéntico." -#: ../meld/dirdiff.py:839 +#: ../meld/dirdiff.py:838 msgid "" "Scanned files in folders appear identical, but contents have not been " "scanned." @@ -1700,45 +1697,44 @@ msgstr "" "Los archivos analizados en las carpetas parecen idénticos, pero no se ha " "analizado el contenido." -#: ../meld/dirdiff.py:842 +#: ../meld/dirdiff.py:841 msgid "File filters are in use, so not all files have been scanned." msgstr "" "Se están usando filtros de archivos, por lo que no se han analizado todos " "los archivos." -#: ../meld/dirdiff.py:844 +#: ../meld/dirdiff.py:843 msgid "Text filters are in use and may be masking content differences." msgstr "" "Se están usando filtros de texto, y pueden estar ocultando diferencias entre " "archivos." -#: ../meld/dirdiff.py:862 ../meld/filediff.py:1370 ../meld/filediff.py:1400 -#: ../meld/filediff.py:1402 ../meld/ui/msgarea.py:109 -#: ../meld/ui/msgarea.py:122 +#: ../meld/dirdiff.py:861 ../meld/filediff.py:1383 ../meld/filediff.py:1413 +#: ../meld/filediff.py:1415 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 msgid "Hi_de" msgstr "_Ocultar" -#: ../meld/dirdiff.py:872 +#: ../meld/dirdiff.py:871 msgid "Multiple errors occurred while scanning this folder" msgstr "Ocurrieron varios errores al escanear esta carpeta" -#: ../meld/dirdiff.py:873 +#: ../meld/dirdiff.py:872 msgid "Files with invalid encodings found" msgstr "Se encontraron archivos con codificaciones no válidas" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:875 +#: ../meld/dirdiff.py:874 msgid "Some files were in an incorrect encoding. The names are something like:" msgstr "" "Algunos archivos tienen una codificación incorrecta. Los nombres son como " "esto:" -#: ../meld/dirdiff.py:877 +#: ../meld/dirdiff.py:876 msgid "Files hidden by case insensitive comparison" msgstr "Archivos ocultos por una comparación no sensible a capitalización" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:879 +#: ../meld/dirdiff.py:878 msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. The following files in this folder are hidden:" @@ -1747,17 +1743,17 @@ msgstr "" "sensible a capitalización. Los siguientes archivos de esta carpeta archivos " "están ocultos:" -#: ../meld/dirdiff.py:890 +#: ../meld/dirdiff.py:889 #, python-format msgid "'%s' hidden by '%s'" msgstr "«%s» oculto por «%s»" -#: ../meld/dirdiff.py:946 +#: ../meld/dirdiff.py:945 #, python-format msgid "Replace folder “%s”?" msgstr "¿Reemplazar la carpeta «%s»?" -#: ../meld/dirdiff.py:948 +#: ../meld/dirdiff.py:947 #, python-format msgid "" "Another folder with the same name already exists in “%s”.\n" @@ -1766,11 +1762,11 @@ msgstr "" "Ya existe otra carpeta con el mismo nombre en «%s».\n" "Si reemplaza la carpeta existente, se perderán todos sus archivos." -#: ../meld/dirdiff.py:961 +#: ../meld/dirdiff.py:960 msgid "Error copying file" msgstr "Error al copiar el archivo" -#: ../meld/dirdiff.py:962 +#: ../meld/dirdiff.py:961 #, python-format msgid "" "Couldn't copy %s\n" @@ -1783,35 +1779,35 @@ msgstr "" "\n" "%s" -#: ../meld/dirdiff.py:985 +#: ../meld/dirdiff.py:984 #, python-format msgid "Error deleting %s" msgstr "Error al eliminar %s" -#: ../meld/dirdiff.py:1492 +#: ../meld/dirdiff.py:1489 msgid "No folder" msgstr "No hay ninguna carpeta" #. Abbreviations for insert and overwrite that fit in the status bar -#: ../meld/filediff.py:357 +#: ../meld/filediff.py:354 msgid "INS" msgstr "INS" -#: ../meld/filediff.py:357 +#: ../meld/filediff.py:354 msgid "OVR" msgstr "SOB" #. Abbreviation for line, column so that it will fit in the status bar -#: ../meld/filediff.py:359 +#: ../meld/filediff.py:356 #, python-format msgid "Ln %i, Col %i" msgstr "Lín %i, Col %i" -#: ../meld/filediff.py:771 +#: ../meld/filediff.py:781 msgid "Comparison results will be inaccurate" msgstr "Los resultados de la comparación pueden no ser precisos" -#: ../meld/filediff.py:773 +#: ../meld/filediff.py:783 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1819,65 +1815,65 @@ msgstr "" "Un filtro cambia el número de líneas en el archivo, lo que no está " "soportado. La comparación no será exacta." -#: ../meld/filediff.py:831 +#: ../meld/filediff.py:839 msgid "Mark conflict as resolved?" msgstr "¿Marcar conflicto como resuelto?" -#: ../meld/filediff.py:833 +#: ../meld/filediff.py:841 msgid "" "If the conflict was resolved successfully, you may mark it as resolved now." msgstr "" "Si el conflicto se ha resuelto con éxito, debe marcarlo como resuelto ahora." -#: ../meld/filediff.py:835 +#: ../meld/filediff.py:843 msgid "Cancel" msgstr "Cancelar" -#: ../meld/filediff.py:836 +#: ../meld/filediff.py:844 msgid "Mark _Resolved" msgstr "Mar_car como resuelto" -#: ../meld/filediff.py:1086 +#: ../meld/filediff.py:1092 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Ha habido un problema al abrir el archivo «%s»." -#: ../meld/filediff.py:1094 +#: ../meld/filediff.py:1100 #, python-format msgid "File %s appears to be a binary file." msgstr "El archivo %s parece ser un archivo binario." -#: ../meld/filediff.py:1096 +#: ../meld/filediff.py:1102 msgid "Do you want to open the file using the default application?" msgstr "¿Quiere abrir el archivo usando la aplicación predeterminada?" -#: ../meld/filediff.py:1098 +#: ../meld/filediff.py:1104 msgid "Open" msgstr "Abrir" -#: ../meld/filediff.py:1114 +#: ../meld/filediff.py:1120 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Calculando las diferencias" -#: ../meld/filediff.py:1179 +#: ../meld/filediff.py:1185 #, python-format msgid "File %s has changed on disk" msgstr "El archivo %s ha cambiado en el disco" -#: ../meld/filediff.py:1180 +#: ../meld/filediff.py:1186 msgid "Do you want to reload the file?" msgstr "¿Quiere recargar el archivo?" -#: ../meld/filediff.py:1182 +#: ../meld/filediff.py:1188 msgid "_Reload" msgstr "_Recargar" -#: ../meld/filediff.py:1333 +#: ../meld/filediff.py:1346 msgid "Files are identical" msgstr "Los campos son idénticos" -#: ../meld/filediff.py:1346 +#: ../meld/filediff.py:1359 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1885,11 +1881,11 @@ msgstr "" "Se están usando filtros de texto, y pueden estar ocultando diferencias entre " "archivos. ¿Quiere comprar los archivos no filtrados?" -#: ../meld/filediff.py:1351 +#: ../meld/filediff.py:1364 msgid "Files differ in line endings only" msgstr "Los archivos difieren en los finales de línea" -#: ../meld/filediff.py:1353 +#: ../meld/filediff.py:1366 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1898,15 +1894,15 @@ msgstr "" "Los archivos son idénticos excepto por los finales de línea:\n" "%s" -#: ../meld/filediff.py:1373 +#: ../meld/filediff.py:1386 msgid "Show without filters" msgstr "Mostrar sin filtros" -#: ../meld/filediff.py:1395 +#: ../meld/filediff.py:1408 msgid "Change highlighting incomplete" msgstr "Cambiar el resaltado incompleto" -#: ../meld/filediff.py:1396 +#: ../meld/filediff.py:1409 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." @@ -1915,20 +1911,20 @@ msgstr "" "forzar a Meld para que resalte los cambios largos, aunque esto haga que sea " "más lento." -#: ../meld/filediff.py:1404 +#: ../meld/filediff.py:1417 msgid "Keep highlighting" msgstr "Mantener el resaltado" -#: ../meld/filediff.py:1406 +#: ../meld/filediff.py:1419 msgid "_Keep highlighting" msgstr "_Mantener el resaltado" -#: ../meld/filediff.py:1438 +#: ../meld/filediff.py:1451 #, python-format msgid "Replace file “%s”?" msgstr "¿Reemplazar el archivo «%s»?" -#: ../meld/filediff.py:1440 +#: ../meld/filediff.py:1453 #, python-format msgid "" "A file with this name already exists in “%s”.\n" @@ -1937,45 +1933,45 @@ msgstr "" "Ya existe un archivo con el mismo nombre en «%s».\n" "Si reemplaza el archivo existente, se perderá su contenido." -#: ../meld/filediff.py:1457 +#: ../meld/filediff.py:1470 msgid "Save Left Pane As" msgstr "Guardar panel izquierdo como" -#: ../meld/filediff.py:1459 +#: ../meld/filediff.py:1472 msgid "Save Middle Pane As" msgstr "Guardar el panel central como" -#: ../meld/filediff.py:1461 +#: ../meld/filediff.py:1474 msgid "Save Right Pane As" msgstr "Guardar el panel derecho como" -#: ../meld/filediff.py:1475 +#: ../meld/filediff.py:1488 #, python-format msgid "File %s has changed on disk since it was opened" msgstr "El archivo %s ha cambiado en el disco desde que se abrió" -#: ../meld/filediff.py:1477 +#: ../meld/filediff.py:1490 msgid "If you save it, any external changes will be lost." msgstr "Si lo guarda, los cambios externos se perderán." -#: ../meld/filediff.py:1480 +#: ../meld/filediff.py:1493 msgid "Save Anyway" msgstr "Guardar de todas formas" -#: ../meld/filediff.py:1481 +#: ../meld/filediff.py:1494 msgid "Don't Save" msgstr "No guardar" -#: ../meld/filediff.py:1503 +#: ../meld/filediff.py:1516 msgid "_Save as UTF-8" msgstr "_Guardar como UTF-8" -#: ../meld/filediff.py:1506 +#: ../meld/filediff.py:1519 #, python-format msgid "Couldn't encode text as “%s”" msgstr "No se pudo codificar el texto como «%s»" -#: ../meld/filediff.py:1508 +#: ../meld/filediff.py:1521 #, python-format msgid "" "File “%s” contains characters that can't be encoded using encoding “%s”.\n" @@ -1984,12 +1980,12 @@ msgstr "" "El archivo «%s» contiene caracteres no codificables con «%s».\n" "¿Quiere guardarlos como UTF-8?" -#: ../meld/filediff.py:1545 ../meld/patchdialog.py:125 +#: ../meld/filediff.py:1561 ../meld/patchdialog.py:131 #, python-format msgid "Could not save file %s." msgstr "No se pudo guardar el archivo %s." -#: ../meld/filediff.py:1546 ../meld/patchdialog.py:126 +#: ../meld/filediff.py:1562 ../meld/patchdialog.py:132 #, python-format msgid "" "Couldn't save file due to:\n" @@ -1998,11 +1994,11 @@ msgstr "" "No se pudo guardar el archivo debido a:\n" "%s" -#: ../meld/filediff.py:1892 +#: ../meld/filediff.py:1907 msgid "Live comparison updating disabled" msgstr "Actualización de la comparación en directo desactivada" -#: ../meld/filediff.py:1893 +#: ../meld/filediff.py:1908 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -2026,340 +2022,300 @@ msgstr "Copiar hacia _arriba" msgid "Copy _down" msgstr "Copiar hacia a_bajo" -#: ../meld/meldapp.py:177 +#: ../meld/meldapp.py:175 msgid "wrong number of arguments supplied to --diff" msgstr "el número de argumentos proporcionados para --diff es erróneo" -#: ../meld/meldapp.py:182 +#: ../meld/meldapp.py:180 msgid "Start with an empty window" msgstr "Iniciar con una ventana vacía" -#: ../meld/meldapp.py:183 ../meld/meldapp.py:185 +#: ../meld/meldapp.py:181 ../meld/meldapp.py:183 msgid "file" msgstr "archivo" -#: ../meld/meldapp.py:183 ../meld/meldapp.py:187 +#: ../meld/meldapp.py:181 ../meld/meldapp.py:185 msgid "folder" msgstr "carpeta" -#: ../meld/meldapp.py:184 +#: ../meld/meldapp.py:182 msgid "Start a version control comparison" msgstr "Iniciar una comparación de control de versiones" -#: ../meld/meldapp.py:186 +#: ../meld/meldapp.py:184 msgid "Start a 2- or 3-way file comparison" msgstr "Iniciar una comparación de archivo de 2 ó 3 vías" -#: ../meld/meldapp.py:188 +#: ../meld/meldapp.py:186 msgid "Start a 2- or 3-way folder comparison" msgstr "Iniciar una comparación de carpetas de 2 ó 3 vías" -#: ../meld/meldapp.py:231 +#: ../meld/meldapp.py:229 #, python-format msgid "Error: %s\n" msgstr "Error: %s\n" -#: ../meld/meldapp.py:238 +#: ../meld/meldapp.py:236 msgid "Meld is a file and directory comparison tool." msgstr "Meld es una herramienta de comparación de archivos y carpetas" -#: ../meld/meldapp.py:242 +#: ../meld/meldapp.py:240 msgid "Set label to use instead of file name" msgstr "Establecer etiqueta que usar en vez del nombre del archivo" -#: ../meld/meldapp.py:245 +#: ../meld/meldapp.py:243 msgid "Open a new tab in an already running instance" msgstr "Abrir una pestaña nueva en una instancia en ejecución" -#: ../meld/meldapp.py:248 +#: ../meld/meldapp.py:246 msgid "Automatically compare all differing files on startup" msgstr "Comparar automáticamente al inicio todos los archivos que difieran" -#: ../meld/meldapp.py:251 +#: ../meld/meldapp.py:249 msgid "Ignored for compatibility" msgstr "Ignorado por compatibilidad" -#: ../meld/meldapp.py:255 +#: ../meld/meldapp.py:253 msgid "Set the target file for saving a merge result" msgstr "Establecer el archivo de destino para guardar el resultado del cambio" -#: ../meld/meldapp.py:258 +#: ../meld/meldapp.py:256 msgid "Automatically merge files" msgstr "Mezclar archivos automáticamente" -#: ../meld/meldapp.py:262 +#: ../meld/meldapp.py:260 msgid "Load a saved comparison from a Meld comparison file" msgstr "" "Cargar un archivo de comparación guardado desde un archivo de comparación de " "Meld" -#: ../meld/meldapp.py:266 +#: ../meld/meldapp.py:264 msgid "Create a diff tab for the supplied files or folders" msgstr "Crea una pestaña «diff» para los archivos o carpetas proporcionadas." -#: ../meld/meldapp.py:286 +#: ../meld/meldapp.py:284 #, python-format msgid "too many arguments (wanted 0-3, got %d)" msgstr "demasiados argumentos (se esperaban 0-3, se obtuvieron %d)" -#: ../meld/meldapp.py:289 +#: ../meld/meldapp.py:287 msgid "can't auto-merge less than 3 files" msgstr "no se pueden mezclar automáticamente menos de 3 archivos" -#: ../meld/meldapp.py:291 +#: ../meld/meldapp.py:289 msgid "can't auto-merge directories" msgstr "no se pueden mezclar carpetas automáticamente" -#: ../meld/meldapp.py:305 +#: ../meld/meldapp.py:303 msgid "Error reading saved comparison file" msgstr "Error al leer el archivo de comparación guardado" -#: ../meld/meldapp.py:332 +#: ../meld/meldapp.py:330 #, python-format msgid "invalid path or URI \"%s\"" msgstr "ruta u URI «%s» no válido" #. TRANSLATORS: This is the label of a new, currently-unnamed file. -#: ../meld/meldbuffer.py:132 +#: ../meld/meldbuffer.py:131 msgid "" msgstr "" -#: ../meld/melddoc.py:83 ../meld/melddoc.py:84 +#: ../meld/melddoc.py:64 msgid "untitled" msgstr "sin título" -#: ../meld/meldwindow.py:49 +#: ../meld/meldwindow.py:48 msgid "_File" msgstr "_Archivo" -#: ../meld/meldwindow.py:50 +#: ../meld/meldwindow.py:49 msgid "_New Comparison..." msgstr "_Nueva comparación…" -#: ../meld/meldwindow.py:51 +#: ../meld/meldwindow.py:50 msgid "Start a new comparison" msgstr "Iniciar una nueva comparación" -#: ../meld/meldwindow.py:54 +#: ../meld/meldwindow.py:53 msgid "Save the current file" msgstr "Guardar el archivo actual" -#: ../meld/meldwindow.py:56 +#: ../meld/meldwindow.py:55 msgid "Save As..." msgstr "Guardar como…" -#: ../meld/meldwindow.py:57 +#: ../meld/meldwindow.py:56 msgid "Save the current file with a different name" msgstr "Guardar el archivo actual con un nombre diferente" -#: ../meld/meldwindow.py:60 +#: ../meld/meldwindow.py:59 msgid "Close the current file" msgstr "Cerrar el archivo actual" -#: ../meld/meldwindow.py:63 +#: ../meld/meldwindow.py:62 msgid "_Edit" msgstr "_Editar" -#: ../meld/meldwindow.py:65 +#: ../meld/meldwindow.py:64 msgid "Undo the last action" msgstr "Deshacer la última acción" -#: ../meld/meldwindow.py:68 +#: ../meld/meldwindow.py:67 msgid "Redo the last undone action" msgstr "Rehacer la última acción deshecha" -#: ../meld/meldwindow.py:70 +#: ../meld/meldwindow.py:69 msgid "Cut the selection" msgstr "Cortar la selección" -#: ../meld/meldwindow.py:72 +#: ../meld/meldwindow.py:71 msgid "Copy the selection" msgstr "Copiar la selección" -#: ../meld/meldwindow.py:74 +#: ../meld/meldwindow.py:73 msgid "Paste the clipboard" msgstr "Pegar del portapapeles" -#: ../meld/meldwindow.py:76 +#: ../meld/meldwindow.py:75 msgid "Find..." msgstr "Buscar…" -#: ../meld/meldwindow.py:76 +#: ../meld/meldwindow.py:75 msgid "Search for text" msgstr "Buscar el texto" -#: ../meld/meldwindow.py:78 +#: ../meld/meldwindow.py:77 msgid "Find Ne_xt" msgstr "Buscar _siguiente" -#: ../meld/meldwindow.py:79 +#: ../meld/meldwindow.py:78 msgid "Search forwards for the same text" msgstr "Buscar el mismo texto hacia adelante" -#: ../meld/meldwindow.py:81 +#: ../meld/meldwindow.py:80 msgid "Find _Previous" msgstr "Buscar _anterior" -#: ../meld/meldwindow.py:82 +#: ../meld/meldwindow.py:81 msgid "Search backwards for the same text" msgstr "Buscar hacia atrás el mismo texto" -#: ../meld/meldwindow.py:85 +#: ../meld/meldwindow.py:84 msgid "_Replace..." msgstr "_Reemplazar…" -#: ../meld/meldwindow.py:86 +#: ../meld/meldwindow.py:85 msgid "Find and replace text" msgstr "Buscar y reemplazar texto" -#: ../meld/meldwindow.py:89 +#: ../meld/meldwindow.py:88 msgid "_Changes" msgstr "_Cambios" -#: ../meld/meldwindow.py:90 +#: ../meld/meldwindow.py:89 msgid "Next Change" msgstr "Siguiente cambio" -#: ../meld/meldwindow.py:91 +#: ../meld/meldwindow.py:90 msgid "Go to the next change" msgstr "Ir al siguiente cambio" -#: ../meld/meldwindow.py:93 +#: ../meld/meldwindow.py:92 msgid "Previous Change" msgstr "Cambio anterior" -#: ../meld/meldwindow.py:94 +#: ../meld/meldwindow.py:93 msgid "Go to the previous change" msgstr "Ir al cambio anterior" -#: ../meld/meldwindow.py:96 +#: ../meld/meldwindow.py:95 msgid "Open Externally" msgstr "Abrir externamente" -#: ../meld/meldwindow.py:97 +#: ../meld/meldwindow.py:96 msgid "Open selected file or directory in the default external application" msgstr "" "Abrir el archivo o la carpeta seleccionada en la aplicación externa " "predeterminada" -#: ../meld/meldwindow.py:101 +#: ../meld/meldwindow.py:100 msgid "_View" msgstr "_Ver" -#: ../meld/meldwindow.py:102 +#: ../meld/meldwindow.py:101 msgid "File Status" msgstr "Estado del archivo" -#: ../meld/meldwindow.py:103 +#: ../meld/meldwindow.py:102 msgid "Version Status" msgstr "Estado de la versión" -#: ../meld/meldwindow.py:106 +#: ../meld/meldwindow.py:105 msgid "Stop the current action" msgstr "Parar la acción actual" -#: ../meld/meldwindow.py:109 +#: ../meld/meldwindow.py:108 msgid "Refresh the view" msgstr "Actualizar la vista" #: ../meld/meldwindow.py:112 -msgid "_Tabs" -msgstr "_Pestañas" - -#: ../meld/meldwindow.py:113 -msgid "_Previous Tab" -msgstr "Pestaña _anterior" - -#: ../meld/meldwindow.py:114 -msgid "Activate previous tab" -msgstr "Activar la pestaña anterior" - -#: ../meld/meldwindow.py:116 -msgid "_Next Tab" -msgstr "_Siguiente pestaña" - -#: ../meld/meldwindow.py:117 -msgid "Activate next tab" -msgstr "Activar la siguiente pestaña" - -#: ../meld/meldwindow.py:120 -msgid "Move Tab _Left" -msgstr "Mover la pestaña a la _izquierda" - -#: ../meld/meldwindow.py:121 -msgid "Move current tab to left" -msgstr "Mover la pestaña actual a la izquierda" - -#: ../meld/meldwindow.py:124 -msgid "Move Tab _Right" -msgstr "Mover la pestaña a la de_recha" - -#: ../meld/meldwindow.py:125 -msgid "Move current tab to right" -msgstr "Mover la pestaña actual a la derecha" - -#: ../meld/meldwindow.py:129 msgid "Fullscreen" msgstr "Pantalla completa" -#: ../meld/meldwindow.py:130 +#: ../meld/meldwindow.py:113 msgid "View the comparison in fullscreen" msgstr "Ver la comparación a pantalla completa" -#: ../meld/meldwindow.py:132 +#: ../meld/meldwindow.py:115 msgid "_Toolbar" msgstr "Barra de _herramientas" -#: ../meld/meldwindow.py:133 +#: ../meld/meldwindow.py:116 msgid "Show or hide the toolbar" msgstr "Mostrar u ocultar la barra de herramientas" -#: ../meld/meldwindow.py:143 +#: ../meld/meldwindow.py:126 msgid "Open Recent" msgstr "Abrir recientes" -#: ../meld/meldwindow.py:144 +#: ../meld/meldwindow.py:127 msgid "Open recent files" msgstr "Abrir archivos recientes" -#: ../meld/meldwindow.py:166 +#: ../meld/meldwindow.py:149 msgid "_Meld" msgstr "_Meld" -#: ../meld/meldwindow.py:167 +#: ../meld/meldwindow.py:150 msgid "Quit the program" msgstr "Salir del programa" -#: ../meld/meldwindow.py:169 +#: ../meld/meldwindow.py:152 msgid "Prefere_nces" msgstr "Prefere_ncias" -#: ../meld/meldwindow.py:170 +#: ../meld/meldwindow.py:153 msgid "Configure the application" msgstr "Configurar la aplicación" -#: ../meld/meldwindow.py:172 +#: ../meld/meldwindow.py:155 msgid "_Contents" msgstr "Índ_ice" -#: ../meld/meldwindow.py:173 +#: ../meld/meldwindow.py:156 msgid "Open the Meld manual" msgstr "Abrir el manual de Meld" -#: ../meld/meldwindow.py:175 +#: ../meld/meldwindow.py:158 msgid "About this application" msgstr "Acerca de esta aplicación" -#: ../meld/meldwindow.py:587 -msgid "Switch to this tab" -msgstr "Cambiar a esta pestaña" - -#: ../meld/meldwindow.py:702 +#: ../meld/meldwindow.py:604 #, python-format msgid "Need three files to auto-merge, got: %r" msgstr "Se necesita tres archivos para la mezcla automática, se obtuvieron: %r" -#: ../meld/meldwindow.py:716 +#: ../meld/meldwindow.py:618 msgid "Cannot compare a mixture of files and directories" msgstr "No se puede comparar una mezcla de archivos y carpetas" @@ -2371,7 +2327,7 @@ msgstr "" "una instalación incorrecta" #. no common path. empty names get changed to "[None]" -#: ../meld/misc.py:288 +#: ../meld/misc.py:263 msgid "[None]" msgstr "[Ninguno]" @@ -2383,7 +2339,7 @@ msgstr "etiqueta" msgid "pattern" msgstr "patrón" -#: ../meld/recent.py:115 +#: ../meld/recent.py:114 msgid "Version control:" msgstr "Control de versión:" @@ -2391,43 +2347,43 @@ msgstr "Control de versión:" msgid "Close tab" msgstr "Cerrar pestaña" -#: ../meld/ui/vcdialogs.py:50 +#: ../meld/ui/vcdialogs.py:48 msgid "No files will be committed" msgstr "No se efectuarán cambios en archivos" #. Translators: First %s is replaced by translated "%d unpushed #. commits", second %s is replaced by translated "%d branches" -#: ../meld/vc/git.py:95 +#: ../meld/vc/git.py:94 #, python-format msgid "%s in %s" msgstr "%s en %s" #. Translators: These messages cover the case where there is #. only one branch, and are not part of another message. -#: ../meld/vc/git.py:96 ../meld/vc/git.py:103 +#: ../meld/vc/git.py:95 ../meld/vc/git.py:102 #, python-format msgid "%d unpushed commit" msgid_plural "%d unpushed commits" msgstr[0] "%d cambio sin empujar" msgstr[1] "%d cambios sin empujar" -#: ../meld/vc/git.py:98 +#: ../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:352 +#: ../meld/vc/git.py:330 #, python-format msgid "Mode changed from %s to %s" msgstr "Modo cambiado de %s a %s" -#: ../meld/vc/git.py:360 +#: ../meld/vc/git.py:338 msgid "Partially staged" msgstr "Reservado parcialmente" -#: ../meld/vc/git.py:360 +#: ../meld/vc/git.py:338 msgid "Staged" msgstr "Reservado" @@ -2437,142 +2393,142 @@ msgstr "Reservado" msgid "None" msgstr "Ninguno" -#: ../meld/vc/svn.py:216 +#: ../meld/vc/svn.py:204 #, python-format msgid "Rev %s" msgstr "Rev. %s" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Merged" msgstr "Mezclados" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Base" msgstr "Base" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Local" msgstr "Local" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Remote" msgstr "Remoto" -#: ../meld/vc/_vc.py:68 +#: ../meld/vc/_vc.py:70 msgid "Unversioned" msgstr "Sin versión" -#: ../meld/vc/_vc.py:71 +#: ../meld/vc/_vc.py:73 msgid "Error" msgstr "Error" -#: ../meld/vc/_vc.py:73 +#: ../meld/vc/_vc.py:75 msgid "Newly added" msgstr "Nuevo añadido" -#: ../meld/vc/_vc.py:75 +#: ../meld/vc/_vc.py:77 msgid "Renamed" msgstr "Renombrado" -#: ../meld/vc/_vc.py:76 +#: ../meld/vc/_vc.py:78 msgid "Conflict" msgstr "Conflicto" -#: ../meld/vc/_vc.py:77 +#: ../meld/vc/_vc.py:79 msgid "Removed" msgstr "Eliminado" -#: ../meld/vc/_vc.py:78 +#: ../meld/vc/_vc.py:80 msgid "Missing" msgstr "Falta" -#: ../meld/vc/_vc.py:79 +#: ../meld/vc/_vc.py:81 msgid "Not present" msgstr "No presente" #. Translators: This error message is shown when a version #. control binary isn't installed. -#: ../meld/vcview.py:261 +#: ../meld/vcview.py:251 #, python-format msgid "%(name)s (%(cmd)s not installed)" msgstr "%(name)s (%(cmd)s no está instalado)" #. Translators: This error message is shown when a version #. controlled repository is invalid. -#: ../meld/vcview.py:265 +#: ../meld/vcview.py:255 #, python-format msgid "%(name)s (Invalid repository)" msgstr "%(name)s (Repositorio no válido)" -#: ../meld/vcview.py:286 +#: ../meld/vcview.py:276 msgid "No valid version control system found in this folder" msgstr "" "No se ha encontrado un sistema de control de versiones válido en esta carpeta" -#: ../meld/vcview.py:288 +#: ../meld/vcview.py:278 msgid "Only one version control system found in this folder" msgstr "" "Sólo se ha encontrado un sistema de control de versiones en esta carpeta" -#: ../meld/vcview.py:290 +#: ../meld/vcview.py:280 msgid "Choose which version control system to use" msgstr "Elegir qué sistema de control de versiones usar" #. TRANSLATORS: This is the location of the directory being viewed -#: ../meld/vcview.py:343 +#: ../meld/vcview.py:332 #, python-format msgid "%s: %s" msgstr "%s: %s" -#: ../meld/vcview.py:363 +#: ../meld/vcview.py:352 #, python-format msgid "Scanning %s" msgstr "Analizando %s" -#: ../meld/vcview.py:402 +#: ../meld/vcview.py:391 msgid "(Empty)" msgstr "(Vacío)" -#: ../meld/vcview.py:446 +#: ../meld/vcview.py:435 #, python-format msgid "%s — local" msgstr "%s — local" -#: ../meld/vcview.py:447 +#: ../meld/vcview.py:436 #, python-format msgid "%s — remote" msgstr "%s — remoto" -#: ../meld/vcview.py:455 +#: ../meld/vcview.py:444 #, python-format msgid "%s (local, merge, remote)" msgstr "%s (local, mezcla, remoto)" -#: ../meld/vcview.py:460 +#: ../meld/vcview.py:449 #, python-format msgid "%s (remote, merge, local)" msgstr "%s (remoto, mezcla, local)" -#: ../meld/vcview.py:471 +#: ../meld/vcview.py:460 #, python-format msgid "%s — repository" msgstr "%s — repositorio" -#: ../meld/vcview.py:477 +#: ../meld/vcview.py:466 #, python-format msgid "%s (working, repository)" msgstr "%s (funcionando, repositorio)" -#: ../meld/vcview.py:481 +#: ../meld/vcview.py:470 #, python-format msgid "%s (repository, working)" msgstr "%s (repositorio, funcionando)" -#: ../meld/vcview.py:649 +#: ../meld/vcview.py:638 msgid "Remove folder and all its files?" msgstr "¿Quitar la carpeta y todos sus archivos?" -#: ../meld/vcview.py:651 +#: ../meld/vcview.py:640 msgid "" "This will remove all selected files and folders, and all files within any " "selected folders, from version control." @@ -2580,15 +2536,48 @@ msgstr "" "Esto quitará todos los archivos y carpetas seleccionadas, y todos los " "archivos de las carpetas seleccionadas, del control de versiones." -#: ../meld/vcview.py:676 +#: ../meld/vcview.py:665 #, python-format msgid "Error removing %s" msgstr "Error al quitar %s" -#: ../meld/vcview.py:756 +#: ../meld/vcview.py:745 msgid "Clear" msgstr "Limpiar" +#~ msgid "Meld does not support Python 3." +#~ msgstr "Meld no soporta Python 3." + +#~ msgid "_Tabs" +#~ msgstr "_Pestañas" + +#~ msgid "_Previous Tab" +#~ msgstr "Pestaña _anterior" + +#~ msgid "Activate previous tab" +#~ msgstr "Activar la pestaña anterior" + +#~ msgid "_Next Tab" +#~ msgstr "_Siguiente pestaña" + +#~ msgid "Activate next tab" +#~ msgstr "Activar la siguiente pestaña" + +#~ msgid "Move Tab _Left" +#~ msgstr "Mover la pestaña a la _izquierda" + +#~ msgid "Move current tab to left" +#~ msgstr "Mover la pestaña actual a la izquierda" + +#~ msgid "Move Tab _Right" +#~ msgstr "Mover la pestaña a la de_recha" + +#~ msgid "Move current tab to right" +#~ msgstr "Mover la pestaña actual a la derecha" + +#~ msgid "Switch to this tab" +#~ msgstr "Cambiar a esta pestaña" + #~ msgid "" #~ "These text encodings will be automatically used (in order) to try to " #~ "decode loaded text files." From 5bd65a9c0b0bd6d2d852c4d62225b72b6ecee5d8 Mon Sep 17 00:00:00 2001 From: Vasily Galkin Date: Tue, 13 Sep 2016 19:45:51 +0300 Subject: [PATCH 0030/1316] filediff: Round position to avoid recursive scroll sync (bgo#769705) --- meld/filediff.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meld/filediff.py b/meld/filediff.py index 20ad86d6..d52752ca 100644 --- a/meld/filediff.py +++ b/meld/filediff.py @@ -16,6 +16,7 @@ import copy import functools +import math import os import time @@ -1730,6 +1731,7 @@ def _sync_vscroll(self, adjustment, master): val += (other_line-int(other_line)) * height val = min(max(val, adj.get_lower()), adj.get_upper() - adj.get_page_size()) + val = math.floor(val) adj.set_value(val) # If we just changed the central bar, make it the master From f9be239c438d70f6f3aa9b85f09f53356a3b7def Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sat, 17 Sep 2016 09:02:06 +1000 Subject: [PATCH 0031/1316] meldwindow: Fix for GtkWindow sizing API break (bgo#771288) With client-side decorations, the window's saved size and set size don't round-trip correctly. See bgo#771112 for more fun. --- meld/meldwindow.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meld/meldwindow.py b/meld/meldwindow.py index de9cc794..e5c2e86a 100644 --- a/meld/meldwindow.py +++ b/meld/meldwindow.py @@ -414,7 +414,8 @@ def on_configure_event(self, window, event): state = event.window.get_state() nosave = Gdk.WindowState.FULLSCREEN | Gdk.WindowState.MAXIMIZED if not (state & nosave): - variant = GLib.Variant('(ii)', (event.width, event.height)) + width, height = self.widget.get_size() + variant = GLib.Variant('(ii)', (width, height)) settings.set_value('window-size', variant) maximised = state & Gdk.WindowState.MAXIMIZED From 440f7479ba6f7a18df7c01e928113d3daf08bd8e Mon Sep 17 00:00:00 2001 From: Vasily Galkin Date: Sat, 17 Sep 2016 12:08:33 +0300 Subject: [PATCH 0032/1316] Fix saving of text created in blank comparison (bgo#771498) --- meld/filediff.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meld/filediff.py b/meld/filediff.py index d52752ca..01bebc72 100644 --- a/meld/filediff.py +++ b/meld/filediff.py @@ -1507,6 +1507,10 @@ def on_file_changed_response(msgarea, response_id, *args): text = buf.get_text(start, end, False) source_encoding = bufdata.sourcefile.get_encoding() + if not source_encoding: + # no encoding for new blank comparison + source_encoding = GtkSource.Encoding.get_utf8() + while isinstance(text, str): try: encoding = source_encoding.get_charset() From efd797292a3c855fa84e5abd3d1b96db00f8c563 Mon Sep 17 00:00:00 2001 From: Anders Jonsson Date: Tue, 20 Sep 2016 21:05:09 +0000 Subject: [PATCH 0033/1316] Updated Swedish translation --- help/sv/sv.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/help/sv/sv.po b/help/sv/sv.po index 38200265..42197dcb 100644 --- a/help/sv/sv.po +++ b/help/sv/sv.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: meld master\n" -"POT-Creation-Date: 2016-05-01 13:05+0000\n" -"PO-Revision-Date: 2016-05-25 23:01+0200\n" +"POT-Creation-Date: 2016-09-17 21:06+0000\n" +"PO-Revision-Date: 2016-09-20 23:04+0200\n" "Last-Translator: Anders Jonsson \n" "Language-Team: Swedish \n" "Language: sv\n" @@ -14,7 +14,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 1.8.7.1\n" +"X-Generator: Poedit 1.8.9\n" #. Put one translator per line, in the form NAME , YEAR1, YEAR2 msgctxt "_" @@ -293,7 +293,7 @@ msgid "" "and folders; if a folder matches a filter, it and all of its contents are " "ignored." msgstr "" -"Du kan lägga till, ta bort eller ändra filnamnsfilter från avsnittetFilfilter i dialogen Inställningar. " "Filnamnsfilter specificerar mönster av filnamn som inte kommer att " "behandlas vid en mappjämförelse. Filer som matchar ett aktivt filnamnsfilter " From e00f400c3cba20cc9c791d9e36aac8dc8bccd9cf Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sat, 24 Sep 2016 10:29:29 +1000 Subject: [PATCH 0034/1316] bin/meld: Setup glib log handler forwarding to Python logging With this change, we hand warning-and-above logs from GTK+ on to our Python logger, which gets us some consistency of formatting and destination, but most importantly means that we also get to silence GTK+ warnings based on whether the running Meld version is stable or not. Effectively, this should silence a lot of noisy complaints about missing allocations and size requests not happening where GTK+'s expectations have changed and we don't meet them... or the expectations aren't actually documented anywhere. --- bin/meld | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/bin/meld b/bin/meld index 1151bc67..013ae703 100755 --- a/bin/meld +++ b/bin/meld @@ -237,6 +237,27 @@ def setup_logging(): log.addHandler(handler) +def setup_glib_logging(): + from gi.repository import GLib + levels = { + GLib.LogLevelFlags.LEVEL_WARNING: logging.WARNING, + GLib.LogLevelFlags.LEVEL_ERROR: logging.ERROR, + GLib.LogLevelFlags.LEVEL_CRITICAL: logging.CRITICAL, + } + level_flag = ( + GLib.LogLevelFlags.LEVEL_WARNING | + GLib.LogLevelFlags.LEVEL_ERROR | + GLib.LogLevelFlags.LEVEL_CRITICAL + ) + + log_domain = "Gtk" + log = logging.getLogger(log_domain) + + def log_adapter(domain, level, message, user_data): + log.log(levels[level], message) + GLib.log_set_handler(log_domain, level_flag, log_adapter, None) + + def environment_hacks(): # We manage cwd ourselves for git operations, and GIT_DIR in particular # can mess with this when set. @@ -251,6 +272,7 @@ if __name__ == '__main__': setup_logging() disable_stdout_buffering() check_requirements() + setup_glib_logging() setup_resources() setup_settings() environment_hacks() From 0725a2c4ce11ec6edeb0b81ca6963d32d4a29667 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sat, 24 Sep 2016 10:49:25 +1000 Subject: [PATCH 0035/1316] bin/meld: Remove support for outdated pygobject We probably haven't actually supported the documented release for a while, so just bump the requirement to match current GTK+. --- README | 2 +- bin/meld | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/README b/README index 5295dd56..4c11b3d5 100644 --- a/README +++ b/README @@ -19,7 +19,7 @@ Requirements * Python 2.7 * GTK+ 3.14 * GLib 2.36 -* PyGObject 3.8 +* PyGObject 3.14 * GtkSourceView 3.14 diff --git a/bin/meld b/bin/meld index 013ae703..f4dc4afb 100755 --- a/bin/meld +++ b/bin/meld @@ -175,14 +175,11 @@ def check_requirements(): def setup_resources(): - from gi.repository import GObject from gi.repository import GLib from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GtkSource - if GObject.pygobject_version <= (3, 11): - GObject.threads_init() icon_dir = os.path.join(meld.conf.DATADIR, "icons") Gtk.IconTheme.get_default().append_search_path(icon_dir) From ca682eb231cd7f3ba88f2978fb9ff62ffee6ffa2 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Thu, 29 Sep 2016 06:49:53 +1000 Subject: [PATCH 0036/1316] meldwindow: Stop using configure-event According to https://wiki.gnome.org/HowDoI/SaveWindowState, we should be using size-allocate and window-state-event. --- data/ui/meldapp.ui | 3 ++- meld/meldwindow.py | 13 ++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/data/ui/meldapp.ui b/data/ui/meldapp.ui index 42ada894..b33c20e5 100644 --- a/data/ui/meldapp.ui +++ b/data/ui/meldapp.ui @@ -7,7 +7,8 @@ Meld meld - + + True diff --git a/meld/meldwindow.py b/meld/meldwindow.py index e5c2e86a..9b92fd74 100644 --- a/meld/meldwindow.py +++ b/meld/meldwindow.py @@ -410,15 +410,22 @@ def on_next_diff_changed(self, doc, have_prev, have_next): self.actiongroup.get_action("PrevChange").set_sensitive(have_prev) self.actiongroup.get_action("NextChange").set_sensitive(have_next) - def on_configure_event(self, window, event): - state = event.window.get_state() + def on_size_allocate(self, window, allocation): + gdk_window = window.get_window() + if not gdk_window: + return nosave = Gdk.WindowState.FULLSCREEN | Gdk.WindowState.MAXIMIZED - if not (state & nosave): + if not (gdk_window.get_state() & nosave): width, height = self.widget.get_size() variant = GLib.Variant('(ii)', (width, height)) settings.set_value('window-size', variant) + def on_window_state_event(self, window, event): + state = event.window.get_state() + + # TODO: Handle fullscreen maximised = state & Gdk.WindowState.MAXIMIZED + # fullscreen = state & Gdk.WindowState.FULLSCREEN window_state = 'maximized' if maximised else 'normal' settings.set_string('window-state', window_state) From 80652e2c9b29ee9b1fe2ac516d0daaeae9bf98df Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sat, 1 Oct 2016 07:09:40 +1000 Subject: [PATCH 0037/1316] meldwindow: Rearrange window state saving --- meld/meldwindow.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/meld/meldwindow.py b/meld/meldwindow.py index 9b92fd74..9fd86f42 100644 --- a/meld/meldwindow.py +++ b/meld/meldwindow.py @@ -230,15 +230,18 @@ def app_action(*args): self.widget.connect("drag_data_received", self.on_widget_drag_data_received) - self.should_close = False - self.idle_hooked = 0 - self.scheduler = task.LifoScheduler() - self.scheduler.connect("runnable", self.on_scheduler_runnable) + # Handle saved window size and state window_size = settings.get_value('window-size') self.widget.set_default_size(window_size[0], window_size[1]) window_state = settings.get_string('window-state') if window_state == 'maximized': self.widget.maximize() + + self.should_close = False + self.idle_hooked = 0 + self.scheduler = task.LifoScheduler() + self.scheduler.connect("runnable", self.on_scheduler_runnable) + self.ui.ensure_update() self.diff_handler = None self.undo_handlers = tuple() From 9dd06adaee3571e957ff90b204f3a809967727ad Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sat, 1 Oct 2016 08:39:57 +1000 Subject: [PATCH 0038/1316] settings: Better support loading of arbitrary sub-schemas We want this so that we can put window state into a subtree. --- meld/settings.py | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/meld/settings.py b/meld/settings.py index 04e49fcc..b144aaff 100644 --- a/meld/settings.py +++ b/meld/settings.py @@ -81,13 +81,13 @@ def _current_font_from_gsetting(self, *args): return Pango.FontDescription(font_string) -def find_schema(): +def find_schema(schema_id): schema_source = Gio.SettingsSchemaSource.new_from_directory( meld.conf.DATADIR, Gio.SettingsSchemaSource.get_default(), False, ) - return schema_source.lookup(MELD_SCHEMA, False) + return schema_source.lookup(schema_id, False) def check_backend(): @@ -100,18 +100,22 @@ def check_backend(): return None -def create_settings(uninstalled=False): - global settings, interface_settings, meldsettings - +def load_settings_schema(schema_id, uninstalled=False): backend = check_backend() if uninstalled: - schema = find_schema() + schema = find_schema(schema_id) settings = Gio.Settings.new_full(schema, backend, None) elif backend: - settings = Gio.Settings.new_with_backend(MELD_SCHEMA, backend) + settings = Gio.Settings.new_with_backend(schema_id, backend) else: - settings = Gio.Settings.new(MELD_SCHEMA) + settings = Gio.Settings.new(schema_id) + return settings + + +def create_settings(uninstalled=False): + global settings, interface_settings, meldsettings + settings = load_settings_schema(MELD_SCHEMA, uninstalled) interface_settings = Gio.Settings.new('org.gnome.desktop.interface') meldsettings = MeldSettings() From a876abd19802b0d80b98d4e4b81651415bbd7638 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sat, 1 Oct 2016 09:00:44 +1000 Subject: [PATCH 0039/1316] settings: Remove backend fallback which hasn't worked for years --- meld/settings.py | 35 ++++++++--------------------------- 1 file changed, 8 insertions(+), 27 deletions(-) diff --git a/meld/settings.py b/meld/settings.py index b144aaff..db352742 100644 --- a/meld/settings.py +++ b/meld/settings.py @@ -13,10 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -import os - from gi.repository import Gio -from gi.repository import GLib from gi.repository import GObject from gi.repository import Pango from gi.repository import GtkSource @@ -81,32 +78,16 @@ def _current_font_from_gsetting(self, *args): return Pango.FontDescription(font_string) -def find_schema(schema_id): - schema_source = Gio.SettingsSchemaSource.new_from_directory( - meld.conf.DATADIR, - Gio.SettingsSchemaSource.get_default(), - False, - ) - return schema_source.lookup(schema_id, False) - - -def check_backend(): - force_ini = os.path.exists( - os.path.join(GLib.get_user_config_dir(), 'meld', 'use-rc-prefs')) - if force_ini: - # TODO: Use GKeyfileSettingsBackend once available (see bgo#682702) - print("Using a flat-file settings backend is not yet supported") - return None - return None - - def load_settings_schema(schema_id, uninstalled=False): - backend = check_backend() if uninstalled: - schema = find_schema(schema_id) - settings = Gio.Settings.new_full(schema, backend, None) - elif backend: - settings = Gio.Settings.new_with_backend(schema_id, backend) + schema_source = Gio.SettingsSchemaSource.new_from_directory( + meld.conf.DATADIR, + Gio.SettingsSchemaSource.get_default(), + False, + ) + schema = schema_source.lookup(schema_id, False) + settings = Gio.Settings.new_full( + schema=schema, backend=None, path=None) else: settings = Gio.Settings.new(schema_id) return settings From 6246f959d7eb549c4ddc578508766f5b3d049e11 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sat, 1 Oct 2016 09:10:41 +1000 Subject: [PATCH 0040/1316] Make uninstalled state part of conf This avoids the schema-loading callers having to know whether they're running in an uninstalled state, which is relevant now that we're looking to add a second schema load. --- bin/meld | 2 +- meld/conf.py | 7 +++++-- meld/settings.py | 8 ++++---- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/bin/meld b/bin/meld index f4dc4afb..bafb4e0d 100755 --- a/bin/meld +++ b/bin/meld @@ -215,7 +215,7 @@ def setup_settings(): cwd=melddir) import meld.settings - meld.settings.create_settings(uninstalled=uninstalled or frozen) + meld.settings.create_settings() def setup_logging(): diff --git a/meld/conf.py b/meld/conf.py index f244ee9d..ae12f1c5 100644 --- a/meld/conf.py +++ b/meld/conf.py @@ -10,6 +10,7 @@ LOCALEDIR = os.path.join(sys.prefix, "share", "locale") # END UNINSTALLED = False +UNINSTALLED_SCHEMA = False # Installed from main script _ = lambda x: x @@ -17,12 +18,13 @@ def frozen(): - global DATADIR, LOCALEDIR + global DATADIR, LOCALEDIR, UNINSTALLED_SCHEMA melddir = os.path.dirname(sys.executable) DATADIR = os.path.join(melddir, "share", "meld") LOCALEDIR = os.path.join(melddir, "share", "mo") + UNINSTALLED_SCHEMA = True # This first bit should be unnecessary, but some things (GTK icon theme # location, GSettings schema location) don't fall back correctly. @@ -32,13 +34,14 @@ def frozen(): def uninstalled(): - global DATADIR, LOCALEDIR, UNINSTALLED + global DATADIR, LOCALEDIR, UNINSTALLED, UNINSTALLED_SCHEMA melddir = os.path.abspath(os.path.join( os.path.dirname(os.path.realpath(__file__)), "..")) DATADIR = os.path.join(melddir, "data") LOCALEDIR = os.path.join(melddir, "build", "mo") UNINSTALLED = True + UNINSTALLED_SCHEMA = True # This first bit should be unnecessary, but some things (GTK icon theme # location, GSettings schema location) don't fall back correctly. diff --git a/meld/settings.py b/meld/settings.py index db352742..ee4d02f6 100644 --- a/meld/settings.py +++ b/meld/settings.py @@ -78,8 +78,8 @@ def _current_font_from_gsetting(self, *args): return Pango.FontDescription(font_string) -def load_settings_schema(schema_id, uninstalled=False): - if uninstalled: +def load_settings_schema(schema_id): + if meld.conf.UNINSTALLED_SCHEMA: schema_source = Gio.SettingsSchemaSource.new_from_directory( meld.conf.DATADIR, Gio.SettingsSchemaSource.get_default(), @@ -93,10 +93,10 @@ def load_settings_schema(schema_id, uninstalled=False): return settings -def create_settings(uninstalled=False): +def create_settings(): global settings, interface_settings, meldsettings - settings = load_settings_schema(MELD_SCHEMA, uninstalled) + settings = load_settings_schema(MELD_SCHEMA) interface_settings = Gio.Settings.new('org.gnome.desktop.interface') meldsettings = MeldSettings() From c63c56327c9a217a28d98dd9b3296f7826883e3e Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sat, 1 Oct 2016 09:14:45 +1000 Subject: [PATCH 0041/1316] windowstate: New module for managing window state in the prefered way This moves some logic out of meldwindow, and changes the way we store window state in the gsettings schema. No migration is provided because this is fairly low-value configuration data. --- data/org.gnome.meld.gschema.xml | 34 ++++++++++------- data/ui/meldapp.ui | 2 - meld/meldwindow.py | 28 ++------------ meld/windowstate.py | 65 +++++++++++++++++++++++++++++++++ 4 files changed, 89 insertions(+), 40 deletions(-) create mode 100644 meld/windowstate.py diff --git a/data/org.gnome.meld.gschema.xml b/data/org.gnome.meld.gschema.xml index f4239564..50ab4502 100644 --- a/data/org.gnome.meld.gschema.xml +++ b/data/org.gnome.meld.gschema.xml @@ -23,21 +23,29 @@ - - - - (-1, -1) - Default window size - + + - - - - - - "normal" - Default window state + + -1 + Default window width + + + -1 + Default window height + + + false + Default window maximised state + + false + Default window fullscreen state + + + + + true diff --git a/data/ui/meldapp.ui b/data/ui/meldapp.ui index b33c20e5..f112cff4 100644 --- a/data/ui/meldapp.ui +++ b/data/ui/meldapp.ui @@ -7,8 +7,6 @@ Meld meld - - True diff --git a/meld/meldwindow.py b/meld/meldwindow.py index 9fd86f42..4078c69d 100644 --- a/meld/meldwindow.py +++ b/meld/meldwindow.py @@ -36,6 +36,7 @@ from meld.conf import _ from meld.recent import recent_comparisons from meld.settings import interface_settings, settings +from meld.windowstate import SavedWindowState class MeldWindow(gnomeglade.Component): @@ -230,12 +231,8 @@ def app_action(*args): self.widget.connect("drag_data_received", self.on_widget_drag_data_received) - # Handle saved window size and state - window_size = settings.get_value('window-size') - self.widget.set_default_size(window_size[0], window_size[1]) - window_state = settings.get_string('window-state') - if window_state == 'maximized': - self.widget.maximize() + self.window_state = SavedWindowState() + self.window_state.bind(self.widget) self.should_close = False self.idle_hooked = 0 @@ -413,25 +410,6 @@ def on_next_diff_changed(self, doc, have_prev, have_next): self.actiongroup.get_action("PrevChange").set_sensitive(have_prev) self.actiongroup.get_action("NextChange").set_sensitive(have_next) - def on_size_allocate(self, window, allocation): - gdk_window = window.get_window() - if not gdk_window: - return - nosave = Gdk.WindowState.FULLSCREEN | Gdk.WindowState.MAXIMIZED - if not (gdk_window.get_state() & nosave): - width, height = self.widget.get_size() - variant = GLib.Variant('(ii)', (width, height)) - settings.set_value('window-size', variant) - - def on_window_state_event(self, window, event): - state = event.window.get_state() - - # TODO: Handle fullscreen - maximised = state & Gdk.WindowState.MAXIMIZED - # fullscreen = state & Gdk.WindowState.FULLSCREEN - window_state = 'maximized' if maximised else 'normal' - settings.set_string('window-state', window_state) - def on_menu_file_new_activate(self, menuitem): self.append_new_comparison() diff --git a/meld/windowstate.py b/meld/windowstate.py new file mode 100644 index 00000000..baf7d987 --- /dev/null +++ b/meld/windowstate.py @@ -0,0 +1,65 @@ +# Copyright (C) 2016 Kai Willadsen +# +# This program 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. +# +# This program 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. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +from gi.repository import Gdk, Gio, GObject + +from meld.settings import load_settings_schema + + +WINDOW_STATE_SCHEMA = 'org.gnome.meld.WindowState' + + +class SavedWindowState(GObject.GObject): + '''Utility class for saving and restoring GtkWindow state''' + + __gtype_name__ = 'SavedWindowState' + + width = GObject.property( + type=int, nick='Current window width', default=-1) + height = GObject.property( + type=int, nick='Current window height', default=-1) + is_maximized = GObject.property( + type=bool, nick='Is window maximized', default=False) + is_fullscreen = GObject.property( + type=bool, nick='Is window fullscreen', default=False) + + def bind(self, window): + window.connect('size-allocate', self.on_size_allocate) + window.connect('window-state-event', self.on_window_state_event) + + bind_flags = Gio.SettingsBindFlags.DEFAULT + self.settings = load_settings_schema(WINDOW_STATE_SCHEMA) + self.settings.bind('width', self, 'width', bind_flags) + self.settings.bind('height', self, 'height', bind_flags) + self.settings.bind('is-maximized', self, 'is-maximized', bind_flags) + self.settings.bind('is-fullscreen', self, 'is-fullscreen', bind_flags) + + window.set_default_size(self.props.width, self.props.height) + if self.props.is_maximized: + window.maximize() + if self.props.is_fullscreen: + window.fullscreen() + + def on_size_allocate(self, window, allocation): + if not (self.props.is_maximized or self.props.is_fullscreen): + width, height = window.get_size() + self.props.width = width + self.props.height = height + + def on_window_state_event(self, window, event): + state = event.window.get_state() + self.props.is_maximized = state & Gdk.WindowState.MAXIMIZED + self.props.is_fullscreen = state & Gdk.WindowState.FULLSCREEN From d018519f3711530dbff8bb87af353dd46a5cf345 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20=C4=8Cernock=C3=BD?= Date: Sat, 1 Oct 2016 12:39:44 +0200 Subject: [PATCH 0042/1316] Updated Czech translation --- po/cs.po | 414 ++++++++++++++++++++++++++----------------------------- 1 file changed, 195 insertions(+), 219 deletions(-) diff --git a/po/cs.po b/po/cs.po index 9ec12623..67033bd0 100644 --- a/po/cs.po +++ b/po/cs.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: meld\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=meld&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-08-20 21:39+0000\n" -"PO-Revision-Date: 2016-08-21 11:08+0200\n" +"POT-Creation-Date: 2016-09-30 23:28+0000\n" +"PO-Revision-Date: 2016-10-01 12:39+0200\n" "Last-Translator: Marek Černocký \n" "Language-Team: čeština \n" "Language: cs\n" @@ -31,7 +31,7 @@ msgstr "Nelze importovat: " msgid "Meld requires %s or higher." msgstr "Meld vyžaduje %s nebo vyšší." -#: ../bin/meld:194 +#: ../bin/meld:191 #, c-format msgid "" "Couldn't load Meld-specific CSS (%s)\n" @@ -94,34 +94,42 @@ msgid "Meld comparison description" msgstr "Definice porovnávání Meld" #: ../data/org.gnome.meld.gschema.xml.h:1 -msgid "Default window size" -msgstr "Výchozí velikost okna" +msgid "Default window width" +msgstr "Výchozí šířka okna" #: ../data/org.gnome.meld.gschema.xml.h:2 -msgid "Default window state" -msgstr "Výchozí stav okna" +msgid "Default window height" +msgstr "Výchozí výška okna" #: ../data/org.gnome.meld.gschema.xml.h:3 +msgid "Default window maximised state" +msgstr "Výchozí stav maximalizace okna" + +#: ../data/org.gnome.meld.gschema.xml.h:4 +msgid "Default window fullscreen state" +msgstr "Výchozí stav režimu celá obrazovka" + +#: ../data/org.gnome.meld.gschema.xml.h:5 msgid "Show toolbar" msgstr "Zobrazovat nástrojovou lištu" -#: ../data/org.gnome.meld.gschema.xml.h:4 +#: ../data/org.gnome.meld.gschema.xml.h:6 msgid "If true, the window toolbar is visible." msgstr "Když je zapnuto, je nástrojová lišta v okně viditelná." -#: ../data/org.gnome.meld.gschema.xml.h:5 +#: ../data/org.gnome.meld.gschema.xml.h:7 msgid "Show statusbar" msgstr "Zobrazovat stavovou lištu" -#: ../data/org.gnome.meld.gschema.xml.h:6 +#: ../data/org.gnome.meld.gschema.xml.h:8 msgid "If true, the window statusbar is visible." msgstr "Když je zapnuto, je stavová lišta v okně viditelná." -#: ../data/org.gnome.meld.gschema.xml.h:7 +#: ../data/org.gnome.meld.gschema.xml.h:9 msgid "Additional automatically detected text encodings" msgstr "Doplňková kódování textu pro automatickou detekci" -#: ../data/org.gnome.meld.gschema.xml.h:8 +#: ../data/org.gnome.meld.gschema.xml.h:10 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 " @@ -134,39 +142,39 @@ msgstr "" "V závislosti na národním prostředí mohou být vyzkoušena i některá další " "kódování." -#: ../data/org.gnome.meld.gschema.xml.h:9 +#: ../data/org.gnome.meld.gschema.xml.h:11 msgid "Width of an indentation step" msgstr "Šířka stupně odsazení" -#: ../data/org.gnome.meld.gschema.xml.h:10 +#: ../data/org.gnome.meld.gschema.xml.h:12 msgid "The number of spaces to use for a single indent step" msgstr "Počet mezer použitých pro jeden stupeň odsazení" -#: ../data/org.gnome.meld.gschema.xml.h:11 +#: ../data/org.gnome.meld.gschema.xml.h:13 msgid "Whether to indent using spaces or tabs" msgstr "Zda odsazovat pomocí mezer nebo tabulátorů" -#: ../data/org.gnome.meld.gschema.xml.h:12 +#: ../data/org.gnome.meld.gschema.xml.h:14 msgid "If true, any new indentation will use spaces instead of tabs." msgstr "" "Když je zapnuto, budou se pro nová odsazení používat mezery namísto " "tabulátorů." -#: ../data/org.gnome.meld.gschema.xml.h:13 +#: ../data/org.gnome.meld.gschema.xml.h:15 msgid "Show line numbers" msgstr "Zobrazovat čísla řádků" -#: ../data/org.gnome.meld.gschema.xml.h:14 +#: ../data/org.gnome.meld.gschema.xml.h:16 msgid "If true, line numbers will be shown in the gutter of file comparisons." msgstr "" "Když je zapnuto, budou se po boku porovnávaných souborů zobrazovat čísla " "řádků." -#: ../data/org.gnome.meld.gschema.xml.h:15 +#: ../data/org.gnome.meld.gschema.xml.h:17 msgid "Highlight syntax" msgstr "Zvýrazňovat syntaxe" -#: ../data/org.gnome.meld.gschema.xml.h:16 +#: ../data/org.gnome.meld.gschema.xml.h:18 msgid "" "Whether to highlight syntax in comparisons. Because of Meld's own color " "highlighting, this is off by default." @@ -174,19 +182,19 @@ msgstr "" "Zda v porovnání zvýrazňovat syntaxe. Vzhledem k tomu, že Meld má vlastní " "barevné zvýrazňování, je ve výchozím stavu vypnuto." -#: ../data/org.gnome.meld.gschema.xml.h:17 +#: ../data/org.gnome.meld.gschema.xml.h:19 msgid "Color scheme to use for syntax highlighting" msgstr "Schéma barev použité ke zvýraznění syntaxe" -#: ../data/org.gnome.meld.gschema.xml.h:18 +#: ../data/org.gnome.meld.gschema.xml.h:20 msgid "Used by GtkSourceView to determine colors for syntax highlighting" msgstr "Používá GtkSourceView k určení barev pro zvýraznění syntaxe" -#: ../data/org.gnome.meld.gschema.xml.h:19 +#: ../data/org.gnome.meld.gschema.xml.h:21 msgid "Displayed whitespace" msgstr "Viditelné bílé znaky" -#: ../data/org.gnome.meld.gschema.xml.h:20 +#: ../data/org.gnome.meld.gschema.xml.h:22 msgid "" "Selector for individual whitespace character types to be shown. Possible " "values are 'space', 'tab', 'newline' and 'nbsp'." @@ -195,11 +203,11 @@ msgstr "" "hodnoty jsou „space“ (mezera), „tab“ (tabulátor), „newline“ (odřádkování) a " "„nbsp“ (nezalomitelná mezera)." -#: ../data/org.gnome.meld.gschema.xml.h:21 +#: ../data/org.gnome.meld.gschema.xml.h:23 msgid "Wrap mode" msgstr "Režim zalamování" -#: ../data/org.gnome.meld.gschema.xml.h:22 +#: ../data/org.gnome.meld.gschema.xml.h:24 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 " @@ -208,32 +216,32 @@ msgstr "" "Řádky v porovnání souborů budou zalamovány podle tohoto nastavení, a to buď " "vůbec („none“), za libovolným znakem („char“) nebo na koncích slov („word“)." -#: ../data/org.gnome.meld.gschema.xml.h:23 +#: ../data/org.gnome.meld.gschema.xml.h:25 msgid "Highlight current line" msgstr "Zvýrazňovat aktuální řádek" -#: ../data/org.gnome.meld.gschema.xml.h:24 +#: ../data/org.gnome.meld.gschema.xml.h:26 msgid "" "If true, the line containing the cursor will be highlighted in file " "comparisons." msgstr "Když je zapnuto, bude řádek s kurzorem v porovnání zvýrazněn." -#: ../data/org.gnome.meld.gschema.xml.h:25 +#: ../data/org.gnome.meld.gschema.xml.h:27 msgid "Use the system default monospace font" msgstr "Používat výchozí systémové písmo s pevnou šířkou" -#: ../data/org.gnome.meld.gschema.xml.h:26 +#: ../data/org.gnome.meld.gschema.xml.h:28 msgid "" "If false, custom-font will be used instead of the system monospace font." msgstr "" "Když je vypnuto, použije se namísto systémového písma s pevnou šířkou " "vlastní písmo." -#: ../data/org.gnome.meld.gschema.xml.h:27 +#: ../data/org.gnome.meld.gschema.xml.h:29 msgid "Custom font" msgstr "Vlastní písmo" -#: ../data/org.gnome.meld.gschema.xml.h:28 +#: ../data/org.gnome.meld.gschema.xml.h:30 msgid "" "The custom font to use, stored as a string and parsed as a Pango font " "description." @@ -241,22 +249,22 @@ msgstr "" "Vlastní písmo, které se má používat; uloženo jako řetězec a zpracováno jako " "popis písma Pango." -#: ../data/org.gnome.meld.gschema.xml.h:29 +#: ../data/org.gnome.meld.gschema.xml.h:31 msgid "Ignore blank lines when comparing files" msgstr "Při porovnávání souborů ignorovat prázdné řádky" -#: ../data/org.gnome.meld.gschema.xml.h:30 +#: ../data/org.gnome.meld.gschema.xml.h:32 msgid "" "If true, blank lines will be trimmed when highlighting changes between files." msgstr "" "Když je zapnuto, budou prázdné řádky ve zvýrazňování změn mezi soubory " "vynechány." -#: ../data/org.gnome.meld.gschema.xml.h:31 +#: ../data/org.gnome.meld.gschema.xml.h:33 msgid "Use the system default editor" msgstr "Používat výchozí editor systému" -#: ../data/org.gnome.meld.gschema.xml.h:32 +#: ../data/org.gnome.meld.gschema.xml.h:34 msgid "" "If false, custom-editor-command will be used instead of the system editor " "when opening files externally." @@ -264,11 +272,11 @@ msgstr "" "Když je zapnuto, použije se při externím otevírání souborů vlastní editor " "namísto systémového editoru." -#: ../data/org.gnome.meld.gschema.xml.h:33 +#: ../data/org.gnome.meld.gschema.xml.h:35 msgid "The custom editor launch command" msgstr "Příkaz pro spuštění vlastního editoru" -#: ../data/org.gnome.meld.gschema.xml.h:34 +#: ../data/org.gnome.meld.gschema.xml.h:36 msgid "" "The command used to launch a custom editor. Some limited templating is " "supported here; at the moment '{file}' and '{line}' are recognised tokens." @@ -277,21 +285,21 @@ msgstr "" "míry šablony – v tuto chvíli jsou rozpoznávány symboly „{file}“ (soubor) a " "„{line}“ (řádek)." -#: ../data/org.gnome.meld.gschema.xml.h:35 +#: ../data/org.gnome.meld.gschema.xml.h:37 msgid "Columns to display" msgstr "Zobrazované sloupce" -#: ../data/org.gnome.meld.gschema.xml.h:36 +#: ../data/org.gnome.meld.gschema.xml.h:38 msgid "" "List of column names in folder comparison and whether they should be " "displayed." msgstr "Seznam názvů sloupců v porovnávání složek a zda by měly být zobrazeny." -#: ../data/org.gnome.meld.gschema.xml.h:37 ../data/ui/preferences.ui.h:32 +#: ../data/org.gnome.meld.gschema.xml.h:39 ../data/ui/preferences.ui.h:32 msgid "Ignore symbolic links" msgstr "Ignorovat symbolické odkazy" -#: ../data/org.gnome.meld.gschema.xml.h:38 +#: ../data/org.gnome.meld.gschema.xml.h:40 msgid "" "If true, folder comparisons do not follow symbolic links when traversing the " "folder tree." @@ -299,11 +307,11 @@ msgstr "" "Když je zapnuto, nenásledují se při porovnávání složek symbolické odkazy " "během procházení stromu složek." -#: ../data/org.gnome.meld.gschema.xml.h:39 +#: ../data/org.gnome.meld.gschema.xml.h:41 msgid "Use shallow comparison" msgstr "Používat povrchní porovnání" -#: ../data/org.gnome.meld.gschema.xml.h:40 +#: ../data/org.gnome.meld.gschema.xml.h:42 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 " @@ -313,11 +321,11 @@ msgstr "" "a času mtime. Soubory jsou považovány za identické, když mají stejnou " "velikost i čas, v opačném případě za rozdílné." -#: ../data/org.gnome.meld.gschema.xml.h:41 +#: ../data/org.gnome.meld.gschema.xml.h:43 msgid "File timestamp resolution" msgstr "Přesnost časového razítka" -#: ../data/org.gnome.meld.gschema.xml.h:42 +#: ../data/org.gnome.meld.gschema.xml.h:44 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 " @@ -329,11 +337,11 @@ msgstr "" "jejich časy považovány za rozdílné. To je užitečné při porovnávání souborů " "mezi souborovými systémy, které mají různou přesnost časových razítek." -#: ../data/org.gnome.meld.gschema.xml.h:43 ../data/ui/preferences.ui.h:30 +#: ../data/org.gnome.meld.gschema.xml.h:45 ../data/ui/preferences.ui.h:30 msgid "Apply text filters during folder comparisons" msgstr "Použít textové filtry při porovnávání složek" -#: ../data/org.gnome.meld.gschema.xml.h:44 +#: ../data/org.gnome.meld.gschema.xml.h:46 msgid "" "If true, folder comparisons that compare file contents also apply active " "text filters and the blank line trimming option, and ignore newline " @@ -343,20 +351,20 @@ msgstr "" "použije aktivní textové filtry, volbu ořezávání prázdných řádků a ignorování " "rozdílů v zalomení řádků." -#: ../data/org.gnome.meld.gschema.xml.h:45 +#: ../data/org.gnome.meld.gschema.xml.h:47 msgid "File status filters" msgstr "Filtry stavu souboru" -#: ../data/org.gnome.meld.gschema.xml.h:46 +#: ../data/org.gnome.meld.gschema.xml.h:48 msgid "List of statuses used to filter visible files in folder comparison." msgstr "" "Seznam stavů použitých k filtrování viditelných souborů v porovnávání složek." -#: ../data/org.gnome.meld.gschema.xml.h:47 +#: ../data/org.gnome.meld.gschema.xml.h:49 msgid "Show the version control console output" msgstr "Zobrazovat výstup konzole správy verzí" -#: ../data/org.gnome.meld.gschema.xml.h:48 +#: ../data/org.gnome.meld.gschema.xml.h:50 msgid "" "If true, a console output section will be shown in version control views, " "showing the commands run for version control operations." @@ -364,11 +372,11 @@ msgstr "" "Když je zapnuto, bude v zobrazení správy verzí zobrazen výstup konzole, na " "kterém uvidíte příkazy spouštěné pro jednotlivé operace správy verzí." -#: ../data/org.gnome.meld.gschema.xml.h:49 +#: ../data/org.gnome.meld.gschema.xml.h:51 msgid "Version control pane position" msgstr "Umístění panelu správy verzí" -#: ../data/org.gnome.meld.gschema.xml.h:50 +#: ../data/org.gnome.meld.gschema.xml.h:52 msgid "" "This is the height of the main version control tree when the console pane is " "shown." @@ -376,11 +384,11 @@ msgstr "" "Jde o výšku hlavního stromu správy verzí v případě, že je zobrazen panel " "konzoly." -#: ../data/org.gnome.meld.gschema.xml.h:51 +#: ../data/org.gnome.meld.gschema.xml.h:53 msgid "Present version comparisons as left-local/right-remote" msgstr "Zobrazovat porovnání verzí jako vlevo-místní/vpravo-vzdálené" -#: ../data/org.gnome.meld.gschema.xml.h:52 +#: ../data/org.gnome.meld.gschema.xml.h:54 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, " @@ -390,11 +398,11 @@ msgstr "" "vpravo-vzdálené k určení pořadí, v jakém se mají soubory zobrazovat v " "panelech. V opačném případe je použito schéma vlevo-jejich, vpravo-moje." -#: ../data/org.gnome.meld.gschema.xml.h:53 +#: ../data/org.gnome.meld.gschema.xml.h:55 msgid "Order for files in three-way version control merge comparisons" msgstr "Pořadí pro soubory v trojcestném slučovacím porovnání ve správě verzí" -#: ../data/org.gnome.meld.gschema.xml.h:54 +#: ../data/org.gnome.meld.gschema.xml.h:56 msgid "" "Choices for file order are remote/merged/local and local/merged/remote. This " "preference only affects three-way comparisons launched from the version " @@ -406,11 +414,11 @@ msgstr "" "protože se používá výhradně pro řešení slučování/konfliktů v rámci aplikace " "Meld." -#: ../data/org.gnome.meld.gschema.xml.h:55 +#: ../data/org.gnome.meld.gschema.xml.h:57 msgid "Show margin in commit message editor" msgstr "Zobrazovat okraj v editoru zpráv k zařazení" -#: ../data/org.gnome.meld.gschema.xml.h:56 +#: ../data/org.gnome.meld.gschema.xml.h:58 msgid "" "If true, a guide will be displayed to show what column the margin is at in " "the version control commit message editor." @@ -418,11 +426,11 @@ msgstr "" "Když je zapnuto, bude zobrazeno vodítko, které ukazuje, na kterém sloupci je " "okraj editoru zpráv popisujících zařazení ve správě verzí." -#: ../data/org.gnome.meld.gschema.xml.h:57 +#: ../data/org.gnome.meld.gschema.xml.h:59 msgid "Margin column in commit message editor" msgstr "Sloupec okraje v editoru zpráv k zařazení" -#: ../data/org.gnome.meld.gschema.xml.h:58 +#: ../data/org.gnome.meld.gschema.xml.h:60 msgid "" "The column at which to show the margin in the version control commit message " "editor." @@ -430,11 +438,11 @@ msgstr "" "Sloupec, ve kterém se má zobrazit okraj v editoru zpráv popisujících " "zařazení ve správě verzí." -#: ../data/org.gnome.meld.gschema.xml.h:59 +#: ../data/org.gnome.meld.gschema.xml.h:61 msgid "Automatically hard-wrap commit messages" msgstr "Automaticky natvrdo zalamovat zprávy k zařazení" -#: ../data/org.gnome.meld.gschema.xml.h:60 +#: ../data/org.gnome.meld.gschema.xml.h:62 msgid "" "If true, the version control commit message editor will hard-wrap (i.e., " "insert line breaks) at the commit margin before commit." @@ -443,22 +451,22 @@ msgstr "" "zařazením zprávu natvrdo zalamovat (tj. vkládat zalomení řádku) na " "příslušném sloupci." -#: ../data/org.gnome.meld.gschema.xml.h:61 +#: ../data/org.gnome.meld.gschema.xml.h:63 msgid "Version control status filters" msgstr "Filtry stavu správy verzí" -#: ../data/org.gnome.meld.gschema.xml.h:62 +#: ../data/org.gnome.meld.gschema.xml.h:64 msgid "" "List of statuses used to filter visible files in version control comparison." msgstr "" "Seznam stavů použitých k filtrování viditelných souborů v porovnávání správy " "verzí." -#: ../data/org.gnome.meld.gschema.xml.h:63 +#: ../data/org.gnome.meld.gschema.xml.h:65 msgid "Filename-based filters" msgstr "Filtry názvů souborů" -#: ../data/org.gnome.meld.gschema.xml.h:64 +#: ../data/org.gnome.meld.gschema.xml.h:66 msgid "" "List of predefined filename-based filters that, if active, will remove " "matching files from a folder comparison." @@ -466,11 +474,11 @@ msgstr "" "Seznam předdefinovaných filtrů názvů souborů. Když jsou aktivní, vynechají " "odpovídající soubory z porovnání složek." -#: ../data/org.gnome.meld.gschema.xml.h:65 +#: ../data/org.gnome.meld.gschema.xml.h:67 msgid "Text-based filters" msgstr "Filtry textu" -#: ../data/org.gnome.meld.gschema.xml.h:66 +#: ../data/org.gnome.meld.gschema.xml.h:68 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, " @@ -567,7 +575,7 @@ msgstr "Kopírovat doprava" msgid "Delete selected" msgstr "Odstranit vybrané" -#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:859 ../meld/filediff.py:1384 +#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:858 ../meld/filediff.py:1382 msgid "Hide" msgstr "Skrýt" @@ -858,8 +866,8 @@ msgstr "Pokud se změny neuloží, budou trvale ztraceny." msgid "Close _without Saving" msgstr "Zavřít _bez uložení" -#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:941 ../meld/filediff.py:1450 -#: ../meld/filediff.py:1518 +#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:940 ../meld/filediff.py:1448 +#: ../meld/filediff.py:1520 msgid "_Cancel" msgstr "_Zrušit" @@ -896,7 +904,7 @@ msgstr "Vrátit stav před neuložené změny v dokumentu?" msgid "Changes made to the following documents will be permanently lost:\n" msgstr "Změny provedené v následujících dokumentech budou trvale ztraceny:\n" -#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:942 ../meld/filediff.py:1451 +#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:941 ../meld/filediff.py:1449 msgid "_Replace" msgstr "Nahradi_t" @@ -944,7 +952,7 @@ msgstr "Formátovat jako záplatu" msgid "Copy to Clipboard" msgstr "Kopírovat do schránky" -#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:144 +#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:155 msgid "Save Patch" msgstr "Uložení záplaty" @@ -1134,7 +1142,7 @@ msgstr "" "Každý vzorek je seznamem zástupných znaků ve stylu shellu oddělovaný " "mezerami." -#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:103 +#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:104 msgid "File Filters" msgstr "Filtry souborů" @@ -1413,7 +1421,7 @@ msgctxt "shortcut window" msgid "Show/hide console output" msgstr "Zobrazit/skrýt výstup konzoly" -#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:570 +#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:559 #: ../meld/newdifftab.py:38 msgid "New comparison" msgstr "Nové porovnání" @@ -1656,20 +1664,20 @@ msgstr "Skrýt %s" msgid "[%s] Scanning %s" msgstr "[%s] Prochází se %s" -#: ../meld/dirdiff.py:826 +#: ../meld/dirdiff.py:825 #, python-format msgid "[%s] Done" msgstr "[%s] Hotovo" -#: ../meld/dirdiff.py:834 +#: ../meld/dirdiff.py:833 msgid "Folders have no differences" msgstr "Mezi složkami není žádný rozdíl" -#: ../meld/dirdiff.py:836 +#: ../meld/dirdiff.py:835 msgid "Contents of scanned files in folders are identical." msgstr "Obsah kontrolovaných souborů ve složkách je stejný." -#: ../meld/dirdiff.py:838 +#: ../meld/dirdiff.py:837 msgid "" "Scanned files in folders appear identical, but contents have not been " "scanned." @@ -1677,42 +1685,42 @@ msgstr "" "Kontrolované soubory ve složkách vypadají stejně, ale nebyl kontrolován " "jejich obsah." -#: ../meld/dirdiff.py:841 +#: ../meld/dirdiff.py:840 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:843 +#: ../meld/dirdiff.py:842 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:861 ../meld/filediff.py:1386 ../meld/filediff.py:1416 -#: ../meld/filediff.py:1418 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 +#: ../meld/dirdiff.py:860 ../meld/filediff.py:1384 ../meld/filediff.py:1414 +#: ../meld/filediff.py:1416 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 msgid "Hi_de" msgstr "_Skrýt" -#: ../meld/dirdiff.py:871 +#: ../meld/dirdiff.py:870 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:872 +#: ../meld/dirdiff.py:871 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:874 +#: ../meld/dirdiff.py:873 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:876 +#: ../meld/dirdiff.py:875 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:878 +#: ../meld/dirdiff.py:877 msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. The following files in this folder are hidden:" @@ -1720,17 +1728,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:889 +#: ../meld/dirdiff.py:888 #, python-format msgid "'%s' hidden by '%s'" msgstr "„%s“ skryto v „%s“" -#: ../meld/dirdiff.py:945 +#: ../meld/dirdiff.py:944 #, python-format msgid "Replace folder “%s”?" msgstr "Nahradit složku „%s“?" -#: ../meld/dirdiff.py:947 +#: ../meld/dirdiff.py:946 #, python-format msgid "" "Another folder with the same name already exists in “%s”.\n" @@ -1739,11 +1747,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:960 +#: ../meld/dirdiff.py:959 msgid "Error copying file" msgstr "Chyba při kopírování souboru" -#: ../meld/dirdiff.py:961 +#: ../meld/dirdiff.py:960 #, python-format msgid "" "Couldn't copy %s\n" @@ -1756,35 +1764,35 @@ msgstr "" "\n" "%s" -#: ../meld/dirdiff.py:984 +#: ../meld/dirdiff.py:983 #, python-format msgid "Error deleting %s" msgstr "Chyba při mazání %s" -#: ../meld/dirdiff.py:1489 +#: ../meld/dirdiff.py:1488 msgid "No folder" msgstr "Žádná složka" #. Abbreviations for insert and overwrite that fit in the status bar -#: ../meld/filediff.py:354 +#: ../meld/filediff.py:355 msgid "INS" msgstr "VKL" -#: ../meld/filediff.py:354 +#: ../meld/filediff.py:355 msgid "OVR" msgstr "PŘE" #. Abbreviation for line, column so that it will fit in the status bar -#: ../meld/filediff.py:356 +#: ../meld/filediff.py:357 #, python-format msgid "Ln %i, Col %i" msgstr "Řád %i, sl %i" -#: ../meld/filediff.py:781 +#: ../meld/filediff.py:782 msgid "Comparison results will be inaccurate" msgstr "Výsledky porovnávání budou nepřesné" -#: ../meld/filediff.py:783 +#: ../meld/filediff.py:784 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1792,64 +1800,64 @@ msgstr "" "Filtr změnil počet řádků v souboru, což není podporováno. Porovnání nebude " "správné." -#: ../meld/filediff.py:841 +#: ../meld/filediff.py:840 msgid "Mark conflict as resolved?" msgstr "Označit konflikt jako vyřešený?" -#: ../meld/filediff.py:843 +#: ../meld/filediff.py:842 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:845 +#: ../meld/filediff.py:844 msgid "Cancel" msgstr "Zrušit" -#: ../meld/filediff.py:846 +#: ../meld/filediff.py:845 msgid "Mark _Resolved" msgstr "Označi_t za vyřešené" -#: ../meld/filediff.py:1095 +#: ../meld/filediff.py:1093 #, 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:1103 +#: ../meld/filediff.py:1101 #, python-format msgid "File %s appears to be a binary file." msgstr "Soubor %s je zřejmě binární." -#: ../meld/filediff.py:1105 +#: ../meld/filediff.py:1103 msgid "Do you want to open the file using the default application?" msgstr "Chcete soubor otevřít pomocí výchozí aplikace?" -#: ../meld/filediff.py:1107 +#: ../meld/filediff.py:1105 msgid "Open" msgstr "Otevřít" -#: ../meld/filediff.py:1123 +#: ../meld/filediff.py:1121 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Počítají se rozdíly" -#: ../meld/filediff.py:1188 +#: ../meld/filediff.py:1186 #, python-format msgid "File %s has changed on disk" msgstr "Soubor „%s“ byl změněn na disku." -#: ../meld/filediff.py:1189 +#: ../meld/filediff.py:1187 msgid "Do you want to reload the file?" msgstr "Chcete soubor znovu načíst?" -#: ../meld/filediff.py:1191 +#: ../meld/filediff.py:1189 msgid "_Reload" msgstr "Zno_vu načíst" -#: ../meld/filediff.py:1349 +#: ../meld/filediff.py:1347 msgid "Files are identical" msgstr "Soubory jsou stejné" -#: ../meld/filediff.py:1362 +#: ../meld/filediff.py:1360 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1857,11 +1865,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:1367 +#: ../meld/filediff.py:1365 msgid "Files differ in line endings only" msgstr "Soubory se liší pouze zakončením řádků" -#: ../meld/filediff.py:1369 +#: ../meld/filediff.py:1367 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1870,15 +1878,15 @@ msgstr "" "Soubory jsou shodné, vyjma rozdílného zakončení řádků:\n" "%s" -#: ../meld/filediff.py:1389 +#: ../meld/filediff.py:1387 msgid "Show without filters" msgstr "Zobrazit bez filtrů" -#: ../meld/filediff.py:1411 +#: ../meld/filediff.py:1409 msgid "Change highlighting incomplete" msgstr "Změnit zvýraznění neúplných" -#: ../meld/filediff.py:1412 +#: ../meld/filediff.py:1410 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." @@ -1887,20 +1895,20 @@ 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:1420 +#: ../meld/filediff.py:1418 msgid "Keep highlighting" msgstr "Zachovat zvýrazňování" -#: ../meld/filediff.py:1422 +#: ../meld/filediff.py:1420 msgid "_Keep highlighting" msgstr "Z_achovat zvýrazňování" -#: ../meld/filediff.py:1454 +#: ../meld/filediff.py:1452 #, python-format msgid "Replace file “%s”?" msgstr "Nahradit soubor „%s“?" -#: ../meld/filediff.py:1456 +#: ../meld/filediff.py:1454 #, python-format msgid "" "A file with this name already exists in “%s”.\n" @@ -1909,45 +1917,45 @@ msgstr "" "V „%s“ již existuje soubor se stejným názvem.\n" "Pokud stávající soubor nahradíte, jeho obsah bude ztracen." -#: ../meld/filediff.py:1473 +#: ../meld/filediff.py:1471 msgid "Save Left Pane As" msgstr "Uložení levého panelu jako" -#: ../meld/filediff.py:1475 +#: ../meld/filediff.py:1473 msgid "Save Middle Pane As" msgstr "Uložení prostředního panelu jako" -#: ../meld/filediff.py:1477 +#: ../meld/filediff.py:1475 msgid "Save Right Pane As" msgstr "Uložení pravého panelu jako" -#: ../meld/filediff.py:1491 +#: ../meld/filediff.py:1489 #, 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:1493 +#: ../meld/filediff.py:1491 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:1496 +#: ../meld/filediff.py:1494 msgid "Save Anyway" msgstr "Přesto uložit" -#: ../meld/filediff.py:1497 +#: ../meld/filediff.py:1495 msgid "Don't Save" msgstr "Neukládat" -#: ../meld/filediff.py:1519 +#: ../meld/filediff.py:1521 msgid "_Save as UTF-8" msgstr "_Uložit v UTF-8" -#: ../meld/filediff.py:1522 +#: ../meld/filediff.py:1524 #, python-format msgid "Couldn't encode text as “%s”" msgstr "Text nelze zakódovat jako „%s“" -#: ../meld/filediff.py:1524 +#: ../meld/filediff.py:1526 #, python-format msgid "" "File “%s” contains characters that can't be encoded using encoding “%s”.\n" @@ -1956,12 +1964,12 @@ msgstr "" "Soubor „%s“ obsahuje znaky, které nelze zakódovat pomocí kódování „%s“\n" "Chcete jej uložit v UTF-8?" -#: ../meld/filediff.py:1564 ../meld/patchdialog.py:120 +#: ../meld/filediff.py:1566 ../meld/patchdialog.py:131 #, python-format msgid "Could not save file %s." msgstr "Nelze uložit soubor %s." -#: ../meld/filediff.py:1565 ../meld/patchdialog.py:121 +#: ../meld/filediff.py:1567 ../meld/patchdialog.py:132 #, python-format msgid "" "Couldn't save file due to:\n" @@ -1970,11 +1978,11 @@ msgstr "" "Nelze uložit soubor z důvodu:\n" "%s" -#: ../meld/filediff.py:1910 +#: ../meld/filediff.py:1913 msgid "Live comparison updating disabled" msgstr "Živá aktualizace porovnání zakázána" -#: ../meld/filediff.py:1911 +#: ../meld/filediff.py:1914 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -2097,196 +2105,196 @@ msgstr "" msgid "untitled" msgstr "nepojmenovaný" -#: ../meld/meldwindow.py:48 +#: ../meld/meldwindow.py:49 msgid "_File" msgstr "_Soubor" -#: ../meld/meldwindow.py:49 +#: ../meld/meldwindow.py:50 msgid "_New Comparison..." msgstr "_Nové porovnávání…" -#: ../meld/meldwindow.py:50 +#: ../meld/meldwindow.py:51 msgid "Start a new comparison" msgstr "Spustit nové porovnání" -#: ../meld/meldwindow.py:53 +#: ../meld/meldwindow.py:54 msgid "Save the current file" msgstr "Uložit aktuální soubor" -#: ../meld/meldwindow.py:55 +#: ../meld/meldwindow.py:56 msgid "Save As..." msgstr "Uložit jako…" -#: ../meld/meldwindow.py:56 +#: ../meld/meldwindow.py:57 msgid "Save the current file with a different name" msgstr "Uložit aktuální soubor pod jiným názvem" -#: ../meld/meldwindow.py:59 +#: ../meld/meldwindow.py:60 msgid "Close the current file" msgstr "Zavřít aktuální soubor" -#: ../meld/meldwindow.py:62 +#: ../meld/meldwindow.py:63 msgid "_Edit" msgstr "_Upravit" -#: ../meld/meldwindow.py:64 +#: ../meld/meldwindow.py:65 msgid "Undo the last action" msgstr "Vrátit zpět poslední činnost" -#: ../meld/meldwindow.py:67 +#: ../meld/meldwindow.py:68 msgid "Redo the last undone action" msgstr "Zopakovat poslední činnost vrácenou zpět" -#: ../meld/meldwindow.py:69 +#: ../meld/meldwindow.py:70 msgid "Cut the selection" msgstr "Vyjmout výběr" -#: ../meld/meldwindow.py:71 +#: ../meld/meldwindow.py:72 msgid "Copy the selection" msgstr "Kopírovat výběr" -#: ../meld/meldwindow.py:73 +#: ../meld/meldwindow.py:74 msgid "Paste the clipboard" msgstr "Vložit obsah schránky" -#: ../meld/meldwindow.py:75 +#: ../meld/meldwindow.py:76 msgid "Find..." msgstr "Najít…" -#: ../meld/meldwindow.py:75 +#: ../meld/meldwindow.py:76 msgid "Search for text" msgstr "Hledat text" -#: ../meld/meldwindow.py:77 +#: ../meld/meldwindow.py:78 msgid "Find Ne_xt" msgstr "_Najít následující" -#: ../meld/meldwindow.py:78 +#: ../meld/meldwindow.py:79 msgid "Search forwards for the same text" msgstr "Hledat tentýž text vpřed" -#: ../meld/meldwindow.py:80 +#: ../meld/meldwindow.py:81 msgid "Find _Previous" msgstr "Najít _předchozí" -#: ../meld/meldwindow.py:81 +#: ../meld/meldwindow.py:82 msgid "Search backwards for the same text" msgstr "Hledat nazpět tentýž text" -#: ../meld/meldwindow.py:84 +#: ../meld/meldwindow.py:85 msgid "_Replace..." msgstr "Nah_radit…" -#: ../meld/meldwindow.py:85 +#: ../meld/meldwindow.py:86 msgid "Find and replace text" msgstr "Najít a nahradit text" -#: ../meld/meldwindow.py:88 +#: ../meld/meldwindow.py:89 msgid "_Changes" msgstr "_Změny" -#: ../meld/meldwindow.py:89 +#: ../meld/meldwindow.py:90 msgid "Next Change" msgstr "Následující změna" -#: ../meld/meldwindow.py:90 +#: ../meld/meldwindow.py:91 msgid "Go to the next change" msgstr "Přejít na následující změnu" -#: ../meld/meldwindow.py:92 +#: ../meld/meldwindow.py:93 msgid "Previous Change" msgstr "Předchozí změna" -#: ../meld/meldwindow.py:93 +#: ../meld/meldwindow.py:94 msgid "Go to the previous change" msgstr "Přejít na předchozí změnu" -#: ../meld/meldwindow.py:95 +#: ../meld/meldwindow.py:96 msgid "Open Externally" msgstr "Otevřít externě" -#: ../meld/meldwindow.py:96 +#: ../meld/meldwindow.py:97 msgid "Open selected file or directory in the default external application" msgstr "Otevřít vybraný soubor nebo složku ve výchozí externí aplikaci" -#: ../meld/meldwindow.py:100 +#: ../meld/meldwindow.py:101 msgid "_View" msgstr "_Zobrazit" -#: ../meld/meldwindow.py:101 +#: ../meld/meldwindow.py:102 msgid "File Status" msgstr "Stav souboru" -#: ../meld/meldwindow.py:102 +#: ../meld/meldwindow.py:103 msgid "Version Status" msgstr "Stav verze" -#: ../meld/meldwindow.py:105 +#: ../meld/meldwindow.py:106 msgid "Stop the current action" msgstr "Zastavit aktuální činnost" -#: ../meld/meldwindow.py:108 +#: ../meld/meldwindow.py:109 msgid "Refresh the view" msgstr "Obnovit zobrazení" -#: ../meld/meldwindow.py:112 +#: ../meld/meldwindow.py:113 msgid "Fullscreen" msgstr "Celá obrazovka" -#: ../meld/meldwindow.py:113 +#: ../meld/meldwindow.py:114 msgid "View the comparison in fullscreen" msgstr "Zobrazit porovnání na celou obrazovku" -#: ../meld/meldwindow.py:115 +#: ../meld/meldwindow.py:116 msgid "_Toolbar" msgstr "Nástrojová _lišta" -#: ../meld/meldwindow.py:116 +#: ../meld/meldwindow.py:117 msgid "Show or hide the toolbar" msgstr "Zobrazit nebo skrýt nástrojovou lištu" -#: ../meld/meldwindow.py:126 +#: ../meld/meldwindow.py:127 msgid "Open Recent" msgstr "Otevřít nedávné" -#: ../meld/meldwindow.py:127 +#: ../meld/meldwindow.py:128 msgid "Open recent files" msgstr "Otevřít nedávné soubory" -#: ../meld/meldwindow.py:149 +#: ../meld/meldwindow.py:150 msgid "_Meld" msgstr "_Meld" -#: ../meld/meldwindow.py:150 +#: ../meld/meldwindow.py:151 msgid "Quit the program" msgstr "Ukončit program" -#: ../meld/meldwindow.py:152 +#: ../meld/meldwindow.py:153 msgid "Prefere_nces" msgstr "_Předvolby" -#: ../meld/meldwindow.py:153 +#: ../meld/meldwindow.py:154 msgid "Configure the application" msgstr "Nastavit aplikaci" -#: ../meld/meldwindow.py:155 +#: ../meld/meldwindow.py:156 msgid "_Contents" msgstr "O_bsah" -#: ../meld/meldwindow.py:156 +#: ../meld/meldwindow.py:157 msgid "Open the Meld manual" msgstr "Otevřít příručku aplikace Meld" -#: ../meld/meldwindow.py:158 +#: ../meld/meldwindow.py:159 msgid "About this application" msgstr "O této aplikaci" -#: ../meld/meldwindow.py:604 +#: ../meld/meldwindow.py:593 #, python-format msgid "Need three files to auto-merge, got: %r" msgstr "Pro automatické sloučení jsou zapotřebí tři soubory, obdržen: %r" -#: ../meld/meldwindow.py:618 +#: ../meld/meldwindow.py:607 msgid "Cannot compare a mixture of files and directories" msgstr "Nelze porovnávat směs souborů a složek" @@ -2515,35 +2523,3 @@ msgstr "Chyba při odstraňování %s" msgid "Clear" msgstr "Vymazat" -#~ msgid "Meld does not support Python 3." -#~ msgstr "Meld nepodporuje Python 3." - -#~ msgid "_Tabs" -#~ msgstr "Kar_ty" - -#~ msgid "_Previous Tab" -#~ msgstr "_Předchozí karta" - -#~ msgid "Activate previous tab" -#~ msgstr "Přejít na předchozí kartu" - -#~ msgid "_Next Tab" -#~ msgstr "_Následující karta" - -#~ msgid "Activate next tab" -#~ msgstr "Aktivovat následující kartu" - -#~ msgid "Move Tab _Left" -#~ msgstr "Přesunout kartu do_leva" - -#~ msgid "Move current tab to left" -#~ msgstr "Přesunout aktuální kartu doleva" - -#~ msgid "Move Tab _Right" -#~ msgstr "Přesunout kartu dop_rava" - -#~ msgid "Move current tab to right" -#~ msgstr "Přesunout aktuální kartu doprava" - -#~ msgid "Switch to this tab" -#~ msgstr "Přepnout na tuto kartu" From 4dafa364d62b062b85f9aef0f90da09521712dff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mario=20Bl=C3=A4ttermann?= Date: Sat, 1 Oct 2016 19:17:05 +0000 Subject: [PATCH 0043/1316] Updated German translation --- po/de.po | 382 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 195 insertions(+), 187 deletions(-) diff --git a/po/de.po b/po/de.po index f3ad6104..4720d592 100644 --- a/po/de.po +++ b/po/de.po @@ -14,8 +14,8 @@ msgstr "" "Project-Id-Version: meld master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=meld&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-08-20 21:39+0000\n" -"PO-Revision-Date: 2016-09-09 20:39+0200\n" +"POT-Creation-Date: 2016-09-30 23:28+0000\n" +"PO-Revision-Date: 2016-10-01 21:16+0200\n" "Last-Translator: Mario Blättermann \n" "Language-Team: Deutsch \n" "Language: de\n" @@ -35,7 +35,7 @@ msgstr "Import nicht möglich: " msgid "Meld requires %s or higher." msgstr "Meld benötigt %s oder aktueller." -#: ../bin/meld:194 +#: ../bin/meld:191 #, c-format msgid "" "Couldn't load Meld-specific CSS (%s)\n" @@ -97,36 +97,44 @@ msgid "Meld comparison description" msgstr "Meld Vergleichsbeschreibung" #: ../data/org.gnome.meld.gschema.xml.h:1 -msgid "Default window size" -msgstr "Voreingestellte Fenstergröße" +msgid "Default window width" +msgstr "Voreingestellte Fensterbreite" #: ../data/org.gnome.meld.gschema.xml.h:2 -msgid "Default window state" -msgstr "Voreingestellter Fensterzustand" +msgid "Default window height" +msgstr "Voreingestellte Fensterhöhe" #: ../data/org.gnome.meld.gschema.xml.h:3 +msgid "Default window maximised state" +msgstr "Voreingestellter Maximierungszustand des Fensters" + +#: ../data/org.gnome.meld.gschema.xml.h:4 +msgid "Default window fullscreen state" +msgstr "Voreingestellter Vollbildzustand des Fensters" + +#: ../data/org.gnome.meld.gschema.xml.h:5 msgid "Show toolbar" msgstr "Werkzeugleiste anzeigen" -#: ../data/org.gnome.meld.gschema.xml.h:4 +#: ../data/org.gnome.meld.gschema.xml.h:6 msgid "If true, the window toolbar is visible." msgstr "" "Wenn dieser Schlüssel wahr ist, so ist die Fenster-Werkzeugleiste sichtbar." -#: ../data/org.gnome.meld.gschema.xml.h:5 +#: ../data/org.gnome.meld.gschema.xml.h:7 msgid "Show statusbar" msgstr "Statusleiste anzeigen" -#: ../data/org.gnome.meld.gschema.xml.h:6 +#: ../data/org.gnome.meld.gschema.xml.h:8 msgid "If true, the window statusbar is visible." msgstr "" "Wenn dieser Schlüssel wahr ist, so ist die Fenster-Statusleiste sichtbar." -#: ../data/org.gnome.meld.gschema.xml.h:7 +#: ../data/org.gnome.meld.gschema.xml.h:9 msgid "Additional automatically detected text encodings" msgstr "Zusätzliche automatisch erkannte Textkodierungen" -#: ../data/org.gnome.meld.gschema.xml.h:8 +#: ../data/org.gnome.meld.gschema.xml.h:10 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 " @@ -139,42 +147,42 @@ msgstr "" "aktuellen Spracheinstellung versucht. Anderer Kodierungen können ebenfalls " "versucht werden, abhängig von der Spracheinstellung des Benutzers." -#: ../data/org.gnome.meld.gschema.xml.h:9 +#: ../data/org.gnome.meld.gschema.xml.h:11 msgid "Width of an indentation step" msgstr "Breite eines Einrückungsschritts" -#: ../data/org.gnome.meld.gschema.xml.h:10 +#: ../data/org.gnome.meld.gschema.xml.h:12 msgid "The number of spaces to use for a single indent step" msgstr "" "Die Anzahl an zu verwendender Leerzeichen für einen einfachen " "Einrückungsschritt" -#: ../data/org.gnome.meld.gschema.xml.h:11 +#: ../data/org.gnome.meld.gschema.xml.h:13 msgid "Whether to indent using spaces or tabs" msgstr "" "Legt fest, ob mit Leerzeichen oder Tabulatorzeichen eingerückt werden soll" -#: ../data/org.gnome.meld.gschema.xml.h:12 +#: ../data/org.gnome.meld.gschema.xml.h:14 msgid "If true, any new indentation will use spaces instead of tabs." msgstr "" "Wenn dieser Schlüssel wahr ist, werden für neue Einrückungen Leerzeichen " "anstellen von Tabulatoren verwenden." -#: ../data/org.gnome.meld.gschema.xml.h:13 +#: ../data/org.gnome.meld.gschema.xml.h:15 msgid "Show line numbers" msgstr "Zeilennummern anzeigen" -#: ../data/org.gnome.meld.gschema.xml.h:14 +#: ../data/org.gnome.meld.gschema.xml.h:16 msgid "If true, line numbers will be shown in the gutter of file comparisons." msgstr "" "Wenn dieser Schlüssel wahr ist, werden Zeilennummern im Seitenbereich der " "Dateivergleiche angezeigt." -#: ../data/org.gnome.meld.gschema.xml.h:15 +#: ../data/org.gnome.meld.gschema.xml.h:17 msgid "Highlight syntax" msgstr "Quelltext hervorheben" -#: ../data/org.gnome.meld.gschema.xml.h:16 +#: ../data/org.gnome.meld.gschema.xml.h:18 msgid "" "Whether to highlight syntax in comparisons. Because of Meld's own color " "highlighting, this is off by default." @@ -183,21 +191,21 @@ msgstr "" "Weil Meld bereits eigene Farbhervorhebungen verwendet, ist diese Funktion " "standardmäßig deaktiviert." -#: ../data/org.gnome.meld.gschema.xml.h:17 +#: ../data/org.gnome.meld.gschema.xml.h:19 msgid "Color scheme to use for syntax highlighting" msgstr "Farbschema für Syntaxhervorhebung" -#: ../data/org.gnome.meld.gschema.xml.h:18 +#: ../data/org.gnome.meld.gschema.xml.h:20 msgid "Used by GtkSourceView to determine colors for syntax highlighting" msgstr "" "Wird von GtkSourceView verwendet, um Farben für die Syntaxhervorhebung zu " "bestimmen" -#: ../data/org.gnome.meld.gschema.xml.h:19 +#: ../data/org.gnome.meld.gschema.xml.h:21 msgid "Displayed whitespace" msgstr "Angezeigtes Leerzeichen" -#: ../data/org.gnome.meld.gschema.xml.h:20 +#: ../data/org.gnome.meld.gschema.xml.h:22 msgid "" "Selector for individual whitespace character types to be shown. Possible " "values are 'space', 'tab', 'newline' and 'nbsp'." @@ -206,11 +214,11 @@ msgstr "" "»space« (Leerzeichen), »tab« (Tabulator), »newline« (Zeilenumbruch) und " "»nbsp« (geschütztes Leerzeichen)." -#: ../data/org.gnome.meld.gschema.xml.h:21 +#: ../data/org.gnome.meld.gschema.xml.h:23 msgid "Wrap mode" msgstr "Wortumbruch-Modus" -#: ../data/org.gnome.meld.gschema.xml.h:22 +#: ../data/org.gnome.meld.gschema.xml.h:24 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 " @@ -220,11 +228,11 @@ msgstr "" "Werte sind »none« (kein Umbruch), »char« (Umbruch bei beliebigen Zeichen) " "oder »word« (Umbruch nach Wortende)" -#: ../data/org.gnome.meld.gschema.xml.h:23 +#: ../data/org.gnome.meld.gschema.xml.h:25 msgid "Highlight current line" msgstr "Aktuelle Zeile hervorheben" -#: ../data/org.gnome.meld.gschema.xml.h:24 +#: ../data/org.gnome.meld.gschema.xml.h:26 msgid "" "If true, the line containing the cursor will be highlighted in file " "comparisons." @@ -232,22 +240,22 @@ msgstr "" "Wenn dieser Schlüssel wahr ist, wird in Dateivergleichen die Zeile " "hervorgehoben, in der sich die Textmarke befindet." -#: ../data/org.gnome.meld.gschema.xml.h:25 +#: ../data/org.gnome.meld.gschema.xml.h:27 msgid "Use the system default monospace font" msgstr "Die dicktengleiche Systemschrift verwenden" -#: ../data/org.gnome.meld.gschema.xml.h:26 +#: ../data/org.gnome.meld.gschema.xml.h:28 msgid "" "If false, custom-font will be used instead of the system monospace font." msgstr "" "Falls falsch, wird die angegebene Schriftart anstelle der systemweiten " "dicktengleichen Schriftart verwendet." -#: ../data/org.gnome.meld.gschema.xml.h:27 +#: ../data/org.gnome.meld.gschema.xml.h:29 msgid "Custom font" msgstr "Eigene Schriftart" -#: ../data/org.gnome.meld.gschema.xml.h:28 +#: ../data/org.gnome.meld.gschema.xml.h:30 msgid "" "The custom font to use, stored as a string and parsed as a Pango font " "description." @@ -255,22 +263,22 @@ msgstr "" "Die zu verwendende benutzerdefinierte Schriftart, als Zeichenkette " "gespeichert und von Pango als eingelesen." -#: ../data/org.gnome.meld.gschema.xml.h:29 +#: ../data/org.gnome.meld.gschema.xml.h:31 msgid "Ignore blank lines when comparing files" msgstr "Leere Zeilen beim Vergleichen ignorieren" -#: ../data/org.gnome.meld.gschema.xml.h:30 +#: ../data/org.gnome.meld.gschema.xml.h:32 msgid "" "If true, blank lines will be trimmed when highlighting changes between files." msgstr "" "Wenn dieser Schlüssel wahr ist, werden leere Zeilen beim Anzeigen der " "Änderungen zwischen Dateien ausgenommen." -#: ../data/org.gnome.meld.gschema.xml.h:31 +#: ../data/org.gnome.meld.gschema.xml.h:33 msgid "Use the system default editor" msgstr "Den vom System vorgegebenen Editor verwenden" -#: ../data/org.gnome.meld.gschema.xml.h:32 +#: ../data/org.gnome.meld.gschema.xml.h:34 msgid "" "If false, custom-editor-command will be used instead of the system editor " "when opening files externally." @@ -279,11 +287,11 @@ msgstr "" "Bearbeitungsprogramm anstelle des voreingestellten Bearbeitungsprogramms " "verwendet." -#: ../data/org.gnome.meld.gschema.xml.h:33 +#: ../data/org.gnome.meld.gschema.xml.h:35 msgid "The custom editor launch command" msgstr "Benutzerdefinierter Startbefehl für das Bearbeitungsprogramm" -#: ../data/org.gnome.meld.gschema.xml.h:34 +#: ../data/org.gnome.meld.gschema.xml.h:36 msgid "" "The command used to launch a custom editor. Some limited templating is " "supported here; at the moment '{file}' and '{line}' are recognised tokens." @@ -292,22 +300,22 @@ msgstr "" "zusätzliche Parameter können »{file}« (Datei) und »{line}« (Zeile) verwendet " "werden." -#: ../data/org.gnome.meld.gschema.xml.h:35 +#: ../data/org.gnome.meld.gschema.xml.h:37 msgid "Columns to display" msgstr "Anzuzeigende Spalten" -#: ../data/org.gnome.meld.gschema.xml.h:36 +#: ../data/org.gnome.meld.gschema.xml.h:38 msgid "" "List of column names in folder comparison and whether they should be " "displayed." msgstr "" "Liste der Spaltennamen im Ordnervergleich und ob sie angezeigt werden sollen." -#: ../data/org.gnome.meld.gschema.xml.h:37 ../data/ui/preferences.ui.h:32 +#: ../data/org.gnome.meld.gschema.xml.h:39 ../data/ui/preferences.ui.h:32 msgid "Ignore symbolic links" msgstr "Symbolische Verknüpfungen ignorieren" -#: ../data/org.gnome.meld.gschema.xml.h:38 +#: ../data/org.gnome.meld.gschema.xml.h:40 msgid "" "If true, folder comparisons do not follow symbolic links when traversing the " "folder tree." @@ -315,11 +323,11 @@ msgstr "" "Wenn dieser Schlüssel wahr ist, werden Ordnervergleiche symbolische " "Verknüpfungen nicht folgen." -#: ../data/org.gnome.meld.gschema.xml.h:39 +#: ../data/org.gnome.meld.gschema.xml.h:41 msgid "Use shallow comparison" msgstr "Oberflächlicher Vergleich" -#: ../data/org.gnome.meld.gschema.xml.h:40 +#: ../data/org.gnome.meld.gschema.xml.h:42 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 " @@ -330,11 +338,11 @@ msgstr "" "Dateien identisch sind, wenn deren Größe und Änderungsdatum identisch ist, " "ohne den Inhalt zu prüfen." -#: ../data/org.gnome.meld.gschema.xml.h:41 +#: ../data/org.gnome.meld.gschema.xml.h:43 msgid "File timestamp resolution" msgstr "Auflösung des Zeitstempels" -#: ../data/org.gnome.meld.gschema.xml.h:42 +#: ../data/org.gnome.meld.gschema.xml.h:44 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 " @@ -346,11 +354,11 @@ msgstr "" "verschieden gelten. Diese Funktion ist nützlich beim Vergleichen von Dateien " "auf unterschiedlichen Dateisystemen mit verschiedenen Zeitauflösungen." -#: ../data/org.gnome.meld.gschema.xml.h:43 ../data/ui/preferences.ui.h:30 +#: ../data/org.gnome.meld.gschema.xml.h:45 ../data/ui/preferences.ui.h:30 msgid "Apply text filters during folder comparisons" msgstr "Textfilter während eines Ordnervergleichs anwenden" -#: ../data/org.gnome.meld.gschema.xml.h:44 +#: ../data/org.gnome.meld.gschema.xml.h:46 msgid "" "If true, folder comparisons that compare file contents also apply active " "text filters and the blank line trimming option, and ignore newline " @@ -360,19 +368,19 @@ msgstr "" "aktive Textfilter und das Leerzeilenabschneiden anwenden sowie Änderungen in " "den Leerzeilen ignorieren." -#: ../data/org.gnome.meld.gschema.xml.h:45 +#: ../data/org.gnome.meld.gschema.xml.h:47 msgid "File status filters" msgstr "Dateistatusfilter" -#: ../data/org.gnome.meld.gschema.xml.h:46 +#: ../data/org.gnome.meld.gschema.xml.h:48 msgid "List of statuses used to filter visible files in folder comparison." msgstr "Liste von Status, um sichtbare Dateien im Ordnervergleich zu filtern." -#: ../data/org.gnome.meld.gschema.xml.h:47 +#: ../data/org.gnome.meld.gschema.xml.h:49 msgid "Show the version control console output" msgstr "Die Ausgabe der Versionskontrolle anzeigen" -#: ../data/org.gnome.meld.gschema.xml.h:48 +#: ../data/org.gnome.meld.gschema.xml.h:50 msgid "" "If true, a console output section will be shown in version control views, " "showing the commands run for version control operations." @@ -381,11 +389,11 @@ msgstr "" "Anzeige der Befehle für die Versionskontrollhandlungen in " "Versionskontrollansichten angezeigt." -#: ../data/org.gnome.meld.gschema.xml.h:49 +#: ../data/org.gnome.meld.gschema.xml.h:51 msgid "Version control pane position" msgstr "Position der Versionskontrollansicht" -#: ../data/org.gnome.meld.gschema.xml.h:50 +#: ../data/org.gnome.meld.gschema.xml.h:52 msgid "" "This is the height of the main version control tree when the console pane is " "shown." @@ -393,11 +401,11 @@ msgstr "" "Die Höhe des Hauptversionskontrollbaumes wenn der Bereich für die " "Konsolenanzeige geöffnet ist." -#: ../data/org.gnome.meld.gschema.xml.h:51 +#: ../data/org.gnome.meld.gschema.xml.h:53 msgid "Present version comparisons as left-local/right-remote" msgstr "Versionsvergleiche als links-lokal/rechts-entfernt darstellen" -#: ../data/org.gnome.meld.gschema.xml.h:52 +#: ../data/org.gnome.meld.gschema.xml.h:54 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, " @@ -408,12 +416,12 @@ msgstr "" "Reihenfolge Dateien in den Bereichen angezeigt werden sollen. Ansonsten wird " "die Methode links-ist-ihre, rechts-ist-meine verwendet." -#: ../data/org.gnome.meld.gschema.xml.h:53 +#: ../data/org.gnome.meld.gschema.xml.h:55 msgid "Order for files in three-way version control merge comparisons" msgstr "" "Dateireihenfolge in einem Drei-Wege Versionskontroll Zusammenfügevergleich" -#: ../data/org.gnome.meld.gschema.xml.h:54 +#: ../data/org.gnome.meld.gschema.xml.h:56 msgid "" "Choices for file order are remote/merged/local and local/merged/remote. This " "preference only affects three-way comparisons launched from the version " @@ -425,11 +433,11 @@ msgstr "" "Versionskontrollansicht gestartet werden und werden nur für Zusammenfügungen " "und Konfliktlösung in Meld verwendet." -#: ../data/org.gnome.meld.gschema.xml.h:55 +#: ../data/org.gnome.meld.gschema.xml.h:57 msgid "Show margin in commit message editor" msgstr "Den Rand im Einbringungsnachrichten-Editor anzeigen" -#: ../data/org.gnome.meld.gschema.xml.h:56 +#: ../data/org.gnome.meld.gschema.xml.h:58 msgid "" "If true, a guide will be displayed to show what column the margin is at in " "the version control commit message editor." @@ -437,22 +445,22 @@ msgstr "" "Wenn dieser Schlüssel wahr ist, wird eine Hilfslinie angezeigt, um den Rand " "für Einspielnachrichten im Versionskontroll-Editor zu markieren." -#: ../data/org.gnome.meld.gschema.xml.h:57 +#: ../data/org.gnome.meld.gschema.xml.h:59 msgid "Margin column in commit message editor" msgstr "Randspalte im Einspielnachrichteneditor" -#: ../data/org.gnome.meld.gschema.xml.h:58 +#: ../data/org.gnome.meld.gschema.xml.h:60 msgid "" "The column at which to show the margin in the version control commit message " "editor." msgstr "" "Die Randspalte des Einbringungsnachrichten-Editors für Versionskontrolle." -#: ../data/org.gnome.meld.gschema.xml.h:59 +#: ../data/org.gnome.meld.gschema.xml.h:61 msgid "Automatically hard-wrap commit messages" msgstr "Einspielnachrichten automatisch hart umbrechen" -#: ../data/org.gnome.meld.gschema.xml.h:60 +#: ../data/org.gnome.meld.gschema.xml.h:62 msgid "" "If true, the version control commit message editor will hard-wrap (i.e., " "insert line breaks) at the commit margin before commit." @@ -461,21 +469,21 @@ msgstr "" "Versionskontrolle am definierten Rand vor dem Einspielen hart umgebrochen (d." "h. Zeilenumbrüche werden eingefügt)." -#: ../data/org.gnome.meld.gschema.xml.h:61 +#: ../data/org.gnome.meld.gschema.xml.h:63 msgid "Version control status filters" msgstr "Versionskontrollstatus-Filter" -#: ../data/org.gnome.meld.gschema.xml.h:62 +#: ../data/org.gnome.meld.gschema.xml.h:64 msgid "" "List of statuses used to filter visible files in version control comparison." msgstr "" "Liste von Status, um sichtbare Dateien im Versionsvergleich zu filtern." -#: ../data/org.gnome.meld.gschema.xml.h:63 +#: ../data/org.gnome.meld.gschema.xml.h:65 msgid "Filename-based filters" msgstr "Auf Dateinamen basierende Filter" -#: ../data/org.gnome.meld.gschema.xml.h:64 +#: ../data/org.gnome.meld.gschema.xml.h:66 msgid "" "List of predefined filename-based filters that, if active, will remove " "matching files from a folder comparison." @@ -483,11 +491,11 @@ msgstr "" "Liste von vordefinierten, Dateinamen-basierten Filtern. Falls aktiviert, " "werden treffende Dateien aus einem Ordnervergleich entfernt." -#: ../data/org.gnome.meld.gschema.xml.h:65 +#: ../data/org.gnome.meld.gschema.xml.h:67 msgid "Text-based filters" msgstr "Auf Text basierende Filter" -#: ../data/org.gnome.meld.gschema.xml.h:66 +#: ../data/org.gnome.meld.gschema.xml.h:68 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, " @@ -589,7 +597,7 @@ msgstr "Nach rechts kopieren" msgid "Delete selected" msgstr "Markierte löschen" -#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:859 ../meld/filediff.py:1384 +#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:858 ../meld/filediff.py:1382 msgid "Hide" msgstr "Verbergen" @@ -881,8 +889,8 @@ msgstr "Wenn Sie nicht speichern, gehen die Änderungen verloren." msgid "Close _without Saving" msgstr "Schließen _ohne zu Speichern" -#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:941 ../meld/filediff.py:1450 -#: ../meld/filediff.py:1518 +#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:940 ../meld/filediff.py:1448 +#: ../meld/filediff.py:1520 msgid "_Cancel" msgstr "A_bbrechen" @@ -919,7 +927,7 @@ msgstr "Nicht gespeicherte Dokumentenänderungen zurücknehmen?" msgid "Changes made to the following documents will be permanently lost:\n" msgstr "Änderungen der folgenden Dokumente werden verloren gehen:\n" -#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:942 ../meld/filediff.py:1451 +#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:941 ../meld/filediff.py:1449 msgid "_Replace" msgstr "E_rsetzen" @@ -967,7 +975,7 @@ msgstr "Als Patch formatieren" msgid "Copy to Clipboard" msgstr "In die Zwischenablage kopieren" -#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:144 +#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:155 msgid "Save Patch" msgstr "Patch speichern" @@ -1157,7 +1165,7 @@ msgstr "" "Dateien und Ordner nach Namen herauszufiltern. Jedes Muster ist dabei eine " "durch Leerzeichen getrennte Liste von Befehlszeilenplatzhaltern." -#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:103 +#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:104 msgid "File Filters" msgstr "Dateifilter" @@ -1437,7 +1445,7 @@ msgctxt "shortcut window" msgid "Show/hide console output" msgstr "Konsolenausgabe anzeigen/verbergen" -#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:570 +#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:559 #: ../meld/newdifftab.py:38 msgid "New comparison" msgstr "Neuer Vergleich" @@ -1681,20 +1689,20 @@ msgstr "%s verbergen" msgid "[%s] Scanning %s" msgstr "[%s] %s wird durchsucht" -#: ../meld/dirdiff.py:826 +#: ../meld/dirdiff.py:825 #, python-format msgid "[%s] Done" msgstr "[%s] Fertig" -#: ../meld/dirdiff.py:834 +#: ../meld/dirdiff.py:833 msgid "Folders have no differences" msgstr "Keine Unterschiede zwischen Ordnern" -#: ../meld/dirdiff.py:836 +#: ../meld/dirdiff.py:835 msgid "Contents of scanned files in folders are identical." msgstr "Inhalte der untersuchten Dateien in den Ordnern sind identisch." -#: ../meld/dirdiff.py:838 +#: ../meld/dirdiff.py:837 msgid "" "Scanned files in folders appear identical, but contents have not been " "scanned." @@ -1702,43 +1710,43 @@ msgstr "" "Untersuchte Dateien in den Ordner scheinen identisch zu sein, jedoch wurden " "die Dateiinhalte nicht geprüft." -#: ../meld/dirdiff.py:841 +#: ../meld/dirdiff.py:840 msgid "File filters are in use, so not all files have been scanned." msgstr "" "Dateifilter wurden verwendet, deshalb wurden nicht alle Dateien untersucht." -#: ../meld/dirdiff.py:843 +#: ../meld/dirdiff.py:842 msgid "Text filters are in use and may be masking content differences." msgstr "" "Textfilter werden verwendet, welche Unterschiede zwischen Dateien maskieren " "könnten." -#: ../meld/dirdiff.py:861 ../meld/filediff.py:1386 ../meld/filediff.py:1416 -#: ../meld/filediff.py:1418 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 +#: ../meld/dirdiff.py:860 ../meld/filediff.py:1384 ../meld/filediff.py:1414 +#: ../meld/filediff.py:1416 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 msgid "Hi_de" msgstr "Ver_bergen" -#: ../meld/dirdiff.py:871 +#: ../meld/dirdiff.py:870 msgid "Multiple errors occurred while scanning this folder" msgstr "Beim Einlesen dieses Ordners traten mehrere Fehler auf" -#: ../meld/dirdiff.py:872 +#: ../meld/dirdiff.py:871 msgid "Files with invalid encodings found" msgstr "Dateien mit ungültigen Kodierungen gefunden" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:874 +#: ../meld/dirdiff.py:873 msgid "Some files were in an incorrect encoding. The names are something like:" msgstr "" "Einige Dateien lagen in einer inkorrekten Kodierung vor. Folgende Namen sind " "davon betroffen:" -#: ../meld/dirdiff.py:876 +#: ../meld/dirdiff.py:875 msgid "Files hidden by case insensitive comparison" msgstr "Dateien durch von Schreibweise unabhängigen Vergleich verborgen" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:878 +#: ../meld/dirdiff.py:877 msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. The following files in this folder are hidden:" @@ -1747,17 +1755,17 @@ msgstr "" "auf einem Dateisystem durch, welches zwischen Groß- und Kleinschreibung " "unterscheidet. Die folgenden Dateien in diesem Ordner sind nicht sichtbar:" -#: ../meld/dirdiff.py:889 +#: ../meld/dirdiff.py:888 #, python-format msgid "'%s' hidden by '%s'" msgstr "»%s« verborgen durch »%s«" -#: ../meld/dirdiff.py:945 +#: ../meld/dirdiff.py:944 #, python-format msgid "Replace folder “%s”?" msgstr "Ordner »%s« ersetzen?" -#: ../meld/dirdiff.py:947 +#: ../meld/dirdiff.py:946 #, python-format msgid "" "Another folder with the same name already exists in “%s”.\n" @@ -1766,11 +1774,11 @@ msgstr "" "Ein Ordner mit diesem Namen existiert bereits in »%s«.\n" "Wenn Sie den vorhandenen Ordner ersetzen, gehen alle Dateien darin verloren." -#: ../meld/dirdiff.py:960 +#: ../meld/dirdiff.py:959 msgid "Error copying file" msgstr "Fehler beim Kopieren der Datei" -#: ../meld/dirdiff.py:961 +#: ../meld/dirdiff.py:960 #, python-format msgid "" "Couldn't copy %s\n" @@ -1783,35 +1791,35 @@ msgstr "" "\n" "%s" -#: ../meld/dirdiff.py:984 +#: ../meld/dirdiff.py:983 #, python-format msgid "Error deleting %s" msgstr "Fehler beim Löschen von »%s«" -#: ../meld/dirdiff.py:1489 +#: ../meld/dirdiff.py:1488 msgid "No folder" msgstr "Kein Ordner" #. Abbreviations for insert and overwrite that fit in the status bar -#: ../meld/filediff.py:354 +#: ../meld/filediff.py:355 msgid "INS" msgstr "EINF" -#: ../meld/filediff.py:354 +#: ../meld/filediff.py:355 msgid "OVR" msgstr "ÜBR" #. Abbreviation for line, column so that it will fit in the status bar -#: ../meld/filediff.py:356 +#: ../meld/filediff.py:357 #, python-format msgid "Ln %i, Col %i" msgstr "Zeile %i, Spalte %i" -#: ../meld/filediff.py:781 +#: ../meld/filediff.py:782 msgid "Comparison results will be inaccurate" msgstr "Ergebnisse werden ungenau sein" -#: ../meld/filediff.py:783 +#: ../meld/filediff.py:784 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1820,66 +1828,66 @@ msgstr "" "nicht unterstützt, deshalb wird ein Vergleich keine korrekten Ergebnisse " "liefern." -#: ../meld/filediff.py:841 +#: ../meld/filediff.py:840 msgid "Mark conflict as resolved?" msgstr "Konflikt als _gelöst markieren?" -#: ../meld/filediff.py:843 +#: ../meld/filediff.py:842 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:845 +#: ../meld/filediff.py:844 msgid "Cancel" msgstr "Abbrechen" -#: ../meld/filediff.py:846 +#: ../meld/filediff.py:845 msgid "Mark _Resolved" msgstr "Als _gelöst markieren" -#: ../meld/filediff.py:1095 +#: ../meld/filediff.py:1093 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Beim Öffnen der Datei »%s« ist ein Fehler aufgetreten." -#: ../meld/filediff.py:1103 +#: ../meld/filediff.py:1101 #, python-format msgid "File %s appears to be a binary file." msgstr "Datei %s scheint eine Binärdatei zu sein." -#: ../meld/filediff.py:1105 +#: ../meld/filediff.py:1103 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:1107 +#: ../meld/filediff.py:1105 msgid "Open" msgstr "Öffnen" -#: ../meld/filediff.py:1123 +#: ../meld/filediff.py:1121 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Unterschiede werden berechnet" -#: ../meld/filediff.py:1188 +#: ../meld/filediff.py:1186 #, python-format msgid "File %s has changed on disk" msgstr "Die Datei %s wurde auf dem Datenträger geändert" -#: ../meld/filediff.py:1189 +#: ../meld/filediff.py:1187 msgid "Do you want to reload the file?" msgstr "Möchten Sie die Datei neu laden?" -#: ../meld/filediff.py:1191 +#: ../meld/filediff.py:1189 msgid "_Reload" msgstr "_Neu laden" -#: ../meld/filediff.py:1349 +#: ../meld/filediff.py:1347 msgid "Files are identical" msgstr "Dateien sind identisch" -#: ../meld/filediff.py:1362 +#: ../meld/filediff.py:1360 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1887,11 +1895,11 @@ msgstr "" "Textfilter werden verwendet, welche Unterschiede zwischen Dateien maskieren " "könnten. Wollen Sie die ungefilterten Dateien vergleichen?" -#: ../meld/filediff.py:1367 +#: ../meld/filediff.py:1365 msgid "Files differ in line endings only" msgstr "Dateien unterscheiden sich nur in den Zeilenendungen" -#: ../meld/filediff.py:1369 +#: ../meld/filediff.py:1367 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1900,15 +1908,15 @@ msgstr "" "Dateien sind identisch, abgesehen von unterschiedlichen Zeilenenden:\n" "%s" -#: ../meld/filediff.py:1389 +#: ../meld/filediff.py:1387 msgid "Show without filters" msgstr "Ungefiltert anzeigen" -#: ../meld/filediff.py:1411 +#: ../meld/filediff.py:1409 msgid "Change highlighting incomplete" msgstr "Änderungsmarkierung unvollständig" -#: ../meld/filediff.py:1412 +#: ../meld/filediff.py:1410 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." @@ -1917,20 +1925,20 @@ msgstr "" "Sie können Meld zur Hervorhebung längerer Änderungen zwingen, was jedoch " "langsam sein könnte." -#: ../meld/filediff.py:1420 +#: ../meld/filediff.py:1418 msgid "Keep highlighting" msgstr "Hervorhebung fortführen" -#: ../meld/filediff.py:1422 +#: ../meld/filediff.py:1420 msgid "_Keep highlighting" msgstr "Hervorhebung _fortführen" -#: ../meld/filediff.py:1454 +#: ../meld/filediff.py:1452 #, python-format msgid "Replace file “%s”?" msgstr "Datei »%s« ersetzen?" -#: ../meld/filediff.py:1456 +#: ../meld/filediff.py:1454 #, python-format msgid "" "A file with this name already exists in “%s”.\n" @@ -1939,46 +1947,46 @@ msgstr "" "Eine Datei mit diesem Namen existiert bereits in »%s«.\n" "Wenn Sie die vorhandene Datei ersetzen, geht dessen Inhalt verloren." -#: ../meld/filediff.py:1473 +#: ../meld/filediff.py:1471 msgid "Save Left Pane As" msgstr "Linke Ansicht speichern unter" -#: ../meld/filediff.py:1475 +#: ../meld/filediff.py:1473 msgid "Save Middle Pane As" msgstr "Mittlere Ansicht speichern unter" -#: ../meld/filediff.py:1477 +#: ../meld/filediff.py:1475 msgid "Save Right Pane As" msgstr "Rechte Ansicht speichern unter" -#: ../meld/filediff.py:1491 +#: ../meld/filediff.py:1489 #, 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:1493 +#: ../meld/filediff.py:1491 msgid "If you save it, any external changes will be lost." msgstr "Wenn Sie speichern, gehen externe Änderungen verloren." -#: ../meld/filediff.py:1496 +#: ../meld/filediff.py:1494 msgid "Save Anyway" msgstr "Dennoch speichern" -#: ../meld/filediff.py:1497 +#: ../meld/filediff.py:1495 msgid "Don't Save" msgstr "Nicht Speichern" -#: ../meld/filediff.py:1519 +#: ../meld/filediff.py:1521 msgid "_Save as UTF-8" msgstr "Als UTF-8 _speichern" -#: ../meld/filediff.py:1522 +#: ../meld/filediff.py:1524 #, python-format msgid "Couldn't encode text as “%s”" msgstr "Text konnte nicht als »%s« kodiert werden." -#: ../meld/filediff.py:1524 +#: ../meld/filediff.py:1526 #, python-format msgid "" "File “%s” contains characters that can't be encoded using encoding “%s”.\n" @@ -1987,12 +1995,12 @@ msgstr "" "Die Datei »%s« enthält Zeichen, die mit »%s« nicht kodierbar sind.\n" "Möchten Sie im UTF-8-Format speichern?" -#: ../meld/filediff.py:1564 ../meld/patchdialog.py:120 +#: ../meld/filediff.py:1566 ../meld/patchdialog.py:131 #, python-format msgid "Could not save file %s." msgstr "Datei %s konnte nicht gespeichert werden." -#: ../meld/filediff.py:1565 ../meld/patchdialog.py:121 +#: ../meld/filediff.py:1567 ../meld/patchdialog.py:132 #, python-format msgid "" "Couldn't save file due to:\n" @@ -2001,11 +2009,11 @@ msgstr "" "Datei konnte nicht gespeichert werden:\n" "%s" -#: ../meld/filediff.py:1910 +#: ../meld/filediff.py:1913 msgid "Live comparison updating disabled" msgstr "Direkte Vergleichsaktualisierung deaktiviert" -#: ../meld/filediff.py:1911 +#: ../meld/filediff.py:1914 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -2131,197 +2139,197 @@ msgstr "" msgid "untitled" msgstr "unbenannt" -#: ../meld/meldwindow.py:48 +#: ../meld/meldwindow.py:49 msgid "_File" msgstr "_Datei" -#: ../meld/meldwindow.py:49 +#: ../meld/meldwindow.py:50 msgid "_New Comparison..." msgstr "Neuer _Vergleich …" -#: ../meld/meldwindow.py:50 +#: ../meld/meldwindow.py:51 msgid "Start a new comparison" msgstr "Neuen Vergleich starten" -#: ../meld/meldwindow.py:53 +#: ../meld/meldwindow.py:54 msgid "Save the current file" msgstr "Aktuelle Datei speichern" -#: ../meld/meldwindow.py:55 +#: ../meld/meldwindow.py:56 msgid "Save As..." msgstr "Speichern unter …" -#: ../meld/meldwindow.py:56 +#: ../meld/meldwindow.py:57 msgid "Save the current file with a different name" msgstr "Aktuelle Datei unter einem anderen Namen speichern" -#: ../meld/meldwindow.py:59 +#: ../meld/meldwindow.py:60 msgid "Close the current file" msgstr "Aktuelle Datei schließen" -#: ../meld/meldwindow.py:62 +#: ../meld/meldwindow.py:63 msgid "_Edit" msgstr "_Bearbeiten" -#: ../meld/meldwindow.py:64 +#: ../meld/meldwindow.py:65 msgid "Undo the last action" msgstr "Letzte Aktion rückgängig machen" -#: ../meld/meldwindow.py:67 +#: ../meld/meldwindow.py:68 msgid "Redo the last undone action" msgstr "Letzte Aktion wiederholen" -#: ../meld/meldwindow.py:69 +#: ../meld/meldwindow.py:70 msgid "Cut the selection" msgstr "Auswahl ausschneiden" -#: ../meld/meldwindow.py:71 +#: ../meld/meldwindow.py:72 msgid "Copy the selection" msgstr "Auswahl kopieren" -#: ../meld/meldwindow.py:73 +#: ../meld/meldwindow.py:74 msgid "Paste the clipboard" msgstr "Aus der Zwischenablage einfügen" -#: ../meld/meldwindow.py:75 +#: ../meld/meldwindow.py:76 msgid "Find..." msgstr "Suchen …" -#: ../meld/meldwindow.py:75 +#: ../meld/meldwindow.py:76 msgid "Search for text" msgstr "Nach Text suchen" -#: ../meld/meldwindow.py:77 +#: ../meld/meldwindow.py:78 msgid "Find Ne_xt" msgstr "Nä_chste" -#: ../meld/meldwindow.py:78 +#: ../meld/meldwindow.py:79 msgid "Search forwards for the same text" msgstr "Vorwärts nach dem gleichen Text suchen" -#: ../meld/meldwindow.py:80 +#: ../meld/meldwindow.py:81 msgid "Find _Previous" msgstr "_Rückwärts suchen" -#: ../meld/meldwindow.py:81 +#: ../meld/meldwindow.py:82 msgid "Search backwards for the same text" msgstr "Rückwärts nach dem gleichen Text suchen" -#: ../meld/meldwindow.py:84 +#: ../meld/meldwindow.py:85 msgid "_Replace..." msgstr "Erset_zen …" -#: ../meld/meldwindow.py:85 +#: ../meld/meldwindow.py:86 msgid "Find and replace text" msgstr "Text suchen und ersetzen" -#: ../meld/meldwindow.py:88 +#: ../meld/meldwindow.py:89 msgid "_Changes" msgstr "Än_derungen" -#: ../meld/meldwindow.py:89 +#: ../meld/meldwindow.py:90 msgid "Next Change" msgstr "Nächste Änderung" -#: ../meld/meldwindow.py:90 +#: ../meld/meldwindow.py:91 msgid "Go to the next change" msgstr "Zur nächsten Änderung gehen" -#: ../meld/meldwindow.py:92 +#: ../meld/meldwindow.py:93 msgid "Previous Change" msgstr "Vorherige Änderung" -#: ../meld/meldwindow.py:93 +#: ../meld/meldwindow.py:94 msgid "Go to the previous change" msgstr "Zur vorherigen Änderung gehen" -#: ../meld/meldwindow.py:95 +#: ../meld/meldwindow.py:96 msgid "Open Externally" msgstr "Extern öffnen" -#: ../meld/meldwindow.py:96 +#: ../meld/meldwindow.py:97 msgid "Open selected file or directory in the default external application" msgstr "" "Gewählte Datei oder Ordner in der vorgegebenen externen Anwendung öffnen" -#: ../meld/meldwindow.py:100 +#: ../meld/meldwindow.py:101 msgid "_View" msgstr "_Ansicht" -#: ../meld/meldwindow.py:101 +#: ../meld/meldwindow.py:102 msgid "File Status" msgstr "Dateistatus" -#: ../meld/meldwindow.py:102 +#: ../meld/meldwindow.py:103 msgid "Version Status" msgstr "Versionsstatus" -#: ../meld/meldwindow.py:105 +#: ../meld/meldwindow.py:106 msgid "Stop the current action" msgstr "Aktuelle Aktion abbrechen" -#: ../meld/meldwindow.py:108 +#: ../meld/meldwindow.py:109 msgid "Refresh the view" msgstr "Ansicht aktualisieren" -#: ../meld/meldwindow.py:112 +#: ../meld/meldwindow.py:113 msgid "Fullscreen" msgstr "Vollbild" -#: ../meld/meldwindow.py:113 +#: ../meld/meldwindow.py:114 msgid "View the comparison in fullscreen" msgstr "Den Vergleich im Vollbildmodus anzeigen" -#: ../meld/meldwindow.py:115 +#: ../meld/meldwindow.py:116 msgid "_Toolbar" msgstr "_Werkzeugleiste" -#: ../meld/meldwindow.py:116 +#: ../meld/meldwindow.py:117 msgid "Show or hide the toolbar" msgstr "Werkzeugleiste anzeigen oder verbergen" -#: ../meld/meldwindow.py:126 +#: ../meld/meldwindow.py:127 msgid "Open Recent" msgstr "Zuletzt verwendete Dateien öffnen" -#: ../meld/meldwindow.py:127 +#: ../meld/meldwindow.py:128 msgid "Open recent files" msgstr "Zuletzt verwendete Dateien öffnen" -#: ../meld/meldwindow.py:149 +#: ../meld/meldwindow.py:150 msgid "_Meld" msgstr "_Meld" -#: ../meld/meldwindow.py:150 +#: ../meld/meldwindow.py:151 msgid "Quit the program" msgstr "Anwendung beenden" -#: ../meld/meldwindow.py:152 +#: ../meld/meldwindow.py:153 msgid "Prefere_nces" msgstr "_Einstellungen" -#: ../meld/meldwindow.py:153 +#: ../meld/meldwindow.py:154 msgid "Configure the application" msgstr "Anwendung konfigurieren" -#: ../meld/meldwindow.py:155 +#: ../meld/meldwindow.py:156 msgid "_Contents" msgstr "I_nhalt" -#: ../meld/meldwindow.py:156 +#: ../meld/meldwindow.py:157 msgid "Open the Meld manual" msgstr "Handbuch öffnen" -#: ../meld/meldwindow.py:158 +#: ../meld/meldwindow.py:159 msgid "About this application" msgstr "Info zu dieser Anwendung" -#: ../meld/meldwindow.py:604 +#: ../meld/meldwindow.py:593 #, python-format msgid "Need three files to auto-merge, got: %r" msgstr "Drei Dateien zum automatischen Zusammenführen benötigt, %r erhalten." -#: ../meld/meldwindow.py:618 +#: ../meld/meldwindow.py:607 msgid "Cannot compare a mixture of files and directories" msgstr "Es kann keine Mischung aus Dateien und Ordnern verglichen werden" From af5ad58a6787c01fe8f96cae6bf61ab989af5d47 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 25 Sep 2016 10:29:42 +1000 Subject: [PATCH 0044/1316] gutterrendererchunk: Use built-in background drawing support This is good for a ~3x performance improvement when drawing chunk backgrounds, just because we don't have to individually draw the background for each gutter line with nothing going on. --- meld/gutterrendererchunk.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/meld/gutterrendererchunk.py b/meld/gutterrendererchunk.py index a8b961f4..4ba672b4 100644 --- a/meld/gutterrendererchunk.py +++ b/meld/gutterrendererchunk.py @@ -45,22 +45,12 @@ def on_setting_changed(self, meldsettings, key): def draw_chunks( self, context, background_area, cell_area, start, end, state): - stylecontext = self.props.view.get_style_context() - background_set, background_rgba = ( - stylecontext.lookup_color('theme_bg_color')) - line = start.get_line() chunk_index = self.linediffer.locate_chunk(self.from_pane, line)[0] context.save() context.set_line_width(1.0) - context.rectangle( - background_area.x, background_area.y, - background_area.width, background_area.height) - context.set_source_rgba(*background_rgba) - context.fill() - if chunk_index is not None: chunk = self.linediffer.get_chunk( chunk_index, self.from_pane, self.to_pane) @@ -201,6 +191,14 @@ def do_query_data(self, start, end, state): if chunk and chunk[1] == line: action = self._classify_change_actions(chunk) pixbuf = self.action_map.get(action) + self.set_background(None) + else: + # TODO: Remove when fixed in upstream GTK+ + stylecontext = self.props.view.get_style_context() + background_set, background_rgba = ( + stylecontext.lookup_color('theme_bg_color')) + self.set_background(background_rgba) + if pixbuf: self.set_pixbuf(pixbuf) else: From 2a15af055f6f91f0c53705340d43f41bbe96667a Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 25 Sep 2016 10:52:16 +1000 Subject: [PATCH 0045/1316] diffgrid: Simplify and speed up our child property requests --- meld/diffgrid.py | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/meld/diffgrid.py b/meld/diffgrid.py index ae0463e7..71ee7b50 100644 --- a/meld/diffgrid.py +++ b/meld/diffgrid.py @@ -166,25 +166,11 @@ def do_size_allocate(self, allocation): allocation.x, wmap1, wpane1, wlink1, wpane2, wlink2, wpane3, wmap2) columns = [sum(wcols[:i + 1]) for i in range(len(wcols))] - def get_child_prop_int(child, name): - prop = GObject.Value(int) - self.child_get_property(child, name, prop) - return prop.get_int() - - def get_child_attach(child): - attach = [ - get_child_prop_int(child, 'left-attach'), - get_child_prop_int(child, 'top-attach'), - get_child_prop_int(child, 'width'), - get_child_prop_int(child, 'height'), - ] - return attach - def child_allocate(child): if not child.get_visible(): return - attach = get_child_attach(child) - left, top, width, height = attach + left, top, width, height = self.child_get( + child, 'left-attach', 'top-attach', 'width', 'height') # This is a copy, and we have to do this because there's no Python # access to Gtk.Allocation. child_alloc = self.get_allocation() From d7aca32d40352e029cd6ee9af2acd3e2397a818f Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 25 Sep 2016 11:11:24 +1000 Subject: [PATCH 0046/1316] gutterrendererchunk: Improve escape checks for chunk drawing --- meld/gutterrendererchunk.py | 58 ++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 27 deletions(-) diff --git a/meld/gutterrendererchunk.py b/meld/gutterrendererchunk.py index 4ba672b4..11c2ecbf 100644 --- a/meld/gutterrendererchunk.py +++ b/meld/gutterrendererchunk.py @@ -48,37 +48,41 @@ def draw_chunks( line = start.get_line() chunk_index = self.linediffer.locate_chunk(self.from_pane, line)[0] + if chunk_index is None: + return + + chunk = self.linediffer.get_chunk( + chunk_index, self.from_pane, self.to_pane) + if not chunk: + return + + x = background_area.x - 1 + y = background_area.y + width = background_area.width + 2 + height = 1 if chunk[1] == chunk[2] else background_area.height + context.save() context.set_line_width(1.0) - if chunk_index is not None: - chunk = self.linediffer.get_chunk( - chunk_index, self.from_pane, self.to_pane) + context.rectangle(x, y, width, height) + context.set_source_rgba(*self.fill_colors[chunk[0]]) + + if self.props.view.current_chunk_check(chunk): + context.fill_preserve() + highlight = self.fill_colors['current-chunk-highlight'] + context.set_source_rgba(*highlight) + context.fill() + + if line == chunk[1] or line == chunk[2] - 1: + context.set_source_rgba(*self.line_colors[chunk[0]]) + if line == chunk[1]: + context.move_to(x, y + 0.5) + context.rel_line_to(width, 0) + if line == chunk[2] - 1: + context.move_to(x, y - 0.5 + height) + context.rel_line_to(width, 0) + context.stroke() - if chunk: - x = background_area.x - 1 - width = background_area.width + 2 - - height = 1 if chunk[1] == chunk[2] else background_area.height - y = background_area.y - context.rectangle(x, y, width, height) - context.set_source_rgba(*self.fill_colors[chunk[0]]) - - if self.props.view.current_chunk_check(chunk): - context.fill_preserve() - highlight = self.fill_colors['current-chunk-highlight'] - context.set_source_rgba(*highlight) - context.fill() - - if line == chunk[1] or line == chunk[2] - 1: - context.set_source_rgba(*self.line_colors[chunk[0]]) - if line == chunk[1]: - context.move_to(x, y + 0.5) - context.rel_line_to(width, 0) - if line == chunk[2] - 1: - context.move_to(x, y - 0.5 + height) - context.rel_line_to(width, 0) - context.stroke() context.restore() From 0455bd45137ed65160da29b03873e173975cc7c2 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 25 Sep 2016 11:37:39 +1000 Subject: [PATCH 0047/1316] gutterrendererchunk: Remove superfluous context saving The GtkSourceGutter already makes sure to save and restore its context around us, so we don't need to repeat that here. --- meld/gutterrendererchunk.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/meld/gutterrendererchunk.py b/meld/gutterrendererchunk.py index 11c2ecbf..ccb20817 100644 --- a/meld/gutterrendererchunk.py +++ b/meld/gutterrendererchunk.py @@ -61,9 +61,6 @@ def draw_chunks( width = background_area.width + 2 height = 1 if chunk[1] == chunk[2] else background_area.height - context.save() - context.set_line_width(1.0) - context.rectangle(x, y, width, height) context.set_source_rgba(*self.fill_colors[chunk[0]]) @@ -74,6 +71,7 @@ def draw_chunks( context.fill() if line == chunk[1] or line == chunk[2] - 1: + context.set_line_width(1.0) context.set_source_rgba(*self.line_colors[chunk[0]]) if line == chunk[1]: context.move_to(x, y + 0.5) @@ -83,8 +81,6 @@ def draw_chunks( context.rel_line_to(width, 0) context.stroke() - context.restore() - class GutterRendererChunkAction( GtkSource.GutterRendererPixbuf, MeldGutterRenderer): From c57c36f62b05d8fa75a75dd2d76ccc2443a6579f Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Mon, 26 Sep 2016 06:56:28 +1000 Subject: [PATCH 0048/1316] matchers: Copy the passed-in text for mutability and speed The mutability argument here is pretty clear: we should take a copy of the sequences, because we can't guarantee that they're not going to change while we're running our comparison. I'm pretty sure that our yield points actually happen to guarantee this anyway, but I'd much prefer being explicit here. The speed argument is much weirder and more annoying. What this differ almost always gets passed is a pair of MeldBufferLines instances, which expose a Python-list-like interface over the lines of a GtkTextBuffer. What this means in practice is that doing things like iterating over MeldBufferLines results in half a dozen GTK+ API calls to e.g., get the text iterator for a visual line, get the start and end of the line, get the text from that line, clean it up... it's a nightmare and it's super, super slow. Doing the whole-buffer copy here does all of this, but only once. Obviously we pay the memory penalty of copying the whole file, but given the performance improvements I'm willing to take this as a peak usage cost. --- meld/matchers.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/meld/matchers.py b/meld/matchers.py index af51fa9f..160db127 100644 --- a/meld/matchers.py +++ b/meld/matchers.py @@ -82,8 +82,11 @@ class MyersSequenceMatcher(difflib.SequenceMatcher): def __init__(self, isjunk=None, a="", b=""): if isjunk is not None: raise NotImplementedError('isjunk is not supported yet') - self.a = a - self.b = b + # The sequences we're comparing must be considered immutable; + # calling e.g., GtkTextBuffer methods to retrieve these line-by-line + # isn't really a thing we can or should do. + self.a = a[:] + self.b = b[:] self.matching_blocks = self.opcodes = None self.aindex = [] self.bindex = [] From 6751e06bb0635b095b7181caa771e3f7f476b6f5 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sat, 1 Oct 2016 09:32:42 +1000 Subject: [PATCH 0049/1316] linkmap: Slightly improve some variable locality --- meld/linkmap.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meld/linkmap.py b/meld/linkmap.py index c50b50a4..c86d7da5 100644 --- a/meld/linkmap.py +++ b/meld/linkmap.py @@ -52,17 +52,16 @@ def do_draw(self, context): if not self.filediff: return - context.set_line_width(1.0) - allocation = self.get_allocation() - pix_start = [t.get_visible_rect().y for t in self.views] y_offset = [ t.translate_coordinates(self, 0, 0)[1] + 1 for t in self.views] clip_y = min(y_offset) - 1 clip_height = max(t.get_visible_rect().height for t in self.views) + 2 + allocation = self.get_allocation() context.rectangle(0, clip_y, allocation.width, clip_height) context.clip() + context.set_line_width(1.0) stylecontext = self.get_style_context() Gtk.render_background( From ab2484f1ce4b73150a7642177396b2bd031e6289 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sat, 1 Oct 2016 10:09:56 +1000 Subject: [PATCH 0050/1316] gutterrendererchunk: Use renderer backgrounds for chunks as well This currently breaks the background rendering for the line-number gutter, but that's easily fixable. --- meld/gutterrendererchunk.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/meld/gutterrendererchunk.py b/meld/gutterrendererchunk.py index ccb20817..e84b36fb 100644 --- a/meld/gutterrendererchunk.py +++ b/meld/gutterrendererchunk.py @@ -61,14 +61,11 @@ def draw_chunks( width = background_area.width + 2 height = 1 if chunk[1] == chunk[2] else background_area.height - context.rectangle(x, y, width, height) - context.set_source_rgba(*self.fill_colors[chunk[0]]) - if self.props.view.current_chunk_check(chunk): - context.fill_preserve() highlight = self.fill_colors['current-chunk-highlight'] + context.rectangle(x, y, width, height) context.set_source_rgba(*highlight) - context.fill() + context.fill() if line == chunk[1] or line == chunk[2] - 1: context.set_line_width(1.0) @@ -165,10 +162,10 @@ def copy_chunk(widget, chunk, copy_up): return copy_menu def do_draw(self, context, background_area, cell_area, start, end, state): + GtkSource.GutterRendererPixbuf.do_draw( + self, context, background_area, cell_area, start, end, state) self.draw_chunks( context, background_area, cell_area, start, end, state) - return GtkSource.GutterRendererPixbuf.do_draw( - self, context, background_area, cell_area, start, end, state) def do_query_activatable(self, start, area, event): line = start.get_line() @@ -191,7 +188,8 @@ def do_query_data(self, start, end, state): if chunk and chunk[1] == line: action = self._classify_change_actions(chunk) pixbuf = self.action_map.get(action) - self.set_background(None) + self.set_background(self.fill_colors[chunk[0]]) + else: # TODO: Remove when fixed in upstream GTK+ stylecontext = self.props.view.get_style_context() From a1203efc72932868e74f14f1945098104644ad76 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sat, 1 Oct 2016 10:14:23 +1000 Subject: [PATCH 0051/1316] gutterrendererchunk: Set the background for the highlight as well This is completely wrong because highlight is used as a tint, but at least it gets the logic in the correct place. --- meld/gutterrendererchunk.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/meld/gutterrendererchunk.py b/meld/gutterrendererchunk.py index e84b36fb..8b2edd94 100644 --- a/meld/gutterrendererchunk.py +++ b/meld/gutterrendererchunk.py @@ -61,12 +61,6 @@ def draw_chunks( width = background_area.width + 2 height = 1 if chunk[1] == chunk[2] else background_area.height - if self.props.view.current_chunk_check(chunk): - highlight = self.fill_colors['current-chunk-highlight'] - context.rectangle(x, y, width, height) - context.set_source_rgba(*highlight) - context.fill() - if line == chunk[1] or line == chunk[2] - 1: context.set_line_width(1.0) context.set_source_rgba(*self.line_colors[chunk[0]]) @@ -188,14 +182,17 @@ def do_query_data(self, start, end, state): if chunk and chunk[1] == line: action = self._classify_change_actions(chunk) pixbuf = self.action_map.get(action) - self.set_background(self.fill_colors[chunk[0]]) + if self.props.view.current_chunk_check(chunk): + background_rgba = self.fill_colors['current-chunk-highlight'] + else: + background_rgba = self.fill_colors[chunk[0]] else: # TODO: Remove when fixed in upstream GTK+ stylecontext = self.props.view.get_style_context() background_set, background_rgba = ( stylecontext.lookup_color('theme_bg_color')) - self.set_background(background_rgba) + self.set_background(background_rgba) if pixbuf: self.set_pixbuf(pixbuf) From 9f6be510d5f45d76f23ccb7f595a857043c3ba8c Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sat, 1 Oct 2016 11:12:04 +1000 Subject: [PATCH 0052/1316] gutterrendererchunk: Simplify whether-to-draw logic for chunk lines --- meld/gutterrendererchunk.py | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/meld/gutterrendererchunk.py b/meld/gutterrendererchunk.py index 8b2edd94..a01549ed 100644 --- a/meld/gutterrendererchunk.py +++ b/meld/gutterrendererchunk.py @@ -56,21 +56,26 @@ def draw_chunks( if not chunk: return + is_first_line = line == chunk[1] + is_last_line = line == chunk[2] - 1 + if not (is_first_line or is_last_line): + # Only paint for the first and last lines of a chunk + return + x = background_area.x - 1 y = background_area.y width = background_area.width + 2 height = 1 if chunk[1] == chunk[2] else background_area.height - if line == chunk[1] or line == chunk[2] - 1: - context.set_line_width(1.0) - context.set_source_rgba(*self.line_colors[chunk[0]]) - if line == chunk[1]: - context.move_to(x, y + 0.5) - context.rel_line_to(width, 0) - if line == chunk[2] - 1: - context.move_to(x, y - 0.5 + height) - context.rel_line_to(width, 0) - context.stroke() + context.set_line_width(1.0) + context.set_source_rgba(*self.line_colors[chunk[0]]) + if is_first_line: + context.move_to(x, y + 0.5) + context.rel_line_to(width, 0) + if is_last_line: + context.move_to(x, y - 0.5 + height) + context.rel_line_to(width, 0) + context.stroke() class GutterRendererChunkAction( From fb1f98d9ce99e98fe5d7bfae33d08a90f235dd56 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 2 Oct 2016 08:30:25 +1000 Subject: [PATCH 0053/1316] gutterrendererchunk: Dodge some unnecessary None logic --- meld/gutterrendererchunk.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/meld/gutterrendererchunk.py b/meld/gutterrendererchunk.py index a01549ed..26645b63 100644 --- a/meld/gutterrendererchunk.py +++ b/meld/gutterrendererchunk.py @@ -198,11 +198,7 @@ def do_query_data(self, start, end, state): background_set, background_rgba = ( stylecontext.lookup_color('theme_bg_color')) self.set_background(background_rgba) - - if pixbuf: - self.set_pixbuf(pixbuf) - else: - self.props.pixbuf = None + self.props.pixbuf = pixbuf def on_container_mode_changed(self, container, mode): self.mode = mode From c5310604ead64ef9b2092c3133ae6e53e6203d02 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 2 Oct 2016 08:40:17 +1000 Subject: [PATCH 0054/1316] gutterrendererchunk: Move background setting to MeldGutterRenderer This fixes the broken background painting for the line number gutter, and should also result in many fewer queries for chunk indices. --- meld/gutterrendererchunk.py | 58 +++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/meld/gutterrendererchunk.py b/meld/gutterrendererchunk.py index 26645b63..6de3d7dc 100644 --- a/meld/gutterrendererchunk.py +++ b/meld/gutterrendererchunk.py @@ -45,17 +45,11 @@ def on_setting_changed(self, meldsettings, key): def draw_chunks( self, context, background_area, cell_area, start, end, state): - line = start.get_line() - chunk_index = self.linediffer.locate_chunk(self.from_pane, line)[0] - - if chunk_index is None: - return - - chunk = self.linediffer.get_chunk( - chunk_index, self.from_pane, self.to_pane) + chunk = self._chunk if not chunk: return + line = start.get_line() is_first_line = line == chunk[1] is_last_line = line == chunk[2] - 1 if not (is_first_line or is_last_line): @@ -77,6 +71,26 @@ def draw_chunks( context.rel_line_to(width, 0) context.stroke() + def query_chunks(self, start, end, state): + line = start.get_line() + chunk_index = self.linediffer.locate_chunk(self.from_pane, line)[0] + + if chunk_index is not None: + self._chunk = self.linediffer.get_chunk( + chunk_index, self.from_pane, self.to_pane) + + if self.props.view.current_chunk_check(self._chunk): + background_rgba = self.fill_colors['current-chunk-highlight'] + else: + background_rgba = self.fill_colors[self._chunk[0]] + else: + self._chunk = None + # TODO: Remove when fixed in upstream GTK+ + stylecontext = self.props.view.get_style_context() + background_set, background_rgba = ( + stylecontext.lookup_color('theme_bg_color')) + self.set_background(background_rgba) + class GutterRendererChunkAction( GtkSource.GutterRendererPixbuf, MeldGutterRenderer): @@ -177,27 +191,14 @@ def do_query_activatable(self, start, area, event): return False def do_query_data(self, start, end, state): + self.query_chunks(start, end, state) line = start.get_line() - chunk_index = self.linediffer.locate_chunk(self.from_pane, line)[0] - - pixbuf = None - if chunk_index is not None: - chunk = self.linediffer.get_chunk( - chunk_index, self.from_pane, self.to_pane) - if chunk and chunk[1] == line: - action = self._classify_change_actions(chunk) - pixbuf = self.action_map.get(action) - if self.props.view.current_chunk_check(chunk): - background_rgba = self.fill_colors['current-chunk-highlight'] - else: - background_rgba = self.fill_colors[chunk[0]] + if self._chunk and self._chunk[1] == line: + action = self._classify_change_actions(self._chunk) + pixbuf = self.action_map.get(action) else: - # TODO: Remove when fixed in upstream GTK+ - stylecontext = self.props.view.get_style_context() - background_set, background_rgba = ( - stylecontext.lookup_color('theme_bg_color')) - self.set_background(background_rgba) + pixbuf = None self.props.pixbuf = pixbuf def on_container_mode_changed(self, container, mode): @@ -300,12 +301,13 @@ def recalculate_size(self, buf): self.set_size(width) def do_draw(self, context, background_area, cell_area, start, end, state): + GtkSource.GutterRendererText.do_draw( + self, context, background_area, cell_area, start, end, state) self.draw_chunks( context, background_area, cell_area, start, end, state) - return GtkSource.GutterRendererText.do_draw( - self, context, background_area, cell_area, start, end, state) def do_query_data(self, start, end, state): + self.query_chunks(start, end, state) line = start.get_line() + 1 current_line = state & GtkSource.GutterRendererState.CURSOR markup = "%d" % line if current_line else str(line) From 6ad8e47f60d35f2550f475b54e9e73e998eaf48d Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 2 Oct 2016 09:30:40 +1000 Subject: [PATCH 0055/1316] gutterrendererchunk: Use GDK-Cairo API to avoid colour overrides Doing the *colour expansion is surprisingly costly, and unnecessary given that the GDK-Cairo integration lets us use an RGBA directly. --- meld/gutterrendererchunk.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meld/gutterrendererchunk.py b/meld/gutterrendererchunk.py index 6de3d7dc..a44e3870 100644 --- a/meld/gutterrendererchunk.py +++ b/meld/gutterrendererchunk.py @@ -16,6 +16,7 @@ import math from gi.repository import Pango +from gi.repository import Gdk from gi.repository import Gtk from gi.repository import GtkSource @@ -62,7 +63,7 @@ def draw_chunks( height = 1 if chunk[1] == chunk[2] else background_area.height context.set_line_width(1.0) - context.set_source_rgba(*self.line_colors[chunk[0]]) + Gdk.cairo_set_source_rgba(context, self.line_colors[chunk[0]]) if is_first_line: context.move_to(x, y + 0.5) context.rel_line_to(width, 0) From 3286e9d66eb8ddaee706fab8d31cc96e152991b5 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 2 Oct 2016 09:31:59 +1000 Subject: [PATCH 0056/1316] gutterrendererchunk: Add some unpleasant style context caching As the docstring expounds up, this is unpleasant and theoretically very fragile, but in practice is almost certain to be totally fine. It is, in other words, the worst kind of hack. --- meld/gutterrendererchunk.py | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/meld/gutterrendererchunk.py b/meld/gutterrendererchunk.py index a44e3870..1dd0ca63 100644 --- a/meld/gutterrendererchunk.py +++ b/meld/gutterrendererchunk.py @@ -36,6 +36,27 @@ def load(icon_name): return icon_theme.load_icon(icon_name, LINE_HEIGHT, 0) +def get_background_rgba(renderer): + '''Get and cache the expected background for the renderer widget + + Current versions of GTK+ don't paint the background of text view + gutters with the actual expected widget background, which causes + them to look wrong when put next to any other widgets. This hack + just gets the background from the renderer's view, and then caches + in for performance, and on the basis that all renderers will be + assigned to similarly-styled views. This is fragile, but the + alternative is really significantly slower. + ''' + global _background_rgba + if _background_rgba is None: + if renderer.props.view: + stylecontext = renderer.props.view.get_style_context() + background_set, _background_rgba = ( + stylecontext.lookup_color('theme_bg_color')) + return _background_rgba +_background_rgba = None + + class MeldGutterRenderer(object): def on_setting_changed(self, meldsettings, key): @@ -77,19 +98,18 @@ def query_chunks(self, start, end, state): chunk_index = self.linediffer.locate_chunk(self.from_pane, line)[0] if chunk_index is not None: - self._chunk = self.linediffer.get_chunk( + chunk = self.linediffer.get_chunk( chunk_index, self.from_pane, self.to_pane) - if self.props.view.current_chunk_check(self._chunk): + if self.props.view.current_chunk_check(chunk): background_rgba = self.fill_colors['current-chunk-highlight'] else: - background_rgba = self.fill_colors[self._chunk[0]] + background_rgba = self.fill_colors[chunk[0]] else: - self._chunk = None + chunk = None # TODO: Remove when fixed in upstream GTK+ - stylecontext = self.props.view.get_style_context() - background_set, background_rgba = ( - stylecontext.lookup_color('theme_bg_color')) + background_rgba = get_background_rgba(self) + self._chunk = chunk self.set_background(background_rgba) From d942089edce209c408ba7c4f0c3fa6d08e2f9b47 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 2 Oct 2016 09:39:33 +1000 Subject: [PATCH 0057/1316] gutterrendererchunk: Don't draw backgrounds for empty insert chunks --- meld/gutterrendererchunk.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meld/gutterrendererchunk.py b/meld/gutterrendererchunk.py index 1dd0ca63..5948990f 100644 --- a/meld/gutterrendererchunk.py +++ b/meld/gutterrendererchunk.py @@ -101,7 +101,9 @@ def query_chunks(self, start, end, state): chunk = self.linediffer.get_chunk( chunk_index, self.from_pane, self.to_pane) - if self.props.view.current_chunk_check(chunk): + if chunk[1] == chunk[2]: + background_rgba = get_background_rgba(self) + elif self.props.view.current_chunk_check(chunk): background_rgba = self.fill_colors['current-chunk-highlight'] else: background_rgba = self.fill_colors[chunk[0]] From 7c192e68392a8afdefaa5f62fbf9fa1d5dade554 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 2 Oct 2016 10:08:04 +1000 Subject: [PATCH 0058/1316] gutterrendererchunk: Fix current chunk highlight colour --- meld/gutterrendererchunk.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meld/gutterrendererchunk.py b/meld/gutterrendererchunk.py index 5948990f..91f6dba3 100644 --- a/meld/gutterrendererchunk.py +++ b/meld/gutterrendererchunk.py @@ -63,6 +63,12 @@ def on_setting_changed(self, meldsettings, key): if key == 'style-scheme': # meldsettings.style_scheme self.fill_colors, self.line_colors = get_common_theme() + alpha = self.fill_colors['current-chunk-highlight'].alpha + make_highlight = lambda color: Gdk.RGBA( + *[alpha + c * (1.0 - alpha) for c in color]) + self.chunk_highlights = { + k: make_highlight(v) for k, v in self.fill_colors.items() + } def draw_chunks( self, context, background_area, cell_area, start, end, state): @@ -104,7 +110,7 @@ def query_chunks(self, start, end, state): if chunk[1] == chunk[2]: background_rgba = get_background_rgba(self) elif self.props.view.current_chunk_check(chunk): - background_rgba = self.fill_colors['current-chunk-highlight'] + background_rgba = self.chunk_highlights[chunk[0]] else: background_rgba = self.fill_colors[chunk[0]] else: From 243ad3e4a9f31e0f5c828c9f0ecac0617ae388fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bal=C3=A1zs=20Mesk=C3=B3?= Date: Sun, 2 Oct 2016 08:02:29 +0000 Subject: [PATCH 0059/1316] Updated Hungarian translation --- po/hu.po | 382 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 195 insertions(+), 187 deletions(-) diff --git a/po/hu.po b/po/hu.po index 783388ac..fdebae67 100644 --- a/po/hu.po +++ b/po/hu.po @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: meld master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=meld&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-08-20 21:39+0000\n" -"PO-Revision-Date: 2016-08-22 13:51+0200\n" +"POT-Creation-Date: 2016-09-30 23:28+0000\n" +"PO-Revision-Date: 2016-10-01 22:03+0200\n" "Last-Translator: Meskó Balázs \n" "Language-Team: Hungarian \n" "Language: hu\n" @@ -29,7 +29,7 @@ msgstr "Nem importálható: " msgid "Meld requires %s or higher." msgstr "A Meld futásához %s vagy újabb szükséges." -#: ../bin/meld:194 +#: ../bin/meld:191 #, c-format msgid "" "Couldn't load Meld-specific CSS (%s)\n" @@ -90,34 +90,42 @@ msgid "Meld comparison description" msgstr "Meld összehasonlítás-leírás" #: ../data/org.gnome.meld.gschema.xml.h:1 -msgid "Default window size" -msgstr "Alapértelmezett ablakméret" +msgid "Default window width" +msgstr "Alapértelmezett ablakszélesség" #: ../data/org.gnome.meld.gschema.xml.h:2 -msgid "Default window state" -msgstr "Alapértelmezett ablakállapot" +msgid "Default window height" +msgstr "Alapértelmezett ablakmagasság" #: ../data/org.gnome.meld.gschema.xml.h:3 +msgid "Default window maximised state" +msgstr "Ablak alapértelmezett maximalizálási állapota" + +#: ../data/org.gnome.meld.gschema.xml.h:4 +msgid "Default window fullscreen state" +msgstr "Ablak alapértelmezett teljes képernyős állapota" + +#: ../data/org.gnome.meld.gschema.xml.h:5 msgid "Show toolbar" msgstr "Eszköztár megjelenítése" -#: ../data/org.gnome.meld.gschema.xml.h:4 +#: ../data/org.gnome.meld.gschema.xml.h:6 msgid "If true, the window toolbar is visible." msgstr "Az ablak eszköztára látható-e." -#: ../data/org.gnome.meld.gschema.xml.h:5 +#: ../data/org.gnome.meld.gschema.xml.h:7 msgid "Show statusbar" msgstr "Állapotsor megjelenítése" -#: ../data/org.gnome.meld.gschema.xml.h:6 +#: ../data/org.gnome.meld.gschema.xml.h:8 msgid "If true, the window statusbar is visible." msgstr "Az ablak állapotsora látható-e." -#: ../data/org.gnome.meld.gschema.xml.h:7 +#: ../data/org.gnome.meld.gschema.xml.h:9 msgid "Additional automatically detected text encodings" msgstr "További automatikusan felismert szövegkódolások" -#: ../data/org.gnome.meld.gschema.xml.h:8 +#: ../data/org.gnome.meld.gschema.xml.h:10 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 " @@ -130,38 +138,38 @@ msgstr "" "kódolása mindig felhasználásra kerül, a felhasználó területi beállításától " "függően más kódolások is kipróbálhatók." -#: ../data/org.gnome.meld.gschema.xml.h:9 +#: ../data/org.gnome.meld.gschema.xml.h:11 msgid "Width of an indentation step" msgstr "Behúzási lépés szélessége" -#: ../data/org.gnome.meld.gschema.xml.h:10 +#: ../data/org.gnome.meld.gschema.xml.h:12 msgid "The number of spaces to use for a single indent step" msgstr "Egy behúzási lépéshez használandó szóközök száma" -#: ../data/org.gnome.meld.gschema.xml.h:11 +#: ../data/org.gnome.meld.gschema.xml.h:13 msgid "Whether to indent using spaces or tabs" msgstr "A behúzáshoz szóközök vagy tabok használandók-e" -#: ../data/org.gnome.meld.gschema.xml.h:12 +#: ../data/org.gnome.meld.gschema.xml.h:14 msgid "If true, any new indentation will use spaces instead of tabs." msgstr "" "Ha ez be van állítva, az új behúzás szóközöket fog használni tabok helyett." -#: ../data/org.gnome.meld.gschema.xml.h:13 +#: ../data/org.gnome.meld.gschema.xml.h:15 msgid "Show line numbers" msgstr "Sorszámok megjelenítése" -#: ../data/org.gnome.meld.gschema.xml.h:14 +#: ../data/org.gnome.meld.gschema.xml.h:16 msgid "If true, line numbers will be shown in the gutter of file comparisons." msgstr "" "Ha ez be van állítva, a sorszámok meg fognak jelenni a fájl-" "összehasonlítások margóján." -#: ../data/org.gnome.meld.gschema.xml.h:15 +#: ../data/org.gnome.meld.gschema.xml.h:17 msgid "Highlight syntax" msgstr "Szintaxiskiemelés" -#: ../data/org.gnome.meld.gschema.xml.h:16 +#: ../data/org.gnome.meld.gschema.xml.h:18 msgid "" "Whether to highlight syntax in comparisons. Because of Meld's own color " "highlighting, this is off by default." @@ -169,21 +177,21 @@ msgstr "" "A szintaxis kiemelése az összehasonlításokban. A Meld saját színkiemelése " "miatt ez alapesetben ki van kapcsolva." -#: ../data/org.gnome.meld.gschema.xml.h:17 +#: ../data/org.gnome.meld.gschema.xml.h:19 msgid "Color scheme to use for syntax highlighting" msgstr "Szintaxiskiemeléshez használandó színséma" -#: ../data/org.gnome.meld.gschema.xml.h:18 +#: ../data/org.gnome.meld.gschema.xml.h:20 msgid "Used by GtkSourceView to determine colors for syntax highlighting" msgstr "" "A GtkSourceView használja a szintaxiskiemeléshez használandó színek " "meghatározásához" -#: ../data/org.gnome.meld.gschema.xml.h:19 +#: ../data/org.gnome.meld.gschema.xml.h:21 msgid "Displayed whitespace" msgstr "Megjelenített üres helyek" -#: ../data/org.gnome.meld.gschema.xml.h:20 +#: ../data/org.gnome.meld.gschema.xml.h:22 msgid "" "Selector for individual whitespace character types to be shown. Possible " "values are 'space', 'tab', 'newline' and 'nbsp'." @@ -191,11 +199,11 @@ msgstr "" "A megjelenítendő egyedi üres hely karaktertípusok listája. A lehetséges " "értékek: „space”, „tab”, „newline”, és „nbsp”." -#: ../data/org.gnome.meld.gschema.xml.h:21 +#: ../data/org.gnome.meld.gschema.xml.h:23 msgid "Wrap mode" msgstr "Tördelés módja" -#: ../data/org.gnome.meld.gschema.xml.h:22 +#: ../data/org.gnome.meld.gschema.xml.h:24 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 " @@ -205,33 +213,33 @@ msgstr "" "törni. Lehetséges értékek: „none” (ne törjön), „char” (bármely karakter) " "vagy „word” (csak szavak végén)." -#: ../data/org.gnome.meld.gschema.xml.h:23 +#: ../data/org.gnome.meld.gschema.xml.h:25 msgid "Highlight current line" msgstr "Aktuális sor kiemelése" -#: ../data/org.gnome.meld.gschema.xml.h:24 +#: ../data/org.gnome.meld.gschema.xml.h:26 msgid "" "If true, the line containing the cursor will be highlighted in file " "comparisons." msgstr "A kurzort tartalmazó sor kiemelése a fájl-összehasonlításokban." -#: ../data/org.gnome.meld.gschema.xml.h:25 +#: ../data/org.gnome.meld.gschema.xml.h:27 msgid "Use the system default monospace font" msgstr "" "A rendszer alapértelmezett rögzített szélességű betűkészletének használata" -#: ../data/org.gnome.meld.gschema.xml.h:26 +#: ../data/org.gnome.meld.gschema.xml.h:28 msgid "" "If false, custom-font will be used instead of the system monospace font." msgstr "" "A rendszer rögzített szélességű betűkészlete helyett az egyéni lesz " "használva, ha hamis." -#: ../data/org.gnome.meld.gschema.xml.h:27 +#: ../data/org.gnome.meld.gschema.xml.h:29 msgid "Custom font" msgstr "Egyéni betűkészlet" -#: ../data/org.gnome.meld.gschema.xml.h:28 +#: ../data/org.gnome.meld.gschema.xml.h:30 msgid "" "The custom font to use, stored as a string and parsed as a Pango font " "description." @@ -239,21 +247,21 @@ msgstr "" "Használandó egyéni betűkészlet, karakterláncként tárolva és Pango " "betűleírásként feldolgozva." -#: ../data/org.gnome.meld.gschema.xml.h:29 +#: ../data/org.gnome.meld.gschema.xml.h:31 msgid "Ignore blank lines when comparing files" msgstr "Üres sorok figyelmen kívül hagyása fájlok összehasonlításakor" -#: ../data/org.gnome.meld.gschema.xml.h:30 +#: ../data/org.gnome.meld.gschema.xml.h:32 msgid "" "If true, blank lines will be trimmed when highlighting changes between files." msgstr "" "Az üres sorok ki lesznek hagyva a fájlok közti különbségek kiemelésekor." -#: ../data/org.gnome.meld.gschema.xml.h:31 +#: ../data/org.gnome.meld.gschema.xml.h:33 msgid "Use the system default editor" msgstr "A rendszer alapértelmezett szerkesztőjének használata" -#: ../data/org.gnome.meld.gschema.xml.h:32 +#: ../data/org.gnome.meld.gschema.xml.h:34 msgid "" "If false, custom-editor-command will be used instead of the system editor " "when opening files externally." @@ -261,11 +269,11 @@ msgstr "" "Ha hamis, a custom-editor-command lesz a rendszer alapértelmezett " "szerkesztője helyett használva." -#: ../data/org.gnome.meld.gschema.xml.h:33 +#: ../data/org.gnome.meld.gschema.xml.h:35 msgid "The custom editor launch command" msgstr "Az egyéni szerkesztőt indító parancs" -#: ../data/org.gnome.meld.gschema.xml.h:34 +#: ../data/org.gnome.meld.gschema.xml.h:36 msgid "" "The command used to launch a custom editor. Some limited templating is " "supported here; at the moment '{file}' and '{line}' are recognised tokens." @@ -273,22 +281,22 @@ msgstr "" "Az egyéni szerkesztőt indító parancs. Ez a kulcs korlátozottan támogat " "sablonokat is. Jelenleg a {file} és {line} a felismert helyettesítők." -#: ../data/org.gnome.meld.gschema.xml.h:35 +#: ../data/org.gnome.meld.gschema.xml.h:37 msgid "Columns to display" msgstr "Megjelenítendő oszlopok" -#: ../data/org.gnome.meld.gschema.xml.h:36 +#: ../data/org.gnome.meld.gschema.xml.h:38 msgid "" "List of column names in folder comparison and whether they should be " "displayed." msgstr "" "Oszlopnevek listája a mappa-összehasonlításban, és hogy megjelenítendők-e." -#: ../data/org.gnome.meld.gschema.xml.h:37 ../data/ui/preferences.ui.h:32 +#: ../data/org.gnome.meld.gschema.xml.h:39 ../data/ui/preferences.ui.h:32 msgid "Ignore symbolic links" msgstr "Szimbolikus linkek figyelmen kívül hagyása" -#: ../data/org.gnome.meld.gschema.xml.h:38 +#: ../data/org.gnome.meld.gschema.xml.h:40 msgid "" "If true, folder comparisons do not follow symbolic links when traversing the " "folder tree." @@ -296,11 +304,11 @@ msgstr "" "A mappa-összehasonlítások nem követik a szimbolikus linkeket a mappafa " "bejárásakor." -#: ../data/org.gnome.meld.gschema.xml.h:39 +#: ../data/org.gnome.meld.gschema.xml.h:41 msgid "Use shallow comparison" msgstr "Sekély összehasonlítás használata" -#: ../data/org.gnome.meld.gschema.xml.h:40 +#: ../data/org.gnome.meld.gschema.xml.h:42 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 +318,11 @@ msgstr "" "hasonlítják össze, a fájlokat azonosnak tekintik a méret és módosítási idő " "egyezésekor, és eltérőnek egyébként." -#: ../data/org.gnome.meld.gschema.xml.h:41 +#: ../data/org.gnome.meld.gschema.xml.h:43 msgid "File timestamp resolution" msgstr "Fájlidőbélyeg felbontása" -#: ../data/org.gnome.meld.gschema.xml.h:42 +#: ../data/org.gnome.meld.gschema.xml.h:44 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,11 +334,11 @@ msgstr "" "számítanának. Ez eltérő időbélyeg-felbontással rendelkező fájlrendszereken " "lévő fájlok összehasonlításakor hasznos." -#: ../data/org.gnome.meld.gschema.xml.h:43 ../data/ui/preferences.ui.h:30 +#: ../data/org.gnome.meld.gschema.xml.h:45 ../data/ui/preferences.ui.h:30 msgid "Apply text filters during folder comparisons" msgstr "Szövegszűrők alkalmazása mappa-összehasonlításkor" -#: ../data/org.gnome.meld.gschema.xml.h:44 +#: ../data/org.gnome.meld.gschema.xml.h:46 msgid "" "If true, folder comparisons that compare file contents also apply active " "text filters and the blank line trimming option, and ignore newline " @@ -340,21 +348,21 @@ msgstr "" "is alkalmaznak, valamint levágják az üres sorokat, és mellőzik az üreshely-" "különbségeket." -#: ../data/org.gnome.meld.gschema.xml.h:45 +#: ../data/org.gnome.meld.gschema.xml.h:47 msgid "File status filters" msgstr "Fájlállapotszűrők" -#: ../data/org.gnome.meld.gschema.xml.h:46 +#: ../data/org.gnome.meld.gschema.xml.h:48 msgid "List of statuses used to filter visible files in folder comparison." msgstr "" "A mappa-összehasonlításban látható fájlok szűrésére használt állapotok " "listája." -#: ../data/org.gnome.meld.gschema.xml.h:47 +#: ../data/org.gnome.meld.gschema.xml.h:49 msgid "Show the version control console output" msgstr "A verziókövető konzolos kimenetének megjelenítése" -#: ../data/org.gnome.meld.gschema.xml.h:48 +#: ../data/org.gnome.meld.gschema.xml.h:50 msgid "" "If true, a console output section will be shown in version control views, " "showing the commands run for version control operations." @@ -362,21 +370,21 @@ msgstr "" "A verziókövető nézetekben megjelenik egy konzolos kimenet szakasz, amely a " "verziókövetési műveletekhez használt parancsokat jeleníti meg." -#: ../data/org.gnome.meld.gschema.xml.h:49 +#: ../data/org.gnome.meld.gschema.xml.h:51 msgid "Version control pane position" msgstr "Verziókövetés ablaktábla pozíciója" -#: ../data/org.gnome.meld.gschema.xml.h:50 +#: ../data/org.gnome.meld.gschema.xml.h:52 msgid "" "This is the height of the main version control tree when the console pane is " "shown." msgstr "A fő verziókövetési fa magassága, amikor a konzol ablaktábla látható." -#: ../data/org.gnome.meld.gschema.xml.h:51 +#: ../data/org.gnome.meld.gschema.xml.h:53 msgid "Present version comparisons as left-local/right-remote" msgstr "Verzió-összehasonlítások megjelenítése mint bal-helyi / jobb-távoli" -#: ../data/org.gnome.meld.gschema.xml.h:52 +#: ../data/org.gnome.meld.gschema.xml.h:54 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, " @@ -386,13 +394,13 @@ msgstr "" "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." -#: ../data/org.gnome.meld.gschema.xml.h:53 +#: ../data/org.gnome.meld.gschema.xml.h:55 msgid "Order for files in three-way version control merge comparisons" msgstr "" "Fájlok sorrendje a háromutas verziókövetési összefésülési " "összehasonlításokban" -#: ../data/org.gnome.meld.gschema.xml.h:54 +#: ../data/org.gnome.meld.gschema.xml.h:56 msgid "" "Choices for file order are remote/merged/local and local/merged/remote. This " "preference only affects three-way comparisons launched from the version " @@ -403,11 +411,11 @@ msgstr "" "összehasonlításokat befolyásolja, így csak a Melden belüli összefésülésekhez/" "ütközésfeloldásokhoz kerül felhasználásra." -#: ../data/org.gnome.meld.gschema.xml.h:55 +#: ../data/org.gnome.meld.gschema.xml.h:57 msgid "Show margin in commit message editor" msgstr "Margó megjelenítése a kommitüzenet-szerkesztőben" -#: ../data/org.gnome.meld.gschema.xml.h:56 +#: ../data/org.gnome.meld.gschema.xml.h:58 msgid "" "If true, a guide will be displayed to show what column the margin is at in " "the version control commit message editor." @@ -415,11 +423,11 @@ msgstr "" "Megjelenjen-e egy útmutató, jelezve, hogy a margó melyik oszlopban van a " "verziókövetési kommitüzenet-szerkesztőben." -#: ../data/org.gnome.meld.gschema.xml.h:57 +#: ../data/org.gnome.meld.gschema.xml.h:59 msgid "Margin column in commit message editor" msgstr "Margó oszlop a kommitüzenet-szerkesztőben" -#: ../data/org.gnome.meld.gschema.xml.h:58 +#: ../data/org.gnome.meld.gschema.xml.h:60 msgid "" "The column at which to show the margin in the version control commit message " "editor." @@ -427,33 +435,33 @@ msgstr "" "A margó megjelenítése ebben az oszlopban a verziókövető kommitüzenet-" "szerkesztőjében." -#: ../data/org.gnome.meld.gschema.xml.h:59 +#: ../data/org.gnome.meld.gschema.xml.h:61 msgid "Automatically hard-wrap commit messages" msgstr "Kommitüzenetek automatikus törése" -#: ../data/org.gnome.meld.gschema.xml.h:60 +#: ../data/org.gnome.meld.gschema.xml.h:62 msgid "" "If true, the version control commit message editor will hard-wrap (i.e., " "insert line breaks) at the commit margin before commit." msgstr "" "A verziókövető szúrjon-e be sortöréseket a kommit margónál a kommit előtt." -#: ../data/org.gnome.meld.gschema.xml.h:61 +#: ../data/org.gnome.meld.gschema.xml.h:63 msgid "Version control status filters" msgstr "Verziókövetési állapotszűrők" -#: ../data/org.gnome.meld.gschema.xml.h:62 +#: ../data/org.gnome.meld.gschema.xml.h:64 msgid "" "List of statuses used to filter visible files in version control comparison." msgstr "" "A verziókövetési összehasonlításban látható fájlok szűrésére használt " "állapotok listája." -#: ../data/org.gnome.meld.gschema.xml.h:63 +#: ../data/org.gnome.meld.gschema.xml.h:65 msgid "Filename-based filters" msgstr "Fájlnév alapú szűrők" -#: ../data/org.gnome.meld.gschema.xml.h:64 +#: ../data/org.gnome.meld.gschema.xml.h:66 msgid "" "List of predefined filename-based filters that, if active, will remove " "matching files from a folder comparison." @@ -461,11 +469,11 @@ msgstr "" "Előre megadott fájlnév alapú szűrők listája, amelyekre illeszkedő fájlok " "eltávolításra kerülnek a mappa-összehasonlításból." -#: ../data/org.gnome.meld.gschema.xml.h:65 +#: ../data/org.gnome.meld.gschema.xml.h:67 msgid "Text-based filters" msgstr "Szöveg alapú szűrők" -#: ../data/org.gnome.meld.gschema.xml.h:66 +#: ../data/org.gnome.meld.gschema.xml.h:68 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, " @@ -561,7 +569,7 @@ msgstr "Másolás a jobb oldalra" msgid "Delete selected" msgstr "Kijelölt törlése" -#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:859 ../meld/filediff.py:1384 +#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:858 ../meld/filediff.py:1382 msgid "Hide" msgstr "Elrejtés" @@ -852,8 +860,8 @@ 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" -#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:941 ../meld/filediff.py:1450 -#: ../meld/filediff.py:1518 +#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:940 ../meld/filediff.py:1448 +#: ../meld/filediff.py:1520 msgid "_Cancel" msgstr "Mé_gse" @@ -889,7 +897,7 @@ msgstr "Visszavonja a dokumentumok mentetlen változtatásait?" msgid "Changes made to the following documents will be permanently lost:\n" msgstr "A következő dokumentumok változásai véglegesen elvesznek:\n" -#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:942 ../meld/filediff.py:1451 +#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:941 ../meld/filediff.py:1449 msgid "_Replace" msgstr "_Csere" @@ -937,7 +945,7 @@ msgstr "Formázás foltként" msgid "Copy to Clipboard" msgstr "Másolás vágólapra" -#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:144 +#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:155 msgid "Save Patch" msgstr "Folt mentése" @@ -1127,7 +1135,7 @@ msgstr "" "alapján. Minden minta egy shell-stílusú helyettesítőkarakter-lista " "szóközökkel elválasztva." -#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:103 +#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:104 msgid "File Filters" msgstr "Fájlszűrők" @@ -1406,7 +1414,7 @@ msgctxt "shortcut window" msgid "Show/hide console output" msgstr "Konzolkimenet megjelenítése/elrejtése" -#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:570 +#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:559 #: ../meld/newdifftab.py:38 msgid "New comparison" msgstr "Új összehasonlítás" @@ -1648,20 +1656,20 @@ msgstr "%s elrejtése" msgid "[%s] Scanning %s" msgstr "[%s] %s beolvasása" -#: ../meld/dirdiff.py:826 +#: ../meld/dirdiff.py:825 #, python-format msgid "[%s] Done" msgstr "[%s] Kész" -#: ../meld/dirdiff.py:834 +#: ../meld/dirdiff.py:833 msgid "Folders have no differences" msgstr "A mappák közt nincs eltérés" -#: ../meld/dirdiff.py:836 +#: ../meld/dirdiff.py:835 msgid "Contents of scanned files in folders are identical." msgstr "A mappákban vizsgált fájlok tartalma azonos." -#: ../meld/dirdiff.py:838 +#: ../meld/dirdiff.py:837 msgid "" "Scanned files in folders appear identical, but contents have not been " "scanned." @@ -1669,42 +1677,42 @@ msgstr "" "A mappákban vizsgált fájlok azonosnak tűnnek, de a tartalom nem lett " "vizsgálva." -#: ../meld/dirdiff.py:841 +#: ../meld/dirdiff.py:840 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:843 +#: ../meld/dirdiff.py:842 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:861 ../meld/filediff.py:1386 ../meld/filediff.py:1416 -#: ../meld/filediff.py:1418 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 +#: ../meld/dirdiff.py:860 ../meld/filediff.py:1384 ../meld/filediff.py:1414 +#: ../meld/filediff.py:1416 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 msgid "Hi_de" msgstr "_Elrejtés" -#: ../meld/dirdiff.py:871 +#: ../meld/dirdiff.py:870 msgid "Multiple errors occurred while scanning this folder" msgstr "Több hiba történt a mappa vizsgálatakor" -#: ../meld/dirdiff.py:872 +#: ../meld/dirdiff.py:871 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:874 +#: ../meld/dirdiff.py:873 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:876 +#: ../meld/dirdiff.py:875 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:878 +#: ../meld/dirdiff.py:877 msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. The following files in this folder are hidden:" @@ -1712,17 +1720,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:889 +#: ../meld/dirdiff.py:888 #, python-format msgid "'%s' hidden by '%s'" msgstr "„%s” rejtve „%s” által" -#: ../meld/dirdiff.py:945 +#: ../meld/dirdiff.py:944 #, python-format msgid "Replace folder “%s”?" msgstr "Cseréli ezt a mappát: „%s”?" -#: ../meld/dirdiff.py:947 +#: ../meld/dirdiff.py:946 #, python-format msgid "" "Another folder with the same name already exists in “%s”.\n" @@ -1731,11 +1739,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:960 +#: ../meld/dirdiff.py:959 msgid "Error copying file" msgstr "Hiba a fájl másolásakor" -#: ../meld/dirdiff.py:961 +#: ../meld/dirdiff.py:960 #, python-format msgid "" "Couldn't copy %s\n" @@ -1748,35 +1756,35 @@ msgstr "" "\n" "%s" -#: ../meld/dirdiff.py:984 +#: ../meld/dirdiff.py:983 #, python-format msgid "Error deleting %s" msgstr "Hiba %s törlésekor" -#: ../meld/dirdiff.py:1489 +#: ../meld/dirdiff.py:1488 msgid "No folder" msgstr "Nincs mappa" #. Abbreviations for insert and overwrite that fit in the status bar -#: ../meld/filediff.py:354 +#: ../meld/filediff.py:355 msgid "INS" msgstr "BESZ" -#: ../meld/filediff.py:354 +#: ../meld/filediff.py:355 msgid "OVR" msgstr "ÁTÍR" #. Abbreviation for line, column so that it will fit in the status bar -#: ../meld/filediff.py:356 +#: ../meld/filediff.py:357 #, python-format msgid "Ln %i, Col %i" msgstr "%i. sor, %i. oszlop" -#: ../meld/filediff.py:781 +#: ../meld/filediff.py:782 msgid "Comparison results will be inaccurate" msgstr "Az összehasonlítás eredményei pontatlanok lesznek" -#: ../meld/filediff.py:783 +#: ../meld/filediff.py:784 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1784,65 +1792,65 @@ 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:841 +#: ../meld/filediff.py:840 msgid "Mark conflict as resolved?" msgstr "Megjelöli az ütközést feloldottként?" -#: ../meld/filediff.py:843 +#: ../meld/filediff.py:842 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:845 +#: ../meld/filediff.py:844 msgid "Cancel" msgstr "Mégse" -#: ../meld/filediff.py:846 +#: ../meld/filediff.py:845 msgid "Mark _Resolved" msgstr "Megjelölés _feloldottként" -#: ../meld/filediff.py:1095 +#: ../meld/filediff.py:1093 #, 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:1103 +#: ../meld/filediff.py:1101 #, python-format msgid "File %s appears to be a binary file." msgstr "%s bináris fájlnak tűnik." -#: ../meld/filediff.py:1105 +#: ../meld/filediff.py:1103 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:1107 +#: ../meld/filediff.py:1105 msgid "Open" msgstr "Megnyitás" -#: ../meld/filediff.py:1123 +#: ../meld/filediff.py:1121 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Eltérések számítása" -#: ../meld/filediff.py:1188 +#: ../meld/filediff.py:1186 #, python-format msgid "File %s has changed on disk" msgstr "%s fájl megváltozott a lemezen" -#: ../meld/filediff.py:1189 +#: ../meld/filediff.py:1187 msgid "Do you want to reload the file?" msgstr "Újratölti a fájlt?" -#: ../meld/filediff.py:1191 +#: ../meld/filediff.py:1189 msgid "_Reload" msgstr "Új_ratöltés" -#: ../meld/filediff.py:1349 +#: ../meld/filediff.py:1347 msgid "Files are identical" msgstr "A fájlok azonosak" -#: ../meld/filediff.py:1362 +#: ../meld/filediff.py:1360 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1850,11 +1858,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:1367 +#: ../meld/filediff.py:1365 msgid "Files differ in line endings only" msgstr "A fájlok csak a sorvégekben térnek el" -#: ../meld/filediff.py:1369 +#: ../meld/filediff.py:1367 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1863,15 +1871,15 @@ msgstr "" "A fájlok azonosak a sorvégjelektől eltekintve:\n" "%s" -#: ../meld/filediff.py:1389 +#: ../meld/filediff.py:1387 msgid "Show without filters" msgstr "Megjelenítés szűrők nélkül" -#: ../meld/filediff.py:1411 +#: ../meld/filediff.py:1409 msgid "Change highlighting incomplete" msgstr "Részleges kiemelés módosítása" -#: ../meld/filediff.py:1412 +#: ../meld/filediff.py:1410 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." @@ -1879,20 +1887,20 @@ 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:1420 +#: ../meld/filediff.py:1418 msgid "Keep highlighting" msgstr "Kiemelés továbbra is" -#: ../meld/filediff.py:1422 +#: ../meld/filediff.py:1420 msgid "_Keep highlighting" msgstr "_Kiemelés továbbra is" -#: ../meld/filediff.py:1454 +#: ../meld/filediff.py:1452 #, python-format msgid "Replace file “%s”?" msgstr "Cseréli a fájlt: „%s”?" -#: ../meld/filediff.py:1456 +#: ../meld/filediff.py:1454 #, python-format msgid "" "A file with this name already exists in “%s”.\n" @@ -1901,45 +1909,45 @@ msgstr "" "Már létezik ilyen nevű fájl itt: „%s”.\n" "Ha lecseréli a meglévő fájlt, akkor a tartalma elvész." -#: ../meld/filediff.py:1473 +#: ../meld/filediff.py:1471 msgid "Save Left Pane As" msgstr "Bal ablaktábla mentése másként" -#: ../meld/filediff.py:1475 +#: ../meld/filediff.py:1473 msgid "Save Middle Pane As" msgstr "Középső ablaktábla mentése másként" -#: ../meld/filediff.py:1477 +#: ../meld/filediff.py:1475 msgid "Save Right Pane As" msgstr "Jobb ablaktábla mentése másként" -#: ../meld/filediff.py:1491 +#: ../meld/filediff.py:1489 #, 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:1493 +#: ../meld/filediff.py:1491 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:1496 +#: ../meld/filediff.py:1494 msgid "Save Anyway" msgstr "Mentés mindenképp" -#: ../meld/filediff.py:1497 +#: ../meld/filediff.py:1495 msgid "Don't Save" msgstr "Ne mentse" -#: ../meld/filediff.py:1519 +#: ../meld/filediff.py:1521 msgid "_Save as UTF-8" msgstr "Mentés _UTF-8-ként" -#: ../meld/filediff.py:1522 +#: ../meld/filediff.py:1524 #, python-format msgid "Couldn't encode text as “%s”" msgstr "Nem kódolható a szöveg mint „%s”" -#: ../meld/filediff.py:1524 +#: ../meld/filediff.py:1526 #, python-format msgid "" "File “%s” contains characters that can't be encoded using encoding “%s”.\n" @@ -1948,12 +1956,12 @@ msgstr "" "„%s” a(z) „%s” használatával kódolhatatlan karaktereket tartalmaz.\n" "Szeretné UTF-8 kódolással menteni?" -#: ../meld/filediff.py:1564 ../meld/patchdialog.py:120 +#: ../meld/filediff.py:1566 ../meld/patchdialog.py:131 #, python-format msgid "Could not save file %s." msgstr "A fájl (%s) nem menthető." -#: ../meld/filediff.py:1565 ../meld/patchdialog.py:121 +#: ../meld/filediff.py:1567 ../meld/patchdialog.py:132 #, python-format msgid "" "Couldn't save file due to:\n" @@ -1962,11 +1970,11 @@ msgstr "" "A fájl nem menthető. Ok:\n" "%s" -#: ../meld/filediff.py:1910 +#: ../meld/filediff.py:1913 msgid "Live comparison updating disabled" msgstr "Az élő összehasonlítás-frissítés kikapcsolva" -#: ../meld/filediff.py:1911 +#: ../meld/filediff.py:1914 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -2089,197 +2097,197 @@ msgstr "" msgid "untitled" msgstr "névtelen" -#: ../meld/meldwindow.py:48 +#: ../meld/meldwindow.py:49 msgid "_File" msgstr "_Fájl" -#: ../meld/meldwindow.py:49 +#: ../meld/meldwindow.py:50 msgid "_New Comparison..." msgstr "Új össze_hasonlítás…" -#: ../meld/meldwindow.py:50 +#: ../meld/meldwindow.py:51 msgid "Start a new comparison" msgstr "Új összehasonlítás indítása" -#: ../meld/meldwindow.py:53 +#: ../meld/meldwindow.py:54 msgid "Save the current file" msgstr "A jelenlegi fájl mentése" -#: ../meld/meldwindow.py:55 +#: ../meld/meldwindow.py:56 msgid "Save As..." msgstr "Mentés másként…" -#: ../meld/meldwindow.py:56 +#: ../meld/meldwindow.py:57 msgid "Save the current file with a different name" msgstr "A jelenlegi fájl mentése más néven" -#: ../meld/meldwindow.py:59 +#: ../meld/meldwindow.py:60 msgid "Close the current file" msgstr "A jelenlegi fájl bezárása" -#: ../meld/meldwindow.py:62 +#: ../meld/meldwindow.py:63 msgid "_Edit" msgstr "S_zerkesztés" -#: ../meld/meldwindow.py:64 +#: ../meld/meldwindow.py:65 msgid "Undo the last action" msgstr "Az utolsó művelet visszavonása" -#: ../meld/meldwindow.py:67 +#: ../meld/meldwindow.py:68 msgid "Redo the last undone action" msgstr "A visszavont művelet ismételt végrehajtása" -#: ../meld/meldwindow.py:69 +#: ../meld/meldwindow.py:70 msgid "Cut the selection" msgstr "A kijelölés kivágása" -#: ../meld/meldwindow.py:71 +#: ../meld/meldwindow.py:72 msgid "Copy the selection" msgstr "A kijelölés másolása" -#: ../meld/meldwindow.py:73 +#: ../meld/meldwindow.py:74 msgid "Paste the clipboard" msgstr "A vágólap tartalmának beillesztése" -#: ../meld/meldwindow.py:75 +#: ../meld/meldwindow.py:76 msgid "Find..." msgstr "Keresés…" -#: ../meld/meldwindow.py:75 +#: ../meld/meldwindow.py:76 msgid "Search for text" msgstr "Szöveg keresése" -#: ../meld/meldwindow.py:77 +#: ../meld/meldwindow.py:78 msgid "Find Ne_xt" msgstr "Kö_vetkező találat" -#: ../meld/meldwindow.py:78 +#: ../meld/meldwindow.py:79 msgid "Search forwards for the same text" msgstr "Keresés előre ugyanarra a szövegre" -#: ../meld/meldwindow.py:80 +#: ../meld/meldwindow.py:81 msgid "Find _Previous" msgstr "_Előző találat" -#: ../meld/meldwindow.py:81 +#: ../meld/meldwindow.py:82 msgid "Search backwards for the same text" msgstr "Keresés visszafelé ugyanarra a szövegre" -#: ../meld/meldwindow.py:84 +#: ../meld/meldwindow.py:85 msgid "_Replace..." msgstr "_Csere…" -#: ../meld/meldwindow.py:85 +#: ../meld/meldwindow.py:86 msgid "Find and replace text" msgstr "Szöveg keresése és cseréje" -#: ../meld/meldwindow.py:88 +#: ../meld/meldwindow.py:89 msgid "_Changes" msgstr "Válto_zások" -#: ../meld/meldwindow.py:89 +#: ../meld/meldwindow.py:90 msgid "Next Change" msgstr "Következő változás" -#: ../meld/meldwindow.py:90 +#: ../meld/meldwindow.py:91 msgid "Go to the next change" msgstr "Ugrás a következő változásra" -#: ../meld/meldwindow.py:92 +#: ../meld/meldwindow.py:93 msgid "Previous Change" msgstr "Előző változás" -#: ../meld/meldwindow.py:93 +#: ../meld/meldwindow.py:94 msgid "Go to the previous change" msgstr "Ugrás az előző változásra" -#: ../meld/meldwindow.py:95 +#: ../meld/meldwindow.py:96 msgid "Open Externally" msgstr "Megnyitás alkalmazással" -#: ../meld/meldwindow.py:96 +#: ../meld/meldwindow.py:97 msgid "Open selected file or directory in the default external application" msgstr "" "Kijelölt fájl vagy könyvtár megnyitása az alapértelmezett külső alkalmazással" -#: ../meld/meldwindow.py:100 +#: ../meld/meldwindow.py:101 msgid "_View" msgstr "_Nézet" -#: ../meld/meldwindow.py:101 +#: ../meld/meldwindow.py:102 msgid "File Status" msgstr "Fájlállapot" -#: ../meld/meldwindow.py:102 +#: ../meld/meldwindow.py:103 msgid "Version Status" msgstr "Verzióállapot" -#: ../meld/meldwindow.py:105 +#: ../meld/meldwindow.py:106 msgid "Stop the current action" msgstr "Jelenlegi művelet leállítása" -#: ../meld/meldwindow.py:108 +#: ../meld/meldwindow.py:109 msgid "Refresh the view" msgstr "A nézet frissítése" -#: ../meld/meldwindow.py:112 +#: ../meld/meldwindow.py:113 msgid "Fullscreen" msgstr "Teljes képernyő" -#: ../meld/meldwindow.py:113 +#: ../meld/meldwindow.py:114 msgid "View the comparison in fullscreen" msgstr "Az összehasonlítás megjelenítése teljes képernyőn" -#: ../meld/meldwindow.py:115 +#: ../meld/meldwindow.py:116 msgid "_Toolbar" msgstr "_Eszköztár" -#: ../meld/meldwindow.py:116 +#: ../meld/meldwindow.py:117 msgid "Show or hide the toolbar" msgstr "Eszköztár megjelenítése vagy elrejtése" -#: ../meld/meldwindow.py:126 +#: ../meld/meldwindow.py:127 msgid "Open Recent" msgstr "Legutóbbi megnyitása" -#: ../meld/meldwindow.py:127 +#: ../meld/meldwindow.py:128 msgid "Open recent files" msgstr "Legutóbbi fájlok megnyitása" -#: ../meld/meldwindow.py:149 +#: ../meld/meldwindow.py:150 msgid "_Meld" msgstr "_Meld" -#: ../meld/meldwindow.py:150 +#: ../meld/meldwindow.py:151 msgid "Quit the program" msgstr "Kilépés a programból" -#: ../meld/meldwindow.py:152 +#: ../meld/meldwindow.py:153 msgid "Prefere_nces" msgstr "B_eállítások" -#: ../meld/meldwindow.py:153 +#: ../meld/meldwindow.py:154 msgid "Configure the application" msgstr "Az alkalmazás beállítása" -#: ../meld/meldwindow.py:155 +#: ../meld/meldwindow.py:156 msgid "_Contents" msgstr "_Tartalom" -#: ../meld/meldwindow.py:156 +#: ../meld/meldwindow.py:157 msgid "Open the Meld manual" msgstr "A Meld kézikönyvének megnyitása" -#: ../meld/meldwindow.py:158 +#: ../meld/meldwindow.py:159 msgid "About this application" msgstr "Az alkalmazás névjegye" -#: ../meld/meldwindow.py:604 +#: ../meld/meldwindow.py:593 #, python-format msgid "Need three files to auto-merge, got: %r" msgstr "Az automatikus összefésüléshez három fájl kell, érkezett: %r" -#: ../meld/meldwindow.py:618 +#: ../meld/meldwindow.py:607 msgid "Cannot compare a mixture of files and directories" msgstr "Fájlok és könyvtárak keveréke nem hasonlítható össze." From 2b3362106de607725b43ef89fa7ff15eac73b41f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Dr=C4=85g?= Date: Sun, 2 Oct 2016 12:51:09 +0200 Subject: [PATCH 0060/1316] Updated Polish translation --- po/pl.po | 384 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 196 insertions(+), 188 deletions(-) diff --git a/po/pl.po b/po/pl.po index 82a7ecfe..30104d39 100644 --- a/po/pl.po +++ b/po/pl.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: meld\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-09 23:45+0200\n" -"PO-Revision-Date: 2016-09-09 23:47+0200\n" +"POT-Creation-Date: 2016-10-02 12:49+0200\n" +"PO-Revision-Date: 2016-10-02 12:50+0200\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "Language: pl\n" @@ -29,7 +29,7 @@ msgstr "Nie można zaimportować: " msgid "Meld requires %s or higher." msgstr "Program Meld wymaga wersji %s lub nowszej." -#: ../bin/meld:194 +#: ../bin/meld:191 #, c-format msgid "" "Couldn't load Meld-specific CSS (%s)\n" @@ -90,34 +90,42 @@ msgid "Meld comparison description" msgstr "Opis porównywania programu Meld" #: ../data/org.gnome.meld.gschema.xml.h:1 -msgid "Default window size" -msgstr "Domyślny rozmiar okna" +msgid "Default window width" +msgstr "Domyślna szerokość okna" #: ../data/org.gnome.meld.gschema.xml.h:2 -msgid "Default window state" -msgstr "Domyślny stan okna" +msgid "Default window height" +msgstr "Domyślna wysokość okna" #: ../data/org.gnome.meld.gschema.xml.h:3 +msgid "Default window maximised state" +msgstr "Domyślny stan maksymalizacji okna" + +#: ../data/org.gnome.meld.gschema.xml.h:4 +msgid "Default window fullscreen state" +msgstr "Domyślny stan trybu pełnoekranowego okna" + +#: ../data/org.gnome.meld.gschema.xml.h:5 msgid "Show toolbar" msgstr "Wyświetlanie paska narzędziowego" -#: ../data/org.gnome.meld.gschema.xml.h:4 +#: ../data/org.gnome.meld.gschema.xml.h:6 msgid "If true, the window toolbar is visible." msgstr "Jeśli wynosi „true”, to pasek narzędziowy okna jest widoczny." -#: ../data/org.gnome.meld.gschema.xml.h:5 +#: ../data/org.gnome.meld.gschema.xml.h:7 msgid "Show statusbar" msgstr "Wyświetlanie paska stanu" -#: ../data/org.gnome.meld.gschema.xml.h:6 +#: ../data/org.gnome.meld.gschema.xml.h:8 msgid "If true, the window statusbar is visible." msgstr "Jeśli wynosi „true”, to pasek stanu okna jest widoczny." -#: ../data/org.gnome.meld.gschema.xml.h:7 +#: ../data/org.gnome.meld.gschema.xml.h:9 msgid "Additional automatically detected text encodings" msgstr "Dodatkowe automatycznie wykrywane kodowania tekstu" -#: ../data/org.gnome.meld.gschema.xml.h:8 +#: ../data/org.gnome.meld.gschema.xml.h:10 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 " @@ -130,38 +138,38 @@ msgstr "" "będą zawsze używane. Inne kodowania mogą być także próbowane, w zależności " "od lokalizacji użytkownika." -#: ../data/org.gnome.meld.gschema.xml.h:9 +#: ../data/org.gnome.meld.gschema.xml.h:11 msgid "Width of an indentation step" msgstr "Szerokość kroku wcięcia" -#: ../data/org.gnome.meld.gschema.xml.h:10 +#: ../data/org.gnome.meld.gschema.xml.h:12 msgid "The number of spaces to use for a single indent step" msgstr "Liczba spacji używanych dla jednego kroku wcięcia" -#: ../data/org.gnome.meld.gschema.xml.h:11 +#: ../data/org.gnome.meld.gschema.xml.h:13 msgid "Whether to indent using spaces or tabs" msgstr "Określa, czy wcięcia używają spacji, czy tabulatorów" -#: ../data/org.gnome.meld.gschema.xml.h:12 +#: ../data/org.gnome.meld.gschema.xml.h:14 msgid "If true, any new indentation will use spaces instead of tabs." msgstr "" "Jeśli wynosi „true”, to każde nowe wcięcie będzie używało spacji zamiast " "tabulatorów." -#: ../data/org.gnome.meld.gschema.xml.h:13 +#: ../data/org.gnome.meld.gschema.xml.h:15 msgid "Show line numbers" msgstr "Wyświetlanie numerów wierszy" -#: ../data/org.gnome.meld.gschema.xml.h:14 +#: ../data/org.gnome.meld.gschema.xml.h:16 msgid "If true, line numbers will be shown in the gutter of file comparisons." msgstr "" "Jeśli wynosi „true”, to numery wierszy będą wyświetlane obok porównań plików." -#: ../data/org.gnome.meld.gschema.xml.h:15 +#: ../data/org.gnome.meld.gschema.xml.h:17 msgid "Highlight syntax" msgstr "Wyróżnianie składni" -#: ../data/org.gnome.meld.gschema.xml.h:16 +#: ../data/org.gnome.meld.gschema.xml.h:18 msgid "" "Whether to highlight syntax in comparisons. Because of Meld's own color " "highlighting, this is off by default." @@ -169,21 +177,21 @@ msgstr "" "Określa, czy wyróżniać składnię w porównaniach. Jest to domyślnie wyłączone " "z powodu własnego wyróżniania kolorów programu Meld." -#: ../data/org.gnome.meld.gschema.xml.h:17 +#: ../data/org.gnome.meld.gschema.xml.h:19 msgid "Color scheme to use for syntax highlighting" msgstr "Schemat kolorów używany do wyróżniania elementów składni" -#: ../data/org.gnome.meld.gschema.xml.h:18 +#: ../data/org.gnome.meld.gschema.xml.h:20 msgid "Used by GtkSourceView to determine colors for syntax highlighting" msgstr "" "Używane przez bibliotekę GtkSourceView do ustalania kolorów dla wyróżniania " "elementów składni" -#: ../data/org.gnome.meld.gschema.xml.h:19 +#: ../data/org.gnome.meld.gschema.xml.h:21 msgid "Displayed whitespace" msgstr "Wyświetlane białe znaki" -#: ../data/org.gnome.meld.gschema.xml.h:20 +#: ../data/org.gnome.meld.gschema.xml.h:22 msgid "" "Selector for individual whitespace character types to be shown. Possible " "values are 'space', 'tab', 'newline' and 'nbsp'." @@ -191,11 +199,11 @@ msgstr "" "Wybór poszczególnych typów białych znaków do wyświetlania. Możliwe wartości: " "„space”, „tab”, „newline” i „nbsp”." -#: ../data/org.gnome.meld.gschema.xml.h:21 +#: ../data/org.gnome.meld.gschema.xml.h:23 msgid "Wrap mode" msgstr "Tryb zawijania" -#: ../data/org.gnome.meld.gschema.xml.h:22 +#: ../data/org.gnome.meld.gschema.xml.h:24 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 " @@ -205,11 +213,11 @@ msgstr "" "wartości: „none” (brak zawijania), „char” (na dowolnym znaku) lub " "„word” (tylko na końcu wyrazów)." -#: ../data/org.gnome.meld.gschema.xml.h:23 +#: ../data/org.gnome.meld.gschema.xml.h:25 msgid "Highlight current line" msgstr "Wyróżnianie bieżącego wiersza" -#: ../data/org.gnome.meld.gschema.xml.h:24 +#: ../data/org.gnome.meld.gschema.xml.h:26 msgid "" "If true, the line containing the cursor will be highlighted in file " "comparisons." @@ -217,22 +225,22 @@ msgstr "" "Jeśli wynosi „true”, to wiersz zawierający kursor będzie wyróżniany " "w porównaniach plików." -#: ../data/org.gnome.meld.gschema.xml.h:25 +#: ../data/org.gnome.meld.gschema.xml.h:27 msgid "Use the system default monospace font" msgstr "Używanie domyślnej systemowej czcionki o stałej szerokości" -#: ../data/org.gnome.meld.gschema.xml.h:26 +#: ../data/org.gnome.meld.gschema.xml.h:28 msgid "" "If false, custom-font will be used instead of the system monospace font." msgstr "" "Jeśli wynosi „false”, to podana własna czcionka w „custom-font” będzie " "używana zamiast systemowej czcionki o stałej szerokości." -#: ../data/org.gnome.meld.gschema.xml.h:27 +#: ../data/org.gnome.meld.gschema.xml.h:29 msgid "Custom font" msgstr "Własna czcionka" -#: ../data/org.gnome.meld.gschema.xml.h:28 +#: ../data/org.gnome.meld.gschema.xml.h:30 msgid "" "The custom font to use, stored as a string and parsed as a Pango font " "description." @@ -240,22 +248,22 @@ msgstr "" "Używana własna czcionka, przechowywana jako ciąg i przetwarzana jako opis " "czcionki biblioteki Pango." -#: ../data/org.gnome.meld.gschema.xml.h:29 +#: ../data/org.gnome.meld.gschema.xml.h:31 msgid "Ignore blank lines when comparing files" msgstr "Ignorowanie pustych wierszy podczas porównywania plików" -#: ../data/org.gnome.meld.gschema.xml.h:30 +#: ../data/org.gnome.meld.gschema.xml.h:32 msgid "" "If true, blank lines will be trimmed when highlighting changes between files." msgstr "" "Jeśli wynosi „true”, to puste wiersze będą obcinane podczas wyróżniania " "zmian między plikami." -#: ../data/org.gnome.meld.gschema.xml.h:31 +#: ../data/org.gnome.meld.gschema.xml.h:33 msgid "Use the system default editor" msgstr "Używanie domyślnego edytora systemu" -#: ../data/org.gnome.meld.gschema.xml.h:32 +#: ../data/org.gnome.meld.gschema.xml.h:34 msgid "" "If false, custom-editor-command will be used instead of the system editor " "when opening files externally." @@ -264,11 +272,11 @@ msgstr "" "będzie używany zamiast systemowego edytora podczas zewnętrznego otwierania " "plików." -#: ../data/org.gnome.meld.gschema.xml.h:33 +#: ../data/org.gnome.meld.gschema.xml.h:35 msgid "The custom editor launch command" msgstr "Polecenie uruchamiania własnego edytora" -#: ../data/org.gnome.meld.gschema.xml.h:34 +#: ../data/org.gnome.meld.gschema.xml.h:36 msgid "" "The command used to launch a custom editor. Some limited templating is " "supported here; at the moment '{file}' and '{line}' are recognised tokens." @@ -277,22 +285,22 @@ msgstr "" "szablony są obsługiwane. W tej chwili „{file}” i „{line}” są rozpoznawanymi " "tokenami." -#: ../data/org.gnome.meld.gschema.xml.h:35 +#: ../data/org.gnome.meld.gschema.xml.h:37 msgid "Columns to display" msgstr "Kolumny do wyświetlania" -#: ../data/org.gnome.meld.gschema.xml.h:36 +#: ../data/org.gnome.meld.gschema.xml.h:38 msgid "" "List of column names in folder comparison and whether they should be " "displayed." msgstr "" "Lista nazwa kolumn w porównaniu katalogów i czy powinny być wyświetlane." -#: ../data/org.gnome.meld.gschema.xml.h:37 ../data/ui/preferences.ui.h:32 +#: ../data/org.gnome.meld.gschema.xml.h:39 ../data/ui/preferences.ui.h:32 msgid "Ignore symbolic links" msgstr "Ignorowanie dowiązań symbolicznych" -#: ../data/org.gnome.meld.gschema.xml.h:38 +#: ../data/org.gnome.meld.gschema.xml.h:40 msgid "" "If true, folder comparisons do not follow symbolic links when traversing the " "folder tree." @@ -300,11 +308,11 @@ msgstr "" "Jeśli wynosi „true”, to porównania katalogów nie będą podążały za " "dowiązaniami symbolicznymi podczas przeglądania drzewa katalogów." -#: ../data/org.gnome.meld.gschema.xml.h:39 +#: ../data/org.gnome.meld.gschema.xml.h:41 msgid "Use shallow comparison" msgstr "Używanie płytkiego porównania" -#: ../data/org.gnome.meld.gschema.xml.h:40 +#: ../data/org.gnome.meld.gschema.xml.h:42 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 " @@ -314,11 +322,11 @@ msgstr "" "podstawie wyłącznie rozmiaru i czasu modyfikacji. Pliki o identycznym " "rozmiarze i czasie modyfikacji będą uznawane za identyczne." -#: ../data/org.gnome.meld.gschema.xml.h:41 +#: ../data/org.gnome.meld.gschema.xml.h:43 msgid "File timestamp resolution" msgstr "Rozwiązywanie czasu modyfikacji plików" -#: ../data/org.gnome.meld.gschema.xml.h:42 +#: ../data/org.gnome.meld.gschema.xml.h:44 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 " @@ -330,11 +338,11 @@ msgstr "" "Jest to przydatne podczas porównywania plików między systemami plików " "z różnym rozwiązywaniem czasu modyfikacji." -#: ../data/org.gnome.meld.gschema.xml.h:43 ../data/ui/preferences.ui.h:30 +#: ../data/org.gnome.meld.gschema.xml.h:45 ../data/ui/preferences.ui.h:30 msgid "Apply text filters during folder comparisons" msgstr "Zastosowywanie filtrów tekstowych podczas porównywania katalogów" -#: ../data/org.gnome.meld.gschema.xml.h:44 +#: ../data/org.gnome.meld.gschema.xml.h:46 msgid "" "If true, folder comparisons that compare file contents also apply active " "text filters and the blank line trimming option, and ignore newline " @@ -344,21 +352,21 @@ msgstr "" "także zastosowują aktywne filtry tekstowe i opcję usuwania pustych wierszy, " "oraz ignorują różnice znaczników nowych wierszy." -#: ../data/org.gnome.meld.gschema.xml.h:45 +#: ../data/org.gnome.meld.gschema.xml.h:47 msgid "File status filters" msgstr "Filtry stanu plików" -#: ../data/org.gnome.meld.gschema.xml.h:46 +#: ../data/org.gnome.meld.gschema.xml.h:48 msgid "List of statuses used to filter visible files in folder comparison." msgstr "" "Lista stanów używanych do filtrowania widocznym plików w porównaniu " "katalogów." -#: ../data/org.gnome.meld.gschema.xml.h:47 +#: ../data/org.gnome.meld.gschema.xml.h:49 msgid "Show the version control console output" msgstr "Wyświetlanie wyjścia konsoli systemu kontroli wersji" -#: ../data/org.gnome.meld.gschema.xml.h:48 +#: ../data/org.gnome.meld.gschema.xml.h:50 msgid "" "If true, a console output section will be shown in version control views, " "showing the commands run for version control operations." @@ -367,11 +375,11 @@ msgstr "" "kontroli wersji, wyświetlając polecenia wykonywane do działań kontroli " "wersji." -#: ../data/org.gnome.meld.gschema.xml.h:49 +#: ../data/org.gnome.meld.gschema.xml.h:51 msgid "Version control pane position" msgstr "Położenie panelu kontroli wersji" -#: ../data/org.gnome.meld.gschema.xml.h:50 +#: ../data/org.gnome.meld.gschema.xml.h:52 msgid "" "This is the height of the main version control tree when the console pane is " "shown." @@ -379,11 +387,11 @@ msgstr "" "Jest to wysokość głównego drzewa kontroli wersji, kiedy wyświetlany jest " "panel konsoli." -#: ../data/org.gnome.meld.gschema.xml.h:51 +#: ../data/org.gnome.meld.gschema.xml.h:53 msgid "Present version comparisons as left-local/right-remote" msgstr "Wyświetlanie porównań wersji jako lewo-lokalne/prawo-zdalne" -#: ../data/org.gnome.meld.gschema.xml.h:52 +#: ../data/org.gnome.meld.gschema.xml.h:54 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 +402,13 @@ msgstr "" "plików w panelach. W przeciwnym wypadku używany będzie schemat lewo-jest-" "ich, prawo-jest-moje." -#: ../data/org.gnome.meld.gschema.xml.h:53 +#: ../data/org.gnome.meld.gschema.xml.h:55 msgid "Order for files in three-way version control merge comparisons" msgstr "" "Kolejność plików podczas porównywania trzech plików w czasie scalania " "w systemie kontroli wersji" -#: ../data/org.gnome.meld.gschema.xml.h:54 +#: ../data/org.gnome.meld.gschema.xml.h:56 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 +419,11 @@ msgstr "" "kontroli wersji, więc jest używana wyłącznie do scalania/rozwiązywania " "konfliktów w ramach programu Meld." -#: ../data/org.gnome.meld.gschema.xml.h:55 +#: ../data/org.gnome.meld.gschema.xml.h:57 msgid "Show margin in commit message editor" msgstr "Wyświetlanie marginesów w edytorze komunikatów zatwierdzeń" -#: ../data/org.gnome.meld.gschema.xml.h:56 +#: ../data/org.gnome.meld.gschema.xml.h:58 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 +431,11 @@ msgstr "" "Jeśli wynosi „true”, to wyświetlana będzie linia oznaczająca kolumnę " "marginesu w edytorze komunikatów zatwierdzeń kontroli wersji." -#: ../data/org.gnome.meld.gschema.xml.h:57 +#: ../data/org.gnome.meld.gschema.xml.h:59 msgid "Margin column in commit message editor" msgstr "Kolumna marginesu w edytorze komunikatów zatwierdzeń" -#: ../data/org.gnome.meld.gschema.xml.h:58 +#: ../data/org.gnome.meld.gschema.xml.h:60 msgid "" "The column at which to show the margin in the version control commit message " "editor." @@ -435,11 +443,11 @@ msgstr "" "Kolumna, w której wyświetlać margines w edytorze komunikatów zatwierdzeń " "kontroli wersji." -#: ../data/org.gnome.meld.gschema.xml.h:59 +#: ../data/org.gnome.meld.gschema.xml.h:61 msgid "Automatically hard-wrap commit messages" msgstr "Automatyczne twarde zawijanie komunikatów zatwierdzeń" -#: ../data/org.gnome.meld.gschema.xml.h:60 +#: ../data/org.gnome.meld.gschema.xml.h:62 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 +456,22 @@ msgstr "" "będzie twardo zawijał (tzn. wstawiał łamanie wierszy) na marginesie przed " "zatwierdzeniem." -#: ../data/org.gnome.meld.gschema.xml.h:61 +#: ../data/org.gnome.meld.gschema.xml.h:63 msgid "Version control status filters" msgstr "Filtry stanu kontroli wersji" -#: ../data/org.gnome.meld.gschema.xml.h:62 +#: ../data/org.gnome.meld.gschema.xml.h:64 msgid "" "List of statuses used to filter visible files in version control comparison." msgstr "" "Lista stanów używanych do filtrowania widocznych plików w porównaniu " "kontroli wersji." -#: ../data/org.gnome.meld.gschema.xml.h:63 +#: ../data/org.gnome.meld.gschema.xml.h:65 msgid "Filename-based filters" msgstr "Filtry na podstawie nazw plików" -#: ../data/org.gnome.meld.gschema.xml.h:64 +#: ../data/org.gnome.meld.gschema.xml.h:66 msgid "" "List of predefined filename-based filters that, if active, will remove " "matching files from a folder comparison." @@ -471,11 +479,11 @@ msgstr "" "Lista uprzednio podanych filtrów na podstawie nazw plików, które jeśli są " "aktywne, będą usuwały pasujące pliki z porównania katalogów." -#: ../data/org.gnome.meld.gschema.xml.h:65 +#: ../data/org.gnome.meld.gschema.xml.h:67 msgid "Text-based filters" msgstr "Filtry na podstawie tekstu" -#: ../data/org.gnome.meld.gschema.xml.h:66 +#: ../data/org.gnome.meld.gschema.xml.h:68 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, " @@ -576,7 +584,7 @@ msgstr "Kopiuje element na prawo" msgid "Delete selected" msgstr "Usuwa zaznaczone" -#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:859 ../meld/filediff.py:1381 +#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:858 ../meld/filediff.py:1382 msgid "Hide" msgstr "Ukryj" @@ -866,8 +874,8 @@ msgstr "" msgid "Close _without Saving" msgstr "Zamknij _bez zapisywania" -#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:941 ../meld/filediff.py:1447 -#: ../meld/filediff.py:1515 +#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:940 ../meld/filediff.py:1448 +#: ../meld/filediff.py:1520 msgid "_Cancel" msgstr "_Anuluj" @@ -904,7 +912,7 @@ msgid "Changes made to the following documents will be permanently lost:\n" msgstr "" "Zmiany naniesione do poniższych dokumentów zostaną bezpowrotnie utracone:\n" -#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:942 ../meld/filediff.py:1448 +#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:941 ../meld/filediff.py:1449 msgid "_Replace" msgstr "Z_amień" @@ -1143,7 +1151,7 @@ msgstr "" "podstawie nazwy. Każdy wzorzec jest listą symboli wieloznacznych powłoki " "rozdzieloną spacjami." -#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:103 +#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:104 msgid "File Filters" msgstr "Filtry plików" @@ -1422,7 +1430,7 @@ msgctxt "shortcut window" msgid "Show/hide console output" msgstr "Wyświetlenie/ukrycie wyjścia konsoli" -#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:570 +#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:559 #: ../meld/newdifftab.py:38 msgid "New comparison" msgstr "Nowe porównanie" @@ -1664,20 +1672,20 @@ msgstr "Ukryj %s" msgid "[%s] Scanning %s" msgstr "[%s] Skanowanie %s" -#: ../meld/dirdiff.py:826 +#: ../meld/dirdiff.py:825 #, python-format msgid "[%s] Done" msgstr "[%s] Ukończono" -#: ../meld/dirdiff.py:834 +#: ../meld/dirdiff.py:833 msgid "Folders have no differences" msgstr "Katalogi się nie różnią" -#: ../meld/dirdiff.py:836 +#: ../meld/dirdiff.py:835 msgid "Contents of scanned files in folders are identical." msgstr "Treść zeskanowanych plików w katalogach jest identyczna." -#: ../meld/dirdiff.py:838 +#: ../meld/dirdiff.py:837 msgid "" "Scanned files in folders appear identical, but contents have not been " "scanned." @@ -1685,40 +1693,40 @@ msgstr "" "Zeskanowane pliki wydają się identyczne, ale treść mogła nie zostać " "zeskanowana." -#: ../meld/dirdiff.py:841 +#: ../meld/dirdiff.py:840 msgid "File filters are in use, so not all files have been scanned." msgstr "" "Filtry plików są używane, więc nie wszystkie pliki zostały zeskanowane." -#: ../meld/dirdiff.py:843 +#: ../meld/dirdiff.py:842 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:861 ../meld/filediff.py:1383 ../meld/filediff.py:1413 -#: ../meld/filediff.py:1415 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 +#: ../meld/dirdiff.py:860 ../meld/filediff.py:1384 ../meld/filediff.py:1414 +#: ../meld/filediff.py:1416 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 msgid "Hi_de" msgstr "_Ukryj" -#: ../meld/dirdiff.py:871 +#: ../meld/dirdiff.py:870 msgid "Multiple errors occurred while scanning this folder" msgstr "Wystąpiło wiele błędów podczas skanowania tego katalogu" -#: ../meld/dirdiff.py:872 +#: ../meld/dirdiff.py:871 msgid "Files with invalid encodings found" msgstr "Odnaleziono pliki z nieprawidłowym kodowaniem znaków" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:874 +#: ../meld/dirdiff.py:873 msgid "Some files were in an incorrect encoding. The names are something like:" msgstr "" "Niektóre pliki mają nieprawidłowe kodowanie znaków. Nazwy tych plików to:" -#: ../meld/dirdiff.py:876 +#: ../meld/dirdiff.py:875 msgid "Files hidden by case insensitive comparison" msgstr "Pliku ukryte przez porównywanie bez uwzględniania wielkości liter" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:878 +#: ../meld/dirdiff.py:877 msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. The following files in this folder are hidden:" @@ -1727,17 +1735,17 @@ msgstr "" "w systemie plików, który rozróżnia wielkość liter. Następujące pliki w tym " "katalogu zostały ukryte:" -#: ../meld/dirdiff.py:889 +#: ../meld/dirdiff.py:888 #, python-format msgid "'%s' hidden by '%s'" msgstr "„%s” ukryty przez „%s”" -#: ../meld/dirdiff.py:945 +#: ../meld/dirdiff.py:944 #, python-format msgid "Replace folder “%s”?" msgstr "Zastąpić katalog „%s”?" -#: ../meld/dirdiff.py:947 +#: ../meld/dirdiff.py:946 #, python-format msgid "" "Another folder with the same name already exists in “%s”.\n" @@ -1747,11 +1755,11 @@ msgstr "" "Zastąpienie istniejącego katalogu spowoduje utratę wszystkich plików w nim " "zawartych." -#: ../meld/dirdiff.py:960 +#: ../meld/dirdiff.py:959 msgid "Error copying file" msgstr "Błąd podczas kopiowania pliku" -#: ../meld/dirdiff.py:961 +#: ../meld/dirdiff.py:960 #, python-format msgid "" "Couldn't copy %s\n" @@ -1764,35 +1772,35 @@ msgstr "" "\n" "%s" -#: ../meld/dirdiff.py:984 +#: ../meld/dirdiff.py:983 #, python-format msgid "Error deleting %s" msgstr "Błąd podczas usuwania %s" -#: ../meld/dirdiff.py:1489 +#: ../meld/dirdiff.py:1488 msgid "No folder" msgstr "Brak katalogu" #. Abbreviations for insert and overwrite that fit in the status bar -#: ../meld/filediff.py:354 +#: ../meld/filediff.py:355 msgid "INS" msgstr "WST" -#: ../meld/filediff.py:354 +#: ../meld/filediff.py:355 msgid "OVR" msgstr "ZAS" #. Abbreviation for line, column so that it will fit in the status bar -#: ../meld/filediff.py:356 +#: ../meld/filediff.py:357 #, python-format msgid "Ln %i, Col %i" msgstr "Wrsz %i, kol %i" -#: ../meld/filediff.py:781 +#: ../meld/filediff.py:782 msgid "Comparison results will be inaccurate" msgstr "Wyniki porównania będą niepoprawne" -#: ../meld/filediff.py:783 +#: ../meld/filediff.py:784 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1800,66 +1808,66 @@ msgstr "" "Filtr zmienił liczbę wierszy w pliku, co nie jest obsługiwane. Porównanie " "będzie niepoprawne." -#: ../meld/filediff.py:839 +#: ../meld/filediff.py:840 msgid "Mark conflict as resolved?" msgstr "Oznaczyć konflikt jako rozwiązany?" -#: ../meld/filediff.py:841 +#: ../meld/filediff.py:842 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:843 +#: ../meld/filediff.py:844 msgid "Cancel" msgstr "Anuluj" -#: ../meld/filediff.py:844 +#: ../meld/filediff.py:845 msgid "Mark _Resolved" msgstr "Oznacz jako _rozwiązane" -#: ../meld/filediff.py:1092 +#: ../meld/filediff.py:1093 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Wystąpił problem podczas otwierania pliku „%s”." -#: ../meld/filediff.py:1100 +#: ../meld/filediff.py:1101 #, python-format msgid "File %s appears to be a binary file." msgstr "Plik %s wygląda na plik binarny." -#: ../meld/filediff.py:1102 +#: ../meld/filediff.py:1103 msgid "Do you want to open the file using the default application?" msgstr "Otworzyć go w domyślnym programie?" -#: ../meld/filediff.py:1104 +#: ../meld/filediff.py:1105 msgid "Open" msgstr "Otwórz" -#: ../meld/filediff.py:1120 +#: ../meld/filediff.py:1121 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Analizowanie różnic" -#: ../meld/filediff.py:1185 +#: ../meld/filediff.py:1186 #, python-format msgid "File %s has changed on disk" msgstr "Plik %s został zmieniony na dysku" -#: ../meld/filediff.py:1186 +#: ../meld/filediff.py:1187 msgid "Do you want to reload the file?" msgstr "Ponownie wczytać plik?" -#: ../meld/filediff.py:1188 +#: ../meld/filediff.py:1189 msgid "_Reload" msgstr "_Wczytaj ponownie" -#: ../meld/filediff.py:1346 +#: ../meld/filediff.py:1347 msgid "Files are identical" msgstr "Pliki są identyczne" -#: ../meld/filediff.py:1359 +#: ../meld/filediff.py:1360 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1867,11 +1875,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:1364 +#: ../meld/filediff.py:1365 msgid "Files differ in line endings only" msgstr "Pliki różnią się tylko znacznikami końca wierszy" -#: ../meld/filediff.py:1366 +#: ../meld/filediff.py:1367 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1880,15 +1888,15 @@ msgstr "" "Pliki są identyczne, z wyjątkiem różnych znaczników końca wierszy:\n" "%s" -#: ../meld/filediff.py:1386 +#: ../meld/filediff.py:1387 msgid "Show without filters" msgstr "Wyświetl bez filtrów" -#: ../meld/filediff.py:1408 +#: ../meld/filediff.py:1409 msgid "Change highlighting incomplete" msgstr "Wyróżnianie zmian jest niepełne" -#: ../meld/filediff.py:1409 +#: ../meld/filediff.py:1410 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." @@ -1896,20 +1904,20 @@ 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:1417 +#: ../meld/filediff.py:1418 msgid "Keep highlighting" msgstr "Wyróżniaj dalej" -#: ../meld/filediff.py:1419 +#: ../meld/filediff.py:1420 msgid "_Keep highlighting" msgstr "_Wyróżniaj dalej" -#: ../meld/filediff.py:1451 +#: ../meld/filediff.py:1452 #, python-format msgid "Replace file “%s”?" msgstr "Zastąpić plik „%s”?" -#: ../meld/filediff.py:1453 +#: ../meld/filediff.py:1454 #, python-format msgid "" "A file with this name already exists in “%s”.\n" @@ -1918,47 +1926,47 @@ msgstr "" "Plik o tej samej nazwie już istnieje w „%s”.\n" "Zastąpienie istniejącego pliku spowoduje utratę jego zawartości." -#: ../meld/filediff.py:1470 +#: ../meld/filediff.py:1471 msgid "Save Left Pane As" msgstr "Zapis lewego panelu jako" -#: ../meld/filediff.py:1472 +#: ../meld/filediff.py:1473 msgid "Save Middle Pane As" msgstr "Zapis środkowego panelu jako" -#: ../meld/filediff.py:1474 +#: ../meld/filediff.py:1475 msgid "Save Right Pane As" msgstr "Zapis prawego panelu jako" -#: ../meld/filediff.py:1488 +#: ../meld/filediff.py:1489 #, 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:1490 +#: ../meld/filediff.py:1491 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:1493 +#: ../meld/filediff.py:1494 msgid "Save Anyway" msgstr "Zapisz mimo to" -#: ../meld/filediff.py:1494 +#: ../meld/filediff.py:1495 msgid "Don't Save" msgstr "Nie zapisuj" -#: ../meld/filediff.py:1516 +#: ../meld/filediff.py:1521 msgid "_Save as UTF-8" msgstr "_Zapisz za pomocą UTF-8" -#: ../meld/filediff.py:1519 +#: ../meld/filediff.py:1524 #, python-format msgid "Couldn't encode text as “%s”" msgstr "Nie można zakodować tekstu za pomocą „%s”" -#: ../meld/filediff.py:1521 +#: ../meld/filediff.py:1526 #, python-format msgid "" "File “%s” contains characters that can't be encoded using encoding “%s”.\n" @@ -1968,12 +1976,12 @@ msgstr "" "„%s”.\n" "Zapisać za pomocą kodowania UTF-8?" -#: ../meld/filediff.py:1561 ../meld/patchdialog.py:131 +#: ../meld/filediff.py:1566 ../meld/patchdialog.py:131 #, python-format msgid "Could not save file %s." msgstr "Nie można zapisać pliku %s." -#: ../meld/filediff.py:1562 ../meld/patchdialog.py:132 +#: ../meld/filediff.py:1567 ../meld/patchdialog.py:132 #, python-format msgid "" "Couldn't save file due to:\n" @@ -1982,11 +1990,11 @@ msgstr "" "Nie można zapisać pliku z powodu:\n" "%s" -#: ../meld/filediff.py:1907 +#: ../meld/filediff.py:1913 msgid "Live comparison updating disabled" msgstr "Wyłączono aktualizowanie porównań na żywo" -#: ../meld/filediff.py:1908 +#: ../meld/filediff.py:1914 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -2001,11 +2009,11 @@ msgstr "" msgid "[%s] Merging files" msgstr "[%s] Scalanie plików" -#: ../meld/gutterrendererchunk.py:159 +#: ../meld/gutterrendererchunk.py:188 msgid "Copy _up" msgstr "Skopiuj w gó_rę" -#: ../meld/gutterrendererchunk.py:160 +#: ../meld/gutterrendererchunk.py:189 msgid "Copy _down" msgstr "Skopiuj w _dół" @@ -2110,196 +2118,196 @@ msgstr "" msgid "untitled" msgstr "bez nazwy" -#: ../meld/meldwindow.py:48 +#: ../meld/meldwindow.py:49 msgid "_File" msgstr "_Plik" -#: ../meld/meldwindow.py:49 +#: ../meld/meldwindow.py:50 msgid "_New Comparison..." msgstr "_Nowe porównanie…" -#: ../meld/meldwindow.py:50 +#: ../meld/meldwindow.py:51 msgid "Start a new comparison" msgstr "Rozpoczyna nowe porównanie" -#: ../meld/meldwindow.py:53 +#: ../meld/meldwindow.py:54 msgid "Save the current file" msgstr "Zapisuje bieżący plik" -#: ../meld/meldwindow.py:55 +#: ../meld/meldwindow.py:56 msgid "Save As..." msgstr "Zapisz jako…" -#: ../meld/meldwindow.py:56 +#: ../meld/meldwindow.py:57 msgid "Save the current file with a different name" msgstr "Zapisuje bieżący plik pod inną nazwą" -#: ../meld/meldwindow.py:59 +#: ../meld/meldwindow.py:60 msgid "Close the current file" msgstr "Zamyka bieżący plik" -#: ../meld/meldwindow.py:62 +#: ../meld/meldwindow.py:63 msgid "_Edit" msgstr "_Edycja" -#: ../meld/meldwindow.py:64 +#: ../meld/meldwindow.py:65 msgid "Undo the last action" msgstr "Wycofuje ostatnią czynność" -#: ../meld/meldwindow.py:67 +#: ../meld/meldwindow.py:68 msgid "Redo the last undone action" msgstr "Ponownie wykonuje ostatnio wycofaną czynność" -#: ../meld/meldwindow.py:69 +#: ../meld/meldwindow.py:70 msgid "Cut the selection" msgstr "Wycina zaznaczone" -#: ../meld/meldwindow.py:71 +#: ../meld/meldwindow.py:72 msgid "Copy the selection" msgstr "Kopiuje zaznaczone" -#: ../meld/meldwindow.py:73 +#: ../meld/meldwindow.py:74 msgid "Paste the clipboard" msgstr "Wklej zawartość schowka" -#: ../meld/meldwindow.py:75 +#: ../meld/meldwindow.py:76 msgid "Find..." msgstr "Wyszukiwanie…" -#: ../meld/meldwindow.py:75 +#: ../meld/meldwindow.py:76 msgid "Search for text" msgstr "Znajdź tekst" -#: ../meld/meldwindow.py:77 +#: ../meld/meldwindow.py:78 msgid "Find Ne_xt" msgstr "Znajdź _następny" -#: ../meld/meldwindow.py:78 +#: ../meld/meldwindow.py:79 msgid "Search forwards for the same text" msgstr "Szuka w przód tego samego tekstu" -#: ../meld/meldwindow.py:80 +#: ../meld/meldwindow.py:81 msgid "Find _Previous" msgstr "Znajdź p_oprzedni" -#: ../meld/meldwindow.py:81 +#: ../meld/meldwindow.py:82 msgid "Search backwards for the same text" msgstr "Szuka wstecz tego samego tekstu" -#: ../meld/meldwindow.py:84 +#: ../meld/meldwindow.py:85 msgid "_Replace..." msgstr "Z_amień…" -#: ../meld/meldwindow.py:85 +#: ../meld/meldwindow.py:86 msgid "Find and replace text" msgstr "Wyszukiwanie i zastępowanie testu" -#: ../meld/meldwindow.py:88 +#: ../meld/meldwindow.py:89 msgid "_Changes" msgstr "_Zmiany" -#: ../meld/meldwindow.py:89 +#: ../meld/meldwindow.py:90 msgid "Next Change" msgstr "Następna zmiana" -#: ../meld/meldwindow.py:90 +#: ../meld/meldwindow.py:91 msgid "Go to the next change" msgstr "Przechodzi do następnej zmiany" -#: ../meld/meldwindow.py:92 +#: ../meld/meldwindow.py:93 msgid "Previous Change" msgstr "Poprzednia zmiana" -#: ../meld/meldwindow.py:93 +#: ../meld/meldwindow.py:94 msgid "Go to the previous change" msgstr "Przechodzi do poprzedniej zmiany" -#: ../meld/meldwindow.py:95 +#: ../meld/meldwindow.py:96 msgid "Open Externally" msgstr "Otwórz zewnętrznie" -#: ../meld/meldwindow.py:96 +#: ../meld/meldwindow.py:97 msgid "Open selected file or directory in the default external application" msgstr "Otwiera wybrany plik lub katalog w domyślnym programie" -#: ../meld/meldwindow.py:100 +#: ../meld/meldwindow.py:101 msgid "_View" msgstr "_Widok" -#: ../meld/meldwindow.py:101 +#: ../meld/meldwindow.py:102 msgid "File Status" msgstr "Stan pliku" -#: ../meld/meldwindow.py:102 +#: ../meld/meldwindow.py:103 msgid "Version Status" msgstr "Stan wersji" -#: ../meld/meldwindow.py:105 +#: ../meld/meldwindow.py:106 msgid "Stop the current action" msgstr "Przerywa bieżące działanie" -#: ../meld/meldwindow.py:108 +#: ../meld/meldwindow.py:109 msgid "Refresh the view" msgstr "Odświeża widok" -#: ../meld/meldwindow.py:112 +#: ../meld/meldwindow.py:113 msgid "Fullscreen" msgstr "Pełny ekran" -#: ../meld/meldwindow.py:113 +#: ../meld/meldwindow.py:114 msgid "View the comparison in fullscreen" msgstr "Wyświetla porównanie na pełnym ekranie" -#: ../meld/meldwindow.py:115 +#: ../meld/meldwindow.py:116 msgid "_Toolbar" msgstr "Pasek _narzędziowy" -#: ../meld/meldwindow.py:116 +#: ../meld/meldwindow.py:117 msgid "Show or hide the toolbar" msgstr "Wyświetla/ukrywa pasek narzędziowy" -#: ../meld/meldwindow.py:126 +#: ../meld/meldwindow.py:127 msgid "Open Recent" msgstr "Otwórz ostatnio używane" -#: ../meld/meldwindow.py:127 +#: ../meld/meldwindow.py:128 msgid "Open recent files" msgstr "Otwiera ostatnio używane pliki" -#: ../meld/meldwindow.py:149 +#: ../meld/meldwindow.py:150 msgid "_Meld" msgstr "_Meld" -#: ../meld/meldwindow.py:150 +#: ../meld/meldwindow.py:151 msgid "Quit the program" msgstr "Kończy działanie programu" -#: ../meld/meldwindow.py:152 +#: ../meld/meldwindow.py:153 msgid "Prefere_nces" msgstr "Prefere_ncje" -#: ../meld/meldwindow.py:153 +#: ../meld/meldwindow.py:154 msgid "Configure the application" msgstr "Konfiguracja programu" -#: ../meld/meldwindow.py:155 +#: ../meld/meldwindow.py:156 msgid "_Contents" msgstr "_Spis treści" -#: ../meld/meldwindow.py:156 +#: ../meld/meldwindow.py:157 msgid "Open the Meld manual" msgstr "Otwiera podręcznik programu Meld" -#: ../meld/meldwindow.py:158 +#: ../meld/meldwindow.py:159 msgid "About this application" msgstr "Informacje o tym programie" -#: ../meld/meldwindow.py:604 +#: ../meld/meldwindow.py:593 #, python-format msgid "Need three files to auto-merge, got: %r" msgstr "Automatyczne scalenie wymaga trzech plików, otrzymano: %r" -#: ../meld/meldwindow.py:618 +#: ../meld/meldwindow.py:607 msgid "Cannot compare a mixture of files and directories" msgstr "Jednoczesne porównanie plików i katalogów nie jest możliwe" From e6912cab3c8107145ab087ed0795ca89ee4250bf Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Mon, 3 Oct 2016 07:09:22 +1000 Subject: [PATCH 0061/1316] gutterrendererchunk: Fix accidental replace action for a no-action chunk --- meld/gutterrendererchunk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meld/gutterrendererchunk.py b/meld/gutterrendererchunk.py index 91f6dba3..4970265c 100644 --- a/meld/gutterrendererchunk.py +++ b/meld/gutterrendererchunk.py @@ -180,7 +180,7 @@ def do_activate(self, start, area, event): # TODO: Need a custom GtkMenuPositionFunc to position this next to # the clicked gutter, not where the cursor is copy_menu.popup(None, None, None, None, 0, event.time) - else: + elif action == MODE_REPLACE: self.filediff.replace_chunk(self.from_pane, self.to_pane, chunk) def _make_copy_menu(self, chunk): From 0bf16976a96ca491c99baa3e658f44ede2fa9960 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Mon, 3 Oct 2016 07:13:33 +1000 Subject: [PATCH 0062/1316] gutterrendererchunk: Make insert chunk action consistent in delete mode Replace chunks remove their action if we're in delete mode and the current chunk can't be deleted. This change just makes insert actions do the same thing. --- meld/gutterrendererchunk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meld/gutterrendererchunk.py b/meld/gutterrendererchunk.py index 4970265c..863c756f 100644 --- a/meld/gutterrendererchunk.py +++ b/meld/gutterrendererchunk.py @@ -260,7 +260,7 @@ def _classify_change_actions(self, change): if change_type == "delete": if (editable and (self.mode == MODE_DELETE or not other_editable)): action = MODE_DELETE - elif other_editable: + elif other_editable and self.mode != MODE_DELETE: action = MODE_REPLACE elif change_type == "replace": if not editable: From 0d8f6af5b496acf4db9232c85120b6b65ed73c20 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Mon, 3 Oct 2016 07:54:31 +1000 Subject: [PATCH 0063/1316] gutterrendererchunk: Cache view editability across a drawing run --- meld/gutterrendererchunk.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meld/gutterrendererchunk.py b/meld/gutterrendererchunk.py index 863c756f..b4e9502c 100644 --- a/meld/gutterrendererchunk.py +++ b/meld/gutterrendererchunk.py @@ -203,6 +203,9 @@ def copy_chunk(widget, chunk, copy_up): copy_down.connect('activate', copy_chunk, chunk, False) return copy_menu + def do_begin(self, *args): + self.views_editable = [v.get_editable() for v in self.views] + def do_draw(self, context, background_area, cell_area, start, end, state): GtkSource.GutterRendererPixbuf.do_draw( self, context, background_area, cell_area, start, end, state) @@ -240,7 +243,7 @@ def _classify_change_actions(self, change): Returns the action that can be performed given the content and context of the change. """ - editable, other_editable = [v.get_editable() for v in self.views] + editable, other_editable = self.views_editable if not editable and not other_editable: return None From 714d02c41296ed6819a32cb2234c151074a64b6e Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Mon, 3 Oct 2016 07:55:13 +1000 Subject: [PATCH 0064/1316] test: Add new test for gutter change action classification --- test/test_gutterrendererchunk.py | 69 ++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 test/test_gutterrendererchunk.py diff --git a/test/test_gutterrendererchunk.py b/test/test_gutterrendererchunk.py new file mode 100644 index 00000000..02d8ace4 --- /dev/null +++ b/test/test_gutterrendererchunk.py @@ -0,0 +1,69 @@ + +import mock +import pytest + +import meld.gutterrendererchunk +from meld.gutterrendererchunk import GutterRendererChunkAction +from meld.const import MODE_REPLACE, MODE_DELETE, MODE_INSERT +from meld.matchers import DiffChunk + + +def make_chunk(chunk_type): + return DiffChunk(chunk_type, 0, 1, 0, 1) + + +@pytest.mark.parametrize("mode, editable, chunk, expected_action", [ + # Replace mode with replace chunks + (MODE_REPLACE, (True, True), make_chunk('replace'), MODE_REPLACE), + (MODE_REPLACE, (True, False), make_chunk('replace'), MODE_DELETE), + (MODE_REPLACE, (False, True), make_chunk('replace'), MODE_REPLACE), + (MODE_REPLACE, (False, False), make_chunk('replace'), None), + # Replace mode with delete chunks + (MODE_REPLACE, (True, True), make_chunk('delete'), MODE_REPLACE), + (MODE_REPLACE, (True, False), make_chunk('delete'), MODE_DELETE), + (MODE_REPLACE, (False, True), make_chunk('delete'), MODE_REPLACE), + (MODE_REPLACE, (False, False), make_chunk('delete'), None), + # Delete mode makes a slightly weird choice to remove non-delete + # actions while in delete mode; insert mode makes the opposite + # choice + # + # Delete mode with replace chunks + (MODE_DELETE, (True, True), make_chunk('replace'), MODE_DELETE), + (MODE_DELETE, (True, False), make_chunk('replace'), MODE_DELETE), + (MODE_DELETE, (False, True), make_chunk('replace'), None), + (MODE_DELETE, (False, False), make_chunk('replace'), None), + # Delete mode with delete chunks + (MODE_DELETE, (True, True), make_chunk('delete'), MODE_DELETE), + (MODE_DELETE, (True, False), make_chunk('delete'), MODE_DELETE), + (MODE_DELETE, (False, True), make_chunk('delete'), None), + (MODE_DELETE, (False, False), make_chunk('delete'), None), + # Insert mode with replace chunks + (MODE_INSERT, (True, True), make_chunk('replace'), MODE_INSERT), + (MODE_INSERT, (True, False), make_chunk('replace'), MODE_DELETE), + (MODE_INSERT, (False, True), make_chunk('replace'), MODE_INSERT), + (MODE_INSERT, (False, False), make_chunk('replace'), None), + # Insert mode with delete chunks + (MODE_INSERT, (True, True), make_chunk('delete'), MODE_REPLACE), + (MODE_INSERT, (True, False), make_chunk('delete'), MODE_DELETE), + (MODE_INSERT, (False, True), make_chunk('delete'), MODE_REPLACE), + (MODE_INSERT, (False, False), make_chunk('delete'), None), + # We should never have insert chunks here + (MODE_REPLACE, (True, True), make_chunk('insert'), None), + (MODE_REPLACE, (True, False), make_chunk('insert'), None), + (MODE_REPLACE, (False, True), make_chunk('insert'), None), + (MODE_REPLACE, (False, False), make_chunk('insert'), None), + + # TODO: Add tests for conflict chunks +]) +def test_classify_change_actions(mode, editable, chunk, expected_action): + filediff = mock.MagicMock() + meld.gutterrendererchunk.meldsettings = mock.MagicMock(style_scheme=None) + GutterRendererChunkAction.on_setting_changed = mock.MagicMock() + renderer = GutterRendererChunkAction( + 0, 1, mock.MagicMock(), filediff, None) + + renderer.mode = mode + renderer.views_editable = editable + action = renderer._classify_change_actions(chunk) + + assert action == expected_action From b7dc9659f4ee530519c26d418412cb9985836da8 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Mon, 3 Oct 2016 07:55:45 +1000 Subject: [PATCH 0065/1316] gutterrendererchunk: Simplify logic around gutter action sanitising --- meld/gutterrendererchunk.py | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/meld/gutterrendererchunk.py b/meld/gutterrendererchunk.py index b4e9502c..7411e0fe 100644 --- a/meld/gutterrendererchunk.py +++ b/meld/gutterrendererchunk.py @@ -259,21 +259,16 @@ def _classify_change_actions(self, change): else: change_type = "replace" - action = None - if change_type == "delete": - if (editable and (self.mode == MODE_DELETE or not other_editable)): - action = MODE_DELETE - elif other_editable and self.mode != MODE_DELETE: - action = MODE_REPLACE - elif change_type == "replace": - if not editable: - if self.mode in (MODE_INSERT, MODE_REPLACE): - action = self.mode - elif not other_editable: - action = MODE_DELETE - else: - action = self.mode + if change_type == 'insert': + return None + action = self.mode + if action == MODE_DELETE and not editable: + action = None + elif action == MODE_INSERT and change_type == 'delete': + action = MODE_REPLACE + if not other_editable: + action = MODE_DELETE return action From 86901ed8d5077b509c38f2718ff6a99d4f8808e0 Mon Sep 17 00:00:00 2001 From: Vasily Galkin Date: Tue, 4 Oct 2016 21:17:25 +0300 Subject: [PATCH 0066/1316] For python3 shutil.copyfileobj expects binary file (bgo#772425) --- meld/vc/_null.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meld/vc/_null.py b/meld/vc/_null.py index b52b9aac..a94dd9d9 100644 --- a/meld/vc/_null.py +++ b/meld/vc/_null.py @@ -43,6 +43,6 @@ def _update_tree_state_cache(*args): def get_path_for_repo_file(self, path, commit=None): with tempfile.NamedTemporaryFile(prefix='meld-tmp', delete=False) as f: - with open(path, 'r') as vc_file: + with open(path, 'rb') as vc_file: shutil.copyfileobj(vc_file, f) return f.name From dc05ded6e4d34f42a953699c3216424943b36acb Mon Sep 17 00:00:00 2001 From: Rafael Fontenelle Date: Tue, 4 Oct 2016 21:30:15 +0000 Subject: [PATCH 0067/1316] Updated Brazilian Portuguese translation --- po/pt_BR.po | 548 ++++++++++++++++++++++++++-------------------------- 1 file changed, 275 insertions(+), 273 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index a0e3fd0b..a2f839c4 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -15,8 +15,8 @@ msgstr "" "Project-Id-Version: meld\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=meld&ke" "ywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-09-03 13:24+0000\n" -"PO-Revision-Date: 2016-09-04 21:34-0200\n" +"POT-Creation-Date: 2016-09-30 23:28+0000\n" +"PO-Revision-Date: 2016-10-04 18:28-0200\n" "Last-Translator: Rafael Fontenelle \n" "Language-Team: Brazilian Portuguese \n" "Language: pt_BR\n" @@ -27,20 +27,16 @@ msgstr "" "X-Generator: Virtaal 0.7.1\n" "X-Project-Style: gnome\n" -#: ../bin/meld:144 +#: ../bin/meld:142 msgid "Cannot import: " msgstr "Não foi possível importar: " -#: ../bin/meld:147 +#: ../bin/meld:145 #, c-format msgid "Meld requires %s or higher." msgstr "Meld requer %s ou superior." -#: ../bin/meld:151 -msgid "Meld does not support Python 3." -msgstr "Meld não tem suporte a Python 3." - -#: ../bin/meld:200 +#: ../bin/meld:191 #, c-format msgid "" "Couldn't load Meld-specific CSS (%s)\n" @@ -101,34 +97,46 @@ msgid "Meld comparison description" msgstr "Descrição da comparação do Meld" #: ../data/org.gnome.meld.gschema.xml.h:1 -msgid "Default window size" -msgstr "Tamanho padrão da janela" +#| msgid "Default window size" +msgid "Default window width" +msgstr "Largura padrão da janela" #: ../data/org.gnome.meld.gschema.xml.h:2 -msgid "Default window state" -msgstr "Estado padrão da janela" +#| msgid "Default window size" +msgid "Default window height" +msgstr "Altura padrão da janela" #: ../data/org.gnome.meld.gschema.xml.h:3 +#| msgid "Default window state" +msgid "Default window maximised state" +msgstr "Estado maximizado padrão da janela" + +#: ../data/org.gnome.meld.gschema.xml.h:4 +#| msgid "Default window state" +msgid "Default window fullscreen state" +msgstr "Estado tela cheia padrão da janela" + +#: ../data/org.gnome.meld.gschema.xml.h:5 msgid "Show toolbar" msgstr "Mostra a barra de ferramentas" -#: ../data/org.gnome.meld.gschema.xml.h:4 +#: ../data/org.gnome.meld.gschema.xml.h:6 msgid "If true, the window toolbar is visible." msgstr "Se verdadeiro, a barra de ferramentas da janela fica visível." -#: ../data/org.gnome.meld.gschema.xml.h:5 +#: ../data/org.gnome.meld.gschema.xml.h:7 msgid "Show statusbar" msgstr "Mostra a barra de status" -#: ../data/org.gnome.meld.gschema.xml.h:6 +#: ../data/org.gnome.meld.gschema.xml.h:8 msgid "If true, the window statusbar is visible." msgstr "Se verdadeiro, a barra de status da janela fica visível." -#: ../data/org.gnome.meld.gschema.xml.h:7 +#: ../data/org.gnome.meld.gschema.xml.h:9 msgid "Additional automatically detected text encodings" msgstr "Codificações de texto adicionais detectadas automaticamente" -#: ../data/org.gnome.meld.gschema.xml.h:8 +#: ../data/org.gnome.meld.gschema.xml.h:10 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 " @@ -141,38 +149,38 @@ msgstr "" "será sempre usada; outras codificações também podem ser tentadas, dependendo " "da localidade do usuário." -#: ../data/org.gnome.meld.gschema.xml.h:9 +#: ../data/org.gnome.meld.gschema.xml.h:11 msgid "Width of an indentation step" msgstr "Largura de uma etapa de recuo" -#: ../data/org.gnome.meld.gschema.xml.h:10 +#: ../data/org.gnome.meld.gschema.xml.h:12 msgid "The number of spaces to use for a single indent step" msgstr "O número de espaços a serem usados para uma única etapa de recuo" -#: ../data/org.gnome.meld.gschema.xml.h:11 +#: ../data/org.gnome.meld.gschema.xml.h:13 msgid "Whether to indent using spaces or tabs" msgstr "Se deve ser recuado usando espaços ou tabulações" -#: ../data/org.gnome.meld.gschema.xml.h:12 +#: ../data/org.gnome.meld.gschema.xml.h:14 msgid "If true, any new indentation will use spaces instead of tabs." msgstr "" "Se verdadeiro, qualquer novo recuo vai usar espaços ao invés de tabulações." -#: ../data/org.gnome.meld.gschema.xml.h:13 +#: ../data/org.gnome.meld.gschema.xml.h:15 msgid "Show line numbers" msgstr "Mostra números de linhas" -#: ../data/org.gnome.meld.gschema.xml.h:14 +#: ../data/org.gnome.meld.gschema.xml.h:16 msgid "If true, line numbers will be shown in the gutter of file comparisons." msgstr "" "Se verdadeiro, números de linhas serão mostrados nas margens das comparações " "de arquivos." -#: ../data/org.gnome.meld.gschema.xml.h:15 +#: ../data/org.gnome.meld.gschema.xml.h:17 msgid "Highlight syntax" msgstr "Destaque de linha" -#: ../data/org.gnome.meld.gschema.xml.h:16 +#: ../data/org.gnome.meld.gschema.xml.h:18 msgid "" "Whether to highlight syntax in comparisons. Because of Meld's own color " "highlighting, this is off by default." @@ -180,19 +188,19 @@ msgstr "" "Se deve destacar linhas nas comparações. Por causa do destaque de cores " "próprio do Meld, isso está desativado por padrão." -#: ../data/org.gnome.meld.gschema.xml.h:17 +#: ../data/org.gnome.meld.gschema.xml.h:19 msgid "Color scheme to use for syntax highlighting" msgstr "Esquema de cores a ser usada para realce de sintaxe" -#: ../data/org.gnome.meld.gschema.xml.h:18 +#: ../data/org.gnome.meld.gschema.xml.h:20 msgid "Used by GtkSourceView to determine colors for syntax highlighting" msgstr "Usado pelo GtkSourceView para determinar cores para realce de sintaxe" -#: ../data/org.gnome.meld.gschema.xml.h:19 +#: ../data/org.gnome.meld.gschema.xml.h:21 msgid "Displayed whitespace" msgstr "Espaço em branco exibido" -#: ../data/org.gnome.meld.gschema.xml.h:20 +#: ../data/org.gnome.meld.gschema.xml.h:22 msgid "" "Selector for individual whitespace character types to be shown. Possible " "values are 'space', 'tab', 'newline' and 'nbsp'." @@ -200,11 +208,11 @@ msgstr "" "Seletor para tipos de caracteres de espaço em branco individuais a serem " "mostrados. Valores possíveis são \"space\", \"tab\", \"newline\" e \"nbsp\"." -#: ../data/org.gnome.meld.gschema.xml.h:21 +#: ../data/org.gnome.meld.gschema.xml.h:23 msgid "Wrap mode" msgstr "Quebra de linha" -#: ../data/org.gnome.meld.gschema.xml.h:22 +#: ../data/org.gnome.meld.gschema.xml.h:24 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 " @@ -214,11 +222,11 @@ msgstr "" "configuração, seja nenhuma (\"none\"), seja em qualquer caractere (\"char" "\"), seja apenas ao final das palavras (\"word\")." -#: ../data/org.gnome.meld.gschema.xml.h:23 +#: ../data/org.gnome.meld.gschema.xml.h:25 msgid "Highlight current line" msgstr "Destacar a linha atual" -#: ../data/org.gnome.meld.gschema.xml.h:24 +#: ../data/org.gnome.meld.gschema.xml.h:26 msgid "" "If true, the line containing the cursor will be highlighted in file " "comparisons." @@ -226,22 +234,22 @@ msgstr "" "Se verdadeiro, a linha contendo o cursor será destacada nas comparações de " "arquivos." -#: ../data/org.gnome.meld.gschema.xml.h:25 +#: ../data/org.gnome.meld.gschema.xml.h:27 msgid "Use the system default monospace font" msgstr "Usa a fonte mono-espaçada padrão do sistema" -#: ../data/org.gnome.meld.gschema.xml.h:26 +#: ../data/org.gnome.meld.gschema.xml.h:28 msgid "" "If false, custom-font will be used instead of the system monospace font." msgstr "" "Se falso, a fonte personalizada será usada ao invés da fonte monoespaçada do " "sistema." -#: ../data/org.gnome.meld.gschema.xml.h:27 +#: ../data/org.gnome.meld.gschema.xml.h:29 msgid "Custom font" msgstr "Fonte personalizada" -#: ../data/org.gnome.meld.gschema.xml.h:28 +#: ../data/org.gnome.meld.gschema.xml.h:30 msgid "" "The custom font to use, stored as a string and parsed as a Pango font " "description." @@ -249,22 +257,22 @@ msgstr "" "A fonte personalizada para usar, armazenada como um texto e interpretada " "como uma descrição de fonte Pango." -#: ../data/org.gnome.meld.gschema.xml.h:29 +#: ../data/org.gnome.meld.gschema.xml.h:31 msgid "Ignore blank lines when comparing files" msgstr "Ignorar linhas vazias ao comparar arquivos" -#: ../data/org.gnome.meld.gschema.xml.h:30 +#: ../data/org.gnome.meld.gschema.xml.h:32 msgid "" "If true, blank lines will be trimmed when highlighting changes between files." msgstr "" "Se verdadeiro, linhas vazias serão aparadas ao destacar alterações entre " "arquivos." -#: ../data/org.gnome.meld.gschema.xml.h:31 +#: ../data/org.gnome.meld.gschema.xml.h:33 msgid "Use the system default editor" msgstr "Usar o editor padrão do sistema" -#: ../data/org.gnome.meld.gschema.xml.h:32 +#: ../data/org.gnome.meld.gschema.xml.h:34 msgid "" "If false, custom-editor-command will be used instead of the system editor " "when opening files externally." @@ -272,11 +280,11 @@ msgstr "" "Se falso, o comando de editor personalizado será usado ao invés do editor do " "sistema ao abrir arquivos externamente." -#: ../data/org.gnome.meld.gschema.xml.h:33 +#: ../data/org.gnome.meld.gschema.xml.h:35 msgid "The custom editor launch command" msgstr "O comando para iniciar o editor personalizado" -#: ../data/org.gnome.meld.gschema.xml.h:34 +#: ../data/org.gnome.meld.gschema.xml.h:36 msgid "" "The command used to launch a custom editor. Some limited templating is " "supported here; at the moment '{file}' and '{line}' are recognised tokens." @@ -285,11 +293,11 @@ msgstr "" "limitados têm suporte aqui; no momento \"{file}\" e \"{line}\" são tokens " "reconhecidos." -#: ../data/org.gnome.meld.gschema.xml.h:35 +#: ../data/org.gnome.meld.gschema.xml.h:37 msgid "Columns to display" msgstr "Coluna para exibir" -#: ../data/org.gnome.meld.gschema.xml.h:36 +#: ../data/org.gnome.meld.gschema.xml.h:38 msgid "" "List of column names in folder comparison and whether they should be " "displayed." @@ -297,11 +305,11 @@ msgstr "" "Lista de nomes de colunas na comparação de diretórios e se eles deveriam ser " "exibidos." -#: ../data/org.gnome.meld.gschema.xml.h:37 ../data/ui/preferences.ui.h:32 +#: ../data/org.gnome.meld.gschema.xml.h:39 ../data/ui/preferences.ui.h:32 msgid "Ignore symbolic links" msgstr "Ignorar ligações simbólicas" -#: ../data/org.gnome.meld.gschema.xml.h:38 +#: ../data/org.gnome.meld.gschema.xml.h:40 msgid "" "If true, folder comparisons do not follow symbolic links when traversing the " "folder tree." @@ -309,11 +317,11 @@ msgstr "" "Se verdadeiro, comparações de pastas não seguirão ligações simbólicas ao " "atravessar a árvore de pastas." -#: ../data/org.gnome.meld.gschema.xml.h:39 +#: ../data/org.gnome.meld.gschema.xml.h:41 msgid "Use shallow comparison" msgstr "Usa comparação superficial" -#: ../data/org.gnome.meld.gschema.xml.h:40 +#: ../data/org.gnome.meld.gschema.xml.h:42 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 " @@ -323,11 +331,11 @@ msgstr "" "tamanho e mtime, considerando arquivos como sendo idênticos se seu tamanho e " "mtime corresponderem; do contrário, diferentes." -#: ../data/org.gnome.meld.gschema.xml.h:41 +#: ../data/org.gnome.meld.gschema.xml.h:43 msgid "File timestamp resolution" msgstr "Resolução da marca de tempo de arquivo" -#: ../data/org.gnome.meld.gschema.xml.h:42 +#: ../data/org.gnome.meld.gschema.xml.h:44 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 " @@ -339,11 +347,11 @@ msgstr "" "mtimes diferentes. Isso é útil quando se está comparando arquivos entre " "sistemas de arquivos com diferentes resolução de marca de tempo." -#: ../data/org.gnome.meld.gschema.xml.h:43 ../data/ui/preferences.ui.h:30 +#: ../data/org.gnome.meld.gschema.xml.h:45 ../data/ui/preferences.ui.h:30 msgid "Apply text filters during folder comparisons" msgstr "Aplicar filtros de texto durante comparação de pastas" -#: ../data/org.gnome.meld.gschema.xml.h:44 +#: ../data/org.gnome.meld.gschema.xml.h:46 msgid "" "If true, folder comparisons that compare file contents also apply active " "text filters and the blank line trimming option, and ignore newline " @@ -353,21 +361,21 @@ msgstr "" "também se aplicarão a filtros de texto ativos e à opção de aparar linhas " "vazias, e ignorar diferenças de nova linha." -#: ../data/org.gnome.meld.gschema.xml.h:45 +#: ../data/org.gnome.meld.gschema.xml.h:47 msgid "File status filters" msgstr "Filtros de status de arquivo" -#: ../data/org.gnome.meld.gschema.xml.h:46 +#: ../data/org.gnome.meld.gschema.xml.h:48 msgid "List of statuses used to filter visible files in folder comparison." msgstr "" "Lista de status usados para filtrar arquivos visíveis na comparação de " "pastas." -#: ../data/org.gnome.meld.gschema.xml.h:47 +#: ../data/org.gnome.meld.gschema.xml.h:49 msgid "Show the version control console output" msgstr "Mostra a saída de console de controle de versão" -#: ../data/org.gnome.meld.gschema.xml.h:48 +#: ../data/org.gnome.meld.gschema.xml.h:50 msgid "" "If true, a console output section will be shown in version control views, " "showing the commands run for version control operations." @@ -376,11 +384,11 @@ msgstr "" "controle de versão, mostrando os comandos executados para operações de " "controle de versão." -#: ../data/org.gnome.meld.gschema.xml.h:49 +#: ../data/org.gnome.meld.gschema.xml.h:51 msgid "Version control pane position" msgstr "Posição do painel de controle de versão" -#: ../data/org.gnome.meld.gschema.xml.h:50 +#: ../data/org.gnome.meld.gschema.xml.h:52 msgid "" "This is the height of the main version control tree when the console pane is " "shown." @@ -388,11 +396,11 @@ msgstr "" "Essa é a altura da árvore principal de controle de versão quando o painel de " "console é mostrado." -#: ../data/org.gnome.meld.gschema.xml.h:51 +#: ../data/org.gnome.meld.gschema.xml.h:53 msgid "Present version comparisons as left-local/right-remote" msgstr "Apresenta comparações de versão como esquerda-local/direita-remoto" -#: ../data/org.gnome.meld.gschema.xml.h:52 +#: ../data/org.gnome.meld.gschema.xml.h:54 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, " @@ -403,11 +411,11 @@ msgstr "" "apresentados arquivos nos painéis. Do contrário, um esquema esquerda-é-deles " "e direita-é-meu é usado." -#: ../data/org.gnome.meld.gschema.xml.h:53 +#: ../data/org.gnome.meld.gschema.xml.h:55 msgid "Order for files in three-way version control merge comparisons" msgstr "Ordena por arquivos em comparações de controle de versão em três-vias" -#: ../data/org.gnome.meld.gschema.xml.h:54 +#: ../data/org.gnome.meld.gschema.xml.h:56 msgid "" "Choices for file order are remote/merged/local and local/merged/remote. This " "preference only affects three-way comparisons launched from the version " @@ -418,11 +426,11 @@ msgstr "" "visão de controle de versão, de forma que seja usado apenas para resolução " "de conflitos/mesclagem dentro do Meld." -#: ../data/org.gnome.meld.gschema.xml.h:55 +#: ../data/org.gnome.meld.gschema.xml.h:57 msgid "Show margin in commit message editor" msgstr "Mostrae margem no editor de mensagens de commit" -#: ../data/org.gnome.meld.gschema.xml.h:56 +#: ../data/org.gnome.meld.gschema.xml.h:58 msgid "" "If true, a guide will be displayed to show what column the margin is at in " "the version control commit message editor." @@ -430,11 +438,11 @@ msgstr "" "Se verdadeiro, um guia será exibido para mostrar em qual coluna a margem " "está no editor de mensagens de commit de controle de versão." -#: ../data/org.gnome.meld.gschema.xml.h:57 +#: ../data/org.gnome.meld.gschema.xml.h:59 msgid "Margin column in commit message editor" msgstr "Coluna margem no editor de mensagens de commit" -#: ../data/org.gnome.meld.gschema.xml.h:58 +#: ../data/org.gnome.meld.gschema.xml.h:60 msgid "" "The column at which to show the margin in the version control commit message " "editor." @@ -442,11 +450,11 @@ msgstr "" "A coluna na qual deve ser mostrada a margem do editor de mensagens de commit " "de controle de versão." -#: ../data/org.gnome.meld.gschema.xml.h:59 +#: ../data/org.gnome.meld.gschema.xml.h:61 msgid "Automatically hard-wrap commit messages" msgstr "Inserir quebra de linha automaticamente em mensagens de commit" -#: ../data/org.gnome.meld.gschema.xml.h:60 +#: ../data/org.gnome.meld.gschema.xml.h:62 msgid "" "If true, the version control commit message editor will hard-wrap (i.e., " "insert line breaks) at the commit margin before commit." @@ -454,22 +462,22 @@ msgstr "" "Se verdadeiro, o editor de mensagens de commit de controle de versão vai " "inserir quebra de linha na margem de commit antes de fazer o commit." -#: ../data/org.gnome.meld.gschema.xml.h:61 +#: ../data/org.gnome.meld.gschema.xml.h:63 msgid "Version control status filters" msgstr "Filtros de status de controle de versão" -#: ../data/org.gnome.meld.gschema.xml.h:62 +#: ../data/org.gnome.meld.gschema.xml.h:64 msgid "" "List of statuses used to filter visible files in version control comparison." msgstr "" "Lista de status usados para filtrar arquivos visíveis me comparação de " "controle de versão." -#: ../data/org.gnome.meld.gschema.xml.h:63 +#: ../data/org.gnome.meld.gschema.xml.h:65 msgid "Filename-based filters" msgstr "Filtros baseados em nome de arquivo" -#: ../data/org.gnome.meld.gschema.xml.h:64 +#: ../data/org.gnome.meld.gschema.xml.h:66 msgid "" "List of predefined filename-based filters that, if active, will remove " "matching files from a folder comparison." @@ -477,11 +485,11 @@ msgstr "" "Lista de filtros pré-determinados baseados em nome de arquivo que, se ativa, " "vai remover arquivos correspondentes de uma comparação de pastas." -#: ../data/org.gnome.meld.gschema.xml.h:65 +#: ../data/org.gnome.meld.gschema.xml.h:67 msgid "Text-based filters" msgstr "Filtros baseados em texto" -#: ../data/org.gnome.meld.gschema.xml.h:66 +#: ../data/org.gnome.meld.gschema.xml.h:68 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, " @@ -584,7 +592,7 @@ msgstr "Copia para a direita" msgid "Delete selected" msgstr "Exclui os selecionados" -#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:860 ../meld/filediff.py:1368 +#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:858 ../meld/filediff.py:1382 msgid "Hide" msgstr "Ocultar" @@ -618,7 +626,7 @@ msgstr "Novos" msgid "Show new" msgstr "Mostra os novos" -#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:74 +#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:76 msgid "Modified" msgstr "Modificados" @@ -651,7 +659,7 @@ msgid "_Add" msgstr "_Adicionar" #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11 -#: ../meld/vcview.py:655 +#: ../meld/vcview.py:644 msgid "_Remove" msgstr "_Remover" @@ -673,7 +681,7 @@ msgstr "Mover para _baixo" #. Create icon and filename CellRenderer #: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35 -#: ../meld/dirdiff.py:374 +#: ../meld/dirdiff.py:373 msgid "Name" msgstr "Nome" @@ -874,8 +882,8 @@ msgstr "Se você não salvar, as mudanças serão perdidas permanentemente." msgid "Close _without Saving" msgstr "_Fechar sem salvar" -#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:942 ../meld/filediff.py:1434 -#: ../meld/filediff.py:1502 +#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:940 ../meld/filediff.py:1448 +#: ../meld/filediff.py:1520 msgid "_Cancel" msgstr "_Cancelar" @@ -913,7 +921,7 @@ msgid "Changes made to the following documents will be permanently lost:\n" msgstr "" "Mudanças feitas nos seguintes documentos serão perdidas permanentemente:\n" -#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:943 ../meld/filediff.py:1435 +#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:941 ../meld/filediff.py:1449 msgid "_Replace" msgstr "_Substituir" @@ -961,7 +969,7 @@ msgstr "Formatar como patch" msgid "Copy to Clipboard" msgstr "Copiar para a área de transferência" -#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:160 +#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:155 msgid "Save Patch" msgstr "Salvar patch" @@ -1430,7 +1438,8 @@ msgctxt "shortcut window" msgid "Show/hide console output" msgstr "Mostrar/ocultar saída de console" -#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:668 +#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:559 +#: ../meld/newdifftab.py:38 msgid "New comparison" msgstr "Nova comparação" @@ -1578,7 +1587,7 @@ msgstr "Sem controle de _versão" msgid "Show unversioned files" msgstr "Mostra os arquivos sem controle de versão" -#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:67 +#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69 msgid "Ignored" msgstr "Ignorado" @@ -1606,7 +1615,7 @@ msgstr "Logs anteriores:" msgid "Co_mmit" msgstr "Sub_meter" -#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:343 +#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:332 msgid "Location" msgstr "Localização" @@ -1649,44 +1658,44 @@ msgid "Mac OS (CR)" msgstr "Mac OS (CR)" #. Create file size CellRenderer -#: ../meld/dirdiff.py:392 ../meld/preferences.py:82 +#: ../meld/dirdiff.py:391 ../meld/preferences.py:82 msgid "Size" msgstr "Tamanho" #. Create date-time CellRenderer -#: ../meld/dirdiff.py:400 ../meld/preferences.py:83 +#: ../meld/dirdiff.py:399 ../meld/preferences.py:83 msgid "Modification time" msgstr "Hora da modificação" #. Create permissions CellRenderer -#: ../meld/dirdiff.py:408 ../meld/preferences.py:84 +#: ../meld/dirdiff.py:407 ../meld/preferences.py:84 msgid "Permissions" msgstr "Permissões" -#: ../meld/dirdiff.py:538 +#: ../meld/dirdiff.py:537 #, python-format msgid "Hide %s" msgstr "Ocultar %s" -#: ../meld/dirdiff.py:670 ../meld/dirdiff.py:694 +#: ../meld/dirdiff.py:669 ../meld/dirdiff.py:693 #, python-format msgid "[%s] Scanning %s" msgstr "[%s] Varrendo %s" -#: ../meld/dirdiff.py:827 +#: ../meld/dirdiff.py:825 #, python-format msgid "[%s] Done" msgstr "[%s] Concluído" -#: ../meld/dirdiff.py:835 +#: ../meld/dirdiff.py:833 msgid "Folders have no differences" msgstr "As pastas têm nenhuma diferença" -#: ../meld/dirdiff.py:837 +#: ../meld/dirdiff.py:835 msgid "Contents of scanned files in folders are identical." msgstr "Conteúdos de arquivos verificados em pastas são idênticos." -#: ../meld/dirdiff.py:839 +#: ../meld/dirdiff.py:837 msgid "" "Scanned files in folders appear identical, but contents have not been " "scanned." @@ -1694,44 +1703,44 @@ msgstr "" "Arquivos verificados em pastas parecem ser idênticos, mas conteúdos não " "foram verificados." -#: ../meld/dirdiff.py:842 +#: ../meld/dirdiff.py:840 msgid "File filters are in use, so not all files have been scanned." msgstr "" "Filtros de arquivo estão em uso, portanto nem todos os arquivos foram " "verificados." -#: ../meld/dirdiff.py:844 +#: ../meld/dirdiff.py:842 msgid "Text filters are in use and may be masking content differences." msgstr "" "Filtros de texto estão sendo usados e podem estar escondendo diferenças no " "conteúdo." -#: ../meld/dirdiff.py:862 ../meld/filediff.py:1370 ../meld/filediff.py:1400 -#: ../meld/filediff.py:1402 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 +#: ../meld/dirdiff.py:860 ../meld/filediff.py:1384 ../meld/filediff.py:1414 +#: ../meld/filediff.py:1416 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 msgid "Hi_de" msgstr "Ocu_ltar" -#: ../meld/dirdiff.py:872 +#: ../meld/dirdiff.py:870 msgid "Multiple errors occurred while scanning this folder" msgstr "Ocorreram vários erros ao varrer este diretório" -#: ../meld/dirdiff.py:873 +#: ../meld/dirdiff.py:871 msgid "Files with invalid encodings found" msgstr "Arquivos com codificações inválidas encontrados" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:875 +#: ../meld/dirdiff.py:873 msgid "Some files were in an incorrect encoding. The names are something like:" msgstr "" "Alguns arquivos estavam com uma codificação incorreta. Os nomes são algo " "como:" -#: ../meld/dirdiff.py:877 +#: ../meld/dirdiff.py:875 msgid "Files hidden by case insensitive comparison" msgstr "Arquivos ocultos pela comparação não sensível a maiusculização" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:879 +#: ../meld/dirdiff.py:877 msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. The following files in this folder are hidden:" @@ -1740,17 +1749,17 @@ msgstr "" "minúsculas em um sistema de arquivos que diferencia. Os seguintes arquivos " "neste diretório ficam ocultos:" -#: ../meld/dirdiff.py:890 +#: ../meld/dirdiff.py:888 #, python-format msgid "'%s' hidden by '%s'" msgstr "\"%s\" ocultado por \"%s\"" -#: ../meld/dirdiff.py:946 +#: ../meld/dirdiff.py:944 #, python-format msgid "Replace folder “%s”?" msgstr "Substituir pasta \"%s\"?" -#: ../meld/dirdiff.py:948 +#: ../meld/dirdiff.py:946 #, python-format msgid "" "Another folder with the same name already exists in “%s”.\n" @@ -1759,11 +1768,11 @@ msgstr "" "Uma outra pasta com o mesmo nome já existe em \"%s\".\n" "Se você substituir a pasta existente, todos os arquivos nela serão perdidos." -#: ../meld/dirdiff.py:961 +#: ../meld/dirdiff.py:959 msgid "Error copying file" msgstr "Erro ao copiar arquivo" -#: ../meld/dirdiff.py:962 +#: ../meld/dirdiff.py:960 #, python-format msgid "" "Couldn't copy %s\n" @@ -1776,35 +1785,35 @@ msgstr "" "\n" "%s" -#: ../meld/dirdiff.py:985 +#: ../meld/dirdiff.py:983 #, python-format msgid "Error deleting %s" msgstr "Erro ao excluir %s" -#: ../meld/dirdiff.py:1492 +#: ../meld/dirdiff.py:1488 msgid "No folder" msgstr "Nenhum pasta" #. Abbreviations for insert and overwrite that fit in the status bar -#: ../meld/filediff.py:357 +#: ../meld/filediff.py:355 msgid "INS" msgstr "INS" -#: ../meld/filediff.py:357 +#: ../meld/filediff.py:355 msgid "OVR" msgstr "SBR" #. Abbreviation for line, column so that it will fit in the status bar -#: ../meld/filediff.py:359 +#: ../meld/filediff.py:357 #, python-format msgid "Ln %i, Col %i" msgstr "Lin %i, Col %i" -#: ../meld/filediff.py:771 +#: ../meld/filediff.py:782 msgid "Comparison results will be inaccurate" msgstr "Resultados da comparação será imprecisa" -#: ../meld/filediff.py:773 +#: ../meld/filediff.py:784 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1812,66 +1821,66 @@ 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:831 +#: ../meld/filediff.py:840 msgid "Mark conflict as resolved?" msgstr "Marcar como resolvido?" -#: ../meld/filediff.py:833 +#: ../meld/filediff.py:842 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:835 +#: ../meld/filediff.py:844 msgid "Cancel" msgstr "Cancelar" -#: ../meld/filediff.py:836 +#: ../meld/filediff.py:845 msgid "Mark _Resolved" msgstr "Marcar como _resolvido" -#: ../meld/filediff.py:1086 +#: ../meld/filediff.py:1093 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Ocorreu um problema ao abrir o arquivo \"%s\"." -#: ../meld/filediff.py:1094 +#: ../meld/filediff.py:1101 #, python-format msgid "File %s appears to be a binary file." msgstr "O arquivo %s parece ser um arquivo binário." -#: ../meld/filediff.py:1096 +#: ../meld/filediff.py:1103 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:1098 +#: ../meld/filediff.py:1105 msgid "Open" msgstr "Abrir" -#: ../meld/filediff.py:1114 +#: ../meld/filediff.py:1121 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Analisando diferenças" -#: ../meld/filediff.py:1179 +#: ../meld/filediff.py:1186 #, python-format msgid "File %s has changed on disk" msgstr "O arquivo %s foi alterado em disco" -#: ../meld/filediff.py:1180 +#: ../meld/filediff.py:1187 msgid "Do you want to reload the file?" msgstr "Deseja recarregar o arquivo?" -#: ../meld/filediff.py:1182 +#: ../meld/filediff.py:1189 msgid "_Reload" msgstr "_Recarregar" -#: ../meld/filediff.py:1333 +#: ../meld/filediff.py:1347 msgid "Files are identical" msgstr "Os arquivos são idênticos" -#: ../meld/filediff.py:1346 +#: ../meld/filediff.py:1360 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1879,11 +1888,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:1351 +#: ../meld/filediff.py:1365 msgid "Files differ in line endings only" msgstr "Arquivos se diferenciam nos fins de linha apenas" -#: ../meld/filediff.py:1353 +#: ../meld/filediff.py:1367 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1892,15 +1901,15 @@ msgstr "" "Arquivos são idênticos, exceto pela diferença entre fins de linha:\n" "%s" -#: ../meld/filediff.py:1373 +#: ../meld/filediff.py:1387 msgid "Show without filters" msgstr "Mostrar sem filtros" -#: ../meld/filediff.py:1395 +#: ../meld/filediff.py:1409 msgid "Change highlighting incomplete" msgstr "Alteração de destaque incompleta" -#: ../meld/filediff.py:1396 +#: ../meld/filediff.py:1410 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." @@ -1909,20 +1918,20 @@ 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:1404 +#: ../meld/filediff.py:1418 msgid "Keep highlighting" msgstr "Manter destaque" -#: ../meld/filediff.py:1406 +#: ../meld/filediff.py:1420 msgid "_Keep highlighting" msgstr "_Manter destaque" -#: ../meld/filediff.py:1438 +#: ../meld/filediff.py:1452 #, python-format msgid "Replace file “%s”?" msgstr "Substituir arquivo \"%s\"?" -#: ../meld/filediff.py:1440 +#: ../meld/filediff.py:1454 #, python-format msgid "" "A file with this name already exists in “%s”.\n" @@ -1931,45 +1940,45 @@ msgstr "" "Um arquivo com esse nome já existe em \"%s\".\n" "Se você substituir o arquivo existente, seu conteúdo será perdido." -#: ../meld/filediff.py:1457 +#: ../meld/filediff.py:1471 msgid "Save Left Pane As" msgstr "Salvar o painel esquerdo como" -#: ../meld/filediff.py:1459 +#: ../meld/filediff.py:1473 msgid "Save Middle Pane As" msgstr "Salvar o painel do meio como" -#: ../meld/filediff.py:1461 +#: ../meld/filediff.py:1475 msgid "Save Right Pane As" msgstr "Salvar o painel direito como" -#: ../meld/filediff.py:1475 +#: ../meld/filediff.py:1489 #, 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:1477 +#: ../meld/filediff.py:1491 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:1480 +#: ../meld/filediff.py:1494 msgid "Save Anyway" msgstr "Salvar mesmo assim" -#: ../meld/filediff.py:1481 +#: ../meld/filediff.py:1495 msgid "Don't Save" msgstr "Não salvar" -#: ../meld/filediff.py:1503 +#: ../meld/filediff.py:1521 msgid "_Save as UTF-8" msgstr "_Salvar como UTF-8" -#: ../meld/filediff.py:1506 +#: ../meld/filediff.py:1524 #, python-format msgid "Couldn't encode text as “%s”" msgstr "Não foi possível codificar o texto como \"%s\"" -#: ../meld/filediff.py:1508 +#: ../meld/filediff.py:1526 #, python-format msgid "" "File “%s” contains characters that can't be encoded using encoding “%s”.\n" @@ -1979,12 +1988,12 @@ msgstr "" "codificação \"%s\"\n" "Você gostaria de salvar como UTF-8?" -#: ../meld/filediff.py:1545 ../meld/patchdialog.py:136 +#: ../meld/filediff.py:1566 ../meld/patchdialog.py:131 #, python-format msgid "Could not save file %s." msgstr "Não foi possível salvar o arquivo %s." -#: ../meld/filediff.py:1546 ../meld/patchdialog.py:137 +#: ../meld/filediff.py:1567 ../meld/patchdialog.py:132 #, python-format msgid "" "Couldn't save file due to:\n" @@ -1993,11 +2002,11 @@ msgstr "" "Não foi possível salvar o arquivo pois:\n" "%s" -#: ../meld/filediff.py:1892 +#: ../meld/filediff.py:1913 msgid "Live comparison updating disabled" msgstr "Atualização em tempo real de comparação desabilitada" -#: ../meld/filediff.py:1893 +#: ../meld/filediff.py:1914 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -2021,103 +2030,103 @@ msgstr "Copiar para ci_ma" msgid "Copy _down" msgstr "Copiar para bai_xo" -#: ../meld/meldapp.py:177 +#: ../meld/meldapp.py:175 msgid "wrong number of arguments supplied to --diff" msgstr "número incorreto de argumentos fornecidos para --diff" -#: ../meld/meldapp.py:182 +#: ../meld/meldapp.py:180 msgid "Start with an empty window" msgstr "Iniciar com a janela vazia" -#: ../meld/meldapp.py:183 ../meld/meldapp.py:185 +#: ../meld/meldapp.py:181 ../meld/meldapp.py:183 msgid "file" msgstr "arquivo" -#: ../meld/meldapp.py:183 ../meld/meldapp.py:187 +#: ../meld/meldapp.py:181 ../meld/meldapp.py:185 msgid "folder" msgstr "pasta" -#: ../meld/meldapp.py:184 +#: ../meld/meldapp.py:182 msgid "Start a version control comparison" msgstr "Inicia uma comparação de controle de versão" -#: ../meld/meldapp.py:186 +#: ../meld/meldapp.py:184 msgid "Start a 2- or 3-way file comparison" msgstr "Inicia uma comparação de arquivo em 2 ou 3 vias" -#: ../meld/meldapp.py:188 +#: ../meld/meldapp.py:186 msgid "Start a 2- or 3-way folder comparison" msgstr "Inicia uma comparação de pasta em 2 ou 3 vias" -#: ../meld/meldapp.py:231 +#: ../meld/meldapp.py:229 #, python-format msgid "Error: %s\n" msgstr "Erro: %s\n" -#: ../meld/meldapp.py:238 +#: ../meld/meldapp.py:236 msgid "Meld is a file and directory comparison tool." msgstr "O Meld é uma ferramenta de comparação de arquivos e diretórios." -#: ../meld/meldapp.py:242 +#: ../meld/meldapp.py:240 msgid "Set label to use instead of file name" msgstr "Definir rótulo para usar no lugar do nome do arquivo" -#: ../meld/meldapp.py:245 +#: ../meld/meldapp.py:243 msgid "Open a new tab in an already running instance" msgstr "Abrir em uma nova aba de uma instância existente" -#: ../meld/meldapp.py:248 +#: ../meld/meldapp.py:246 msgid "Automatically compare all differing files on startup" msgstr "Compara automaticamente todos os arquivos diferentes na inicialização" -#: ../meld/meldapp.py:251 +#: ../meld/meldapp.py:249 msgid "Ignored for compatibility" msgstr "Ignorado por questão de compatibilidade" -#: ../meld/meldapp.py:255 +#: ../meld/meldapp.py:253 msgid "Set the target file for saving a merge result" msgstr "Define o arquivo destino para salvar um resultado de mesclagem" -#: ../meld/meldapp.py:258 +#: ../meld/meldapp.py:256 msgid "Automatically merge files" msgstr "Mescla arquivos automaticamente" -#: ../meld/meldapp.py:262 +#: ../meld/meldapp.py:260 msgid "Load a saved comparison from a Meld comparison file" msgstr "Carrega uma comparação salva de um arquivo de comparação" -#: ../meld/meldapp.py:266 +#: ../meld/meldapp.py:264 msgid "Create a diff tab for the supplied files or folders" msgstr "Cria uma aba de diff para os arquivos e pastas fornecidos" -#: ../meld/meldapp.py:286 +#: ../meld/meldapp.py:284 #, python-format msgid "too many arguments (wanted 0-3, got %d)" msgstr "muitos argumentos (esperava 0-3, obteve %d)" -#: ../meld/meldapp.py:289 +#: ../meld/meldapp.py:287 msgid "can't auto-merge less than 3 files" msgstr "não é possível mesclar automaticamente menos que 3 arquivos" -#: ../meld/meldapp.py:291 +#: ../meld/meldapp.py:289 msgid "can't auto-merge directories" msgstr "não é possível mesclar diretórios automaticamente" -#: ../meld/meldapp.py:305 +#: ../meld/meldapp.py:303 msgid "Error reading saved comparison file" msgstr "Erro ao ler arquivo de comparação salvo" -#: ../meld/meldapp.py:332 +#: ../meld/meldapp.py:330 #, python-format msgid "invalid path or URI \"%s\"" msgstr "caminho inválido ou URI \"%s\"" #. TRANSLATORS: This is the label of a new, currently-unnamed file. -#: ../meld/meldbuffer.py:132 +#: ../meld/meldbuffer.py:131 msgid "" msgstr "" -#: ../meld/melddoc.py:83 ../meld/melddoc.py:84 +#: ../meld/melddoc.py:64 msgid "untitled" msgstr "sem título" @@ -2254,105 +2263,65 @@ msgstr "Interrompe a ação atual" msgid "Refresh the view" msgstr "Atualiza a visão" -#: ../meld/meldwindow.py:112 -msgid "_Tabs" -msgstr "A_bas" - #: ../meld/meldwindow.py:113 -msgid "_Previous Tab" -msgstr "Aba _anterior" - -#: ../meld/meldwindow.py:114 -msgid "Activate previous tab" -msgstr "Ativa a aba anterior" - -#: ../meld/meldwindow.py:116 -msgid "_Next Tab" -msgstr "Aba _seguinte" - -#: ../meld/meldwindow.py:117 -msgid "Activate next tab" -msgstr "Ativa a aba seguinte" - -#: ../meld/meldwindow.py:120 -msgid "Move Tab _Left" -msgstr "Mover aba para a _esquerda" - -#: ../meld/meldwindow.py:121 -msgid "Move current tab to left" -msgstr "Move a aba atual para a esquerda" - -#: ../meld/meldwindow.py:124 -msgid "Move Tab _Right" -msgstr "Mover aba para a _direita" - -#: ../meld/meldwindow.py:125 -msgid "Move current tab to right" -msgstr "Move a aba atual para a direita" - -#: ../meld/meldwindow.py:129 msgid "Fullscreen" msgstr "Tela cheia" -#: ../meld/meldwindow.py:130 +#: ../meld/meldwindow.py:114 msgid "View the comparison in fullscreen" msgstr "Visualiza a comparação em tela cheia" -#: ../meld/meldwindow.py:132 +#: ../meld/meldwindow.py:116 msgid "_Toolbar" msgstr "Barra de _ferramentas" -#: ../meld/meldwindow.py:133 +#: ../meld/meldwindow.py:117 msgid "Show or hide the toolbar" msgstr "Mostra ou oculta a barra de ferramentas" -#: ../meld/meldwindow.py:143 +#: ../meld/meldwindow.py:127 msgid "Open Recent" msgstr "Abrir recente" -#: ../meld/meldwindow.py:144 +#: ../meld/meldwindow.py:128 msgid "Open recent files" msgstr "Abre arquivos recentes" -#: ../meld/meldwindow.py:166 +#: ../meld/meldwindow.py:150 msgid "_Meld" msgstr "_Meld" -#: ../meld/meldwindow.py:167 +#: ../meld/meldwindow.py:151 msgid "Quit the program" msgstr "Sai do programa" -#: ../meld/meldwindow.py:169 +#: ../meld/meldwindow.py:153 msgid "Prefere_nces" msgstr "Preferê_ncias" -#: ../meld/meldwindow.py:170 +#: ../meld/meldwindow.py:154 msgid "Configure the application" msgstr "Configura o aplicativo" -#: ../meld/meldwindow.py:172 +#: ../meld/meldwindow.py:156 msgid "_Contents" msgstr "S_umário" -#: ../meld/meldwindow.py:173 +#: ../meld/meldwindow.py:157 msgid "Open the Meld manual" msgstr "Abre o manual do Meld" -#: ../meld/meldwindow.py:175 +#: ../meld/meldwindow.py:159 msgid "About this application" msgstr "Sobre esse aplicativo" -#: ../meld/meldwindow.py:587 -msgid "Switch to this tab" -msgstr "Alterna para esta aba" - -#: ../meld/meldwindow.py:702 +#: ../meld/meldwindow.py:593 #, python-format msgid "Need three files to auto-merge, got: %r" msgstr "" "É necessário ter três arquivos para mesclar automaticamente, obtive: %r" -#: ../meld/meldwindow.py:716 +#: ../meld/meldwindow.py:607 msgid "Cannot compare a mixture of files and directories" msgstr "Não foi possível comparar uma mistura de arquivos e diretórios" @@ -2364,7 +2333,7 @@ msgstr "" "uma instalação ruim" #. no common path. empty names get changed to "[None]" -#: ../meld/misc.py:288 +#: ../meld/misc.py:263 msgid "[None]" msgstr "[Nenhum]" @@ -2376,7 +2345,7 @@ msgstr "rótulo" msgid "pattern" msgstr "padrão" -#: ../meld/recent.py:115 +#: ../meld/recent.py:114 msgid "Version control:" msgstr "Controle de versão:" @@ -2384,43 +2353,43 @@ msgstr "Controle de versão:" msgid "Close tab" msgstr "Fechar aba" -#: ../meld/ui/vcdialogs.py:50 +#: ../meld/ui/vcdialogs.py:48 msgid "No files will be committed" msgstr "Nenhuma arquivo para submeter (commit)" #. Translators: First %s is replaced by translated "%d unpushed #. commits", second %s is replaced by translated "%d branches" -#: ../meld/vc/git.py:95 +#: ../meld/vc/git.py:94 #, python-format msgid "%s in %s" msgstr "%s em %s" #. Translators: These messages cover the case where there is #. only one branch, and are not part of another message. -#: ../meld/vc/git.py:96 ../meld/vc/git.py:103 +#: ../meld/vc/git.py:95 ../meld/vc/git.py:102 #, python-format msgid "%d unpushed commit" msgid_plural "%d unpushed commits" msgstr[0] "%d commit não enviado (push)" msgstr[1] "%d commits não enviados (push)" -#: ../meld/vc/git.py:98 +#: ../meld/vc/git.py:97 #, python-format msgid "%d branch" msgid_plural "%d branches" msgstr[0] "%d ramo" msgstr[1] "%d ramos" -#: ../meld/vc/git.py:352 +#: ../meld/vc/git.py:330 #, python-format msgid "Mode changed from %s to %s" msgstr "Modo modificado de %s para %s" -#: ../meld/vc/git.py:360 +#: ../meld/vc/git.py:338 msgid "Partially staged" msgstr "Apresentados (staged) parcialmente" -#: ../meld/vc/git.py:360 +#: ../meld/vc/git.py:338 msgid "Staged" msgstr "Apresentados (staged)" @@ -2430,140 +2399,140 @@ msgstr "Apresentados (staged)" msgid "None" msgstr "Nenhum" -#: ../meld/vc/svn.py:216 +#: ../meld/vc/svn.py:204 #, python-format msgid "Rev %s" msgstr "Rev %s" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Merged" msgstr "Mesclado" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Base" msgstr "Base" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Local" msgstr "Local" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Remote" msgstr "Remoto" -#: ../meld/vc/_vc.py:68 +#: ../meld/vc/_vc.py:70 msgid "Unversioned" msgstr "Sem controle de versão" -#: ../meld/vc/_vc.py:71 +#: ../meld/vc/_vc.py:73 msgid "Error" msgstr "Erro" -#: ../meld/vc/_vc.py:73 +#: ../meld/vc/_vc.py:75 msgid "Newly added" msgstr "Recém adcionado" -#: ../meld/vc/_vc.py:75 +#: ../meld/vc/_vc.py:77 msgid "Renamed" msgstr "Renomeado" -#: ../meld/vc/_vc.py:76 +#: ../meld/vc/_vc.py:78 msgid "Conflict" msgstr "Conflito" -#: ../meld/vc/_vc.py:77 +#: ../meld/vc/_vc.py:79 msgid "Removed" msgstr "Removido" -#: ../meld/vc/_vc.py:78 +#: ../meld/vc/_vc.py:80 msgid "Missing" msgstr "Faltando" -#: ../meld/vc/_vc.py:79 +#: ../meld/vc/_vc.py:81 msgid "Not present" msgstr "Não presente" #. Translators: This error message is shown when a version #. control binary isn't installed. -#: ../meld/vcview.py:261 +#: ../meld/vcview.py:251 #, python-format msgid "%(name)s (%(cmd)s not installed)" msgstr "%(name)s (%(cmd)s não instalado)" #. Translators: This error message is shown when a version #. controlled repository is invalid. -#: ../meld/vcview.py:265 +#: ../meld/vcview.py:255 #, python-format msgid "%(name)s (Invalid repository)" msgstr "%(name)s (Repositório inválido)" -#: ../meld/vcview.py:286 +#: ../meld/vcview.py:276 msgid "No valid version control system found in this folder" msgstr "Nenhum sistema de controle de versão válido localizado nesta pasta" -#: ../meld/vcview.py:288 +#: ../meld/vcview.py:278 msgid "Only one version control system found in this folder" msgstr "Apenas um sistema de controle de versão foi localizado nesta pasta" -#: ../meld/vcview.py:290 +#: ../meld/vcview.py:280 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:343 +#: ../meld/vcview.py:332 #, python-format msgid "%s: %s" msgstr "%s: %s" -#: ../meld/vcview.py:363 +#: ../meld/vcview.py:352 #, python-format msgid "Scanning %s" msgstr "Varrendo %s" -#: ../meld/vcview.py:402 +#: ../meld/vcview.py:391 msgid "(Empty)" msgstr "(Vazio)" -#: ../meld/vcview.py:446 +#: ../meld/vcview.py:435 #, python-format msgid "%s — local" msgstr "%s — local" -#: ../meld/vcview.py:447 +#: ../meld/vcview.py:436 #, python-format msgid "%s — remote" msgstr "%s — remoto" -#: ../meld/vcview.py:455 +#: ../meld/vcview.py:444 #, python-format msgid "%s (local, merge, remote)" msgstr "%s (local, mesclagem, remoto)" -#: ../meld/vcview.py:460 +#: ../meld/vcview.py:449 #, python-format msgid "%s (remote, merge, local)" msgstr "%s (remoto, mesclagem, local)" -#: ../meld/vcview.py:471 +#: ../meld/vcview.py:460 #, python-format msgid "%s — repository" msgstr "%s — repositório" -#: ../meld/vcview.py:477 +#: ../meld/vcview.py:466 #, python-format msgid "%s (working, repository)" msgstr "%s (em trabalho, repositório)" -#: ../meld/vcview.py:481 +#: ../meld/vcview.py:470 #, python-format msgid "%s (repository, working)" msgstr "%s (repositório, em trabalho)" -#: ../meld/vcview.py:649 +#: ../meld/vcview.py:638 msgid "Remove folder and all its files?" msgstr "Remover pasta e todos seus arquivos?" -#: ../meld/vcview.py:651 +#: ../meld/vcview.py:640 msgid "" "This will remove all selected files and folders, and all files within any " "selected folders, from version control." @@ -2571,15 +2540,48 @@ 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:676 +#: ../meld/vcview.py:665 #, python-format msgid "Error removing %s" msgstr "Erro ao remover %s" -#: ../meld/vcview.py:756 +#: ../meld/vcview.py:745 msgid "Clear" msgstr "Limpar" +#~ msgid "Meld does not support Python 3." +#~ msgstr "Meld não tem suporte a Python 3." + +#~ msgid "_Tabs" +#~ msgstr "A_bas" + +#~ msgid "_Previous Tab" +#~ msgstr "Aba _anterior" + +#~ msgid "Activate previous tab" +#~ msgstr "Ativa a aba anterior" + +#~ msgid "_Next Tab" +#~ msgstr "Aba _seguinte" + +#~ msgid "Activate next tab" +#~ msgstr "Ativa a aba seguinte" + +#~ msgid "Move Tab _Left" +#~ msgstr "Mover aba para a _esquerda" + +#~ msgid "Move current tab to left" +#~ msgstr "Move a aba atual para a esquerda" + +#~ msgid "Move Tab _Right" +#~ msgstr "Mover aba para a _direita" + +#~ msgid "Move current tab to right" +#~ msgstr "Move a aba atual para a direita" + +#~ msgid "Switch to this tab" +#~ msgstr "Alterna para esta aba" + #~ msgid "" #~ "These text encodings will be automatically used (in order) to try to " #~ "decode loaded text files." From 3da8da64d7c779f3fe5cb91fb3f4542a9df5a18d Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Mon, 3 Oct 2016 08:38:47 +1000 Subject: [PATCH 0068/1316] linkmap: Use GDK-Cairo API for a small performance boost --- meld/linkmap.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/meld/linkmap.py b/meld/linkmap.py index c86d7da5..63b7698b 100644 --- a/meld/linkmap.py +++ b/meld/linkmap.py @@ -17,6 +17,7 @@ import math +from gi.repository import Gdk from gi.repository import Gtk from meld.misc import get_common_theme @@ -115,16 +116,16 @@ def do_draw(self, context): x_steps[0], f1 - 0.5) context.close_path() - context.set_source_rgba(*self.fill_colors[c[0]]) + Gdk.cairo_set_source_rgba(context, self.fill_colors[c[0]]) context.fill_preserve() chunk_idx = self.filediff.linediffer.locate_chunk(left, c[1])[0] if chunk_idx == self.filediff.cursor.chunk: highlight = self.fill_colors['current-chunk-highlight'] - context.set_source_rgba(*highlight) + Gdk.cairo_set_source_rgba(context, highlight) context.fill_preserve() - context.set_source_rgba(*self.line_colors[c[0]]) + Gdk.cairo_set_source_rgba(context, self.line_colors[c[0]]) context.stroke() def do_scroll_event(self, event): From 715eaeb0c301ad04d7421de17ef69cbf009a973a Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Mon, 3 Oct 2016 08:39:09 +1000 Subject: [PATCH 0069/1316] linkmap: Don't re-clip the context; this is done for us already --- meld/linkmap.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/meld/linkmap.py b/meld/linkmap.py index 63b7698b..895d455a 100644 --- a/meld/linkmap.py +++ b/meld/linkmap.py @@ -60,13 +60,11 @@ def do_draw(self, context): clip_y = min(y_offset) - 1 clip_height = max(t.get_visible_rect().height for t in self.views) + 2 allocation = self.get_allocation() - context.rectangle(0, clip_y, allocation.width, clip_height) - context.clip() - context.set_line_width(1.0) stylecontext = self.get_style_context() Gtk.render_background( stylecontext, context, 0, clip_y, allocation.width, clip_height) + context.set_line_width(1.0) height = allocation.height visible = [self.views[0].get_line_num_for_y(pix_start[0]), From 84be0c04cedf0c620428ea7ba00d3ac7644f0d65 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sat, 8 Oct 2016 08:21:20 +1000 Subject: [PATCH 0070/1316] linkmap: Adjust bezier control points for a smoother appearance --- meld/linkmap.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meld/linkmap.py b/meld/linkmap.py index 895d455a..f7f7e637 100644 --- a/meld/linkmap.py +++ b/meld/linkmap.py @@ -74,7 +74,7 @@ def do_draw(self, context): wtotal = allocation.width # For bezier control points - x_steps = [-0.5, (1. / 3) * wtotal, (2. / 3) * wtotal, wtotal + 0.5] + x_steps = [-0.5, wtotal / 2, wtotal / 2, wtotal + 0.5] q_rad = math.pi / 2 left, right = self.view_indices From b85930069b4f281888723107818cbbe34322b4d2 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sat, 8 Oct 2016 10:21:20 +1000 Subject: [PATCH 0071/1316] gutterrendererchunk: Handle missing chunks for conflict indices --- meld/gutterrendererchunk.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meld/gutterrendererchunk.py b/meld/gutterrendererchunk.py index 7411e0fe..20855fe0 100644 --- a/meld/gutterrendererchunk.py +++ b/meld/gutterrendererchunk.py @@ -103,10 +103,12 @@ def query_chunks(self, start, end, state): line = start.get_line() chunk_index = self.linediffer.locate_chunk(self.from_pane, line)[0] + chunk = None if chunk_index is not None: chunk = self.linediffer.get_chunk( chunk_index, self.from_pane, self.to_pane) + if chunk is not None: if chunk[1] == chunk[2]: background_rgba = get_background_rgba(self) elif self.props.view.current_chunk_check(chunk): @@ -114,7 +116,6 @@ def query_chunks(self, start, end, state): else: background_rgba = self.fill_colors[chunk[0]] else: - chunk = None # TODO: Remove when fixed in upstream GTK+ background_rgba = get_background_rgba(self) self._chunk = chunk From ca7aeaff64406ba39eb45e4dd52844a0dea4ae28 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Sat, 8 Oct 2016 15:31:59 +0200 Subject: [PATCH 0072/1316] Updated French translation --- po/fr.po | 3024 ++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 2033 insertions(+), 991 deletions(-) diff --git a/po/fr.po b/po/fr.po index 12383adf..8848f62a 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,38 +1,50 @@ # French translation of Meld. -# Copyright (C) 2003-2012 Free Software Foundation, Inc. +# Copyright (C) 2003-2016 Free Software Foundation, Inc. # This file is distributed under the same license as the meld package. # # Stephen Kennedy , 2003. # Jonathan Ernst , 2006. -# Claude Paroz , 2006-2011. +# Claude Paroz , 2006-2016. # Robert-André Mauchin , 2007. # Bruno Brouard , 2009-2012. +# Jérôme Sirgue , 2014. +# Julien Hardelin , 2014, 2016. # msgid "" msgstr "" "Project-Id-Version: Meld HEAD\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=meld&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-04-30 14:40+0000\n" -"PO-Revision-Date: 2012-04-15 16:49+0200\n" -"Last-Translator: Bruno Brouard \n" +"POT-Creation-Date: 2016-10-08 00:22+0000\n" +"PO-Revision-Date: 2016-10-08 15:31+0200\n" +"Last-Translator: Claude Paroz \n" "Language-Team: GNOME French Team \n" "Language: fr\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" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: ../bin/meld:103 +#: ../bin/meld:142 msgid "Cannot import: " msgstr "Impossible d'importer : " -#: ../bin/meld:106 +#: ../bin/meld:145 #, c-format msgid "Meld requires %s or higher." msgstr "Meld nécessite %s ou supérieur." -#: ../data/meld.desktop.in.h:1 ../data/ui/meldapp.ui.h:1 +#: ../bin/meld:191 +#, c-format +msgid "" +"Couldn't load Meld-specific CSS (%s)\n" +"%s" +msgstr "" +"Impossible de charger une CSS spécifique de Meld (%s)\n" +"%s" + +#: ../data/meld.desktop.in.h:1 ../data/meld.appdata.xml.in.h:1 +#: ../data/ui/meldapp.ui.h:1 msgid "Meld" msgstr "Meld" @@ -44,10 +56,596 @@ msgstr "Visionneur de différences" msgid "Meld Diff Viewer" msgstr "Meld visionneur de différences" -#: ../data/meld.desktop.in.h:4 +#: ../data/meld.desktop.in.h:4 ../data/meld.appdata.xml.in.h:2 msgid "Compare and merge your files" msgstr "Comparer et fusionner des fichiers" +#. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! +#: ../data/meld.desktop.in.h:6 +msgid "diff;merge;" +msgstr "diff;fusion;" + +#: ../data/meld.appdata.xml.in.h:3 +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 "" +"Meld est un visionneur de différences et un outil de fusion destiné à des " +"développeurs. Il aide à comparer des fichiers, des dossiers et des projets " +"dépendants d'un gestionnaire de version. Il permet des comparaisons de 2 ou 3 " +"fichiers ou dossiers, et prend en charge de nombreux gestionnaires de version, " +"dont Git, Mercurial, Bazaar et Subversion." + +#: ../data/meld.appdata.xml.in.h:4 +msgid "" +"Meld helps you review code changes, understand patches, and makes enormous " +"merge conflicts slightly less painful." +msgstr "" +"Meld aide à réviser les modifications de code, à comprendre les correctifs " +"et permet de rendre d'énormes conflits de fusion un peu moins pénibles à " +"fusionner." + +#: ../data/meld.appdata.xml.in.h:5 +msgid "The GNOME Project" +msgstr "Le projet GNOME" + +#: ../data/mime/meld.xml.in.h:1 +msgid "Meld comparison description" +msgstr "Description de la comparaison Meld" + +#: ../data/org.gnome.meld.gschema.xml.h:1 +msgid "Default window width" +msgstr "Largeur par défaut de la fenêtre" + +#: ../data/org.gnome.meld.gschema.xml.h:2 +msgid "Default window height" +msgstr "Hauteur par défaut de la fenêtre" + +#: ../data/org.gnome.meld.gschema.xml.h:3 +msgid "Default window maximised state" +msgstr "État de maximisation par défaut de la fenêtre" + +#: ../data/org.gnome.meld.gschema.xml.h:4 +msgid "Default window fullscreen state" +msgstr "État de plein écran par défaut de la fenêtre" + +#: ../data/org.gnome.meld.gschema.xml.h:5 +msgid "Show toolbar" +msgstr "Afficher la barre d'outils" + +#: ../data/org.gnome.meld.gschema.xml.h:6 +msgid "If true, the window toolbar is visible." +msgstr "Si cette option est cochée, la barre d'outils est visible." + +#: ../data/org.gnome.meld.gschema.xml.h:7 +msgid "Show statusbar" +msgstr "Afficher la barre d'état" + +#: ../data/org.gnome.meld.gschema.xml.h:8 +msgid "If true, the window statusbar is visible." +msgstr "Si cette option est cochée, la barre d'état est visible." + +#: ../data/org.gnome.meld.gschema.xml.h:9 +msgid "Additional automatically detected text encodings" +msgstr "Supplément de codages de texte automatiquement détectés" + +#: ../data/org.gnome.meld.gschema.xml.h:10 +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 utilise ces codages de caractères pour tenter de décoder les fichiers " +"texte chargés avant d'essayer d'en utiliser d'autres. En plus des codages " +"de cette liste, UTF-8 et le codage de la langue actuelle par défaut " +"sont toujours utilisés ; d'autres codages peuvent être essayés, selon la " +"langue locale de l'utilisateur." + +#: ../data/org.gnome.meld.gschema.xml.h:11 +msgid "Width of an indentation step" +msgstr "Largeur d'un pas d'indentation" + +#: ../data/org.gnome.meld.gschema.xml.h:12 +msgid "The number of spaces to use for a single indent step" +msgstr "Nombre d'espaces à utiliser pour un pas d'indentation" + +#: ../data/org.gnome.meld.gschema.xml.h:13 +msgid "Whether to indent using spaces or tabs" +msgstr "Indique s'il faut utiliser des espaces ou des tabulations pour indenter" + +#: ../data/org.gnome.meld.gschema.xml.h:14 +msgid "If true, any new indentation will use spaces instead of tabs." +msgstr "" +"Si cette option est cochée, toute nouvelle indentation utilisera des espaces " +"au lieu de tabulations." + +#: ../data/org.gnome.meld.gschema.xml.h:15 +msgid "Show line numbers" +msgstr "Afficher les numéros de ligne" + +#: ../data/org.gnome.meld.gschema.xml.h:16 +msgid "If true, line numbers will be shown in the gutter of file comparisons." +msgstr "" +"Si cette option est cochée, les numéros de ligne s'afficheront dans la barre " +"centrale des comparaisons de fichiers." + +#: ../data/org.gnome.meld.gschema.xml.h:17 +msgid "Highlight syntax" +msgstr "Coloration syntaxique" + +#: ../data/org.gnome.meld.gschema.xml.h:18 +msgid "" +"Whether to highlight syntax in comparisons. Because of Meld's own color " +"highlighting, this is off by default." +msgstr "" +"Indique si la coloration syntaxique doit être activée dans les comparaisons. " +"En raison de la coloration propre à Meld, ceci est désactivé par défaut." + +#: ../data/org.gnome.meld.gschema.xml.h:19 +msgid "Color scheme to use for syntax highlighting" +msgstr "Jeu de couleurs à utiliser pour la coloration syntaxique" + +#: ../data/org.gnome.meld.gschema.xml.h:20 +msgid "Used by GtkSourceView to determine colors for syntax highlighting" +msgstr "" +"Utilisé par GtkSourceView pour définir les couleurs de la coloration " +"syntaxique" + +#: ../data/org.gnome.meld.gschema.xml.h:21 +msgid "Displayed whitespace" +msgstr "Afficher les espaces" + +#: ../data/org.gnome.meld.gschema.xml.h:22 +msgid "" +"Selector for individual whitespace character types to be shown. Possible " +"values are 'space', 'tab', 'newline' and 'nbsp'." +msgstr "" +"Sélecteur de caractère d'espace à afficher. Les choix possibles sont « space » " +"(espace), « tab », « newline » (retour à la ligne) et « nbsp » (espace " +"insécable)." + +#: ../data/org.gnome.meld.gschema.xml.h:23 +msgid "Wrap mode" +msgstr "Mode de retour à la ligne" + +#: ../data/org.gnome.meld.gschema.xml.h:24 +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 "" +"Les retours à la ligne dans les comparaisons de fichiers se font selon ce " +"choix : « none » (pas du tout), « char » (n'importe quel caractère) ou « word » " +"(seulement à la fin des mots)." + +#: ../data/org.gnome.meld.gschema.xml.h:25 +msgid "Highlight current line" +msgstr "Surligner la ligne actuelle" + +#: ../data/org.gnome.meld.gschema.xml.h:26 +msgid "" +"If true, the line containing the cursor will be highlighted in file " +"comparisons." +msgstr "" +"Si cette option est cochée, la ligne où le curseur se trouve sera " +"surlignée dans les comparaisons de fichiers." + +#: ../data/org.gnome.meld.gschema.xml.h:27 +msgid "Use the system default monospace font" +msgstr "Utiliser la police à chasse fixe du système" + +#: ../data/org.gnome.meld.gschema.xml.h:28 +msgid "" +"If false, custom-font will be used instead of the system monospace font." +msgstr "" +"Si cette option n'est pas cochée, la police personnalisée (« custom-font ») " +"sera utilisée au lieu de la police à chasse fixe du système." + +#: ../data/org.gnome.meld.gschema.xml.h:29 +msgid "Custom font" +msgstr "Police personnalisée" + +#: ../data/org.gnome.meld.gschema.xml.h:30 +msgid "" +"The custom font to use, stored as a string and parsed as a Pango font " +"description." +msgstr "" +"La police personnalisée à utiliser, sous la forme d'une chaîne de caractères " +"et analysée comme une description de police Pango." + +#: ../data/org.gnome.meld.gschema.xml.h:31 +msgid "Ignore blank lines when comparing files" +msgstr "Ignorer les lignes vides dans les comparaisons de fichiers." + +#: ../data/org.gnome.meld.gschema.xml.h:32 +msgid "" +"If true, blank lines will be trimmed when highlighting changes between files." +msgstr "" +"Si cette option est cochée, les lignes vides sont ignorées dans la mise en " +"évidence des changements entre fichiers." + +#: ../data/org.gnome.meld.gschema.xml.h:33 +msgid "Use the system default editor" +msgstr "Utiliser l'éditeur par défaut du système" + +#: ../data/org.gnome.meld.gschema.xml.h:34 +msgid "" +"If false, custom-editor-command will be used instead of the system editor " +"when opening files externally." +msgstr "" +"Si cette option n'est pas cochée, l'éditeur personnalisé " +"(« custom-editor-command ») sera utilisé à la place de l'éditeur par défaut " +"du système lors de l'ouverture de fichiers en dehors de Meld." + +#: ../data/org.gnome.meld.gschema.xml.h:35 +msgid "The custom editor launch command" +msgstr "Commande de lancement de l'éditeur personnalisé" + +#: ../data/org.gnome.meld.gschema.xml.h:36 +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 "" +"La commande utilisée pour lancer un éditeur personnalisé. L'utilisation de " +"modèle est, dans certaines limites, permise ici ; pour le moment, " +"« {file} » et « {line} » sont des marqueurs reconnus." + +#: ../data/org.gnome.meld.gschema.xml.h:37 +msgid "Columns to display" +msgstr "Colonnes à afficher" + +#: ../data/org.gnome.meld.gschema.xml.h:38 +msgid "" +"List of column names in folder comparison and whether they should be " +"displayed." +msgstr "" +"Liste des noms de colonnes dans la comparaison de dossiers et choix de leur " +"affichage ou non." + +#: ../data/org.gnome.meld.gschema.xml.h:39 ../data/ui/preferences.ui.h:32 +msgid "Ignore symbolic links" +msgstr "Ignorer les liens symboliques" + +#: ../data/org.gnome.meld.gschema.xml.h:40 +msgid "" +"If true, folder comparisons do not follow symbolic links when traversing the " +"folder tree." +msgstr "" +"Si cette option est cochée, la comparaison de dossiers ne prendra pas en " +"compte les liens symboliques en parcourant l'arborescence." + +#: ../data/org.gnome.meld.gschema.xml.h:41 +msgid "Use shallow comparison" +msgstr "Utiliser la comparaison superficielle" + +#: ../data/org.gnome.meld.gschema.xml.h:42 +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 "" +"Si cette option est cochée, la comparaison de dossiers vérifiera seulement " +"la taille et l'horodatage des fichiers, considérant les fichiers comme " +"identiques si ces valeurs sont égales, comme différents dans le cas inverse." + +#: ../data/org.gnome.meld.gschema.xml.h:43 +msgid "File timestamp resolution" +msgstr "Précision de l'horodatage des fichiers" + +#: ../data/org.gnome.meld.gschema.xml.h:44 +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 "" +"Dans une comparaison basée sur l'horodatage, ceci est la différence minimale " +"en nanosecondes entre deux fichiers avant que leurs horodatages ne soient " +"considérés comme différents. Ceci est utile pour comparer des fichiers " +"stockés sur des systèmes de fichiers ayant une précision d'horodatage " +"différente." + +#: ../data/org.gnome.meld.gschema.xml.h:45 ../data/ui/preferences.ui.h:30 +msgid "Apply text filters during folder comparisons" +msgstr "Appliquer les filtres de texte dans la comparaison de dossiers" + +#: ../data/org.gnome.meld.gschema.xml.h:46 +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 "" +"Si cette option est cochée, les comparaisons de dossiers qui comparent des " +"contenus de fichiers appliquent également les filtres de texte actifs et " +"l'option d'ignorance des lignes vides, et ignore les différences de sauts de " +"ligne." + +#: ../data/org.gnome.meld.gschema.xml.h:47 +msgid "File status filters" +msgstr "Filtres sur l'état des fichiers" + +#: ../data/org.gnome.meld.gschema.xml.h:48 +msgid "List of statuses used to filter visible files in folder comparison." +msgstr "" +"Liste des états de fichiers utilisés pour filtrer les fichiers visibles dans " +"la comparaison de dossiers." + +#: ../data/org.gnome.meld.gschema.xml.h:49 +msgid "Show the version control console output" +msgstr "Afficher la sortie de la console du gestionnaire de versions" + +#: ../data/org.gnome.meld.gschema.xml.h:50 +msgid "" +"If true, a console output section will be shown in version control views, " +"showing the commands run for version control operations." +msgstr "" +"Si cette option est cochée, la sortie de la console sera affichée dans les " +"affichages de gestionnaire de version, avec les commandes exécutées lors des " +"opérations de gestion de version." + +#: ../data/org.gnome.meld.gschema.xml.h:51 +msgid "Version control pane position" +msgstr "Position du panneau de gestion de version" + +#: ../data/org.gnome.meld.gschema.xml.h:52 +msgid "" +"This is the height of the main version control tree when the console pane is " +"shown." +msgstr "" +"Hauteur de l'arborescence principale de gestion de version quand le panneau " +"du terminal est affiché." + +#: ../data/org.gnome.meld.gschema.xml.h:53 +msgid "Present version comparisons as left-local/right-remote" +msgstr "" +"Afficher les comparaisons de versions sous la forme version locale à gauche, " +"version distante à droite" + +#: ../data/org.gnome.meld.gschema.xml.h:54 +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 "" +"Si cette option est cochée, les comparaisons de gestion de version " +"présentent le dossier local à gauche, le distant à droite. Autrement, la " +"disposition inverse est utilisée." + +#: ../data/org.gnome.meld.gschema.xml.h:55 +msgid "Order for files in three-way version control merge comparisons" +msgstr "Ordre des fichiers dans les comparaisons de fusion à trois fichiers" + +#: ../data/org.gnome.meld.gschema.xml.h:56 +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 "" +"Les choix pour l'ordre des fichiers sont : « remote/merged/local » (distant/" +"fusionné/local et « local/merged/remote » (local/fusionné/distant). Cette " +"préférence n'affecte que les comparaisons à trois fichiers lancées depuis la " +"fenêtre de gestion de version ; elle n'est donc utilisée que pour la " +"résolution des conflits de fusion dans Meld." + +#: ../data/org.gnome.meld.gschema.xml.h:57 +msgid "Show margin in commit message editor" +msgstr "Afficher la marge dans l'éditeur de message de « commit »" + +#: ../data/org.gnome.meld.gschema.xml.h:58 +msgid "" +"If true, a guide will be displayed to show what column the margin is at in " +"the version control commit message editor." +msgstr "" +"Si cette option est cochée, un guide sera affiché pour indiquer à quelle " +"colonne correspond la marge dans l'éditeur de message de « commit » de la " +"gestion de version." + +#: ../data/org.gnome.meld.gschema.xml.h:59 +msgid "Margin column in commit message editor" +msgstr "Largeur de la marge dans l'éditeur de message de « commit »" + +#: ../data/org.gnome.meld.gschema.xml.h:60 +msgid "" +"The column at which to show the margin in the version control commit message " +"editor." +msgstr "" +"La colonne à laquelle afficher la marge dans l'éditeur de message de " +"« commit » de la gestion de version." + +#: ../data/org.gnome.meld.gschema.xml.h:61 +msgid "Automatically hard-wrap commit messages" +msgstr "Retourner à la ligne automatiquement dans les messages de « commit »" + +#: ../data/org.gnome.meld.gschema.xml.h:62 +msgid "" +"If true, the version control commit message editor will hard-wrap (i.e., " +"insert line breaks) at the commit margin before commit." +msgstr "" +"Si cette option est cochée, l'éditeur de message de « commit » insérera " +"automatiquement des retours à la ligne (sauts de ligne réels) à la marge " +"définie avant de procéder au « commit »." + +#: ../data/org.gnome.meld.gschema.xml.h:63 +msgid "Version control status filters" +msgstr "Filtres d'état du gestionnaire de version" + +#: ../data/org.gnome.meld.gschema.xml.h:64 +msgid "" +"List of statuses used to filter visible files in version control comparison." +msgstr "" +"Liste d'états utilisés pour filtrer les fichiers visibles dans la comparaison " +"en mode gestionnaire de version." + +#: ../data/org.gnome.meld.gschema.xml.h:65 +msgid "Filename-based filters" +msgstr "Filtres sur le nom de fichier" + +#: ../data/org.gnome.meld.gschema.xml.h:66 +msgid "" +"List of predefined filename-based filters that, if active, will remove " +"matching files from a folder comparison." +msgstr "" +"Liste de filtres de nom de fichier prédéfinis, qui retirent les fichiers " +"correspondants de la comparaison de dossiers quand ils sont actifs." + +#: ../data/org.gnome.meld.gschema.xml.h:67 +msgid "Text-based filters" +msgstr "Filtres textuels" + +#: ../data/org.gnome.meld.gschema.xml.h:68 +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 "" +"Liste de filtres textuels prédéfinis, basés sur les expressions régulières, " +"qui empêchent l'utilisation du texte correspondant dans les comparaisons de " +"fichiers. Le texte reste affiché mais n'est pas pris en compte dans la " +"comparaison." + +#: ../data/styles/meld-base.xml.h:1 +msgid "Meld base scheme" +msgstr "Jeu de couleurs de base" + +#: ../data/styles/meld-base.xml.h:2 +msgid "Base color scheme for Meld highlighting" +msgstr "Jeu de couleurs de base pour la coloration dans Meld" + +#: ../data/styles/meld-dark.xml.h:1 +msgid "Meld dark scheme" +msgstr "Jeu de couleurs sombres" + +#: ../data/styles/meld-dark.xml.h:2 +msgid "Dark color scheme for Meld highlighting" +msgstr "Jeu de couleurs sombres pour la coloration dans Meld" + +#: ../data/ui/application.ui.h:1 +msgid "About Meld" +msgstr "À propos de Meld" + +#: ../data/ui/application.ui.h:2 +msgid "" +"Copyright © 2002-2009 Stephen Kennedy\n" +"Copyright © 2009-2013 Kai Willadsen" +msgstr "" +"Copyright © 2002-2009 Stephen Kennedy\n" +"Copyright © 2009-2013 Kai Willadsen" + +#: ../data/ui/application.ui.h:4 +msgid "Website" +msgstr "Site Web" + +#: ../data/ui/application.ui.h:5 +msgid "translator-credits" +msgstr "" +"Stephen Kennedy , 2003\n" +"Jonathan Ernst , 2006\n" +"Claude Paroz , 2006-2016\n" +"Robert-André Mauchin , 2007\n" +"Bruno Brouard , 2009-2010\n" +"Jérôme Sirgue , 2014" + +#: ../data/ui/application.ui.h:6 +msgid "_Preferences" +msgstr "_Préférences" + +#: ../data/ui/application.ui.h:7 +msgid "_Help" +msgstr "Aid_e" + +#: ../data/ui/application.ui.h:8 +msgid "Keyboard Shortcuts" +msgstr "Raccourcis clavier" + +#: ../data/ui/application.ui.h:9 +msgid "_About" +msgstr "À _propos" + +#: ../data/ui/application.ui.h:10 +msgid "_Quit" +msgstr "_Quitter" + +#: ../data/ui/dirdiff.ui.h:1 ../data/ui/vcview.ui.h:1 +msgid "_Compare" +msgstr "_Comparer" + +#: ../data/ui/dirdiff.ui.h:2 ../data/ui/vcview.ui.h:2 +msgid "Compare selected files" +msgstr "Comparer les fichiers sélectionnés" + +#: ../data/ui/dirdiff.ui.h:3 +msgid "Copy to _Left" +msgstr "Copier vers la _gauche" + +#: ../data/ui/dirdiff.ui.h:4 +msgid "Copy to left" +msgstr "Copie vers la gauche" + +#: ../data/ui/dirdiff.ui.h:5 +msgid "Copy to _Right" +msgstr "Copier vers la _droite" + +#: ../data/ui/dirdiff.ui.h:6 +msgid "Copy to right" +msgstr "Copie vers la droite" + +#: ../data/ui/dirdiff.ui.h:7 +msgid "Delete selected" +msgstr "Effacer la sélection" + +#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:858 ../meld/filediff.py:1382 +msgid "Hide" +msgstr "Masquer" + +#: ../data/ui/dirdiff.ui.h:9 +msgid "Hide selected" +msgstr "Masquer la sélection" + +#: ../data/ui/dirdiff.ui.h:10 +msgid "Ignore Filename Case" +msgstr "Ignorer la casse des noms de fichiers" + +#: ../data/ui/dirdiff.ui.h:11 +msgid "" +"Consider differently-cased filenames that are otherwise-identical to be the " +"same" +msgstr "Ne pas tenir compte de la casse pour comparer les noms de fichiers" + +#: ../data/ui/dirdiff.ui.h:12 +msgid "Same" +msgstr "Identiques" + +#: ../data/ui/dirdiff.ui.h:13 +msgid "Show identical" +msgstr "Afficher les fichiers identiques" + +#: ../data/ui/dirdiff.ui.h:14 +msgid "New" +msgstr "Nouveaux" + +#: ../data/ui/dirdiff.ui.h:15 +msgid "Show new" +msgstr "Afficher les nouveaux fichiers" + +#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:76 +msgid "Modified" +msgstr "Modifiés" + +#: ../data/ui/dirdiff.ui.h:17 +msgid "Show modified" +msgstr "Afficher les objets modifiés" + +#: ../data/ui/dirdiff.ui.h:18 +msgid "Filters" +msgstr "Filtres" + +#: ../data/ui/dirdiff.ui.h:19 +msgid "Set active filters" +msgstr "Définir les filtres actifs" + #: ../data/ui/EditableList.ui.h:1 msgid "Editable List" msgstr "Liste modifiable" @@ -56,67 +654,286 @@ msgstr "Liste modifiable" msgid "Active" msgstr "Actif" -#: ../data/ui/EditableList.ui.h:3 ../meld/vcview.py:166 -msgid "Name" -msgstr "Nom" +#: ../data/ui/EditableList.ui.h:3 +msgid "Column Name" +msgstr "Nom de la colonne" -#: ../data/ui/EditableList.ui.h:4 -msgid "Pattern" -msgstr "Motif" - -#: ../data/ui/EditableList.ui.h:5 -msgid "Add new filter" -msgstr "Ajouter un nouveau filtre" - -#: ../data/ui/EditableList.ui.h:6 ../meld/vcview.py:130 +#: ../data/ui/EditableList.ui.h:4 ../data/ui/vcview.ui.h:9 msgid "_Add" msgstr "_Ajouter" -#: ../data/ui/EditableList.ui.h:7 -msgid "Remove selected filter" -msgstr "Enlève le filtre sélectionné" - -#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:132 +#: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11 +#: ../meld/vcview.py:644 msgid "_Remove" msgstr "_Supprimer" -#: ../data/ui/EditableList.ui.h:9 +#: ../data/ui/EditableList.ui.h:6 msgid "Move item up" msgstr "Fait monter l'élément" -#: ../data/ui/EditableList.ui.h:10 +#: ../data/ui/EditableList.ui.h:7 msgid "Move _Up" msgstr "_Monter" -#: ../data/ui/EditableList.ui.h:11 +#: ../data/ui/EditableList.ui.h:8 msgid "Move item down" msgstr "Fait descendre l'élément" -#: ../data/ui/EditableList.ui.h:12 +#: ../data/ui/EditableList.ui.h:9 msgid "Move _Down" msgstr "_Descendre" +#. Create icon and filename CellRenderer +#: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35 +#: ../meld/dirdiff.py:373 +msgid "Name" +msgstr "Nom" + +#: ../data/ui/EditableList.ui.h:11 +msgid "Pattern" +msgstr "Motif" + +#: ../data/ui/EditableList.ui.h:12 +msgid "Add new filter" +msgstr "Ajouter un nouveau filtre" + +#: ../data/ui/EditableList.ui.h:13 +msgid "Remove selected filter" +msgstr "Enlève le filtre sélectionné" + #: ../data/ui/filediff.ui.h:1 -msgid "Save modified files?" -msgstr "Enregistrer les fichiers modifiés ?" +msgid "Format as Patch..." +msgstr "Créer un correctif (patch)…" #: ../data/ui/filediff.ui.h:2 -msgid "" -"Some files have been modified.\n" -"Which ones would you like to save?" +msgid "Create a patch using differences between files" msgstr "" -"Des fichiers ont été modifiés.\n" -"Lesquels souhaitez-vous enregistrer ?" +"Crée un correctif (patch) en utilisant les différences entre les fichiers" + +#: ../data/ui/filediff.ui.h:3 +msgid "Save A_ll" +msgstr "_Tout enregistrer" #: ../data/ui/filediff.ui.h:4 -msgid "_Discard Changes" -msgstr "_Fermer sans enregistrer" +msgid "Save all files in the current comparison" +msgstr "Enregistrer tous les fichiers de la comparaison en cours" #: ../data/ui/filediff.ui.h:5 -msgid "_Save Selected" -msgstr "_Enregistrer la sélection" +msgid "Revert files to their saved versions" +msgstr "Rétablir les fichiers dans leurs versions enregistrées" + +#: ../data/ui/filediff.ui.h:6 +msgid "Add Synchronization Point" +msgstr "Ajouter un point de synchronisation" + +#: ../data/ui/filediff.ui.h:7 +msgid "Add a synchronization point for changes between files" +msgstr "" +"Ajouter un point de synchronisation des modifications entre les fichiers" + +#: ../data/ui/filediff.ui.h:8 +msgid "Clear Synchronization Points" +msgstr "Effacer les points de synchronisation" + +#: ../data/ui/filediff.ui.h:9 +msgid "Clear sychronization points for changes between files" +msgstr "" +"Effacer les points de synchronisation des modifications entre les fichiers" + +#: ../data/ui/filediff.ui.h:10 +msgid "Previous Conflict" +msgstr "Conflit précédent" + +#: ../data/ui/filediff.ui.h:11 +msgid "Go to the previous conflict" +msgstr "Retour au conflit précédent" + +#: ../data/ui/filediff.ui.h:12 +msgid "Next Conflict" +msgstr "Conflit suivant" + +#: ../data/ui/filediff.ui.h:13 +msgid "Go to the next conflict" +msgstr "Aller au prochain conflit" + +#: ../data/ui/filediff.ui.h:14 +msgid "Push to Left" +msgstr "Envoyer à gauche" + +#: ../data/ui/filediff.ui.h:15 +msgid "Push current change to the left" +msgstr "Envoyer la modification actuelle vers la gauche" + +#: ../data/ui/filediff.ui.h:16 +msgid "Push to Right" +msgstr "Envoyer à droite" + +#: ../data/ui/filediff.ui.h:17 +msgid "Push current change to the right" +msgstr "Envoyer la modification actuelle vers la droite" + +#: ../data/ui/filediff.ui.h:18 +msgid "Pull from Left" +msgstr "Récupérer de la gauche" + +#: ../data/ui/filediff.ui.h:19 +msgid "Pull change from the left" +msgstr "Récupère la modification de gauche" + +#: ../data/ui/filediff.ui.h:20 +msgid "Pull from Right" +msgstr "Récupérer de la droite" + +#: ../data/ui/filediff.ui.h:21 +msgid "Pull change from the right" +msgstr "Récupère la modification de droite" + +#: ../data/ui/filediff.ui.h:22 +msgid "Copy Above Left" +msgstr "Copier au-dessus à gauche" + +#: ../data/ui/filediff.ui.h:23 +msgid "Copy change above the left chunk" +msgstr "Copie la modification au-dessus du segment de gauche" + +#: ../data/ui/filediff.ui.h:24 +msgid "Copy Below Left" +msgstr "Copier en dessous à gauche" + +#: ../data/ui/filediff.ui.h:25 +msgid "Copy change below the left chunk" +msgstr "Copie la modification en dessous du segment de gauche" + +#: ../data/ui/filediff.ui.h:26 +msgid "Copy Above Right" +msgstr "Copier au-dessus à droite" + +#: ../data/ui/filediff.ui.h:27 +msgid "Copy change above the right chunk" +msgstr "Copie la modification au-dessus du segment de droite" + +#: ../data/ui/filediff.ui.h:28 +msgid "Copy Below Right" +msgstr "Copier en dessous à droite" + +#: ../data/ui/filediff.ui.h:29 +msgid "Copy change below the right chunk" +msgstr "Copie la modification en dessous du segment de droite" + +#: ../data/ui/filediff.ui.h:30 +msgid "Delete" +msgstr "Supprimer" + +#: ../data/ui/filediff.ui.h:31 +msgid "Delete change" +msgstr "Supprimer la modification" + +#: ../data/ui/filediff.ui.h:32 +msgid "Merge All from Left" +msgstr "Fusionner toutes les modifications de gauche" + +#: ../data/ui/filediff.ui.h:33 +msgid "Merge all non-conflicting changes from the left" +msgstr "Fusionne toutes les modifications non conflictuelles de gauche" + +#: ../data/ui/filediff.ui.h:34 +msgid "Merge All from Right" +msgstr "Fusionner toutes les modifications de droite" + +#: ../data/ui/filediff.ui.h:35 +msgid "Merge all non-conflicting changes from the right" +msgstr "Fusionne toutes les modifications non conflictuelles de droite" + +#: ../data/ui/filediff.ui.h:36 +msgid "Merge All" +msgstr "Tout fusionner" + +#: ../data/ui/filediff.ui.h:37 +msgid "Merge all non-conflicting changes from left and right panes" +msgstr "" +"Fusionne toutes les modifications non conflictuelles des panneaux de gauche " +"et de droite" + +#: ../data/ui/filediff.ui.h:38 +msgid "Previous Pane" +msgstr "Panneau précédent" + +#: ../data/ui/filediff.ui.h:39 +msgid "Move keyboard focus to the previous document in this comparison" +msgstr "" +"Déplace le focus clavier vers le document précédent dans cette comparaison" + +#: ../data/ui/filediff.ui.h:40 +msgid "Next Pane" +msgstr "Panneau suivant" + +#: ../data/ui/filediff.ui.h:41 +msgid "Move keyboard focus to the next document in this comparison" +msgstr "" +"Déplace le focus clavier vers le document suivant dans cette comparaison" + +#: ../data/ui/filediff.ui.h:42 +msgid "Lock Scrolling" +msgstr "Verrouiller le défilement" + +#: ../data/ui/filediff.ui.h:43 +msgid "Lock scrolling of all panes" +msgstr "Verrouille le défilement de tous les panneaux" + +#: ../data/ui/filediff.ui.h:44 +msgid "Save changes to documents before closing?" +msgstr "Enregistrer les modifications des documents avant de fermer ?" + +#: ../data/ui/filediff.ui.h:45 +msgid "If you don't save, changes will be permanently lost." +msgstr "" +"Si vous n'enregistrez pas, les modifications seront définitivement perdues." + +#: ../data/ui/filediff.ui.h:46 +msgid "Close _without Saving" +msgstr "Fermer _sans enregistrer" + +#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:940 ../meld/filediff.py:1448 +#: ../meld/filediff.py:1520 +msgid "_Cancel" +msgstr "_Annuler" + +#: ../data/ui/filediff.ui.h:48 +msgid "_Save" +msgstr "_Enregistrer" + +#: ../data/ui/filediff.ui.h:49 +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 "" +"Le fichier n'est pas accessible en écriture. Cliquez ici pour le " +"déverrouiller et le modifier quand même, mais les changements devront êtres " +"enregistrés dans un nouveau fichier." + +#: ../data/ui/filediff.ui.h:50 +msgid "File 3" +msgstr "Fichier 3" + +#: ../data/ui/filediff.ui.h:51 +msgid "File 2" +msgstr "Fichier 2" + +#: ../data/ui/filediff.ui.h:52 +msgid "File 1" +msgstr "Fichier 1" + +#: ../data/ui/filediff.ui.h:53 +msgid "Revert unsaved changes to documents?" +msgstr "Annuler les modifications non enregistrées des documents ?" + +#: ../data/ui/filediff.ui.h:54 +msgid "Changes made to the following documents will be permanently lost:\n" +msgstr "" +"Les changements apportés aux documents suivants seront définitivement " +"perdus :\n" -#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:141 +#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:941 ../meld/filediff.py:1449 msgid "_Replace" msgstr "_Remplacer" @@ -134,195 +951,246 @@ msgstr "_Suivant" #: ../data/ui/findbar.ui.h:5 msgid "Find:" -msgstr "Rechercher :" +msgstr "Rechercher :" #: ../data/ui/findbar.ui.h:6 msgid "Replace _with:" -msgstr "Remplacer _par :" +msgstr "Remplacer _par :" #: ../data/ui/findbar.ui.h:7 -msgid "_Match Case" -msgstr "Res_pecter la casse" +msgid "_Match case" +msgstr "Respecter la _casse" #: ../data/ui/findbar.ui.h:8 msgid "Who_le word" msgstr "_Mots entiers" #: ../data/ui/findbar.ui.h:9 -msgid "Regular E_xpression" +msgid "Regular e_xpression" msgstr "E_xpression régulière" -#: ../data/ui/meldapp.ui.h:2 -msgid "" -"Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2012 Kai Willadsen" -msgstr "" -"Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2012 Kai Willadsen" - -#: ../data/ui/meldapp.ui.h:4 -msgid "translator-credits" -msgstr "" -"Stephen Kennedy , 2003\n" -"Jonathan Ernst , 2006\n" -"Claude Paroz , 2006-2010\n" -"Robert-André Mauchin , 2007\n" -"Bruno Brouard , 2009-2010" - -#: ../data/ui/meldapp.ui.h:5 -msgid "Choose Files" -msgstr "Sélectionnez les fichiers" - -#: ../data/ui/meldapp.ui.h:6 -msgid "_Three Way Compare" -msgstr "Comparaison _triple" - -#. Refers to version of the file being compared -#: ../data/ui/meldapp.ui.h:8 -msgid "Mine" -msgstr "Le mien" - -#. Refers to version of the file being compared -#: ../data/ui/meldapp.ui.h:10 -msgid "Original" -msgstr "Original" - -#. Refers to version of the file being compared -#: ../data/ui/meldapp.ui.h:12 -msgid "Other" -msgstr "Autre" - -#: ../data/ui/meldapp.ui.h:13 -msgid "_File Comparison" -msgstr "Comparaison de _fichiers" - -#: ../data/ui/meldapp.ui.h:14 -msgid "_Directory Comparison" -msgstr "Comparaison de _répertoires" - -#: ../data/ui/meldapp.ui.h:15 -msgid "Select VC Directory" -msgstr "Sélectionner le répertoire du gestionnaire de versions" - -#: ../data/ui/meldapp.ui.h:16 -msgid "Directory" -msgstr "Répertoire" - -#: ../data/ui/meldapp.ui.h:17 -msgid "_Version Control Browser" -msgstr "Navigateur du gestionnaire de _versions" +#: ../data/ui/findbar.ui.h:10 +msgid "Wrapped" +msgstr "Saut de ligne" +# Mieux vaut donner à la commande le nom de l'action. +# patch est beaucoup plus connu des utilisateurs de git que correctif #: ../data/ui/patch-dialog.ui.h:1 -msgid "Create Patch" -msgstr "Créer un correctif" +msgid "Format as Patch" +msgstr "Créer un correctif (patch)" #: ../data/ui/patch-dialog.ui.h:2 -msgid "Create a patch" -msgstr "Créer un correctif" +msgid "Copy to Clipboard" +msgstr "Copier vers le presse-papiers" + +#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:155 +msgid "Save Patch" +msgstr "Enregistrer le correctif" -#: ../data/ui/patch-dialog.ui.h:3 +#: ../data/ui/patch-dialog.ui.h:4 msgid "Use differences between:" msgstr "Utiliser les différences entre :" -#: ../data/ui/patch-dialog.ui.h:4 +#: ../data/ui/patch-dialog.ui.h:5 msgid "Left and middle panes" msgstr "Panneaux de gauche et du milieu" -#: ../data/ui/patch-dialog.ui.h:5 +#: ../data/ui/patch-dialog.ui.h:6 msgid "Middle and right panes" msgstr "Panneaux du milieu et de droite" -#: ../data/ui/patch-dialog.ui.h:6 +#: ../data/ui/patch-dialog.ui.h:7 msgid "_Reverse patch direction" msgstr "Inve_rser la direction du correctif" -#: ../data/ui/patch-dialog.ui.h:7 -msgid "Copy to Clipboard" -msgstr "Copier vers le presse-papiers" - #: ../data/ui/preferences.ui.h:1 +msgid "Left is remote, right is local" +msgstr "Distant à gauche, local à droite" + +#: ../data/ui/preferences.ui.h:2 +msgid "Left is local, right is remote" +msgstr "Local à gauche, distant à droite" + +#: ../data/ui/preferences.ui.h:3 +msgid "Remote, merge, local" +msgstr "Distant, fusionné, local" + +#: ../data/ui/preferences.ui.h:4 +msgid "Local, merge, remote" +msgstr "Local, fusionné, distant" + +#: ../data/ui/preferences.ui.h:5 +msgid "1ns (ext4)" +msgstr "1ns (ext4)" + +#: ../data/ui/preferences.ui.h:6 +msgid "100ns (NTFS)" +msgstr "100ns (NTFS)" + +#: ../data/ui/preferences.ui.h:7 +msgid "1s (ext2/ext3)" +msgstr "1s (ext2/ext3)" + +#: ../data/ui/preferences.ui.h:8 +msgid "2s (VFAT)" +msgstr "2s (VFAT)" + +#: ../data/ui/preferences.ui.h:9 msgid "Meld Preferences" msgstr "Préférences de Meld" -#: ../data/ui/preferences.ui.h:2 +#: ../data/ui/preferences.ui.h:10 msgid "Font" msgstr "Police" -#: ../data/ui/preferences.ui.h:3 +#: ../data/ui/preferences.ui.h:11 msgid "_Use the system fixed width font" msgstr "_Utiliser la police à chasse fixe du système" -#: ../data/ui/preferences.ui.h:4 +#: ../data/ui/preferences.ui.h:12 msgid "_Editor font:" msgstr "_Police de l'éditeur :" -#: ../data/ui/preferences.ui.h:5 +#: ../data/ui/preferences.ui.h:13 msgid "Display" msgstr "Affichage" -#: ../data/ui/preferences.ui.h:6 +#: ../data/ui/preferences.ui.h:14 msgid "_Tab width:" msgstr "Largeur des _tabulations :" -#: ../data/ui/preferences.ui.h:7 +#: ../data/ui/preferences.ui.h:15 msgid "_Insert spaces instead of tabs" msgstr "Insérer des _espaces au lieu des tabulations" -#: ../data/ui/preferences.ui.h:8 +#: ../data/ui/preferences.ui.h:16 msgid "Enable text _wrapping" msgstr "Acti_ver les sauts de ligne automatiques" -#: ../data/ui/preferences.ui.h:9 +#: ../data/ui/preferences.ui.h:17 msgid "Do not _split words over two lines" msgstr "Ne pas _couper les mots par les sauts de ligne" -#: ../data/ui/preferences.ui.h:10 +#: ../data/ui/preferences.ui.h:18 +msgid "Highlight _current line" +msgstr "Surligner la ligne _actuelle" + +#: ../data/ui/preferences.ui.h:19 msgid "Show _line numbers" msgstr "Afficher les numéros de _ligne" -#: ../data/ui/preferences.ui.h:11 +#: ../data/ui/preferences.ui.h:20 msgid "Show w_hitespace" msgstr "Affic_her les espaces" -#: ../data/ui/preferences.ui.h:12 +#: ../data/ui/preferences.ui.h:21 msgid "Use s_yntax highlighting" msgstr "Utiliser la _coloration syntaxique" -#: ../data/ui/preferences.ui.h:13 -msgid "External editor" +#: ../data/ui/preferences.ui.h:22 +msgid "Syntax highlighting color scheme:" +msgstr "Jeu de couleurs de la coloration syntaxique :" + +#: ../data/ui/preferences.ui.h:23 +msgid "External Editor" msgstr "Éditeur externe" -#: ../data/ui/preferences.ui.h:14 +#: ../data/ui/preferences.ui.h:24 msgid "Use _default system editor" msgstr "Utiliser l'éditeur par _défaut du système" -#: ../data/ui/preferences.ui.h:15 +#: ../data/ui/preferences.ui.h:25 msgid "Edito_r command:" msgstr "Commande de l'éditeu_r :" -#: ../data/ui/preferences.ui.h:16 +#: ../data/ui/preferences.ui.h:26 msgid "Editor" msgstr "Éditeur" -#: ../data/ui/preferences.ui.h:17 +#: ../data/ui/preferences.ui.h:27 +msgid "Shallow Comparison" +msgstr "Comparaison superficielle" + +#: ../data/ui/preferences.ui.h:28 +msgid "C_ompare files based only on size and timestamp" +msgstr "C_omparer les fichiers selon la taille et l'horodatage uniquement" + +#: ../data/ui/preferences.ui.h:29 +msgid "_Timestamp resolution:" +msgstr "Précision de l'horoda_tage :" + +#: ../data/ui/preferences.ui.h:31 +msgid "Symbolic Links" +msgstr "Liens symboliques" + +#: ../data/ui/preferences.ui.h:33 +msgid "Visible Columns" +msgstr "Colonnes visibles" + +#: ../data/ui/preferences.ui.h:34 +msgid "Folder Comparisons" +msgstr "Comparaisons de dossiers" + +#: ../data/ui/preferences.ui.h:35 +msgid "Version Comparisons" +msgstr "Comparaisons de versions" + +#: ../data/ui/preferences.ui.h:36 +msgid "_Order when comparing file revisions:" +msgstr "_Ordre lors des comparaisons de révisions de fichiers :" + +#: ../data/ui/preferences.ui.h:37 +msgid "Order when _merging files:" +msgstr "Ordre lors des _fusions de fichiers :" + +#: ../data/ui/preferences.ui.h:38 +msgid "Commit Messages" +msgstr "Messages de « commit »" + +#: ../data/ui/preferences.ui.h:39 +msgid "Show _right margin at:" +msgstr "Afficher la marge d_roite à :" + +#: ../data/ui/preferences.ui.h:40 +msgid "Automatically _break lines at right margin on commit" +msgstr "Retour à la ligne automatique lors du « commit »" + +#: ../data/ui/preferences.ui.h:41 +msgid "Version Control" +msgstr "Gestionnaire de versions" + +#: ../data/ui/preferences.ui.h:42 +msgid "Filename filters" +msgstr "Filtres sur les noms de fichiers" + +#: ../data/ui/preferences.ui.h:43 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 "" -"Lors de la comparaison de répertoires, vous pouvez masquer des fichiers et " -"des dossiers en fonction de leur nom. Chaque motif est une liste de jokers " -"de type shell séparés par des espaces." - -#: ../data/ui/preferences.ui.h:18 -msgid "Ignore symbolic links" -msgstr "Ignorer les liens symboliques" +"Lors de la comparaison de dossiers, vous pouvez masquer des fichiers et des " +"dossiers en fonction de leur nom. Chaque motif est une liste de jokers de " +"type shell séparés par des espaces." -#: ../data/ui/preferences.ui.h:19 +#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:104 msgid "File Filters" msgstr "Filtres de fichiers" -#: ../data/ui/preferences.ui.h:20 +#: ../data/ui/preferences.ui.h:45 +msgid "Change trimming" +msgstr "Ignorance des changements « blancs »" + +#: ../data/ui/preferences.ui.h:46 +msgid "Trim blank line differences from the start and end of changes" +msgstr "" +"Ignorer les différences de lignes vides au début et à la fin des modifications" + +#: ../data/ui/preferences.ui.h:47 +msgid "Text filters" +msgstr "Filtres textuels" + +#: ../data/ui/preferences.ui.h:48 msgid "" "When performing file comparisons, you may ignore certain types of changes. " "Each pattern here is a python regular expression which replaces matching " @@ -336,470 +1204,700 @@ msgstr "" "comparaison. Si l'expression contient des groupes, seuls les groupes sont " "remplacés. Consultez le manuel d'utilisation pour plus de détails." -#: ../data/ui/preferences.ui.h:21 -msgid "Ignore changes which insert or delete blank lines" -msgstr "" -"Ignorer les modifications qui concernent l'insertion ou l'effacement de " -"lignes vides." - -#: ../data/ui/preferences.ui.h:22 +#: ../data/ui/preferences.ui.h:49 msgid "Text Filters" -msgstr "Filtres de texte" +msgstr "Filtres textuels" + +#: ../data/ui/shortcuts.ui.h:1 +msgctxt "shortcut window" +msgid "General" +msgstr "Général" + +#: ../data/ui/shortcuts.ui.h:2 +msgctxt "shortcut window" +msgid "New comparison" +msgstr "Nouvelle comparaison" + +#: ../data/ui/shortcuts.ui.h:3 +msgctxt "shortcut window" +msgid "Close a comparison" +msgstr "Fermer une comparaison" + +#: ../data/ui/shortcuts.ui.h:4 +msgctxt "shortcut window" +msgid "Quit Meld" +msgstr "Quitter Meld" + +#: ../data/ui/shortcuts.ui.h:5 +msgctxt "shortcut window" +msgid "Stop the current action" +msgstr "Arrêter l'action en cours" -#: ../data/ui/preferences.ui.h:23 -msgid "Loading" -msgstr "Chargement" +#: ../data/ui/shortcuts.ui.h:6 +msgctxt "shortcut window" +msgid "Refresh comparison" +msgstr "Actualiser la comparaison" -#: ../data/ui/preferences.ui.h:24 -msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)" -msgstr "" -"Lors du chargement, essayer ces codages dans l'ordre (ex : utf-8, iso8859)" +#: ../data/ui/shortcuts.ui.h:7 +msgctxt "shortcut window" +msgid "Fullscreen" +msgstr "Plein écran" -#: ../data/ui/preferences.ui.h:25 -msgid "Encoding" -msgstr "Codage des caractères" +#: ../data/ui/shortcuts.ui.h:8 +msgctxt "shortcut window" +msgid "Tabs" +msgstr "Onglets" + +#: ../data/ui/shortcuts.ui.h:9 +msgctxt "shortcut window" +msgid "Go to previous tab" +msgstr "Aller à l'onglet précédent" + +#: ../data/ui/shortcuts.ui.h:10 +msgctxt "shortcut window" +msgid "Go to next tab" +msgstr "Aller à l'onglet suivant" + +#: ../data/ui/shortcuts.ui.h:11 +msgctxt "shortcut window" +msgid "Switch to tab" +msgstr "Basculer vers l'onglet" + +#: ../data/ui/shortcuts.ui.h:12 +msgctxt "shortcut window" +msgid "Move tab left" +msgstr "Déplacer l'onglet vers la gauche" + +#: ../data/ui/shortcuts.ui.h:13 +msgctxt "shortcut window" +msgid "Move tab right" +msgstr "Déplacer l'onglet vers la droite" + +#: ../data/ui/shortcuts.ui.h:14 +msgctxt "shortcut window" +msgid "Changes" +msgstr "Différences" + +#: ../data/ui/shortcuts.ui.h:15 +msgctxt "shortcut window" +msgid "Go to previous change" +msgstr "Aller à la différence précédente" + +#: ../data/ui/shortcuts.ui.h:16 +msgctxt "shortcut window" +msgid "Go to next change" +msgstr "Aller à la différence suivante" + +#: ../data/ui/shortcuts.ui.h:17 +msgctxt "shortcut window" +msgid "Editing" +msgstr "Édition" + +#: ../data/ui/shortcuts.ui.h:18 +msgctxt "shortcut window" +msgid "Undo" +msgstr "Annuler" + +#: ../data/ui/shortcuts.ui.h:19 +msgctxt "shortcut window" +msgid "Redo" +msgstr "Rétablir" + +#: ../data/ui/shortcuts.ui.h:20 +msgctxt "shortcut window" +msgid "Cut" +msgstr "Couper" + +#: ../data/ui/shortcuts.ui.h:21 +msgctxt "shortcut window" +msgid "Copy" +msgstr "Copier" + +#: ../data/ui/shortcuts.ui.h:22 +msgctxt "shortcut window" +msgid "Paste" +msgstr "Coller" + +#: ../data/ui/shortcuts.ui.h:23 +msgctxt "shortcut window" +msgid "Find" +msgstr "Rechercher" + +#: ../data/ui/shortcuts.ui.h:24 +msgctxt "shortcut window" +msgid "Find Next" +msgstr "Rechercher le suivant" + +#: ../data/ui/shortcuts.ui.h:25 +msgctxt "shortcut window" +msgid "Find Previous" +msgstr "Rechercher le précédent" + +#: ../data/ui/shortcuts.ui.h:26 +msgctxt "shortcut window" +msgid "Replace" +msgstr "Remplacer" + +#: ../data/ui/shortcuts.ui.h:27 +msgctxt "shortcut window" +msgid "File comparison" +msgstr "Comparaison de fichiers" + +#: ../data/ui/shortcuts.ui.h:28 +msgctxt "shortcut window" +msgid "Save current file" +msgstr "Enregistrer le fichier actuel" -#: ../data/ui/vcview.ui.h:1 -msgid "VC Log" -msgstr "Journal du gestionnaire de versions" +#: ../data/ui/shortcuts.ui.h:29 +msgctxt "shortcut window" +msgid "Save current file to new path" +msgstr "Enregistrer le fichier actuel à un autre endroit" -#: ../data/ui/vcview.ui.h:2 -msgid "Commit Files" -msgstr "Valider les fichiers" +#: ../data/ui/shortcuts.ui.h:30 +msgctxt "shortcut window" +msgid "Save all files in comparison" +msgstr "Enregistrer tous les fichiers de la comparaison" -#: ../data/ui/vcview.ui.h:3 -msgid "Previous Logs" -msgstr "Journaux précédents" +#: ../data/ui/shortcuts.ui.h:31 +msgctxt "shortcut window" +msgid "Previous conflict" +msgstr "Conflit précédent" -#: ../data/ui/vcview.ui.h:4 -msgid "Log Message" -msgstr "Message du journal" +#: ../data/ui/shortcuts.ui.h:32 +msgctxt "shortcut window" +msgid "Next conflict" +msgstr "Conflit suivant" -#: ../meld/dirdiff.py:232 ../meld/vcview.py:127 -msgid "_Compare" -msgstr "_Comparer" +#: ../data/ui/shortcuts.ui.h:33 +msgctxt "shortcut window" +msgid "Push change to left" +msgstr "Envoyer la modification vers la gauche" + +#: ../data/ui/shortcuts.ui.h:34 +msgctxt "shortcut window" +msgid "Push change to right" +msgstr "Envoyer la modification vers la droite" + +#: ../data/ui/shortcuts.ui.h:35 +msgctxt "shortcut window" +msgid "Pull change from left" +msgstr "Récupérer la modification de gauche" + +#: ../data/ui/shortcuts.ui.h:36 +msgctxt "shortcut window" +msgid "Pull change from right" +msgstr "Récupérer la modification de droite" + +#: ../data/ui/shortcuts.ui.h:37 +msgctxt "shortcut window" +msgid "Copy change above left" +msgstr "Copier la modification au-dessus à gauche" + +#: ../data/ui/shortcuts.ui.h:38 +msgctxt "shortcut window" +msgid "Copy change below left" +msgstr "Copier la modification en dessous à gauche" + +#: ../data/ui/shortcuts.ui.h:39 +msgctxt "shortcut window" +msgid "Copy change above right" +msgstr "Copier la modification au-dessus à droite" + +#: ../data/ui/shortcuts.ui.h:40 +msgctxt "shortcut window" +msgid "Copy change below right" +msgstr "Copier la modification en dessous à droite" + +#: ../data/ui/shortcuts.ui.h:41 +msgctxt "shortcut window" +msgid "Delete change" +msgstr "Supprimer la modification" -#: ../meld/dirdiff.py:232 ../meld/vcview.py:127 -msgid "Compare selected" -msgstr "Comparer la sélection" +#: ../data/ui/shortcuts.ui.h:42 +msgctxt "shortcut window" +msgid "Previous comparison pane" +msgstr "Panneau de comparaison précédent" -#: ../meld/dirdiff.py:233 -msgid "Copy _Left" -msgstr "Copier à _gauche" +#: ../data/ui/shortcuts.ui.h:43 +msgctxt "shortcut window" +msgid "Next comparison pane" +msgstr "Panneau de comparaison suivant" -#: ../meld/dirdiff.py:233 -msgid "Copy to left" -msgstr "Copie vers la gauche" +#: ../data/ui/shortcuts.ui.h:44 +msgctxt "shortcut window" +msgid "Folder comparison" +msgstr "Comparaison de dossiers" -#: ../meld/dirdiff.py:234 -msgid "Copy _Right" -msgstr "Copier à _droite" +#: ../data/ui/shortcuts.ui.h:45 +msgctxt "shortcut window" +msgid "Copy to left" +msgstr "Copier vers la gauche" -#: ../meld/dirdiff.py:234 +#: ../data/ui/shortcuts.ui.h:46 +msgctxt "shortcut window" msgid "Copy to right" -msgstr "Copie vers la droite" +msgstr "Copier vers la droite" -#: ../meld/dirdiff.py:235 -msgid "Delete selected" -msgstr "Effacer la sélection" +#: ../data/ui/shortcuts.ui.h:47 +msgctxt "shortcut window" +msgid "Version control comparison" +msgstr "Comparaison de gestion de version" -#: ../meld/dirdiff.py:236 ../meld/filediff.py:1167 -msgid "Hide" -msgstr "Masquer" +#: ../data/ui/shortcuts.ui.h:48 +msgctxt "shortcut window" +msgid "Commit to version control" +msgstr "Effectuer le « commit » dans la gestion de version" -#: ../meld/dirdiff.py:236 -msgid "Hide selected" -msgstr "Masquer la sélection" +#: ../data/ui/shortcuts.ui.h:49 +msgctxt "shortcut window" +msgid "Show/hide console output" +msgstr "Afficher/Masquer la sortie de la console" -#: ../meld/dirdiff.py:240 -msgid "Case" -msgstr "Casse" +#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:559 +#: ../meld/newdifftab.py:38 +msgid "New comparison" +msgstr "Nouvelle comparaison" -#: ../meld/dirdiff.py:240 -msgid "Ignore case of entries" -msgstr "Ignorer la casse des entrées" +#: ../data/ui/tab-placeholder.ui.h:2 +msgid "File comparison" +msgstr "Comparaison de fichiers" -#: ../meld/dirdiff.py:241 -msgid "Same" -msgstr "Identique" +#: ../data/ui/tab-placeholder.ui.h:3 +msgid "Directory comparison" +msgstr "Comparaison de dossiers" -#: ../meld/dirdiff.py:241 -msgid "Show identical" -msgstr "Afficher les fichiers identiques" +#: ../data/ui/tab-placeholder.ui.h:4 +msgid "Version control view" +msgstr "Affichage de gestion de version" -#: ../meld/dirdiff.py:242 -msgid "New" -msgstr "Nouveaux" +#: ../data/ui/tab-placeholder.ui.h:5 +msgid "_3-way comparison" +msgstr "Comparaison à _3" -#: ../meld/dirdiff.py:242 -msgid "Show new" -msgstr "Afficher les nouveaux fichiers" +#: ../data/ui/tab-placeholder.ui.h:6 +msgid "Select Third File" +msgstr "Sélectionner le troisième fichier" -#: ../meld/dirdiff.py:243 -msgid "Modified" -msgstr "Modifiés" +#: ../data/ui/tab-placeholder.ui.h:7 +msgid "Select Second File" +msgstr "Sélectionner le deuxième fichier" -#: ../meld/dirdiff.py:243 ../meld/vcview.py:140 -msgid "Show modified" -msgstr "Afficher les objets modifiés" +#: ../data/ui/tab-placeholder.ui.h:8 +msgid "Select First File" +msgstr "Sélectionner le premier fichier" -#: ../meld/dirdiff.py:245 -msgid "Filters" -msgstr "Filtres" +#: ../data/ui/tab-placeholder.ui.h:9 +msgid "Select First Folder" +msgstr "Sélectionner le premier dossier" -#: ../meld/dirdiff.py:245 -msgid "Set active filters" -msgstr "Définir les filtres actifs" +#: ../data/ui/tab-placeholder.ui.h:10 +msgid "Select Second Folder" +msgstr "Sélectionner le deuxième dossier" -#: ../meld/dirdiff.py:362 -#, python-format -msgid "Hide %s" -msgstr "Masquer %s" +#: ../data/ui/tab-placeholder.ui.h:11 +msgid "Select Third Folder" +msgstr "Sélectionner le troisième dossier" -#: ../meld/dirdiff.py:466 ../meld/dirdiff.py:479 ../meld/vcview.py:323 -#: ../meld/vcview.py:347 -#, python-format -msgid "[%s] Scanning %s" -msgstr "[%s] En cours d'analyse de %s" +#: ../data/ui/tab-placeholder.ui.h:12 +msgid "Select A Version-Controlled Folder" +msgstr "Sélectionner un dossier versionné" -#: ../meld/dirdiff.py:578 -#, python-format -msgid "[%s] Done" -msgstr "[%s] Terminé" +#: ../data/ui/tab-placeholder.ui.h:13 +msgid "_Blank comparison" +msgstr "Comparaison _vierge" -#: ../meld/dirdiff.py:582 -msgid "Multiple errors occurred while scanning this folder" -msgstr "Plusieurs erreurs se sont produites lors de l'analyse de ce dossier" +#: ../data/ui/tab-placeholder.ui.h:14 +msgid "C_ompare" +msgstr "C_omparer" -#: ../meld/dirdiff.py:583 -msgid "Files with invalid encodings found" -msgstr "Le codage de caractères de certains fichiers n'est pas valide" +#: ../data/ui/vcview.ui.h:3 +msgid "Co_mmit..." +msgstr "Co_mmit…" -#. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:585 -msgid "Some files were in an incorrect encoding. The names are something like:" -msgstr "" -"Le codage de caractères de certains fichiers n'est pas correct. Les noms " -"ressemblent à :" +#: ../data/ui/vcview.ui.h:4 +msgid "Commit changes to version control" +msgstr "Soumettre (commit) les modifications dans la gestion de version" -#: ../meld/dirdiff.py:587 -msgid "Files hidden by case insensitive comparison" -msgstr "Fichiers cachés en raison de la comparaison insensible à la casse" +#: ../data/ui/vcview.ui.h:5 +msgid "_Update" +msgstr "Mettre à _jour" -#. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:589 -msgid "" -"You are running a case insensitive comparison on a case sensitive " -"filesystem. The following files in this folder are hidden:" -msgstr "" -"Vous effectuez une comparaison insensible à la casse sur un système de " -"fichiers sensible à la casse. Les fichiers suivants de ce dossier sont " -"masqués :" +#: ../data/ui/vcview.ui.h:6 +msgid "Update working copy from version control" +msgstr "Met à jour la copie de travail à partir de la gestion de version" -#: ../meld/dirdiff.py:600 -#, python-format -msgid "'%s' hidden by '%s'" -msgstr "« %s » est masqué par « %s »" +#: ../data/ui/vcview.ui.h:7 +msgid "_Push" +msgstr "_Pousser (push)" -#: ../meld/dirdiff.py:625 ../meld/filediff.py:1010 ../meld/filediff.py:1171 -msgid "Hi_de" -msgstr "Mas_quer" +#: ../data/ui/vcview.ui.h:8 +msgid "Push local changes to remote" +msgstr "Envoie les modifications locales vers le dépôt distant" -#: ../meld/dirdiff.py:675 -#, python-format -msgid "" -"'%s' exists.\n" -"Overwrite?" -msgstr "" -"« %s » existe déjà.\n" -"Écraser ?" +#: ../data/ui/vcview.ui.h:10 +msgid "Add to version control" +msgstr "Ajouter au gestionnaire de version" -#: ../meld/dirdiff.py:682 -#, python-format -msgid "" -"Error copying '%s' to '%s'\n" -"\n" -"%s." -msgstr "" -"Erreur lors de la copie de « %s » vers « %s »\n" -"\n" -"%s." +#: ../data/ui/vcview.ui.h:12 +msgid "Remove from version control" +msgstr "Retirer du gestionnaire de version" -#: ../meld/dirdiff.py:700 ../meld/vcview.py:536 -#, python-format -msgid "" -"'%s' is a directory.\n" -"Remove recursively?" -msgstr "" -"« %s » est un répertoire.\n" -"Supprimer récursivement ?" +#: ../data/ui/vcview.ui.h:13 +msgid "Mar_k as Resolved" +msgstr "Marque_r comme résolu" -#: ../meld/dirdiff.py:707 ../meld/vcview.py:541 -#, python-format -msgid "" -"Error removing %s\n" -"\n" -"%s." +#: ../data/ui/vcview.ui.h:14 +msgid "Mark as resolved in version control" +msgstr "Marque comme résolu pour le gestionnaire de version" + +#: ../data/ui/vcview.ui.h:15 +msgid "Re_vert" +msgstr "Re_venir à l'état précédent" + +#: ../data/ui/vcview.ui.h:16 +msgid "Revert working copy to original state" +msgstr "Rend la copie de travail locale à son état d'origine" + +#: ../data/ui/vcview.ui.h:17 +msgid "Delete from working copy" +msgstr "Supprimer de la copie de travail" + +#: ../data/ui/vcview.ui.h:18 +msgid "Console" +msgstr "Console" + +#: ../data/ui/vcview.ui.h:19 +msgid "Show or hide the version control console output pane" msgstr "" -"Erreur lors de la suppression de %s\n" -"\n" -"%s." +"Affiche ou masque le panneau de sortie de la console du gestionnaire de " +"version" -#: ../meld/dirdiff.py:741 -#, python-format -msgid "%i second" -msgid_plural "%i seconds" -msgstr[0] "%i seconde" -msgstr[1] "%i secondes" +#: ../data/ui/vcview.ui.h:20 +msgid "_Flatten" +msgstr "A_platir" -#: ../meld/dirdiff.py:742 -#, python-format -msgid "%i minute" -msgid_plural "%i minutes" -msgstr[0] "%i minute" -msgstr[1] "%i minutes" +#: ../data/ui/vcview.ui.h:21 +msgid "Flatten directories" +msgstr "Aplatir les dossiers" -#: ../meld/dirdiff.py:743 -#, python-format -msgid "%i hour" -msgid_plural "%i hours" -msgstr[0] "%i heure" -msgstr[1] "%i heures" +#: ../data/ui/vcview.ui.h:22 +msgid "_Modified" +msgstr "_Modifiés" -#: ../meld/dirdiff.py:744 -#, python-format -msgid "%i day" -msgid_plural "%i days" -msgstr[0] "%i jour" -msgstr[1] "%i jours" +#: ../data/ui/vcview.ui.h:23 +msgid "Show modified files" +msgstr "Afficher les fichiers modifiés" -#: ../meld/dirdiff.py:745 -#, python-format -msgid "%i week" -msgid_plural "%i weeks" -msgstr[0] "%i semaine" -msgstr[1] "%i semaines" +#: ../data/ui/vcview.ui.h:24 +msgid "_Normal" +msgstr "_Normal" -#: ../meld/dirdiff.py:746 -#, python-format -msgid "%i month" -msgid_plural "%i months" -msgstr[0] "%i mois" -msgstr[1] "%i mois" +#: ../data/ui/vcview.ui.h:25 +msgid "Show normal files" +msgstr "Afficher les fichiers normaux" -#: ../meld/dirdiff.py:747 -#, python-format -msgid "%i year" -msgid_plural "%i years" -msgstr[0] "%i année" -msgstr[1] "%i années" +#: ../data/ui/vcview.ui.h:26 +msgid "Un_versioned" +msgstr "Non _versionnés" -#: ../meld/filediff.py:295 -msgid "Format as patch..." -msgstr "Mettre sous forme de correctif..." +#: ../data/ui/vcview.ui.h:27 +msgid "Show unversioned files" +msgstr "Afficher les fichiers qui ne sont pas versionnés" -#: ../meld/filediff.py:295 -msgid "Create a patch using differences between files" -msgstr "" -"Crée un correctif (patch) en utilisant les différences entre les fichiers" +#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69 +msgid "Ignored" +msgstr "Ignorés" -#: ../meld/filediff.py:296 -msgid "Previous conflict" -msgstr "Conflit précédent" +#: ../data/ui/vcview.ui.h:29 +msgid "Show ignored files" +msgstr "Afficher les fichiers ignorés" -#: ../meld/filediff.py:296 -msgid "Go to the previous conflict" -msgstr "Revient au conflit précédent" +#: ../data/ui/vcview.ui.h:30 +msgid "Commit" +msgstr "Soumettre (commit)" -#: ../meld/filediff.py:297 -msgid "Next conflict" -msgstr "Conflit suivant" +#: ../data/ui/vcview.ui.h:31 +msgid "Commit Files" +msgstr "Fichiers à soumettre" -#: ../meld/filediff.py:297 -msgid "Go to the next conflict" -msgstr "Va au prochain conflit" +#: ../data/ui/vcview.ui.h:32 +msgid "Log Message" +msgstr "Message du journal" + +#: ../data/ui/vcview.ui.h:33 +msgid "Previous logs:" +msgstr "Journaux précédents :" + +#: ../data/ui/vcview.ui.h:34 +msgid "Co_mmit" +msgstr "Sou_mettre" + +#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:332 +msgid "Location" +msgstr "Emplacement" + +#: ../data/ui/vcview.ui.h:37 +msgid "Status" +msgstr "État" + +#: ../data/ui/vcview.ui.h:38 +msgid "Extra" +msgstr "Extra" + +#: ../data/ui/vcview.ui.h:39 +msgid "Console output" +msgstr "Sortie de la console" + +#: ../data/ui/vcview.ui.h:40 +msgid "Push local commits to remote?" +msgstr "Envoyer les « commits » locaux au dépôt distant ?" + +#: ../data/ui/vcview.ui.h:41 +msgid "The commits to be pushed are determined by your version control system." +msgstr "" +"Les « commits » à envoyer sont déterminés par votre gestionnaire de version." -#: ../meld/filediff.py:298 -msgid "Push to left" -msgstr "Envoyer à gauche" +#: ../data/ui/vcview.ui.h:42 +msgid "_Push commits" +msgstr "_Envoyer (push) les « commits »" -#: ../meld/filediff.py:298 -msgid "Push current change to the left" -msgstr "Envoie la modification actuelle vers la gauche" +#: ../meld/const.py:12 +msgid "UNIX (LF)" +msgstr "UNIX (LF)" -#: ../meld/filediff.py:299 -msgid "Push to right" -msgstr "Envoyer à droite" +#: ../meld/const.py:13 +msgid "DOS/Windows (CR-LF)" +msgstr "DOS/Windows (CR-LF)" -#: ../meld/filediff.py:299 -msgid "Push current change to the right" -msgstr "Envoie la modification actuelle vers la droite" +#: ../meld/const.py:14 +msgid "Mac OS (CR)" +msgstr "Mac OS (CR)" -#. FIXME: using LAST and FIRST is terrible and unreliable icon abuse -#: ../meld/filediff.py:301 -msgid "Pull from left" -msgstr "Récupérer de la gauche" +#. Create file size CellRenderer +#: ../meld/dirdiff.py:391 ../meld/preferences.py:82 +msgid "Size" +msgstr "Taille" -#: ../meld/filediff.py:301 -msgid "Pull change from the left" -msgstr "Récupère la modification de gauche" +#. Create date-time CellRenderer +#: ../meld/dirdiff.py:399 ../meld/preferences.py:83 +msgid "Modification time" +msgstr "Date de modification" -#: ../meld/filediff.py:302 -msgid "Pull from right" -msgstr "Récupérer de la droite" +#. Create permissions CellRenderer +#: ../meld/dirdiff.py:407 ../meld/preferences.py:84 +msgid "Permissions" +msgstr "Droits" -#: ../meld/filediff.py:302 -msgid "Pull change from the right" -msgstr "Récupère la modification de droite" +#: ../meld/dirdiff.py:537 +#, python-format +msgid "Hide %s" +msgstr "Masquer %s" -#: ../meld/filediff.py:303 -msgid "Copy above left" -msgstr "Copier au-dessus de la gauche" +#: ../meld/dirdiff.py:669 ../meld/dirdiff.py:693 +#, python-format +msgid "[%s] Scanning %s" +msgstr "[%s] En cours d'analyse de %s" -#: ../meld/filediff.py:303 -msgid "Copy change above the left chunk" -msgstr "Copie la modification au-dessus du segment de gauche" +#: ../meld/dirdiff.py:825 +#, python-format +msgid "[%s] Done" +msgstr "[%s] Terminé" -#: ../meld/filediff.py:304 -msgid "Copy below left" -msgstr "Copier en dessous de la gauche" +#: ../meld/dirdiff.py:833 +msgid "Folders have no differences" +msgstr "Les dossiers ne comportent aucune différence" -#: ../meld/filediff.py:304 -msgid "Copy change below the left chunk" -msgstr "Copie la modification en dessous du segment de gauche" +#: ../meld/dirdiff.py:835 +msgid "Contents of scanned files in folders are identical." +msgstr "Les contenus des fichiers examinés dans les dossiers sont identiques." -#: ../meld/filediff.py:305 -msgid "Copy above right" -msgstr "Copier au-dessus de la droite" +#: ../meld/dirdiff.py:837 +msgid "" +"Scanned files in folders appear identical, but contents have not been " +"scanned." +msgstr "" +"Les fichiers examinés dans les dossiers paraissent identiques, mais les " +"contenus n'ont pas été examinés." -#: ../meld/filediff.py:305 -msgid "Copy change above the right chunk" -msgstr "Copie la modification au-dessus du segment de droite" +#: ../meld/dirdiff.py:840 +msgid "File filters are in use, so not all files have been scanned." +msgstr "" +"Des filtres de fichier sont en cours d'utilisation, tous les fichiers " +"n'ont donc pas été examinés." -#: ../meld/filediff.py:306 -msgid "Copy below right" -msgstr "Copier en dessous de la droite" +#: ../meld/dirdiff.py:842 +msgid "Text filters are in use and may be masking content differences." +msgstr "" +"Des filtres de texte sont actuellement utilisés et il se peut qu'ils " +"masquent des différences de contenu." -#: ../meld/filediff.py:306 -msgid "Copy change below the right chunk" -msgstr "Copie la modification en dessous du segement de droite" +#: ../meld/dirdiff.py:860 ../meld/filediff.py:1384 ../meld/filediff.py:1414 +#: ../meld/filediff.py:1416 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 +msgid "Hi_de" +msgstr "Mas_quer" -#: ../meld/filediff.py:307 -msgid "Delete" -msgstr "Supprimer" +#: ../meld/dirdiff.py:870 +msgid "Multiple errors occurred while scanning this folder" +msgstr "Plusieurs erreurs se sont produites lors de l'analyse de ce dossier" -#: ../meld/filediff.py:307 -msgid "Delete change" -msgstr "Supprimer les modifications" +#: ../meld/dirdiff.py:871 +msgid "Files with invalid encodings found" +msgstr "Le codage de caractères de certains fichiers n'est pas valide" -#: ../meld/filediff.py:308 -msgid "Merge all changes from left" -msgstr "Fusionne toutes les modifications de gauche" +#. TRANSLATORS: This is followed by a list of files +#: ../meld/dirdiff.py:873 +msgid "Some files were in an incorrect encoding. The names are something like:" +msgstr "" +"Le codage de caractères de certains fichiers n'est pas correct. Les noms " +"ressemblent à :" -#: ../meld/filediff.py:308 -msgid "Merge all non-conflicting changes from the left" -msgstr "Fusionne toutes les modifications non-conflictuelles de gauche" +#: ../meld/dirdiff.py:875 +msgid "Files hidden by case insensitive comparison" +msgstr "Fichiers cachés en raison de la comparaison insensible à la casse" -#: ../meld/filediff.py:309 -msgid "Merge all changes from right" -msgstr "Fusionne toutes les modifications de droite" +#. TRANSLATORS: This is followed by a list of files +#: ../meld/dirdiff.py:877 +msgid "" +"You are running a case insensitive comparison on a case sensitive " +"filesystem. The following files in this folder are hidden:" +msgstr "" +"Vous effectuez une comparaison insensible à la casse sur un système de " +"fichiers sensible à la casse. Les fichiers suivants de ce dossier sont " +"masqués :" -#: ../meld/filediff.py:309 -msgid "Merge all non-conflicting changes from the right" -msgstr "Fusionne toutes les modifications non-conflictuelles de droite" +#: ../meld/dirdiff.py:888 +#, python-format +msgid "'%s' hidden by '%s'" +msgstr "« %s » est masqué par « %s »" -#: ../meld/filediff.py:310 -msgid "Merge all non-conflicting" -msgstr "Fusionne toutes les modifications non-conflictuelles" +#: ../meld/dirdiff.py:944 +#, python-format +msgid "Replace folder “%s”?" +msgstr "Remplacer le dossier « %s » ?" -#: ../meld/filediff.py:310 -msgid "Merge all non-conflicting changes from left and right panes" +#: ../meld/dirdiff.py:946 +#, 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 "" -"Fusionne toutes les modifications non-conflictuelles des panneaux de gauche " -"et de droite" +"Un autre dossier avec le même nom existe déjà dans « %s ».\n" +"Si vous remplacez le fichier existant, tous les fichiers qu'il contient " +"seront perdus." -#: ../meld/filediff.py:311 -msgid "Cycle through documents" -msgstr "Parcourir cycliquement les documents" +#: ../meld/dirdiff.py:959 +msgid "Error copying file" +msgstr "Erreur lors de la copie du fichier" -#: ../meld/filediff.py:311 -msgid "Move keyboard focus to the next document in this comparison" +#: ../meld/dirdiff.py:960 +#, python-format +msgid "" +"Couldn't copy %s\n" +"to %s.\n" +"\n" +"%s" msgstr "" -"Déplacer le focus clavier vers le document suivant dans cette comparaison" +"Impossible de copier %s\n" +"vers %s.\n" +"\n" +"%s" -#: ../meld/filediff.py:315 -msgid "Lock scrolling" -msgstr "Verrouiller le défilement" +#: ../meld/dirdiff.py:983 +#, python-format +msgid "Error deleting %s" +msgstr "Erreur lors de la suppression de %s" -#: ../meld/filediff.py:316 -msgid "Lock scrolling of all panes" -msgstr "Verrouille le défilement de tous les panneaux" +#: ../meld/dirdiff.py:1488 +msgid "No folder" +msgstr "Aucun dossier" #. Abbreviations for insert and overwrite that fit in the status bar -#: ../meld/filediff.py:396 +#: ../meld/filediff.py:355 msgid "INS" msgstr "INS" -#: ../meld/filediff.py:396 +#: ../meld/filediff.py:355 msgid "OVR" msgstr "ÉCR" #. Abbreviation for line, column so that it will fit in the status bar -#: ../meld/filediff.py:398 +#: ../meld/filediff.py:357 #, python-format msgid "Ln %i, Col %i" msgstr "Ln %i, Col %i" -#: ../meld/filediff.py:722 -#, python-format +#: ../meld/filediff.py:782 +msgid "Comparison results will be inaccurate" +msgstr "Les résultats de la comparaison manqueront de précision" + +#: ../meld/filediff.py:784 msgid "" -"Filter '%s' changed the number of lines in the file. Comparison will be " -"incorrect. See the user manual for more details." +"A filter changed the number of lines in the file, which is unsupported. The " +"comparison will not be accurate." msgstr "" -"Le filtre « %s » a modifié le nombre de lignes du fichier. La comparaison ne " -"sera plus correcte. Consultez le manuel d'utilisation pour plus de détails." +"Un filtre a modifié le nombre de lignes du fichier, ce qui n'est pas pris en " +"charge. La comparaison ne sera pas précise." -#. TRANSLATORS: this is the name of a new file which has not yet been saved -#: ../meld/filediff.py:809 -msgid "" -msgstr "" +#: ../meld/filediff.py:840 +msgid "Mark conflict as resolved?" +msgstr "Marquer le conflit comme résolu ?" -#: ../meld/filediff.py:998 -#, python-format -msgid "[%s] Set num panes" -msgstr "[%s] Régler le nombre de volets" +#: ../meld/filediff.py:842 +msgid "" +"If the conflict was resolved successfully, you may mark it as resolved now." +msgstr "" +"Si le conflit a été résolu avec succès, vous pouvez maintenant le marquer " +"comme résolu." -#: ../meld/filediff.py:1004 -#, python-format -msgid "[%s] Opening files" -msgstr "[%s] Ouverture des fichiers" +#: ../meld/filediff.py:844 +msgid "Cancel" +msgstr "Annuler" -#: ../meld/filediff.py:1028 ../meld/filediff.py:1037 ../meld/filediff.py:1049 -#: ../meld/filediff.py:1055 -msgid "Could not read file" -msgstr "Impossible de lire le fichier" +#: ../meld/filediff.py:845 +msgid "Mark _Resolved" +msgstr "Marquer comme _résolu" -#: ../meld/filediff.py:1029 +#: ../meld/filediff.py:1093 #, python-format -msgid "[%s] Reading files" -msgstr "[%s] Lecture des fichiers" +msgid "There was a problem opening the file “%s”." +msgstr "Un problème est survenu lors de l'ouverture du fichier « %s »." -#: ../meld/filediff.py:1038 +#: ../meld/filediff.py:1101 #, python-format -msgid "%s appears to be a binary file." -msgstr "%s semble être un fichier binaire." +msgid "File %s appears to be a binary file." +msgstr "Le fichier %s semble être un fichier binaire." -#: ../meld/filediff.py:1050 -#, python-format -msgid "%s is not in encodings: %s" -msgstr "%s n'est pas dans un des codages : %s" +#: ../meld/filediff.py:1103 +msgid "Do you want to open the file using the default application?" +msgstr "Voulez-vous ouvrir le fichier avec l'application par défaut ?" + +#: ../meld/filediff.py:1105 +msgid "Open" +msgstr "Ouvrir" -#: ../meld/filediff.py:1080 ../meld/filemerge.py:67 +#: ../meld/filediff.py:1121 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Calcul des différences" -#: ../meld/filediff.py:1158 +#: ../meld/filediff.py:1186 +#, python-format +msgid "File %s has changed on disk" +msgstr "Le fichier %s a été modifié sur le disque" + +#: ../meld/filediff.py:1187 +msgid "Do you want to reload the file?" +msgstr "Voulez vous recharger le fichier ?" + +#: ../meld/filediff.py:1189 +msgid "_Reload" +msgstr "_Recharger" + +#: ../meld/filediff.py:1347 +msgid "Files are identical" +msgstr "Les fichiers sont identiques" + +#: ../meld/filediff.py:1360 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -808,720 +1906,664 @@ msgstr "" "masquent des différences entre les fichiers. Voulez-vous comparer les " "fichiers non filtrés ?" -#: ../meld/filediff.py:1164 -msgid "Files are identical" -msgstr "Les fichiers sont identiques" +#: ../meld/filediff.py:1365 +msgid "Files differ in line endings only" +msgstr "Les fichiers ne diffèrent que par les fins de lignes" + +#: ../meld/filediff.py:1367 +#, python-format +msgid "" +"Files are identical except for differing line endings:\n" +"%s" +msgstr "" +"Les fichiers sont identiques sauf dans les fins de lignes :\n" +"%s" -#: ../meld/filediff.py:1174 +#: ../meld/filediff.py:1387 msgid "Show without filters" msgstr "Afficher sans les filtres" -#: ../meld/filediff.py:1363 -#, python-format +#: ../meld/filediff.py:1409 +msgid "Change highlighting incomplete" +msgstr "Surlignage des modifications incomplet" + +#: ../meld/filediff.py:1410 msgid "" -"\"%s\" exists!\n" -"Overwrite?" +"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 "" -"« %s » existe déjà !\n" -"Écraser ?" +"Certaines modifications n'ont pas été surlignées car elles sont trop " +"importantes. Vous pouvez forcer Meld à surligner des modifications plus " +"importantes, mais cela risque d'être plus long." + +#: ../meld/filediff.py:1418 +msgid "Keep highlighting" +msgstr "Continuer à surligner" + +#: ../meld/filediff.py:1420 +msgid "_Keep highlighting" +msgstr "_Continuer à surligner" + +#: ../meld/filediff.py:1452 +#, python-format +msgid "Replace file “%s”?" +msgstr "Remplacer le fichier « %s » ?" -#: ../meld/filediff.py:1376 +#: ../meld/filediff.py:1454 #, python-format msgid "" -"Error writing to %s\n" -"\n" -"%s." +"A file with this name already exists in “%s”.\n" +"If you replace the existing file, its contents will be lost." msgstr "" -"Erreur lors de l'écriture de %s\n" -"\n" -"%s." +"Un fichier avec le même nom existe déjà dans « %s ».\n" +"Si vous remplacez le fichier existant, tout son contenu sera perdu." + +#: ../meld/filediff.py:1471 +msgid "Save Left Pane As" +msgstr "Enregistrer le panneau de gauche sous" -#: ../meld/filediff.py:1385 +#: ../meld/filediff.py:1473 +msgid "Save Middle Pane As" +msgstr "Enregistrer le panneau du milieu sous" + +#: ../meld/filediff.py:1475 +msgid "Save Right Pane As" +msgstr "Enregistrer le panneau de droite sous" + +#: ../meld/filediff.py:1489 #, python-format -msgid "Choose a name for buffer %i." -msgstr "Choisissez un nom pour le tampon %i." +msgid "File %s has changed on disk since it was opened" +msgstr "Le fichier %s a été modifié sur le disque après son ouverture" + +#: ../meld/filediff.py:1491 +msgid "If you save it, any external changes will be lost." +msgstr "Si vous l'enregistrez, toute modification extérieure sera perdue." -#: ../meld/filediff.py:1400 +#: ../meld/filediff.py:1494 +msgid "Save Anyway" +msgstr "Enregistrer malgré tout" + +#: ../meld/filediff.py:1495 +msgid "Don't Save" +msgstr "Ne pas enregistrer" + +#: ../meld/filediff.py:1521 +msgid "_Save as UTF-8" +msgstr "_Enregistrer en tant qu'UTF-8" + +#: ../meld/filediff.py:1524 #, python-format -msgid "" -"This file '%s' contains a mixture of line endings.\n" -"\n" -"Which format would you like to use?" -msgstr "" -"Le fichier « %s » présente un mélange de fins de lignes.\n" -"\n" -"Quel format voulez-vous utiliser ?" +msgid "Couldn't encode text as “%s”" +msgstr "Impossible de coder le texte en « %s »" -#: ../meld/filediff.py:1416 +#: ../meld/filediff.py:1526 #, python-format msgid "" -"'%s' contains characters not encodable with '%s'\n" +"File “%s” contains characters that can't be encoded using encoding “%s”.\n" "Would you like to save as UTF-8?" msgstr "" -"« %s » contient des caractères qui ne peuvent être codés avec « %s »\n" +"Le fichier « %s » contient des caractères qui ne peuvent être codés avec le " +"codage « %s ».\n" "Voulez-vous enregistrer en UTF-8 ?" -#: ../meld/filediff.py:1475 +#: ../meld/filediff.py:1566 ../meld/patchdialog.py:131 +#, python-format +msgid "Could not save file %s." +msgstr "Impossible d'enregistrer le fichier %s." + +#: ../meld/filediff.py:1567 ../meld/patchdialog.py:132 #, python-format msgid "" -"Reloading will discard changes in:\n" -"%s\n" -"\n" -"You cannot undo this operation." +"Couldn't save file due to:\n" +"%s" msgstr "" -"Recharger annulera tous les changements dans :\n" -"%s\n" -"\n" -"Vous ne pouvez pas annuler cette opération." +"Impossible d'enregistrer le fichier à cause de :\n" +"%s" -#: ../meld/filemerge.py:82 +#: ../meld/filediff.py:1913 +msgid "Live comparison updating disabled" +msgstr "La mise à jour en direct des comparaisons est désactivée" + +#: ../meld/filediff.py:1914 +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 "" +"La mise à jour en direct des comparaisons est désactivée quand les points de " +"synchronisation sont actifs. Vous pouvez toujours actualiser manuellement la " +"comparaison, et les mises à jour automatiques reprendront quand les points " +"de synchronisation seront effacés." + +#: ../meld/filemerge.py:37 #, python-format msgid "[%s] Merging files" msgstr "[%s] Fusion des fichiers" -#: ../meld/meldapp.py:152 +#: ../meld/gutterrendererchunk.py:189 +msgid "Copy _up" +msgstr "Copier au-dess_us" + +#: ../meld/gutterrendererchunk.py:190 +msgid "Copy _down" +msgstr "Copier au-dess_ous" + +#: ../meld/meldapp.py:175 msgid "wrong number of arguments supplied to --diff" -msgstr "Nombre de paramètres incorrect pour --diff" +msgstr "nombre de paramètres incorrect pour --diff" -#: ../meld/meldapp.py:156 +#: ../meld/meldapp.py:180 msgid "Start with an empty window" msgstr "Démarrer avec une fenêtre vide" -#: ../meld/meldapp.py:157 ../meld/meldapp.py:158 ../meld/meldapp.py:160 +#: ../meld/meldapp.py:181 ../meld/meldapp.py:183 msgid "file" msgstr "fichier" -#: ../meld/meldapp.py:157 ../meld/meldapp.py:159 ../meld/meldapp.py:160 -msgid "dir" -msgstr "répertoire" +#: ../meld/meldapp.py:181 ../meld/meldapp.py:185 +msgid "folder" +msgstr "dossier" -#: ../meld/meldapp.py:157 +#: ../meld/meldapp.py:182 msgid "Start a version control comparison" -msgstr "Démarrer une comparaison de gestion de versions" +msgstr "Démarrer une comparaison de gestion de version" -#: ../meld/meldapp.py:158 +#: ../meld/meldapp.py:184 msgid "Start a 2- or 3-way file comparison" msgstr "Démarrer une comparaison de 2 ou 3 fichiers" -#: ../meld/meldapp.py:159 -msgid "Start a 2- or 3-way directory comparison" -msgstr "Démarrer une comparaison de 2 ou 3 répertoires" +#: ../meld/meldapp.py:186 +msgid "Start a 2- or 3-way folder comparison" +msgstr "Démarrer une comparaison de 2 ou 3 dossiers" -#: ../meld/meldapp.py:160 -msgid "Start a comparison between file and dir/file" -msgstr "Démarrer une comparaison de fichier et de répertoire/fichier" +#: ../meld/meldapp.py:229 +#, python-format +msgid "Error: %s\n" +msgstr "Erreur : %s\n" -#: ../meld/meldapp.py:166 +#: ../meld/meldapp.py:236 msgid "Meld is a file and directory comparison tool." -msgstr "Meld est un outil de comparaison de fichiers et de répertoires." +msgstr "Meld est un outil de comparaison de fichiers et de dossiers." -#: ../meld/meldapp.py:169 +#: ../meld/meldapp.py:240 msgid "Set label to use instead of file name" -msgstr "Définit l'étiquette à utiliser au lieu du nom de fichier" +msgstr "Définir l'étiquette à utiliser au lieu du nom de fichier" -#: ../meld/meldapp.py:171 +#: ../meld/meldapp.py:243 +msgid "Open a new tab in an already running instance" +msgstr "Ouvrir un nouvel onglet dans une instance en cours" + +#: ../meld/meldapp.py:246 msgid "Automatically compare all differing files on startup" -msgstr "Compare automatiquement tous les fichiers différents au démarrage" +msgstr "Comparer automatiquement tous les fichiers différents au démarrage" -#: ../meld/meldapp.py:173 +#: ../meld/meldapp.py:249 msgid "Ignored for compatibility" msgstr "Ignorée pour compatibilité" -#: ../meld/meldapp.py:176 +#: ../meld/meldapp.py:253 msgid "Set the target file for saving a merge result" -msgstr "Définit le fichier cible pour l'enregistrement d'un résultat de fusion" +msgstr "Définir le fichier cible pour l'enregistrement d'un résultat de fusion" -#: ../meld/meldapp.py:179 -msgid "Creates a diff tab for up to 3 supplied files or directories." -msgstr "Crée un onglet diff pour un maximum de 3 fichiers ou répertoires." +#: ../meld/meldapp.py:256 +msgid "Automatically merge files" +msgstr "Fusionner automatiquement les fichiers" -#: ../meld/meldapp.py:182 +#: ../meld/meldapp.py:260 +msgid "Load a saved comparison from a Meld comparison file" +msgstr "" +"Charger une comparaison enregistrée à partir d'un fichier de comparaison Meld" + +#: ../meld/meldapp.py:264 +msgid "Create a diff tab for the supplied files or folders" +msgstr "Créer un onglet de comparaison pour les fichiers ou dossiers fournis" + +#: ../meld/meldapp.py:284 +#, python-format +msgid "too many arguments (wanted 0-3, got %d)" +msgstr "trop de paramètres (0-3 désirés, %d reçus)" + +#: ../meld/meldapp.py:287 +msgid "can't auto-merge less than 3 files" +msgstr "impossible de fusionner automatiquement moins de 3 fichiers" + +#: ../meld/meldapp.py:289 +msgid "can't auto-merge directories" +msgstr "impossible de fusionner automatiquement les dossiers" + +#: ../meld/meldapp.py:303 +msgid "Error reading saved comparison file" +msgstr "Erreur à la lecture du fichier de comparaison enregistré" + +#: ../meld/meldapp.py:330 #, python-format -msgid "too many arguments (wanted 0-4, got %d)" -msgstr "trop de paramètres (0-4 désirés, %d reçus)" +msgid "invalid path or URI \"%s\"" +msgstr "chemin ou URI non valide « %s »" -#: ../meld/meldapp.py:184 ../meld/meldapp.py:188 -msgid "can't compare more than three directories" -msgstr "impossible de comparer plus de trois répertoires" +#. TRANSLATORS: This is the label of a new, currently-unnamed file. +#: ../meld/meldbuffer.py:131 +msgid "" +msgstr "" -#: ../meld/melddoc.py:56 ../meld/melddoc.py:57 +#: ../meld/melddoc.py:64 msgid "untitled" msgstr "sans titre" -#: ../meld/meldwindow.py:125 +#: ../meld/meldwindow.py:49 msgid "_File" msgstr "_Fichier" -#: ../meld/meldwindow.py:126 -msgid "_New..." -msgstr "_Nouveau..." +#: ../meld/meldwindow.py:50 +msgid "_New Comparison..." +msgstr "_Nouvelle comparaison…" -#: ../meld/meldwindow.py:126 +#: ../meld/meldwindow.py:51 msgid "Start a new comparison" msgstr "Lancer une nouvelle comparaison" -#: ../meld/meldwindow.py:127 +#: ../meld/meldwindow.py:54 msgid "Save the current file" msgstr "Enregistrer le fichier actuel" -#: ../meld/meldwindow.py:129 +#: ../meld/meldwindow.py:56 +msgid "Save As..." +msgstr "Enregistrer sous…" + +#: ../meld/meldwindow.py:57 +msgid "Save the current file with a different name" +msgstr "Enregistrer le fichier en cours sous un nom différent" + +#: ../meld/meldwindow.py:60 msgid "Close the current file" msgstr "Fermer le fichier actuel" -#: ../meld/meldwindow.py:130 -msgid "Quit the program" -msgstr "Quitter le programme" - -#: ../meld/meldwindow.py:132 +#: ../meld/meldwindow.py:63 msgid "_Edit" msgstr "É_dition" -#: ../meld/meldwindow.py:133 +#: ../meld/meldwindow.py:65 msgid "Undo the last action" msgstr "Annuler la dernière action" -#: ../meld/meldwindow.py:134 +#: ../meld/meldwindow.py:68 msgid "Redo the last undone action" msgstr "Rétablir la dernière action annulée" -#: ../meld/meldwindow.py:135 +#: ../meld/meldwindow.py:70 msgid "Cut the selection" msgstr "Couper la sélection" -#: ../meld/meldwindow.py:136 +#: ../meld/meldwindow.py:72 msgid "Copy the selection" msgstr "Copier la sélection" -#: ../meld/meldwindow.py:137 +#: ../meld/meldwindow.py:74 msgid "Paste the clipboard" msgstr "Coller le presse-papiers" -#: ../meld/meldwindow.py:138 +#: ../meld/meldwindow.py:76 +msgid "Find..." +msgstr "Rechercher…" + +#: ../meld/meldwindow.py:76 msgid "Search for text" -msgstr "Rechercher du texte" +msgstr "Rechercher un texte" -#: ../meld/meldwindow.py:139 +#: ../meld/meldwindow.py:78 msgid "Find Ne_xt" msgstr "Rechercher le _suivant" -#: ../meld/meldwindow.py:139 +#: ../meld/meldwindow.py:79 msgid "Search forwards for the same text" msgstr "Recherche le même texte en avant" -#: ../meld/meldwindow.py:140 +#: ../meld/meldwindow.py:81 msgid "Find _Previous" msgstr "Rechercher le _précédent" -#: ../meld/meldwindow.py:140 +#: ../meld/meldwindow.py:82 msgid "Search backwards for the same text" msgstr "Recherche le même texte en arrière" -#: ../meld/meldwindow.py:141 +#: ../meld/meldwindow.py:85 +msgid "_Replace..." +msgstr "_Remplacer…" + +#: ../meld/meldwindow.py:86 msgid "Find and replace text" msgstr "Recherche un texte et le remplace" -#: ../meld/meldwindow.py:142 -msgid "Prefere_nces" -msgstr "_Préférences" - -#: ../meld/meldwindow.py:142 -msgid "Configure the application" -msgstr "Configurer l'application" - -#: ../meld/meldwindow.py:144 +#: ../meld/meldwindow.py:89 msgid "_Changes" msgstr "D_ifférences" -#: ../meld/meldwindow.py:145 -msgid "Next change" -msgstr "Prochaine différence" +#: ../meld/meldwindow.py:90 +msgid "Next Change" +msgstr "Différence suivante" -#: ../meld/meldwindow.py:145 +#: ../meld/meldwindow.py:91 msgid "Go to the next change" -msgstr "Va jusqu'à la prochaine différence" +msgstr "Aller jusqu'à la différence suivante" -#: ../meld/meldwindow.py:146 -msgid "Previous change" +#: ../meld/meldwindow.py:93 +msgid "Previous Change" msgstr "Différence précédente" -#: ../meld/meldwindow.py:146 +#: ../meld/meldwindow.py:94 msgid "Go to the previous change" -msgstr "Revient à la différence précédente" +msgstr "Retour à la différence précédente" -#: ../meld/meldwindow.py:147 -msgid "Open externally" +#: ../meld/meldwindow.py:96 +msgid "Open Externally" msgstr "Ouvrir avec" -#: ../meld/meldwindow.py:147 +#: ../meld/meldwindow.py:97 msgid "Open selected file or directory in the default external application" msgstr "" "Ouvre le dossier ou le fichier sélectionné dans l'application externe par " "défaut" -#: ../meld/meldwindow.py:149 +#: ../meld/meldwindow.py:101 msgid "_View" msgstr "_Affichage" -#: ../meld/meldwindow.py:150 -msgid "File status" +#: ../meld/meldwindow.py:102 +msgid "File Status" msgstr "État du fichier" -#: ../meld/meldwindow.py:151 -msgid "Version status" +#: ../meld/meldwindow.py:103 +msgid "Version Status" msgstr "État de la version" -#: ../meld/meldwindow.py:152 -msgid "File filters" -msgstr "Filtres de fichier" - -#: ../meld/meldwindow.py:153 +#: ../meld/meldwindow.py:106 msgid "Stop the current action" -msgstr "Arrête l'action en cours" +msgstr "Arrêter l'action en cours" -#: ../meld/meldwindow.py:154 +#: ../meld/meldwindow.py:109 msgid "Refresh the view" -msgstr "Actualise l'affichage" - -#: ../meld/meldwindow.py:155 -msgid "Reload" -msgstr "Recharger" - -#: ../meld/meldwindow.py:155 -msgid "Reload the comparison" -msgstr "Recharge la comparaison" +msgstr "Actualiser l'affichage" -#: ../meld/meldwindow.py:157 -msgid "_Tabs" -msgstr "_Onglets" +#: ../meld/meldwindow.py:113 +msgid "Fullscreen" +msgstr "Plein écran" -#: ../meld/meldwindow.py:158 -msgid "_Previous Tab" -msgstr "Onglet _précédent" +#: ../meld/meldwindow.py:114 +msgid "View the comparison in fullscreen" +msgstr "Afficher la comparaison en plein écran" -#: ../meld/meldwindow.py:158 -msgid "Activate previous tab" -msgstr "Active l'onglet précédent" +#: ../meld/meldwindow.py:116 +msgid "_Toolbar" +msgstr "_Barre d'outils" -#: ../meld/meldwindow.py:159 -msgid "_Next Tab" -msgstr "Onglet _suivant" +#: ../meld/meldwindow.py:117 +msgid "Show or hide the toolbar" +msgstr "Afficher ou masquer la barre d'outils" -#: ../meld/meldwindow.py:159 -msgid "Activate next tab" -msgstr "Active l'onglet suivant" +#: ../meld/meldwindow.py:127 +msgid "Open Recent" +msgstr "Récemment ouverts" -#: ../meld/meldwindow.py:160 -msgid "Move Tab _Left" -msgstr "Déplacer l'onglet vers la _gauche" +#: ../meld/meldwindow.py:128 +msgid "Open recent files" +msgstr "Ouvrir les fichiers récents" -#: ../meld/meldwindow.py:160 -msgid "Move current tab to left" -msgstr "Déplace l'onglet actuel vers la gauche" +#: ../meld/meldwindow.py:150 +msgid "_Meld" +msgstr "_Meld" -#: ../meld/meldwindow.py:161 -msgid "Move Tab _Right" -msgstr "Déplacer l'onglet vers la _droite" +#: ../meld/meldwindow.py:151 +msgid "Quit the program" +msgstr "Quitter le programme" -#: ../meld/meldwindow.py:161 -msgid "Move current tab to right" -msgstr "Déplace l'onglet actuel vers la droite" +#: ../meld/meldwindow.py:153 +msgid "Prefere_nces" +msgstr "Préfére_nces" -#: ../meld/meldwindow.py:163 -msgid "_Help" -msgstr "Aid_e" +#: ../meld/meldwindow.py:154 +msgid "Configure the application" +msgstr "Configurer l'application" -#: ../meld/meldwindow.py:164 +#: ../meld/meldwindow.py:156 msgid "_Contents" msgstr "_Sommaire" -#: ../meld/meldwindow.py:164 +#: ../meld/meldwindow.py:157 msgid "Open the Meld manual" -msgstr "Ouvre le manuel de Meld" - -#: ../meld/meldwindow.py:165 -msgid "Report _Bug" -msgstr "Signaler une _anomalie" - -#: ../meld/meldwindow.py:165 -msgid "Report a bug in Meld" -msgstr "Rapporte une anomalie de Meld" - -#: ../meld/meldwindow.py:166 -msgid "About this program" -msgstr "À propos de ce programme" - -#: ../meld/meldwindow.py:169 -msgid "Full Screen" -msgstr "Plein écran" - -#: ../meld/meldwindow.py:169 -msgid "View the comparison in full screen" -msgstr "Afficher la comparaison en plein écran" - -#: ../meld/meldwindow.py:170 -msgid "_Toolbar" -msgstr "_Barre d'outils" - -#: ../meld/meldwindow.py:170 -msgid "Show or hide the toolbar" -msgstr "Affiche ou masque la barre d'outils" +msgstr "Ouvrir le manuel Meld" -#: ../meld/meldwindow.py:171 -msgid "_Statusbar" -msgstr "B_arre d'état" +#: ../meld/meldwindow.py:159 +msgid "About this application" +msgstr "À propos de cette application" -#: ../meld/meldwindow.py:171 -msgid "Show or hide the statusbar" -msgstr "Affiche ou masque la barre d'état" +#: ../meld/meldwindow.py:593 +#, python-format +msgid "Need three files to auto-merge, got: %r" +msgstr "Trois fichiers sont nécessaires pour une auto-fusion, reçu %r" -#: ../meld/meldwindow.py:541 -msgid "Switch to this tab" -msgstr "Basculer vers cet onglet" +#: ../meld/meldwindow.py:607 +msgid "Cannot compare a mixture of files and directories" +msgstr "Impossible de comparer des fichiers avec des dossiers" -#. exit at first non found directory + file -#: ../meld/meldwindow.py:639 -msgid "Cannot compare a mixture of files and directories.\n" -msgstr "Impossible de comparer des fichiers avec des répertoires.\n" +#: ../meld/misc.py:203 +#, python-format +msgid "Couldn't find colour scheme details for %s-%s; this is a bad install" +msgstr "" +"Impossible de trouver les détails du jeu de couleur pour %s-%s ; il s'agit " +"d'une mauvaise installation" #. no common path. empty names get changed to "[None]" -#: ../meld/misc.py:174 +#: ../meld/misc.py:263 msgid "[None]" msgstr "[Aucun]" -#: ../meld/patchdialog.py:122 -msgid "Save Patch As..." -msgstr "Enregistrer le correctif sous..." - -#: ../meld/preferences.py:37 +#: ../meld/preferences.py:33 msgid "label" msgstr "étiquette" -#: ../meld/preferences.py:37 +#: ../meld/preferences.py:33 msgid "pattern" msgstr "motif" -#: ../meld/preferences.py:111 -msgid "Only available if you have gnome-python-desktop installed" -msgstr "Disponible uniquement si gnome-python-desktop est installé" +#: ../meld/recent.py:114 +msgid "Version control:" +msgstr "Gestionnaire de versions :" -#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact -#: ../meld/preferences.py:234 -msgid "Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n" -msgstr "Sauvegardes\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n" +#: ../meld/ui/notebooklabel.py:63 +msgid "Close tab" +msgstr "Fermer l'onglet" -#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact -#: ../meld/preferences.py:236 -msgid "" -"OS-specific metadata\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db " -"Desktop.ini\n" -msgstr "" -"Métadonnées spécifiques au système d'exploitation\t0\t.DS_Store ._* ." -"Spotlight-V100 .Trashes Thumbs.db Desktop.ini\n" +#: ../meld/ui/vcdialogs.py:48 +msgid "No files will be committed" +msgstr "Aucun fichier ne sera soumis" -#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact -#: ../meld/preferences.py:238 +#. Translators: First %s is replaced by translated "%d unpushed +#. commits", second %s is replaced by translated "%d branches" +#: ../meld/vc/git.py:94 #, python-format -msgid "Version Control\t1\t%s\n" -msgstr "Gestionnaire de versions\t1\t%s\n" - -#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact -#: ../meld/preferences.py:240 -msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n" -msgstr "Binaires\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n" - -#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact -#: ../meld/preferences.py:242 -msgid "Media\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}" -msgstr "Média\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}" - -#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact -#: ../meld/preferences.py:244 -msgid "CVS keywords\t0\t\\$\\w+(:[^\\n$]+)?\\$\n" -msgstr "Mots-clés CVS\t0\t\\$\\w+(:[^\\n$]+)?\\$\n" - -#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact -#: ../meld/preferences.py:246 -msgid "C++ comment\t0\t//.*\n" -msgstr "Commentaire C++\t0\t//.*\n" - -#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact -#: ../meld/preferences.py:248 -msgid "C comment\t0\t/\\*.*?\\*/\n" -msgstr "Commentaire C\t0\t/\\*.*?\\*/\n" - -#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact -#: ../meld/preferences.py:250 -msgid "All whitespace\t0\t[ \\t\\r\\f\\v]*\n" -msgstr "Tout caractère d'espacement\t0\t[ \\t\\r\\f\\v]*\n" - -#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact -#: ../meld/preferences.py:252 -msgid "Leading whitespace\t0\t^[ \\t\\r\\f\\v]*\n" -msgstr "Caractère d'espacement en début de ligne\t0\t^[ \\t\\r\\f\\v]*\n" - -#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact -#: ../meld/preferences.py:254 -msgid "Script comment\t0\t#.*" -msgstr "Commentaire de script\t0\t#.*" - -#: ../meld/vcview.py:128 -msgid "Co_mmit" -msgstr "_Valider" - -#: ../meld/vcview.py:128 -msgid "Commit" -msgstr "Fait un « Commit »" - -#: ../meld/vcview.py:129 -msgid "_Update" -msgstr "Mettre à _jour" +msgid "%s in %s" +msgstr "%s dans %s" -#: ../meld/vcview.py:129 -msgid "Update" -msgstr "Fait un « Update »" - -#: ../meld/vcview.py:130 -msgid "Add to VC" -msgstr "Ajoute au gestionnaire de versions" - -#: ../meld/vcview.py:131 -msgid "Add _Binary" -msgstr "Ajouter _binaire" - -#: ../meld/vcview.py:131 -msgid "Add binary to VC" -msgstr "Ajoute le binaire au gestionnaire de versions" - -#: ../meld/vcview.py:132 -msgid "Remove from VC" -msgstr "Supprime du gestionnaire de versions" - -#: ../meld/vcview.py:133 -msgid "_Resolved" -msgstr "_Résolu" - -#: ../meld/vcview.py:133 -msgid "Mark as resolved for VC" -msgstr "Marque comme résolu pour le gestionnaire de versions" +#. Translators: These messages cover the case where there is +#. only one branch, and are not part of another message. +#: ../meld/vc/git.py:95 ../meld/vc/git.py:102 +#, python-format +msgid "%d unpushed commit" +msgid_plural "%d unpushed commits" +msgstr[0] "%d commit non envoyé" +msgstr[1] "%d commits non envoyés" -#: ../meld/vcview.py:134 -msgid "Revert to original" -msgstr "Revenir à l'original" +#: ../meld/vc/git.py:97 +#, python-format +msgid "%d branch" +msgid_plural "%d branches" +msgstr[0] "%d branche" +msgstr[1] "%d branches" -#: ../meld/vcview.py:135 -msgid "Delete locally" -msgstr "Effacer localement" +#: ../meld/vc/git.py:330 +#, python-format +msgid "Mode changed from %s to %s" +msgstr "Mode changé de %s à %s" -#: ../meld/vcview.py:139 -msgid "_Flatten" -msgstr "A_platir" +#: ../meld/vc/git.py:338 +msgid "Partially staged" +msgstr "Partiellement présélectionné" -#: ../meld/vcview.py:139 -msgid "Flatten directories" -msgstr "Aplatir les répertoires" +#: ../meld/vc/git.py:338 +msgid "Staged" +msgstr "Présélectionné" -#: ../meld/vcview.py:140 -msgid "_Modified" -msgstr "_Modifiés" +#. 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 "Aucun" -#: ../meld/vcview.py:141 -msgid "_Normal" -msgstr "_Normal" +#: ../meld/vc/svn.py:204 +#, python-format +msgid "Rev %s" +msgstr "Rév %s" -#: ../meld/vcview.py:141 -msgid "Show normal" -msgstr "Affichage normal" +#: ../meld/vc/_vc.py:54 +msgid "Merged" +msgstr "Fusionné" -#: ../meld/vcview.py:142 -msgid "Non _VC" -msgstr "Non _versionné" +#: ../meld/vc/_vc.py:54 +msgid "Base" +msgstr "Base" -#: ../meld/vcview.py:142 -msgid "Show unversioned files" -msgstr "Affiche les fichiers qui ne sont pas versionnés" +#: ../meld/vc/_vc.py:54 +msgid "Local" +msgstr "Local" -#: ../meld/vcview.py:143 -msgid "Ignored" -msgstr "Ignoré" +#: ../meld/vc/_vc.py:54 +msgid "Remote" +msgstr "Distant" -#: ../meld/vcview.py:143 -msgid "Show ignored files" -msgstr "Affiche les fichiers ignorés" +#: ../meld/vc/_vc.py:70 +msgid "Unversioned" +msgstr "Non versionné" -#: ../meld/vcview.py:186 ../meld/vcview.py:319 -msgid "Location" -msgstr "Emplacement" +#: ../meld/vc/_vc.py:73 +msgid "Error" +msgstr "Erreur" -#: ../meld/vcview.py:187 -msgid "Status" -msgstr "État" +#: ../meld/vc/_vc.py:75 +msgid "Newly added" +msgstr "Récemment ajouté" -#: ../meld/vcview.py:188 -msgid "Rev" -msgstr "Révision" +#: ../meld/vc/_vc.py:77 +msgid "Renamed" +msgstr "Renommé" -#: ../meld/vcview.py:189 -msgid "Tag" -msgstr "Étiquette" +#: ../meld/vc/_vc.py:78 +msgid "Conflict" +msgstr "Conflit" -#: ../meld/vcview.py:190 -msgid "Options" -msgstr "Options" +#: ../meld/vc/_vc.py:79 +msgid "Removed" +msgstr "Supprimé" -#: ../meld/vcview.py:249 -msgid "Choose one Version Control" -msgstr "Choisir un système de gestion de versions" +#: ../meld/vc/_vc.py:80 +msgid "Missing" +msgstr "Manquant" -#: ../meld/vcview.py:250 -msgid "Only one Version Control in this directory" -msgstr "Un seul système de gestion de versions dans ce répertoire" +#: ../meld/vc/_vc.py:81 +msgid "Not present" +msgstr "Absent" -#. TRANSLATORS: this is an error message when a version control -#. application isn't installed or can't be found -#: ../meld/vcview.py:263 +#. Translators: This error message is shown when a version +#. control binary isn't installed. +#: ../meld/vcview.py:251 #, python-format -msgid "%s Not Installed" -msgstr "%s n'est pas installé" +msgid "%(name)s (%(cmd)s not installed)" +msgstr "%(name)s (%(cmd)s n'est pas installé)" -#. TRANSLATORS: this is an error message when a version -#. controlled repository is invalid or corrupted -#: ../meld/vcview.py:267 -msgid "Invalid Repository" -msgstr "Dépôt non valide" +#. Translators: This error message is shown when a version +#. controlled repository is invalid. +#: ../meld/vcview.py:255 +#, python-format +msgid "%(name)s (Invalid repository)" +msgstr "%(name)s (le dépôt n'est pas valide)" #: ../meld/vcview.py:276 -#, python-format -msgid "%s (%s)" -msgstr "%s (%s)" +msgid "No valid version control system found in this folder" +msgstr "Ce dossier ne contient pas de système de gestion de versions valide" + +#: ../meld/vcview.py:278 +msgid "Only one version control system found in this folder" +msgstr "Un seul système de gestion de versions trouvé dans ce dossier" + +#: ../meld/vcview.py:280 +msgid "Choose which version control system to use" +msgstr "Choisir le gestionnaire de versions à utiliser" -#. TRANSLATORS: This is the location of the directory the user is diffing -#: ../meld/vcview.py:319 +#. TRANSLATORS: This is the location of the directory being viewed +#: ../meld/vcview.py:332 #, python-format msgid "%s: %s" msgstr "%s : %s" -#: ../meld/vcview.py:363 +#: ../meld/vcview.py:352 +#, python-format +msgid "Scanning %s" +msgstr "En cours d'analyse de %s" + +#: ../meld/vcview.py:391 msgid "(Empty)" msgstr "(vide)" -#: ../meld/vcview.py:401 +#: ../meld/vcview.py:435 #, python-format -msgid "[%s] Fetching differences" -msgstr "[%s] Récupération des différences" +msgid "%s — local" +msgstr "%s — local" -#: ../meld/vcview.py:409 +#: ../meld/vcview.py:436 #, python-format -msgid "[%s] Applying patch" -msgstr "[%s] Application du correctif" +msgid "%s — remote" +msgstr "%s — distant" -#: ../meld/vcview.py:511 -msgid "Select some files first." -msgstr "Sélectionnez d'abord des fichiers." - -#: ../meld/vcview.py:584 -#, python-format -msgid "" -"\n" -" Invoking 'patch' failed.\n" -" \n" -" Maybe you don't have 'GNU patch' installed,\n" -" or you use an untested version of %s.\n" -" \n" -" Please send email bug report to:\n" -" meld-list@gnome.org\n" -" \n" -" Containing the following information:\n" -" \n" -" - meld version: '%s'\n" -" - source control software type: '%s'\n" -" - source control software version: 'X.Y.Z'\n" -" - the output of '%s somefile.txt'\n" -" - patch command: '%s'\n" -" (no need to actually run it, just provide\n" -" the command line) \n" -" \n" -" Replace 'X.Y.Z' by the actual version for the\n" -" source control software you use.\n" -" " -msgstr "" -"\n" -" L'appel à « patch » a échoué.\n" -" \n" -" « GNU patch » n'est peut-être pas installé,\n" -" ou vous utilisez une version non testée de %s.\n" -" \n" -" Envoyez un rapport d'anomalie à :\n" -" meld-list@gnome.org\n" -" \n" -" Contenant les informations suivantes :\n" -" \n" -" - version de Meld : « %s »\n" -" - type du gestionnaire de versions : « %s »\n" -" - version du gestionnaire de versions : « X.Y.Z »\n" -" - la sortie de « %s somefile.txt »\n" -" - la commande patch : « %s »\n" -" (pas la peine de la lancer, il suffit de fournir\n" -" la ligne de commande) \n" -" \n" -" Remplacez « X.Y.Z » par la version réelle du\n" -" gestionnaire de versions que vous utilisez.\n" -" " - -#: ../meld/ui/findbar.py:140 +#: ../meld/vcview.py:444 #, python-format -msgid "" -"Regular expression error\n" -"'%s'" -msgstr "" -"Erreur d'expression régulière\n" -"« %s »" - -#: ../meld/ui/historyentry.py:293 -msgid "_Browse..." -msgstr "_Parcourir..." - -#: ../meld/ui/historyentry.py:301 -msgid "Path" -msgstr "Chemin" +msgid "%s (local, merge, remote)" +msgstr "%s (local, fusionné, distant)" -#: ../meld/ui/historyentry.py:302 -msgid "Path to file" -msgstr "Chemin vers le fichier" +#: ../meld/vcview.py:449 +#, python-format +msgid "%s (remote, merge, local)" +msgstr "%s (distant, fusionné, local)" -#: ../meld/ui/historyentry.py:303 -msgid "Pop up a file selector to choose a file" -msgstr "Affiche un sélecteur de fichiers pour choisir un fichier" +#: ../meld/vcview.py:460 +#, python-format +msgid "%s — repository" +msgstr "%s — dépôt" -#: ../meld/ui/historyentry.py:441 -msgid "Select directory" -msgstr "Sélectionner le répertoire" +#: ../meld/vcview.py:466 +#, python-format +msgid "%s (working, repository)" +msgstr "%s (en travail, dépôt)" -#: ../meld/ui/historyentry.py:445 -msgid "Select file" -msgstr "Sélectionner le fichier" +#: ../meld/vcview.py:470 +#, python-format +msgid "%s (repository, working)" +msgstr "%s (dépôt, en travail)" -#: ../meld/ui/notebooklabel.py:60 -msgid "Close tab" -msgstr "Fermer l'onglet" +#: ../meld/vcview.py:638 +msgid "Remove folder and all its files?" +msgstr "Supprimer le dossier et tous ses fichiers ?" -#. These are the possible states of files. Be sure to get the colons correct. -#: ../meld/vc/_vc.py:40 +#: ../meld/vcview.py:640 msgid "" -"Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:Missing" +"This will remove all selected files and folders, and all files within any " +"selected folders, from version control." msgstr "" -"Ignoré:Non-versionné:::Erreur::Nouvellement ajouté:Modifié:Conflit:Supprimé:" -"Manquant" +"Supprime de la gestion de versions tous les fichiers et dossiers sélectionnés " +"et tous les fichiers qu'ils contiennent." -#: ../meld/vc/cvs.py:163 +#: ../meld/vcview.py:665 #, python-format -msgid "" -"Error converting to a regular expression\n" -"The pattern was '%s'\n" -"The error was '%s'" -msgstr "" -"Erreur durant la conversion en expression régulière\n" -"Le motif était « %s »\n" -"L'erreur était « %s »" +msgid "Error removing %s" +msgstr "Erreur lors de la suppression de %s" -#~ msgid "_Search for" -#~ msgstr "_Rechercher" +#: ../meld/vcview.py:745 +msgid "Clear" +msgstr "Effacer" From 9b50ea406ca535d8fcc310f81183284b8a4fcd41 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 30 Nov 2014 06:44:03 +1000 Subject: [PATCH 0073/1316] filediff: Remove process-pool diffing, since it's generally slower While just using a thread pool here doesn't sidestep the GIL, the overhead from doing this process-wise is significant, and the main thread just isn't generally doing all that much work other than doing the diffs. Resurrecting the GIL-bypass would still be interesting at some stage, but probably as an external C library that did the main diff calculation and nothing else. --- meld/filediff.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/meld/filediff.py b/meld/filediff.py index 01bebc72..2ec91dfe 100644 --- a/meld/filediff.py +++ b/meld/filediff.py @@ -20,7 +20,6 @@ import os import time -from multiprocessing import Pool from multiprocessing.pool import ThreadPool @@ -67,15 +66,8 @@ class CachedSequenceMatcher(object): eviction is overly simplistic, but is okay for our usage pattern. """ - process_pool = None - def __init__(self): - if self.process_pool is None: - if os.name == "nt": - CachedSequenceMatcher.process_pool = ThreadPool(None) - else: - CachedSequenceMatcher.process_pool = Pool( - None, matchers.init_worker, maxtasksperchild=1) + self.process_pool = ThreadPool(None) self.cache = {} def match(self, text1, textn, cb): From 010eb6156e60db3ea5cd715c07a5f5b8a9cb7ea0 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 21 Dec 2014 11:57:33 +1000 Subject: [PATCH 0074/1316] filediff: First pass at replacing process- with threaded-matching --- meld/filediff.py | 64 +++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 52 insertions(+), 12 deletions(-) diff --git a/meld/filediff.py b/meld/filediff.py index 2ec91dfe..300df2e6 100644 --- a/meld/filediff.py +++ b/meld/filediff.py @@ -16,13 +16,13 @@ import copy import functools +import logging import math import os +import queue +import threading import time -from multiprocessing.pool import ThreadPool - - from gi.repository import GLib from gi.repository import GObject from gi.repository import Gio @@ -48,6 +48,31 @@ from meld.sourceview import LanguageManager, get_custom_encoding_candidates +log = logging.getLogger(__name__) + + +class MatcherWorker(threading.Thread): + + def __init__(self, tasks, results): + super(MatcherWorker, self).__init__() + self.tasks = tasks + self.results = results + self.daemon = True + self.start() + + def run(self): + while True: + task_id, (text1, textn) = self.tasks.get() + try: + opcodes = matchers.matcher_worker(text1, textn) + self.results.put((task_id, opcodes)) + except Exception as e: + log.error("Exception while running diff: %s", e) + finally: + self.tasks.task_done() + time.sleep(0) + + def with_focused_pane(function): @functools.wraps(function) def wrap_function(*args, **kwargs): @@ -67,21 +92,36 @@ class CachedSequenceMatcher(object): """ def __init__(self): - self.process_pool = ThreadPool(None) self.cache = {} + self.tasks = queue.Queue() + self.results = queue.Queue() + self.thread = MatcherWorker(self.tasks, self.results) + self.task_id = 1 + self.queued_matches = {} def match(self, text1, textn, cb): + texts = (text1, textn) try: - self.cache[(text1, textn)][1] = time.time() - opcodes = self.cache[(text1, textn)][0] + self.cache[texts][1] = time.time() + opcodes = self.cache[texts][0] GLib.idle_add(lambda: cb(opcodes)) except KeyError: - def inline_cb(opcodes): - self.cache[(text1, textn)] = [opcodes, time.time()] - GLib.idle_add(lambda: cb(opcodes)) - self.process_pool.apply_async(matchers.matcher_worker, - (text1, textn), - callback=inline_cb) + self.tasks.put((self.task_id, texts)) + if not bool(self.queued_matches): + GLib.idle_add(self.check_results) + self.queued_matches[self.task_id] = (texts, cb) + self.task_id += 1 + + def check_results(self): + try: + task_id, opcodes = self.results.get_nowait() + texts, cb = self.queued_matches.pop(task_id) + self.cache[texts] = [opcodes, time.time()] + GLib.idle_add(lambda: cb(opcodes)) + except queue.Empty: + pass + + return bool(self.queued_matches) def clean(self, size_hint): """Clean the cache if necessary From 4a2c97f9bc06d94ef6e60fff766435bf99d4787a Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 1 Mar 2015 09:41:55 +1000 Subject: [PATCH 0075/1316] matchers: Remove multiprocess-related code --- meld/matchers.py | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/meld/matchers.py b/meld/matchers.py index 160db127..05610345 100644 --- a/meld/matchers.py +++ b/meld/matchers.py @@ -16,20 +16,6 @@ import collections import difflib -import os -import signal -import sys - - -# Support re-execing on Windows -if os.name == "nt": - self_path = os.path.realpath(__file__) - self_dir = os.path.abspath(os.path.dirname(self_path)) - sys.path[0:0] = [self_dir] - - -def init_worker(): - signal.signal(signal.SIGINT, signal.SIG_IGN) def matcher_worker(text1, textn): From 5993e19699ab1c5a4bc59814373601d6d37cd594 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 1 Mar 2015 09:44:50 +1000 Subject: [PATCH 0076/1316] filediff: Move matcher initialisation into the worker The code was previously in matchers, simply because reexecing matchers was safe, but filediff not so much. --- meld/filediff.py | 6 ++++-- meld/matchers.py | 5 ----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/meld/filediff.py b/meld/filediff.py index 300df2e6..e1851dd6 100644 --- a/meld/filediff.py +++ b/meld/filediff.py @@ -53,6 +53,8 @@ class MatcherWorker(threading.Thread): + matcher_class = matchers.InlineMyersSequenceMatcher + def __init__(self, tasks, results): super(MatcherWorker, self).__init__() self.tasks = tasks @@ -64,8 +66,8 @@ def run(self): while True: task_id, (text1, textn) = self.tasks.get() try: - opcodes = matchers.matcher_worker(text1, textn) - self.results.put((task_id, opcodes)) + matcher = self.matcher_class(None, text1, textn) + self.results.put((task_id, matcher.get_opcodes())) except Exception as e: log.error("Exception while running diff: %s", e) finally: diff --git a/meld/matchers.py b/meld/matchers.py index 05610345..03548831 100644 --- a/meld/matchers.py +++ b/meld/matchers.py @@ -18,11 +18,6 @@ import difflib -def matcher_worker(text1, textn): - matcher = InlineMyersSequenceMatcher(None, text1, textn) - return matcher.get_opcodes() - - def find_common_prefix(a, b): if not a or not b: return 0 From 37fa668d2a79c9dfcdaeb6055f1e95dff8383aa7 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 1 Mar 2015 09:46:14 +1000 Subject: [PATCH 0077/1316] filediff: Delay as much thread and queue handling as possible to idle Because of interactions between the GIL, Python threads and the GObject main loop, we get very undesirable behaviour on startup where our threads behave as borderline synchronous code. By putting as much of this as possible in idle, we make this behaviour somewhat less pathological. --- meld/filediff.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/meld/filediff.py b/meld/filediff.py index e1851dd6..c3b8cf7f 100644 --- a/meld/filediff.py +++ b/meld/filediff.py @@ -60,7 +60,6 @@ def __init__(self, tasks, results): self.tasks = tasks self.results = results self.daemon = True - self.start() def run(self): while True: @@ -100,6 +99,7 @@ def __init__(self): self.thread = MatcherWorker(self.tasks, self.results) self.task_id = 1 self.queued_matches = {} + GLib.idle_add(self.thread.start) def match(self, text1, textn, cb): texts = (text1, textn) @@ -108,11 +108,14 @@ def match(self, text1, textn, cb): opcodes = self.cache[texts][0] GLib.idle_add(lambda: cb(opcodes)) except KeyError: - self.tasks.put((self.task_id, texts)) - if not bool(self.queued_matches): - GLib.idle_add(self.check_results) - self.queued_matches[self.task_id] = (texts, cb) - self.task_id += 1 + GLib.idle_add(lambda: self.enqueue_task(texts, cb)) + + def enqueue_task(self, texts, cb): + if not bool(self.queued_matches): + GLib.idle_add(self.check_results) + self.queued_matches[self.task_id] = (texts, cb) + self.tasks.put((self.task_id, texts)) + self.task_id += 1 def check_results(self): try: From 67e847efcff046723339cef57c68dc37ab339691 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sat, 27 Aug 2016 09:42:46 +1000 Subject: [PATCH 0078/1316] filediff: Limit output queue for much better progressive highlighting --- meld/filediff.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meld/filediff.py b/meld/filediff.py index c3b8cf7f..91c7b307 100644 --- a/meld/filediff.py +++ b/meld/filediff.py @@ -95,7 +95,11 @@ class CachedSequenceMatcher(object): def __init__(self): self.cache = {} self.tasks = queue.Queue() - self.results = queue.Queue() + # Limiting the result queue here has the effect of giving us + # much better interactivity. Without this limit, the + # result-checker tends to get starved and all highlights get + # delayed until we're almost completely finished. + self.results = queue.Queue(5) self.thread = MatcherWorker(self.tasks, self.results) self.task_id = 1 self.queued_matches = {} From 9ea7d2707eae443fca198119165d6d1e4fa93c0a Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 9 Oct 2016 07:41:41 +1000 Subject: [PATCH 0079/1316] Create new matchers package for diff-related code This commit also split the threading-related code for handling asynchronous diffs into a new meld.matchers.helpers module. --- meld/filediff.py | 97 +------------------------ meld/filemerge.py | 2 +- meld/matchers/__init__.py | 0 meld/{ => matchers}/diffutil.py | 4 +- meld/matchers/helpers.py | 96 ++++++++++++++++++++++++ meld/{ => matchers}/merge.py | 6 +- meld/{matchers.py => matchers/myers.py} | 0 setup.py | 1 + setup_win32.py | 1 + test/test_gutterrendererchunk.py | 2 +- test/test_matchers.py | 14 ++-- 11 files changed, 115 insertions(+), 108 deletions(-) create mode 100644 meld/matchers/__init__.py rename meld/{ => matchers}/diffutil.py (99%) create mode 100644 meld/matchers/helpers.py rename meld/{ => matchers}/merge.py (98%) rename meld/{matchers.py => matchers/myers.py} (100%) diff --git a/meld/filediff.py b/meld/filediff.py index 91c7b307..16d08152 100644 --- a/meld/filediff.py +++ b/meld/filediff.py @@ -16,12 +16,8 @@ import copy import functools -import logging import math import os -import queue -import threading -import time from gi.repository import GLib from gi.repository import GObject @@ -31,11 +27,10 @@ from gi.repository import GtkSource from meld.conf import _ -from . import diffutil -from . import matchers +from meld.matchers import diffutil from . import meldbuffer from . import melddoc -from . import merge +from meld.matchers import merge from . import misc from . import patchdialog from . import recent @@ -44,36 +39,11 @@ from .ui import gnomeglade from meld.const import MODE_REPLACE, MODE_DELETE, MODE_INSERT, NEWLINES +from meld.matchers.helpers import CachedSequenceMatcher from meld.settings import bind_settings, meldsettings from meld.sourceview import LanguageManager, get_custom_encoding_candidates -log = logging.getLogger(__name__) - - -class MatcherWorker(threading.Thread): - - matcher_class = matchers.InlineMyersSequenceMatcher - - def __init__(self, tasks, results): - super(MatcherWorker, self).__init__() - self.tasks = tasks - self.results = results - self.daemon = True - - def run(self): - while True: - task_id, (text1, textn) = self.tasks.get() - try: - matcher = self.matcher_class(None, text1, textn) - self.results.put((task_id, matcher.get_opcodes())) - except Exception as e: - log.error("Exception while running diff: %s", e) - finally: - self.tasks.task_done() - time.sleep(0) - - def with_focused_pane(function): @functools.wraps(function) def wrap_function(*args, **kwargs): @@ -84,67 +54,6 @@ def wrap_function(*args, **kwargs): return wrap_function -class CachedSequenceMatcher(object): - """Simple class for caching diff results, with LRU-based eviction - - Results from the SequenceMatcher are cached and timestamped, and - subsequently evicted based on least-recent generation/usage. The LRU-based - eviction is overly simplistic, but is okay for our usage pattern. - """ - - def __init__(self): - self.cache = {} - self.tasks = queue.Queue() - # Limiting the result queue here has the effect of giving us - # much better interactivity. Without this limit, the - # result-checker tends to get starved and all highlights get - # delayed until we're almost completely finished. - self.results = queue.Queue(5) - self.thread = MatcherWorker(self.tasks, self.results) - self.task_id = 1 - self.queued_matches = {} - GLib.idle_add(self.thread.start) - - def match(self, text1, textn, cb): - texts = (text1, textn) - try: - self.cache[texts][1] = time.time() - opcodes = self.cache[texts][0] - GLib.idle_add(lambda: cb(opcodes)) - except KeyError: - GLib.idle_add(lambda: self.enqueue_task(texts, cb)) - - def enqueue_task(self, texts, cb): - if not bool(self.queued_matches): - GLib.idle_add(self.check_results) - self.queued_matches[self.task_id] = (texts, cb) - self.tasks.put((self.task_id, texts)) - self.task_id += 1 - - def check_results(self): - try: - task_id, opcodes = self.results.get_nowait() - texts, cb = self.queued_matches.pop(task_id) - self.cache[texts] = [opcodes, time.time()] - GLib.idle_add(lambda: cb(opcodes)) - except queue.Empty: - pass - - return bool(self.queued_matches) - - def clean(self, size_hint): - """Clean the cache if necessary - - @param size_hint: the recommended minimum number of cache entries - """ - if len(self.cache) < size_hint * 3: - return - items = list(self.cache.items()) - items.sort(key=lambda it: it[1][1]) - for item in items[:-size_hint * 2]: - del self.cache[item[0]] - - MASK_SHIFT, MASK_CTRL = 1, 2 PANE_LEFT, PANE_RIGHT = -1, +1 diff --git a/meld/filemerge.py b/meld/filemerge.py index 6ef35c1d..6777ba48 100644 --- a/meld/filemerge.py +++ b/meld/filemerge.py @@ -16,7 +16,7 @@ from meld.conf import _ from . import filediff -from . import merge +from meld.matchers import merge from . import recent diff --git a/meld/matchers/__init__.py b/meld/matchers/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/meld/diffutil.py b/meld/matchers/diffutil.py similarity index 99% rename from meld/diffutil.py rename to meld/matchers/diffutil.py index 2d7de02d..2b20fa84 100644 --- a/meld/diffutil.py +++ b/meld/matchers/diffutil.py @@ -16,8 +16,8 @@ from gi.repository import GObject -from .matchers import DiffChunk, MyersSequenceMatcher, \ - SyncPointMyersSequenceMatcher +from meld.matchers.myers import ( + DiffChunk, MyersSequenceMatcher, SyncPointMyersSequenceMatcher) opcode_reverse = { diff --git a/meld/matchers/helpers.py b/meld/matchers/helpers.py new file mode 100644 index 00000000..86c23ac4 --- /dev/null +++ b/meld/matchers/helpers.py @@ -0,0 +1,96 @@ + +import logging +import queue +import threading +import time + +from gi.repository import GLib + +from meld.matchers import myers + + +log = logging.getLogger(__name__) + + +class MatcherWorker(threading.Thread): + + matcher_class = myers.InlineMyersSequenceMatcher + + def __init__(self, tasks, results): + super(MatcherWorker, self).__init__() + self.tasks = tasks + self.results = results + self.daemon = True + + def run(self): + while True: + task_id, (text1, textn) = self.tasks.get() + try: + matcher = self.matcher_class(None, text1, textn) + self.results.put((task_id, matcher.get_opcodes())) + except Exception as e: + log.error("Exception while running diff: %s", e) + finally: + self.tasks.task_done() + time.sleep(0) + + +class CachedSequenceMatcher(object): + """Simple class for caching diff results, with LRU-based eviction + + Results from the SequenceMatcher are cached and timestamped, and + subsequently evicted based on least-recent generation/usage. The LRU-based + eviction is overly simplistic, but is okay for our usage pattern. + """ + + def __init__(self): + self.cache = {} + self.tasks = queue.Queue() + # Limiting the result queue here has the effect of giving us + # much better interactivity. Without this limit, the + # result-checker tends to get starved and all highlights get + # delayed until we're almost completely finished. + self.results = queue.Queue(5) + self.thread = MatcherWorker(self.tasks, self.results) + self.task_id = 1 + self.queued_matches = {} + GLib.idle_add(self.thread.start) + + def match(self, text1, textn, cb): + texts = (text1, textn) + try: + self.cache[texts][1] = time.time() + opcodes = self.cache[texts][0] + GLib.idle_add(lambda: cb(opcodes)) + except KeyError: + GLib.idle_add(lambda: self.enqueue_task(texts, cb)) + + def enqueue_task(self, texts, cb): + if not bool(self.queued_matches): + GLib.idle_add(self.check_results) + self.queued_matches[self.task_id] = (texts, cb) + self.tasks.put((self.task_id, texts)) + self.task_id += 1 + + def check_results(self): + try: + task_id, opcodes = self.results.get_nowait() + texts, cb = self.queued_matches.pop(task_id) + self.cache[texts] = [opcodes, time.time()] + GLib.idle_add(lambda: cb(opcodes)) + except queue.Empty: + pass + + return bool(self.queued_matches) + + def clean(self, size_hint): + """Clean the cache if necessary + + @param size_hint: the recommended minimum number of cache entries + """ + if len(self.cache) < size_hint * 3: + return + items = list(self.cache.items()) + items.sort(key=lambda it: it[1][1]) + for item in items[:-size_hint * 2]: + del self.cache[item[0]] diff --git a/meld/merge.py b/meld/matchers/merge.py similarity index 98% rename from meld/merge.py rename to meld/matchers/merge.py index 9c454ed1..357576d8 100644 --- a/meld/merge.py +++ b/meld/matchers/merge.py @@ -13,13 +13,13 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from . import diffutil -from . import matchers +from meld.matchers import diffutil +from meld.matchers.myers import MyersSequenceMatcher class AutoMergeDiffer(diffutil.Differ): - _matcher = matchers.MyersSequenceMatcher + _matcher = MyersSequenceMatcher # _matcher = PatienceSequenceMatcher def __init__(self): diff --git a/meld/matchers.py b/meld/matchers/myers.py similarity index 100% rename from meld/matchers.py rename to meld/matchers/myers.py diff --git a/setup.py b/setup.py index 588978b0..05f0af69 100755 --- a/setup.py +++ b/setup.py @@ -30,6 +30,7 @@ keywords=['diff', 'merge'], packages=[ 'meld', + 'meld.matchers', 'meld.ui', 'meld.vc', ], diff --git a/setup_win32.py b/setup_win32.py index afc07614..c3dc9a59 100644 --- a/setup_win32.py +++ b/setup_win32.py @@ -130,6 +130,7 @@ ], packages=[ 'meld', + 'meld.matchers', 'meld.ui', 'meld.vc', ], diff --git a/test/test_gutterrendererchunk.py b/test/test_gutterrendererchunk.py index 02d8ace4..e101ee46 100644 --- a/test/test_gutterrendererchunk.py +++ b/test/test_gutterrendererchunk.py @@ -5,7 +5,7 @@ import meld.gutterrendererchunk from meld.gutterrendererchunk import GutterRendererChunkAction from meld.const import MODE_REPLACE, MODE_DELETE, MODE_INSERT -from meld.matchers import DiffChunk +from meld.matchers.myers import DiffChunk def make_chunk(chunk_type): diff --git a/test/test_matchers.py b/test/test_matchers.py index 955d420c..91c36c0c 100644 --- a/test/test_matchers.py +++ b/test/test_matchers.py @@ -1,6 +1,6 @@ import unittest -from meld import matchers +from meld.matchers import myers class MatchersTests(unittest.TestCase): @@ -9,7 +9,7 @@ def testBasicMatcher(self): a = list('abcbdefgabcdefg') b = list('gfabcdefcd') r = [(0, 2, 3), (4, 5, 3), (10, 8, 2), (15, 10, 0)] - matcher = matchers.MyersSequenceMatcher(None, a, b) + matcher = myers.MyersSequenceMatcher(None, a, b) blocks = matcher.get_matching_blocks() self.assertEqual(blocks, r) @@ -17,7 +17,7 @@ def testPostprocessingCleanup(self): a = list('abcfabgcd') b = list('afabcgabgcabcd') r = [(0, 2, 3), (4, 6, 3), (7, 12, 2), (9, 14, 0)] - matcher = matchers.MyersSequenceMatcher(None, a, b) + matcher = myers.MyersSequenceMatcher(None, a, b) blocks = matcher.get_matching_blocks() self.assertEqual(blocks, r) @@ -25,7 +25,7 @@ def testInlineMatcher(self): a = 'red, blue, yellow, white' b = 'black green, hue, white' r = [(17, 16, 7), (24, 23, 0)] - matcher = matchers.InlineMyersSequenceMatcher(None, a, b) + matcher = myers.InlineMyersSequenceMatcher(None, a, b) blocks = matcher.get_matching_blocks() self.assertEqual(blocks, r) @@ -33,7 +33,7 @@ def testSyncPointMatcher0(self): a = list('012a3456c789') b = list('0a3412b5678') r = [(0, 0, 1), (3, 1, 3), (6, 7, 2), (9, 9, 2), (12, 11, 0)] - matcher = matchers.SyncPointMyersSequenceMatcher(None, a, b) + matcher = myers.SyncPointMyersSequenceMatcher(None, a, b) blocks = matcher.get_matching_blocks() self.assertEqual(blocks, r) @@ -41,7 +41,7 @@ def testSyncPointMatcher1(self): a = list('012a3456c789') b = list('0a3412b5678') r = [(0, 0, 1), (1, 4, 2), (6, 7, 2), (9, 9, 2), (12, 11, 0)] - matcher = matchers.SyncPointMyersSequenceMatcher(None, a, b, [(3, 6)]) + matcher = myers.SyncPointMyersSequenceMatcher(None, a, b, [(3, 6)]) blocks = matcher.get_matching_blocks() self.assertEqual(blocks, r) @@ -49,7 +49,7 @@ def testSyncPointMatcher2(self): a = list('012a3456c789') b = list('02a341b5678') r = [(0, 0, 1), (2, 1, 1), (3, 2, 3), (9, 9, 2), (12, 11, 0)] - matcher = matchers.SyncPointMyersSequenceMatcher( + matcher = myers.SyncPointMyersSequenceMatcher( None, a, b, [(3, 2), (8, 6)]) blocks = matcher.get_matching_blocks() self.assertEqual(blocks, r) From d3831ce06542f11e9bf3b306392d63d29d57c935 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 9 Oct 2016 08:07:28 +1000 Subject: [PATCH 0080/1316] filediff: Clean up some imports --- meld/filediff.py | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/meld/filediff.py b/meld/filediff.py index 16d08152..4e4f74af 100644 --- a/meld/filediff.py +++ b/meld/filediff.py @@ -27,21 +27,21 @@ from gi.repository import GtkSource from meld.conf import _ -from meld.matchers import diffutil from . import meldbuffer from . import melddoc -from meld.matchers import merge from . import misc -from . import patchdialog from . import recent from . import undo -from .ui import findbar from .ui import gnomeglade from meld.const import MODE_REPLACE, MODE_DELETE, MODE_INSERT, NEWLINES +from meld.matchers.diffutil import Differ, merged_chunk_order from meld.matchers.helpers import CachedSequenceMatcher +from meld.matchers.merge import Merger +from meld.patchdialog import PatchDialog from meld.settings import bind_settings, meldsettings from meld.sourceview import LanguageManager, get_custom_encoding_candidates +from meld.ui.findbar import FindBar def with_focused_pane(function): @@ -83,7 +83,7 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component): default=False, ) - differ = diffutil.Differ + differ = Differ keylookup = { Gdk.KEY_Shift_L: MASK_SHIFT, @@ -168,7 +168,7 @@ def __init__(self, num_panes): self.actiongroup = self.FilediffActions self.actiongroup.set_translation_domain("meld") - self.findbar = findbar.FindBar(self.grid) + self.findbar = FindBar(self.grid) self.grid.attach(self.findbar.widget, 1, 2, 5, 1) self.set_num_panes(num_panes) @@ -526,7 +526,7 @@ def action_copy_change_right_down(self, *args): src, dst, self.get_action_chunk(src, dst), copy_up=False) def pull_all_non_conflicting_changes(self, src, dst): - merger = merge.Merger() + merger = Merger() merger.differ = self.linediffer merger.texts = self.buffer_texts for mergedfile in merger.merge_2_files(src, dst): @@ -551,7 +551,7 @@ def action_pull_all_changes_right(self, *args): def merge_all_non_conflicting_changes(self, *args): dst = 1 - merger = merge.Merger() + merger = Merger() merger.differ = self.linediffer merger.texts = self.buffer_texts for mergedfile in merger.merge_3_files(False): @@ -1173,11 +1173,9 @@ def on_diffs_changed(self, linediffer, chunk_changes): # We need to clear removed and modified chunks, and need to # re-highlight added and modified chunks. need_clearing = sorted( - list(removed_chunks), - key=diffutil.merged_chunk_order) + list(removed_chunks), key=merged_chunk_order) need_highlighting = sorted( - list(added_chunks) + [modified_chunks], - key=diffutil.merged_chunk_order) + list(added_chunks) + [modified_chunks], key=merged_chunk_order) alltags = [b.get_tag_table().lookup("inline") for b in self.textbuffer] @@ -1533,7 +1531,7 @@ def file_saved_cb(self, saver, result, user_data): self.state = melddoc.STATE_NORMAL def make_patch(self, *extra): - dialog = patchdialog.PatchDialog(self) + dialog = PatchDialog(self) dialog.run() def update_buffer_writable(self, buf): From c3e2cd2c02bf07c4373dc74560bafac035ef55fc Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 9 Oct 2016 08:11:00 +1000 Subject: [PATCH 0081/1316] data/ui/patch-dialog.ui: Fix map-without-parent warning If the dialog is set to visible in the builder file, it will get mapped before we have set our parent on it, resulting in an annoying warning. --- data/ui/patch-dialog.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/ui/patch-dialog.ui b/data/ui/patch-dialog.ui index eb2ab94c..9696c29d 100644 --- a/data/ui/patch-dialog.ui +++ b/data/ui/patch-dialog.ui @@ -3,7 +3,7 @@ - True + False False 12 Format as Patch From b3a5d42603cb45c3446584588c7832c9220135b7 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 9 Oct 2016 08:25:37 +1000 Subject: [PATCH 0082/1316] patchdialog: Import/super refactoring --- meld/patchdialog.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meld/patchdialog.py b/meld/patchdialog.py index 5f513ee0..bad68f42 100644 --- a/meld/patchdialog.py +++ b/meld/patchdialog.py @@ -23,18 +23,17 @@ from gi.repository import Gtk from gi.repository import GtkSource -from .ui import gnomeglade - from meld.conf import _ from meld.misc import error_dialog from meld.settings import meldsettings from meld.sourceview import LanguageManager +from meld.ui.gnomeglade import Component -class PatchDialog(gnomeglade.Component): +class PatchDialog(Component): def __init__(self, filediff): - gnomeglade.Component.__init__(self, "patch-dialog.ui", "patchdialog") + super().__init__("patch-dialog.ui", "patchdialog") self.widget.set_transient_for(filediff.widget.get_toplevel()) self.filediff = filediff From ac8220ca0908bab3fc97f5ef1b53a652d34f539c Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 16 Oct 2016 06:06:29 +1000 Subject: [PATCH 0083/1316] bin/meld: Fix unintentional glib requirement bump GLib.log_set_handler() is only available in 2.46, and I definitely didn't intend that version bump. --- bin/meld | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/bin/meld b/bin/meld index bafb4e0d..bc6a4df5 100755 --- a/bin/meld +++ b/bin/meld @@ -252,7 +252,12 @@ def setup_glib_logging(): def log_adapter(domain, level, message, user_data): log.log(levels[level], message) - GLib.log_set_handler(log_domain, level_flag, log_adapter, None) + + try: + GLib.log_set_handler(log_domain, level_flag, log_adapter, None) + except AttributeError: + # Only present in glib 2.46+ + pass def environment_hacks(): From a2695ecc9489d52d984e65b82704c213d8a1054c Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 16 Oct 2016 07:07:38 +1000 Subject: [PATCH 0084/1316] vcview.ui: Don't allow the console window to shrink to invisible This hopefully partially addresses bgo#772888, in which the console height keeps changing when the window is maximised, but is totally fine in other circumstances. --- data/ui/vcview.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/ui/vcview.ui b/data/ui/vcview.ui index ec10d861..e60bce96 100644 --- a/data/ui/vcview.ui +++ b/data/ui/vcview.ui @@ -607,7 +607,7 @@ True - True + False From 82a5d61f407ba7d8aeb901abd8b538f7f525aa8b Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 25 Sep 2016 08:32:50 +1000 Subject: [PATCH 0085/1316] filediff: Improve appearance and spacing of action 'buttons' --- meld/filediff.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meld/filediff.py b/meld/filediff.py index 4e4f74af..a9905728 100644 --- a/meld/filediff.py +++ b/meld/filediff.py @@ -205,6 +205,9 @@ def __init__(self, num_panes): window = Gtk.TextWindowType.LEFT views = [self.textview[pane], self.textview[pane + 1]] renderer = GutterRendererChunkAction(pane, pane + 1, views, self, self.linediffer) + renderer.set_alignment_mode(GtkSource.GutterRendererAlignmentMode.FIRST) + renderer.set_padding(3, 0) + renderer.set_alignment(0.5, 0.5) gutter = t.get_gutter(window) gutter.insert(renderer, 10) if pane in (1, 2): @@ -213,6 +216,9 @@ def __init__(self, num_panes): window = Gtk.TextWindowType.RIGHT views = [self.textview[pane], self.textview[pane - 1]] renderer = GutterRendererChunkAction(pane, pane - 1, views, self, self.linediffer) + renderer.set_alignment_mode(GtkSource.GutterRendererAlignmentMode.FIRST) + renderer.set_padding(3, 0) + renderer.set_alignment(0.5, 0.5) gutter = t.get_gutter(window) gutter.insert(renderer, -40) From 31d9bd893cc81577edab95ea3882977dea46ed56 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 25 Sep 2016 08:36:00 +1000 Subject: [PATCH 0086/1316] gutterrendererchunk: Return whether we're in a chunk for the renderer --- meld/gutterrendererchunk.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meld/gutterrendererchunk.py b/meld/gutterrendererchunk.py index 20855fe0..e11330ef 100644 --- a/meld/gutterrendererchunk.py +++ b/meld/gutterrendererchunk.py @@ -102,9 +102,10 @@ def draw_chunks( def query_chunks(self, start, end, state): line = start.get_line() chunk_index = self.linediffer.locate_chunk(self.from_pane, line)[0] + in_chunk = chunk_index is not None chunk = None - if chunk_index is not None: + if in_chunk: chunk = self.linediffer.get_chunk( chunk_index, self.from_pane, self.to_pane) @@ -120,6 +121,7 @@ def query_chunks(self, start, end, state): background_rgba = get_background_rgba(self) self._chunk = chunk self.set_background(background_rgba) + return in_chunk class GutterRendererChunkAction( From c50fc685919f8edaee3be28b778bc869bc51eb05 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 25 Sep 2016 08:54:06 +1000 Subject: [PATCH 0087/1316] gutterrendererchunk: Keep track of whether we're rendering an action --- meld/gutterrendererchunk.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meld/gutterrendererchunk.py b/meld/gutterrendererchunk.py index e11330ef..dc92b1d3 100644 --- a/meld/gutterrendererchunk.py +++ b/meld/gutterrendererchunk.py @@ -156,6 +156,7 @@ def __init__(self, from_pane, to_pane, views, filediff, linediffer): if self.views[0].get_direction() == Gtk.TextDirection.RTL: direction = 'LTR' if direction == 'RTL' else 'RTL' + self.is_action = False self.action_map = self.ACTION_MAP[direction] self.filediff = filediff self.filediff.connect("action-mode-changed", @@ -234,6 +235,7 @@ def do_query_data(self, start, end, state): pixbuf = self.action_map.get(action) else: pixbuf = None + self.is_action = bool(pixbuf) self.props.pixbuf = pixbuf def on_container_mode_changed(self, container, mode): From c478cbb9407a3f3ca73a6074fa9c6165d1574ac4 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 25 Sep 2016 08:54:57 +1000 Subject: [PATCH 0088/1316] gutterrendererchunk: Add support for mapping sourceview states to GTK+ --- meld/gutterrendererchunk.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/meld/gutterrendererchunk.py b/meld/gutterrendererchunk.py index dc92b1d3..d9f2dbc8 100644 --- a/meld/gutterrendererchunk.py +++ b/meld/gutterrendererchunk.py @@ -30,6 +30,13 @@ # and not necessarily desirable. LINE_HEIGHT = 16 +GTK_RENDERER_STATE_MAPPING = { + GtkSource.GutterRendererState.NORMAL: Gtk.StateFlags.NORMAL, + GtkSource.GutterRendererState.CURSOR: Gtk.StateFlags.FOCUSED, + GtkSource.GutterRendererState.PRELIT: Gtk.StateFlags.PRELIGHT, + GtkSource.GutterRendererState.SELECTED: Gtk.StateFlags.SELECTED, +} + def load(icon_name): icon_theme = Gtk.IconTheme.get_default() @@ -57,6 +64,14 @@ def get_background_rgba(renderer): _background_rgba = None +def renderer_to_gtk_state(state): + gtk_state = Gtk.StateFlags(0) + for renderer_flag, gtk_flag in GTK_RENDERER_STATE_MAPPING.items(): + if renderer_flag & state: + gtk_state |= gtk_flag + return gtk_state + + class MeldGutterRenderer(object): def on_setting_changed(self, meldsettings, key): From bcaa21ffd2e235dd10f3c4e91753cac63dc3efee Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 25 Sep 2016 08:55:48 +1000 Subject: [PATCH 0089/1316] gutterrendererchunk: Add hack for drawing chunk actions as button-like --- meld/gutterrendererchunk.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/meld/gutterrendererchunk.py b/meld/gutterrendererchunk.py index d9f2dbc8..5df8da3e 100644 --- a/meld/gutterrendererchunk.py +++ b/meld/gutterrendererchunk.py @@ -226,6 +226,25 @@ def do_begin(self, *args): self.views_editable = [v.get_editable() for v in self.views] def do_draw(self, context, background_area, cell_area, start, end, state): + if self.is_action: + stylecontext = self.props.view.get_style_context() + stylecontext.save() + stylecontext.set_state(renderer_to_gtk_state(state)) + stylecontext.add_class(Gtk.STYLE_CLASS_BUTTON) + stylecontext.add_class(Gtk.STYLE_CLASS_FLAT) + + button_area = background_area.copy() + button_area.x += 1 + button_area.width -= 2 + + Gtk.render_background( + stylecontext, context, button_area.x, button_area.y, + button_area.width, button_area.height) + Gtk.render_frame( + stylecontext, context, button_area.x, button_area.y, + button_area.width, button_area.height) + stylecontext.restore() + GtkSource.GutterRendererPixbuf.do_draw( self, context, background_area, cell_area, start, end, state) self.draw_chunks( From 43fe912b32a073fd9b9e2d6a2eaf36737bfea5c6 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 16 Oct 2016 08:33:51 +1000 Subject: [PATCH 0090/1316] gutterrendererchunk: Make the button prelight fit the line boundaries --- meld/gutterrendererchunk.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meld/gutterrendererchunk.py b/meld/gutterrendererchunk.py index 5df8da3e..b8bebbf3 100644 --- a/meld/gutterrendererchunk.py +++ b/meld/gutterrendererchunk.py @@ -235,7 +235,9 @@ def do_draw(self, context, background_area, cell_area, start, end, state): button_area = background_area.copy() button_area.x += 1 + button_area.y += 1 button_area.width -= 2 + button_area.height -= 2 Gtk.render_background( stylecontext, context, button_area.x, button_area.y, From 04bd8cbaebf5d7627d1117b0670fbc8bd0a61a61 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 16 Oct 2016 08:34:46 +1000 Subject: [PATCH 0091/1316] gutterrendererchunk: Re-paint icons for prelit gutter renderers This works around the breakage caused by recent changes to make the GtkSourceView parent class draw the background. Now, we re-draw the icon if we're also drawing anything else. In this instance, that's just the button background and frame. --- meld/gutterrendererchunk.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/meld/gutterrendererchunk.py b/meld/gutterrendererchunk.py index b8bebbf3..c0a66ea7 100644 --- a/meld/gutterrendererchunk.py +++ b/meld/gutterrendererchunk.py @@ -226,6 +226,8 @@ def do_begin(self, *args): self.views_editable = [v.get_editable() for v in self.views] def do_draw(self, context, background_area, cell_area, start, end, state): + GtkSource.GutterRendererPixbuf.do_draw( + self, context, background_area, cell_area, start, end, state) if self.is_action: stylecontext = self.props.view.get_style_context() stylecontext.save() @@ -245,10 +247,16 @@ def do_draw(self, context, background_area, cell_area, start, end, state): Gtk.render_frame( stylecontext, context, button_area.x, button_area.y, button_area.width, button_area.height) + + pixbuf = self.props.pixbuf + pix_width, pix_height = pixbuf.props.width, pixbuf.props.height + Gtk.render_icon( + stylecontext, context, pixbuf, + button_area.x + (button_area.width - pix_width) // 2, + button_area.y + (button_area.height - pix_height) // 2) + stylecontext.restore() - GtkSource.GutterRendererPixbuf.do_draw( - self, context, background_area, cell_area, start, end, state) self.draw_chunks( context, background_area, cell_area, start, end, state) From 34d707c26683a922254c17f2156a0702d7829622 Mon Sep 17 00:00:00 2001 From: Patrick Griffis Date: Mon, 17 Oct 2016 01:17:08 -0400 Subject: [PATCH 0092/1316] Handle style theme not existing --- meld/misc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meld/misc.py b/meld/misc.py index 65d4d48e..34057b5d 100644 --- a/meld/misc.py +++ b/meld/misc.py @@ -187,7 +187,7 @@ def colour_lookup_with_fallback(name, attribute): from meld.settings import meldsettings source_style = meldsettings.style_scheme - style = source_style.get_style(name) + style = source_style.get_style(name) if source_style else None style_attr = getattr(style.props, attribute) if style else None if not style or not style_attr: base_style = get_base_style_scheme() From e8008f348ec89097035677d807f22afe90d4cb7b Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Thu, 27 Oct 2016 05:47:17 +1000 Subject: [PATCH 0093/1316] filediff: Fix delete action arg signature --- meld/filediff.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meld/filediff.py b/meld/filediff.py index a9905728..c21653e7 100644 --- a/meld/filediff.py +++ b/meld/filediff.py @@ -572,7 +572,7 @@ def resync(): self.scheduler.add_task(resync) @with_focused_pane - def delete_change(self, pane): + def delete_change(self, pane, *args): chunk = self.linediffer.get_chunk(self.cursor.chunk, pane) assert(self.cursor.chunk is not None) assert(chunk is not None) From 59c947c8f43d2a65800ecade8b4a922aa8e7bc8f Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Mon, 24 Oct 2016 16:33:53 +0200 Subject: [PATCH 0094/1316] filediff: Prevent AttributeError when pane has no file --- meld/filediff.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meld/filediff.py b/meld/filediff.py index c21653e7..ff0ab463 100644 --- a/meld/filediff.py +++ b/meld/filediff.py @@ -1579,7 +1579,7 @@ def on_fileentry_file_set(self, entry): entries = self.fileentry[:self.num_panes] if self.check_save_modified() != Gtk.ResponseType.CANCEL: files = [e.get_file() for e in entries] - paths = [f.get_path() for f in files] + paths = [f.get_path() if f is not None else f for f in files] self.set_files(paths) else: idx = entries.index(entry) From c62e13144edb1e07982982b1e9cd0434b05649a6 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Tue, 8 Nov 2016 07:35:19 +1000 Subject: [PATCH 0095/1316] diffmap: Avoid cairo surface creation for negative sizes (bgo#773985) This can occur on initial allocations when we don't have a real allocation ourselves yet, and the theme includes scroll arrows, resulting in us trying to create a cairo surface with a negative height. --- meld/diffmap.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meld/diffmap.py b/meld/diffmap.py index bb44a768..232cf4ac 100644 --- a/meld/diffmap.py +++ b/meld/diffmap.py @@ -123,7 +123,7 @@ def do_draw(self, context): # Hack to work around a cairo bug when calling create_similar # https://bugs.freedesktop.org/show_bug.cgi?id=60519 - if not (width and height): + if not (width > 0 and height > 0): return context.translate(0, y_start) From 18ff8a6f7b26bd0d3fdebb68ee48c385b9dd6629 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Wed, 9 Nov 2016 06:04:44 +1000 Subject: [PATCH 0096/1316] diffmap: Remove now-misleading comment --- meld/diffmap.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/meld/diffmap.py b/meld/diffmap.py index 232cf4ac..50903c3e 100644 --- a/meld/diffmap.py +++ b/meld/diffmap.py @@ -121,8 +121,6 @@ def do_draw(self, context): x0 = xpad x1 = width - 2 * xpad - # Hack to work around a cairo bug when calling create_similar - # https://bugs.freedesktop.org/show_bug.cgi?id=60519 if not (width > 0 and height > 0): return From 3f3e84f8a023e1bb5afbd98b7f65b09615e15f15 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 27 Nov 2016 13:16:33 +1000 Subject: [PATCH 0097/1316] gutterrendererchunk: Handle more StyleContext ABI breaks (bgo#774810) Because of the CSS node breakages in GTK+ 3.20, we need extra handling for doing our new button style drawing in the linkmap. ui.gtkcompat is a new module with code ported from the GTK+ foreigndrawing demo that handles some context creation. Not all of the existing code there is necessary, but some of it would let us use CSS instead of doing manual padding calculations. --- meld/gutterrendererchunk.py | 44 ++++++----- meld/ui/gtkcompat.py | 146 ++++++++++++++++++++++++++++++++++++ 2 files changed, 167 insertions(+), 23 deletions(-) create mode 100644 meld/ui/gtkcompat.py diff --git a/meld/gutterrendererchunk.py b/meld/gutterrendererchunk.py index c0a66ea7..a31bee36 100644 --- a/meld/gutterrendererchunk.py +++ b/meld/gutterrendererchunk.py @@ -24,6 +24,7 @@ from meld.const import MODE_REPLACE, MODE_DELETE, MODE_INSERT from meld.misc import get_common_theme from meld.settings import meldsettings +from meld.ui.gtkcompat import draw_style_common, get_style # Fixed size of the renderer. Ideally this would be font-dependent and # would adjust to other textview attributes, but that's both quite difficult @@ -229,33 +230,30 @@ def do_draw(self, context, background_area, cell_area, start, end, state): GtkSource.GutterRendererPixbuf.do_draw( self, context, background_area, cell_area, start, end, state) if self.is_action: - stylecontext = self.props.view.get_style_context() - stylecontext.save() - stylecontext.set_state(renderer_to_gtk_state(state)) - stylecontext.add_class(Gtk.STYLE_CLASS_BUTTON) - stylecontext.add_class(Gtk.STYLE_CLASS_FLAT) - - button_area = background_area.copy() - button_area.x += 1 - button_area.y += 1 - button_area.width -= 2 - button_area.height -= 2 - - Gtk.render_background( - stylecontext, context, button_area.x, button_area.y, - button_area.width, button_area.height) - Gtk.render_frame( - stylecontext, context, button_area.x, button_area.y, - button_area.width, button_area.height) + if Gtk.get_minor_version() < 20: + style_context = get_style(None, "GtkButton.flat.image-button") + style_context.add_class(Gtk.STYLE_CLASS_BUTTON) + style_context.add_class(Gtk.STYLE_CLASS_FLAT) + else: + # TODO: Fix padding and min-height in CSS and use + # draw_style_common + style_context = get_style(None, "button.flat.image-button") + style_context.set_state(renderer_to_gtk_state(state)) + + x = background_area.x + 1 + y = background_area.y + 1 + width = background_area.width - 2 + height = background_area.height - 2 + + Gtk.render_background(style_context, context, x, y, width, height) + Gtk.render_frame(style_context, context, x, y, width, height) pixbuf = self.props.pixbuf pix_width, pix_height = pixbuf.props.width, pixbuf.props.height Gtk.render_icon( - stylecontext, context, pixbuf, - button_area.x + (button_area.width - pix_width) // 2, - button_area.y + (button_area.height - pix_height) // 2) - - stylecontext.restore() + style_context, context, pixbuf, + x + (width - pix_width) // 2, + y + (height - pix_height) // 2) self.draw_chunks( context, background_area, cell_area, start, end, state) diff --git a/meld/ui/gtkcompat.py b/meld/ui/gtkcompat.py new file mode 100644 index 00000000..0fe1edb8 --- /dev/null +++ b/meld/ui/gtkcompat.py @@ -0,0 +1,146 @@ + +# The original C implementation is part of the GTK+ project, under +# gtk+/demos/gtk-demo/foreigndrawing.c +# +# This Python port of portions of the original source code is copyright +# (C) 2009-2015 Kai Willadsen , and is released +# under the same LGPL version 2 (or later) license. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library 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 +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library. If not, see . + + +import logging +import re + +from gi.repository import GObject, Gtk + +log = logging.getLogger(__name__) + + +def append_element(path, selector): + pseudo_classes = [ + ('active', Gtk.StateFlags.ACTIVE), + ('hover', Gtk.StateFlags.PRELIGHT), + ('selected', Gtk.StateFlags.SELECTED), + ('disabled', Gtk.StateFlags.INSENSITIVE), + ('indeterminate', Gtk.StateFlags.INCONSISTENT), + ('focus', Gtk.StateFlags.FOCUSED), + ('backdrop', Gtk.StateFlags.BACKDROP), + ('dir(ltr)', Gtk.StateFlags.DIR_LTR), + ('dir(rtl)', Gtk.StateFlags.DIR_RTL), + ('link', Gtk.StateFlags.LINK), + ('visited', Gtk.StateFlags.VISITED), + ('checked', Gtk.StateFlags.CHECKED), + ] + if Gtk.get_minor_version() >= 20: + pseudo_classes.append(('drop(active)', Gtk.StateFlags.DROP_ACTIVE)) + + toks = [t for t in re.split('([#\.:])', selector) if t] + elements = [toks[i] + toks[i + 1] for i in range(1, len(toks), 2)] + + name = toks[0] + if name[0].isupper(): + gtype = GObject.GType.from_name(name) + if gtype == GObject.TYPE_INVALID: + log.error('Unknown type name "%s"', name) + return + path.append_type(gtype) + else: + # Omit type, we're using name + path.append_type(GObject.TYPE_NONE) + path.iter_set_object_name(-1, name) + + for segment in elements: + segment_type = segment[0] + name = segment[1:] + if segment_type == '#': + path.iter_set_name(-1, name) + break + elif segment_type == '.': + path.iter_add_class(-1, name) + break + elif segment_type == ':': + for class_name, class_state in pseudo_classes: + if name == class_name: + path.iter_set_state( + -1, path.iter_get_state(-1) | class_state) + break + else: + log.error('Unknown pseudo-class :%s', name) + pass + break + else: + assert False + + +def create_context_for_path(path, parent): + context = Gtk.StyleContext.new() + context.set_path(path) + context.set_parent(parent) + context.set_state(path.iter_get_state(-1)) + return context + + +def get_style(parent, selector): + if parent: + path = Gtk.WidgetPath.copy(parent.get_path()) + else: + path = Gtk.WidgetPath.new() + append_element(path, selector) + return create_context_for_path(path, parent) + + +def query_size(context, width, height): + margin = context.get_margin(context.get_state()) + border = context.get_border(context.get_state()) + padding = context.get_padding(context.get_state()) + min_width = context.get_property('min-width', context.get_state()) + min_height = context.get_property('min-height', context.get_state()) + min_width += ( + margin.left + margin.right + border.left + border.right + + padding.left + padding.right) + min_height += ( + margin.top + margin.bottom + border.top + border.bottom + + padding.top + padding.bottom) + return max(width, min_width), max(height, min_height) + + +def draw_style_common(context, cr, x, y, width, height): + + margin = context.get_margin(context.get_state()) + border = context.get_border(context.get_state()) + padding = context.get_padding(context.get_state()) + + min_width = context.get_property('min-width', context.get_state()) + min_height = context.get_property('min-height', context.get_state()) + + x += margin.left + y += margin.top + width -= margin.left + margin.right + height -= margin.top + margin.bottom + + width = max(width, min_width) + height = max(height, min_height) + + Gtk.render_background(context, cr, x, y, width, height) + Gtk.render_frame(context, cr, x, y, width, height) + + contents_x = x + border.left + padding.left + contents_y = y + border.top + padding.top + contents_width = ( + width - border.left - border.right - padding.left - padding.right) + contents_height = ( + height - border.top - border.bottom - padding.top - padding.bottom) + + return contents_x, contents_y, contents_width, contents_height From 6e5cf5305329cc6cdba2f53cf355d6b0da604c06 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Wed, 14 Dec 2016 09:05:23 +1000 Subject: [PATCH 0098/1316] build_helpers: Don't create empty figures directories (bgo#775954) --- meld/build_helpers.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meld/build_helpers.py b/meld/build_helpers.py index 803b64c3..a75204ae 100644 --- a/meld/build_helpers.py +++ b/meld/build_helpers.py @@ -154,8 +154,9 @@ def get_data_files(self): path_help = os.path.join('share', 'help', lang, name) path_figures = os.path.join(path_help, 'figures') data_files.append((path_help, xml_files + mallard_files)) - data_files.append( - (path_figures, glob.glob('%s/figures/*.png' % build_path))) + figures = glob.glob('%s/figures/*.png' % build_path) + if figures: + data_files.append((path_figures, figures)) return data_files From 98c3abef2fc9aa184858312a779ec60039b79e56 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Wed, 14 Dec 2016 09:09:40 +1000 Subject: [PATCH 0099/1316] Add pycairo to requirements list We use this in diffmap for an annoying surface workaround. --- README | 1 + 1 file changed, 1 insertion(+) diff --git a/README b/README index 4c11b3d5..dc157ec3 100644 --- a/README +++ b/README @@ -21,6 +21,7 @@ Requirements * GLib 2.36 * PyGObject 3.14 * GtkSourceView 3.14 +* pycairo Build requirements From e03cd2bf131927d9ddcae4cc9d7d073653bf12ac Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Wed, 14 Dec 2016 09:10:21 +1000 Subject: [PATCH 0100/1316] help: Update supported version control list This is just making more formal the support changes from: https://mail.gnome.org/archives/meld-list/2015-April/msg00003.html --- help/C/vc-supported.page | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/help/C/vc-supported.page b/help/C/vc-supported.page index 3e9c50b4..2821674a 100644 --- a/help/C/vc-supported.page +++ b/help/C/vc-supported.page @@ -19,16 +19,10 @@

-

Arch

Bazaar

 -

Codeville

 -

CVS

 -

Fossil

 +

Darcs

Git

Mercurial

 -

Monotone

 -

RCS

 -

SVK

SVN

 From 69a8b6b31ca0bf0be52603371af0e2ee5c28ac43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20=C4=8Cernock=C3=BD?= Date: Sat, 17 Dec 2016 16:31:43 +0100 Subject: [PATCH 0101/1316] Updated Czech translation --- help/cs/cs.po | 75 +++++++++++++++++++++++---------------------------- 1 file changed, 33 insertions(+), 42 deletions(-) diff --git a/help/cs/cs.po b/help/cs/cs.po index 20475525..8335fd4c 100644 --- a/help/cs/cs.po +++ b/help/cs/cs.po @@ -1,21 +1,21 @@ # Czech translation for meld. # Copyright (C) 2014 meld's COPYRIGHT HOLDER # This file is distributed under the same license as the meld package. -# Marek Černocký , 2014, 2015. +# Marek Černocký , 2014, 2015, 2016. # msgid "" msgstr "" "Project-Id-Version: meld master\n" -"POT-Creation-Date: 2015-10-11 11:40+0000\n" -"PO-Revision-Date: 2015-10-11 18:42+0200\n" +"POT-Creation-Date: 2016-12-13 23:11+0000\n" +"PO-Revision-Date: 2016-12-17 16:30+0100\n" "Last-Translator: Marek Černocký \n" -"Language-Team: Czech \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.6\n" +"X-Generator: Gtranslator 2.91.7\n" #. Put one translator per line, in the form NAME , YEAR1, YEAR2 msgctxt "_" @@ -58,56 +58,26 @@ msgstr "Meld podporuje širokou škálu systémů pro správu verzí: #. (itstool) path: item/p #: C/vc-supported.page:22 -msgid "Arch" -msgstr "Arch" - -#. (itstool) path: item/p -#: C/vc-supported.page:23 msgid "Bazaar" msgstr "Bazaar" #. (itstool) path: item/p -#: C/vc-supported.page:24 -msgid "Codeville" -msgstr "Codeville" - -#. (itstool) path: item/p -#: C/vc-supported.page:25 -msgid "CVS" -msgstr "CVS" - -#. (itstool) path: item/p -#: C/vc-supported.page:26 -msgid "Fossil" -msgstr "Fossil" +#: C/vc-supported.page:23 +msgid "Darcs" +msgstr "Darcs" #. (itstool) path: item/p -#: C/vc-supported.page:27 +#: C/vc-supported.page:24 msgid "Git" msgstr "Git" #. (itstool) path: item/p -#: C/vc-supported.page:28 +#: C/vc-supported.page:25 msgid "Mercurial" msgstr "Mercurial" #. (itstool) path: item/p -#: C/vc-supported.page:29 -msgid "Monotone" -msgstr "Monotone" - -#. (itstool) path: item/p -#: C/vc-supported.page:30 -msgid "RCS" -msgstr "RCS" - -#. (itstool) path: item/p -#: C/vc-supported.page:31 -msgid "SVK" -msgstr "SVK" - -#. (itstool) path: item/p -#: C/vc-supported.page:32 +#: C/vc-supported.page:26 msgid "SVN" msgstr "SVN" @@ -118,7 +88,7 @@ msgstr "SVN" # (itstool) path: page/p # #. (itstool) path: page/p -#: C/vc-supported.page:35 +#: C/vc-supported.page:29 msgid "" "Less common version control systems or unusual configurations may not be " "properly tested; please report any version control support bugs to meld --help for a list of all command line options." msgstr "" "Spuštěním meld --help si můžete vypsat všechny možnosti " "příkazového řádku." + +#~ msgid "Arch" +#~ msgstr "Arch" + +#~ msgid "Codeville" +#~ msgstr "Codeville" + +#~ msgid "CVS" +#~ msgstr "CVS" + +#~ msgid "Fossil" +#~ msgstr "Fossil" + +#~ msgid "Monotone" +#~ msgstr "Monotone" + +#~ msgid "RCS" +#~ msgstr "RCS" + +#~ msgid "SVK" +#~ msgstr "SVK" From 71ed611b85e88d23354ee8b581f7afa75c8787e2 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 18 Dec 2016 07:38:30 +1000 Subject: [PATCH 0102/1316] maint.py: Fix test invocation; we now use py.test helpers, etc. --- maint.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maint.py b/maint.py index 3b444296..5bc43baf 100755 --- a/maint.py +++ b/maint.py @@ -296,7 +296,7 @@ def cli(): @cli.command() def test(): - cmd = ['python', '-m', 'unittest', 'discover'] + cmd = ['py.test-3', 'test/'] call_with_output(cmd, echo_stdout=True) From edd03c20d6c0146b4aa66a4770d206286a64de5b Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 18 Dec 2016 07:42:15 +1000 Subject: [PATCH 0103/1316] Update NEWS --- NEWS | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/NEWS b/NEWS index 32c97293..d3651b6d 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,91 @@ +2016-12-18 meld 3.17.0 +====================== + + Python 3 porting: + + * Python 3 support; we now require Python 3.3 as a minimum + * Python 3 compatibility fixes; too many cases of bytes/string confusion, + syntax changes and other miscellany to mention individually (Vasily + Galkin, Kai Willadsen) + * Handle new unicode-escape behaviour and unicode/bytes confusion for + process interaction and version control plugins (Vasily Galkin, Kai + Willadsen) + * Add support for byte-based filters, to support directory vs. file + comparison filters (Kai Willadsen) + + + UI changes: + + * The "Tabs" menu item has been removed, to better match up with more + modern GTK+ design. All of the actions are still available in the + expected key bindings, and there is a new per-tab context menu. + * The change action buttons in the central pane divider now correctly + render as flat buttons (Kai Willadsen) + * The curves in the central pane divider are now... smoother! + + + Internal changes: + + * Handle reload notifications better in asynchronous saving (Vasily Galkin) + * Remove multi-process diff in favour of asynchronous (threaded, but + GIL-throttled) matching (Kai Willadsen) + * Performance improvements in rendering of multiple widgets, as well as for + initial text comparison (Kai Willadsen) + * Many updates for GTK+ 3.20 and 3.22 ABI changes (Kai Willadsen) + * NOTE: Windows support is currently untested + + + Fixes: + + * Update supported version control list (Kai Willadsen) + * Update requirements and build requirements lists (Kai Willadsen) + * Don't create empty help/figures directories (Kai Willadsen) + * Translation maintenance (Piotr Drąg) + + + Fixes included in 3.16 releases: + + * Handle themes with scrollbar steppers better (Kai Willadsen) + * Fix a traceback when pane has no file (Claude Paroz) + * Fix triggering "Delete Change" actions from menu (Kai Willadsen) + * Handle style theme not existing (Patrick Griffis) + * Fix bad scroll syncing and inability to move between comparison chunks in + file comparisons (Vasily Galkin) + * Improve version control view behaviour when opening missing paths (Vasily + Galkin) + * Fix saving of text created in blank comparison (Vasily Galkin) + * GTK+ 3.22 compatibility fixes for saving window size (Kai Willadsen) + * Fix formatted patches missing newlines in certain cases (Kai Willadsen) + * Silence GTK+ warning logging if not running in uninstalled (i.e., + development) mode (Kai Willadsen) + * Update AppData (Kai Willadsen) + * Fix performance regression in text filtering (Kai Willadsen) + * Fix regression in respecting custom text encoding (Kai Willadsen) + * Fix regression in support for file comparisons from pipes (Kai Willadsen) + * Add open build service directories to the version control filter + (Dominique Leuenberger) + * Add darcs to list of loaded plugins (pbgc) + * Fix the dark style (Kai Willadsen) + * Windows build fixes (Kai Willadsen) + + + Translations: + + * Anders Jonsson (sv) + * Andika Triwidada (id) + * Balázs Meskó (hu) + * Claude Paroz (fr) + * Daniel Mustieles (es) + * Jiri Grönroos (fi) + * Marek Černocký (cs) + * Mario Blättermann (de) + * Matej Urbančič (sl) + * Rafael Fontenelle (pt_BR) + * Tiago Santos (pt) + * Мирослав Николић (sr, sr@latin) + + 2016-05-01 meld 3.16.0 ====================== From 548435fc223e9dce19c5c9010f60c1da358d4517 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 18 Dec 2016 07:42:44 +1000 Subject: [PATCH 0104/1316] Post-release version bump --- meld/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meld/conf.py b/meld/conf.py index ae12f1c5..6c8f2cd9 100644 --- a/meld/conf.py +++ b/meld/conf.py @@ -3,7 +3,7 @@ import sys __package__ = "meld" -__version__ = "3.17.0" +__version__ = "3.17.1" # START; these paths are clobbered on install by meld.build_helpers DATADIR = os.path.join(sys.prefix, "share", "meld") From ae4987a68ccb46440f2c29286573c0dc3dc51a3a Mon Sep 17 00:00:00 2001 From: Alan Mortensen Date: Wed, 21 Dec 2016 12:59:16 +0100 Subject: [PATCH 0105/1316] Updated Danish translation --- po/da.po | 3367 ++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 2384 insertions(+), 983 deletions(-) diff --git a/po/da.po b/po/da.po index 86f3c27b..c6440c2c 100644 --- a/po/da.po +++ b/po/da.po @@ -1,7 +1,8 @@ # Danish translation for meld. -# Copyright (C) 2011 meld & nedenstående oversættere. +# Copyright (C) 2016 meld & nedenstående oversættere. # This file is distributed under the same license as the meld package. # Joe Hansen , 2010, 2011. +# Alan Mortensen , 2016. # # merge -> flet (sammenføj er til versionstyringskommandoer) # pane -> rude @@ -15,1464 +16,2864 @@ msgid "" msgstr "" "Project-Id-Version: meld master\n" -"Report-Msgid-Bugs-To: Stephen Kennedy \n" -"POT-Creation-Date: 2011-03-13 12:01+0100\n" -"PO-Revision-Date: 2011-01-09 21:19+0000\n" -"Last-Translator: Joe Hansen \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=meld&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2016-09-30 23:28+0000\n" +"PO-Revision-Date: 2016-12-20 18:52+0100\n" +"Last-Translator: Alan Mortensen \n" "Language-Team: Danish \n" "Language: da\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 1.8.7.1\n" -#: ../bin/meld:96 +#: ../bin/meld:142 msgid "Cannot import: " msgstr "Kan ikke importere: " -#: ../bin/meld:99 +#: ../bin/meld:145 #, c-format msgid "Meld requires %s or higher." msgstr "Meld kræver %s eller højere." -#: ../data/meld.desktop.in.h:1 -msgid "Compare and merge your files" -msgstr "Sammenlign og flet dine filer" +#: ../bin/meld:191 +#, c-format +msgid "" +"Couldn't load Meld-specific CSS (%s)\n" +"%s" +msgstr "" +"Kunne ikke indlæse det Meld-specifikke CSS (%s)\n" +"%s" + +#: ../data/meld.desktop.in.h:1 ../data/meld.appdata.xml.in.h:1 +#: ../data/ui/meldapp.ui.h:1 +msgid "Meld" +msgstr "Meld" # Jeg synes også "Diff-viser" kan gå an. (Torben) #: ../data/meld.desktop.in.h:2 msgid "Diff Viewer" msgstr "Diff-fremviser" -#: ../data/meld.desktop.in.h:3 ../data/ui/meldapp.ui.h:5 -msgid "Meld" -msgstr "Meld" - -#: ../data/meld.desktop.in.h:4 +#: ../data/meld.desktop.in.h:3 msgid "Meld Diff Viewer" msgstr "Meld - diff-fremviser" -#: ../data/ui/EditableList.ui.h:1 -msgid "Active" -msgstr "Aktiv" +#: ../data/meld.desktop.in.h:4 ../data/meld.appdata.xml.in.h:2 +msgid "Compare and merge your files" +msgstr "Sammenlign og flet dine filer" -#: ../data/ui/EditableList.ui.h:2 -#, fuzzy -msgid "Add new filter" -msgstr "Filfiltre" +#. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! +#: ../data/meld.desktop.in.h:6 +msgid "diff;merge;" +msgstr "diff;flet;" -#: ../data/ui/EditableList.ui.h:3 -msgid "Editable List" +#: ../data/meld.appdata.xml.in.h:3 +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 "" +"Meld er et visuelt værktøj til diff og flet, som er rettet mod udviklere. Meld " +"hjælper dig med at sammenligne filer, mapper og versionsstyrede projekter. Der er " +"to- og trevejssammenligning af både filer og mapper, og mange " +"versionsstyringssystemer, bl.a. Git, Mercurial, Bazaar og Subversion, er " +"understøttede." -#: ../data/ui/EditableList.ui.h:4 -msgid "Move _Down" +#: ../data/meld.appdata.xml.in.h:4 +msgid "" +"Meld helps you review code changes, understand patches, and makes enormous merge " +"conflicts slightly less painful." msgstr "" +"Meld hjælper dig med at gennemgå kodeændringer, forstå rettelser (patches) og gør " +"enorme flettekonflikter mindre besværlige." -#: ../data/ui/EditableList.ui.h:5 -msgid "Move _Up" -msgstr "" +#: ../data/meld.appdata.xml.in.h:5 +msgid "The GNOME Project" +msgstr "GNOME-projektet" -#: ../data/ui/EditableList.ui.h:6 -msgid "Move item down" -msgstr "" +#: ../data/mime/meld.xml.in.h:1 +msgid "Meld comparison description" +msgstr "Meld-sammenligningsbeskrivelse" -#: ../data/ui/EditableList.ui.h:7 -msgid "Move item up" -msgstr "" +#: ../data/org.gnome.meld.gschema.xml.h:1 +msgid "Default window width" +msgstr "Vinduets standardbredde" -#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:156 -msgid "Name" -msgstr "Navn" +#: ../data/org.gnome.meld.gschema.xml.h:2 +msgid "Default window height" +msgstr "Vinduets standardhøjde" -#: ../data/ui/EditableList.ui.h:9 -msgid "Pattern" -msgstr "Mønster" +#: ../data/org.gnome.meld.gschema.xml.h:3 +msgid "Default window maximised state" +msgstr "Maksimeret-tilstand for standardvinduet" -#: ../data/ui/EditableList.ui.h:10 -#, fuzzy -msgid "Remove selected filter" -msgstr "Vælg fil" +#: ../data/org.gnome.meld.gschema.xml.h:4 +msgid "Default window fullscreen state" +msgstr "Fuldskærmstilstand for standardvinduet" -#: ../data/ui/EditableList.ui.h:11 ../meld/vcview.py:122 -msgid "_Add" -msgstr "_Tilføj" +#: ../data/org.gnome.meld.gschema.xml.h:5 +msgid "Show toolbar" +msgstr "Vis værktøjsbjælken" -#: ../data/ui/EditableList.ui.h:12 ../meld/vcview.py:124 -msgid "_Remove" -msgstr "_Fjern" +#: ../data/org.gnome.meld.gschema.xml.h:6 +msgid "If true, the window toolbar is visible." +msgstr "Hvis sand er vinduets værktøjsbjælke synlig." -#: ../data/ui/filediff.ui.h:1 -msgid "Save modified files?" -msgstr "Gem ændrede filer?" +#: ../data/org.gnome.meld.gschema.xml.h:7 +msgid "Show statusbar" +msgstr "Vis statusbjælke" -#: ../data/ui/filediff.ui.h:2 +#: ../data/org.gnome.meld.gschema.xml.h:8 +msgid "If true, the window statusbar is visible." +msgstr "Hvis sand er vinduets statujsbjælke synlig." + +#: ../data/org.gnome.meld.gschema.xml.h:9 +msgid "Additional automatically detected text encodings" +msgstr "Yderligere automatisk fundne tekstkodninger" + +#: ../data/org.gnome.meld.gschema.xml.h:10 msgid "" -"Some files have been modified.\n" -"Which ones would you like to save?" +"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 "" -"Nogle filer er blevet ændret.\n" -"Hvilke ønsker du at gemme?" +"Meld bruger disse tekstkodninger til at prøve at afkode indlæste tekstfiler, før " +"andre kodninger prøves. Ud over kodningerne på denne liste vil UTF-8 og de aktuelle " +"standardkodninger for regionen altid blive brugt; afhængig af brugerens region vil " +"andre kodninger også blive prøvet." -# Fjern, gem ikke, kasser, forkast -#: ../data/ui/filediff.ui.h:4 -msgid "_Discard Changes" -msgstr "_Kasser ændringer" +#: ../data/org.gnome.meld.gschema.xml.h:11 +msgid "Width of an indentation step" +msgstr "Indrykningsbredde" -#: ../data/ui/filediff.ui.h:5 -msgid "_Save Selected" -msgstr "_Gem valgte" +#: ../data/org.gnome.meld.gschema.xml.h:12 +msgid "The number of spaces to use for a single indent step" +msgstr "Antallet af mellemrum der skal bruges på en enkelt indrykning" -#: ../data/ui/findbar.ui.h:1 -msgid "Regular E_xpression" -msgstr "Regulært _udtryk" +#: ../data/org.gnome.meld.gschema.xml.h:13 +msgid "Whether to indent using spaces or tabs" +msgstr "Om indrykning sker med mellemrum eller tabulator" -#: ../data/ui/findbar.ui.h:2 -msgid "Replace _All" -msgstr "Erstat _alle" +#: ../data/org.gnome.meld.gschema.xml.h:14 +msgid "If true, any new indentation will use spaces instead of tabs." +msgstr "Hvis sand vil nye indrykninger bruge mellemrum i stedet for tabulatorer." -#: ../data/ui/findbar.ui.h:3 -msgid "Replace _With" -msgstr "Erstat _med" +#: ../data/org.gnome.meld.gschema.xml.h:15 +msgid "Show line numbers" +msgstr "Vis linjenumre" -#: ../data/ui/findbar.ui.h:4 -msgid "Who_le word" -msgstr "_Hele ord" +#: ../data/org.gnome.meld.gschema.xml.h:16 +msgid "If true, line numbers will be shown in the gutter of file comparisons." +msgstr "Hvis sand vil linjenumre blive vist i filsammenligningers indvendige margener." -#: ../data/ui/findbar.ui.h:5 -msgid "_Match Case" -msgstr "_Versalfølsom" +#: ../data/org.gnome.meld.gschema.xml.h:17 +msgid "Highlight syntax" +msgstr "Syntaksfremhævning" -#: ../data/ui/findbar.ui.h:6 -msgid "_Next" -msgstr "_Næste" +#: ../data/org.gnome.meld.gschema.xml.h:18 +msgid "" +"Whether to highlight syntax in comparisons. Because of Meld's own color " +"highlighting, this is off by default." +msgstr "" +"Om syntaks skal fremhæves i sammenligninger. Pga. Melds egen farvefremhævning er " +"dette som standard slået fra." -#: ../data/ui/findbar.ui.h:7 -msgid "_Previous" -msgstr "_Forrige" +#: ../data/org.gnome.meld.gschema.xml.h:19 +msgid "Color scheme to use for syntax highlighting" +msgstr "Farveskema til brug for syntaksfremhævning" -#: ../data/ui/findbar.ui.h:8 ../meld/meldwindow.py:140 -msgid "_Replace" -msgstr "_Erstat" +#: ../data/org.gnome.meld.gschema.xml.h:20 +msgid "Used by GtkSourceView to determine colors for syntax highlighting" +msgstr "Bruges af GtkSourceView til at bestemme farver til fremhævning af syntaks" -#: ../data/ui/findbar.ui.h:9 -msgid "_Search for" -msgstr "_Søg efter" +#: ../data/org.gnome.meld.gschema.xml.h:21 +msgid "Displayed whitespace" +msgstr "Viste blanktegn" -#: ../data/ui/meldapp.ui.h:1 -msgid "Choose Files" -msgstr "Vælg filer" +#: ../data/org.gnome.meld.gschema.xml.h:22 +msgid "" +"Selector for individual whitespace character types to be shown. Possible values are " +"'space', 'tab', 'newline' and 'nbsp'." +msgstr "" +"Hvilken type blanktegn skal vises. Mulige værdier er: \"space\", \"tab\", \"newline" +"\" og \"nbsp\"." + +#: ../data/org.gnome.meld.gschema.xml.h:23 +msgid "Wrap mode" +msgstr "Ombrydningstilstand" -#: ../data/ui/meldapp.ui.h:2 +#: ../data/org.gnome.meld.gschema.xml.h:24 msgid "" -"Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2010 Kai Willadsen" +"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 "" -"Ophavsret 2002-2009 Stephen Kennedy\n" -"Ophavsret 2009-2010 Kai Willadsen" +"Linjer i filsammenligninger vil blive ombrudt i henhold til denne indstilling: " +"overhovedet ikke (\"none\"), ved ethvert tegn (\"char\") eller kun efter et ord " +"(\"word\")." -#: ../data/ui/meldapp.ui.h:4 -msgid "Directory" -msgstr "Mappe" +#: ../data/org.gnome.meld.gschema.xml.h:25 +msgid "Highlight current line" +msgstr "Fremhæv den aktuelle linje" -#. Refers to version of the file being compared -#: ../data/ui/meldapp.ui.h:7 -msgid "Mine" -msgstr "Min" +#: ../data/org.gnome.meld.gschema.xml.h:26 +msgid "" +"If true, the line containing the cursor will be highlighted in file comparisons." +msgstr "Hvis sand vil linjen med markøren blive fremhævet i filsammenligninger." -#. Refers to version of the file being compared -#: ../data/ui/meldapp.ui.h:9 -msgid "Original" -msgstr "Oprindelig" +#: ../data/org.gnome.meld.gschema.xml.h:27 +msgid "Use the system default monospace font" +msgstr "Brug systemets standardskrifttype med fast bredde" -#. Refers to version of the file being compared -#: ../data/ui/meldapp.ui.h:11 -msgid "Other" -msgstr "Anden" +#: ../data/org.gnome.meld.gschema.xml.h:28 +msgid "If false, custom-font will be used instead of the system monospace font." +msgstr "" +"Hvis falsk vil en tilpasset skrifttype blive brugt i stedet for systemets " +"standardskrifttype med fast bredde." -#: ../data/ui/meldapp.ui.h:12 -msgid "Select VC Directory" -msgstr "Vælg versionsstyringsmappe" +#: ../data/org.gnome.meld.gschema.xml.h:29 +msgid "Custom font" +msgstr "Tilpasset skrifttype" -# Sammenligning af _mapper -#: ../data/ui/meldapp.ui.h:13 -msgid "_Directory Comparison" -msgstr "_Mappesammenligning" +#: ../data/org.gnome.meld.gschema.xml.h:30 +msgid "" +"The custom font to use, stored as a string and parsed as a Pango font description." +msgstr "" +"Den tilpassede skrifttype som skal bruges. Gemmes som en streng og fortolkes som en " +"Pango-skrifttypebeskrivelse." -# Sammenligning af _filer -#: ../data/ui/meldapp.ui.h:14 -msgid "_File Comparison" -msgstr "_Filsammenligning" +#: ../data/org.gnome.meld.gschema.xml.h:31 +msgid "Ignore blank lines when comparing files" +msgstr "Ignorér tomme linjer, når filer sammenlignes" -# Evt. "Sammenlign tre filer eller mapper -#: ../data/ui/meldapp.ui.h:15 -msgid "_Three Way Compare" -msgstr "_Trepunktssammenligning" +#: ../data/org.gnome.meld.gschema.xml.h:32 +msgid "If true, blank lines will be trimmed when highlighting changes between files." +msgstr "" +"Hvis sand vil tomme linjer blive beskåret, når ændringer mellem filer fremhæves." -#: ../data/ui/meldapp.ui.h:16 -msgid "_Version Control Browser" -msgstr "_Browser til versionsstyring" +# Brug det _normale systemredigeringsprogram +# Brug systemets _standardredigeringsprogram +#: ../data/org.gnome.meld.gschema.xml.h:33 +msgid "Use the system default editor" +msgstr "Brug systemets standardredigeringsprogram" -#: ../data/ui/meldapp.ui.h:17 -msgid "translator-credits" +#: ../data/org.gnome.meld.gschema.xml.h:34 +msgid "" +"If false, custom-editor-command will be used instead of the system editor when " +"opening files externally." msgstr "" -"Joe Hansen, 2010, 2011.\n" -"\n" -"Dansk-gruppen \n" -"Mere info: http://www.dansk-gruppen.dk" +"Hvis falsk vil \"custom-editor-command\" blive brugt i stedet for systemets " +"redigeringsprogram, når filer åbnes eksternt." -#: ../data/ui/patch-dialog.ui.h:1 -msgid "Copy to Clipboard" -msgstr "Kopier til udklipsholderen" +#: ../data/org.gnome.meld.gschema.xml.h:35 +msgid "The custom editor launch command" +msgstr "Kommando til at starte brugerdefineret redigeringsprogram" -#: ../data/ui/patch-dialog.ui.h:2 -msgid "Create Patch" -msgstr "Opret rettelse (patch)" +#: ../data/org.gnome.meld.gschema.xml.h:36 +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 "" +"Kommandoen til at starte et brugerdefineret redigeringsprogram. Begrænset brug af " +"skabeloner understøttes; for øjeblikket kan \"{file}\" og \"{line}\" bruges." -#: ../data/ui/patch-dialog.ui.h:3 -msgid "Create a patch" -msgstr "Opret en rettelse (patch)" +#: ../data/org.gnome.meld.gschema.xml.h:37 +msgid "Columns to display" +msgstr "Kolonner der skal vises" -#: ../data/ui/patch-dialog.ui.h:4 -msgid "Left and middle panes" -msgstr "Ruder til venstre og i midten" +#: ../data/org.gnome.meld.gschema.xml.h:38 +msgid "List of column names in folder comparison and whether they should be displayed." +msgstr "Liste over kolonnenavne i mappesammenligning og om de skal vises." -#: ../data/ui/patch-dialog.ui.h:5 -msgid "Middle and right panes" -msgstr "Ruder i midten og til højre" +#: ../data/org.gnome.meld.gschema.xml.h:39 ../data/ui/preferences.ui.h:32 +msgid "Ignore symbolic links" +msgstr "Ignorér symbolske henvisninger" -#: ../data/ui/patch-dialog.ui.h:6 -msgid "Use differences between:" -msgstr "Brug forskelle mellem:" +#: ../data/org.gnome.meld.gschema.xml.h:40 +msgid "" +"If true, folder comparisons do not follow symbolic links when traversing the folder " +"tree." +msgstr "" +"Hvis sand vil mappesammenligninger ikke følge symbolske henvisninger, når mappetræet " +"gennemkrydses." -#: ../data/ui/patch-dialog.ui.h:7 -msgid "_Reverse patch direction" -msgstr "_Modsat rettelsesretning" +#: ../data/org.gnome.meld.gschema.xml.h:41 +msgid "Use shallow comparison" +msgstr "Brug overfladisk sammenligningen" -#: ../data/ui/preferences.ui.h:1 -msgid "Display" -msgstr "Skærm" +#: ../data/org.gnome.meld.gschema.xml.h:42 +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 "" +"Hvis sand vil mappesammenligninger kun sammenligne filer baseret på størrelse og " +"mtime. Filer anses for at være identiske, hvis deres størrelse og mtime matcher og " +"ellers forskellige." -#: ../data/ui/preferences.ui.h:2 -msgid "Do not _split words over two lines" -msgstr "_Opdel ikke ord over to linjer" +#: ../data/org.gnome.meld.gschema.xml.h:43 +msgid "File timestamp resolution" +msgstr "Filers tidsstempelopløsning" -#: ../data/ui/preferences.ui.h:3 -msgid "Edito_r command:" -msgstr "_Kommando for redigeringsprogram:" +#: ../data/org.gnome.meld.gschema.xml.h:44 +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 "" +"Når sammenligninger er baseret på mtime, er dette den mindste forskel i nanosekunder " +"mellem to filer, før de anses for at have forskellige mtimes. Dette er nyttigt, når " +"der sammenlignes filer på tværs af filsystemer med forskellig tidsstempelopløsning." -#: ../data/ui/preferences.ui.h:4 -msgid "Editor" -msgstr "Redigeringsprogram" +#: ../data/org.gnome.meld.gschema.xml.h:45 ../data/ui/preferences.ui.h:30 +msgid "Apply text filters during folder comparisons" +msgstr "Anvend tekstfiltre under mappesammenligninger" -#: ../data/ui/preferences.ui.h:5 -msgid "Enable text _wrapping" -msgstr "Aktiver _tekstombrydning" +#: ../data/org.gnome.meld.gschema.xml.h:46 +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 "" +"Hvis sand vil mappesammenligninger, som sammenligner filindhold, også anvende aktive " +"tekstfiltre og beskære tomme linjer samt ignorere newline-forskelle." -#: ../data/ui/preferences.ui.h:6 -msgid "Encoding" -msgstr "Kodning" +#: ../data/org.gnome.meld.gschema.xml.h:47 +msgid "File status filters" +msgstr "Filtre for filstatus" -#: ../data/ui/preferences.ui.h:7 -msgid "External editor" -msgstr "Eksternt redigeringsprogram" +#: ../data/org.gnome.meld.gschema.xml.h:48 +msgid "List of statuses used to filter visible files in folder comparison." +msgstr "" +"Oversigt over statusser brugt til at filtrere synlige filer i mappesammenligninger." -#: ../data/ui/preferences.ui.h:8 -msgid "File Filters" -msgstr "Filfiltre" +#: ../data/org.gnome.meld.gschema.xml.h:49 +msgid "Show the version control console output" +msgstr "Vis konsoloutputtet for versionsstyring" -#: ../data/ui/preferences.ui.h:9 -msgid "Font" -msgstr "Skrifttype" +#: ../data/org.gnome.meld.gschema.xml.h:50 +msgid "" +"If true, a console output section will be shown in version control views, showing " +"the commands run for version control operations." +msgstr "" +"Hvis sand vil et konsoloutputafsnit blive vist i visninger af versionsstyring, som " +"viser de kommandoer, der køres for versionsstyringshandlinger." -#: ../data/ui/preferences.ui.h:10 -msgid "Ignore changes which insert or delete blank lines" -msgstr "Ignorer ændringer der indsætter eller sletter tomme linjer" +#: ../data/org.gnome.meld.gschema.xml.h:51 +msgid "Version control pane position" +msgstr "Rudeplacering af versionsstyring" -#: ../data/ui/preferences.ui.h:11 -msgid "Ignore symbolic links" -msgstr "Ignorer symbolske henvisninger" +#: ../data/org.gnome.meld.gschema.xml.h:52 +msgid "" +"This is the height of the main version control tree when the console pane is shown." +msgstr "Dette er højden på versionsstyringens hovedtræ, når konsolruden vises." -#: ../data/ui/preferences.ui.h:12 -msgid "Loading" -msgstr "Indlæser" +#: ../data/org.gnome.meld.gschema.xml.h:53 +msgid "Present version comparisons as left-local/right-remote" +msgstr "Nuværende versionssammenligninger som venstre-lokal/højre-fjern" -#: ../data/ui/preferences.ui.h:13 -msgid "Meld Preferences" -msgstr "Indstillinger for Meld" +#: ../data/org.gnome.meld.gschema.xml.h:54 +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 "" +"Hvis sand vil sammenligning af versionsstyringer bruge et venstre-er-lokal/højre-er-" +"fjern-skema til at bestemme, i hvilken rækkefølge filer vises i ruder. Ellers vil et " +"venstre-er-deres/højre-er-min-skema blive anvendt." -#: ../data/ui/preferences.ui.h:14 -msgid "Show _line numbers" -msgstr "Vis _linjenumre" +#: ../data/org.gnome.meld.gschema.xml.h:55 +msgid "Order for files in three-way version control merge comparisons" +msgstr "Filrækkefølge i fletssammenligninger i trevejsversionsstyring" -#: ../data/ui/preferences.ui.h:15 -msgid "Show w_hitespace" -msgstr "Vis _blanktegn" +#: ../data/org.gnome.meld.gschema.xml.h:56 +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 "" +"Muligheder for filrækkefølge er fjern/flettet/lokal og lokal/flettet/fjern. Denne " +"indstilling påvirker kun trevejssammenligninger, der startes fra " +"versionsstyringsvisningen, så den bruges kun til at løse sammenfletninger/konflikter " +"i Meld." -#: ../data/ui/preferences.ui.h:16 -msgid "Text Filters" -msgstr "Tekstfiltre" +#: ../data/org.gnome.meld.gschema.xml.h:57 +msgid "Show margin in commit message editor" +msgstr "Vis margen i redigeringsprogram til commit-beskeder" -# Brug det _normale systemredigeringsprogram -# Brug systemets _standardredigeringsprogram -#: ../data/ui/preferences.ui.h:17 -msgid "Use _default system editor" -msgstr "Brug det _normale systemredigeringsprogram" +#: ../data/org.gnome.meld.gschema.xml.h:58 +msgid "" +"If true, a guide will be displayed to show what column the margin is at in the " +"version control commit message editor." +msgstr "" +"Hvis sand vil en hjælpelinje blive vist, som viser, hvilken kolonne margenen er ved " +"i redigeringsprogrammet til versionsstyringens commit-beskeder." -#: ../data/ui/preferences.ui.h:18 -msgid "Use s_yntax highlighting" -msgstr "Brug _syntaksfremhævelse" +#: ../data/org.gnome.meld.gschema.xml.h:59 +msgid "Margin column in commit message editor" +msgstr "Margenkolonne i redigeringsprogram til commit-beskeder" -#: ../data/ui/preferences.ui.h:19 -msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)" +#: ../data/org.gnome.meld.gschema.xml.h:60 +msgid "" +"The column at which to show the margin in the version control commit message editor." msgstr "" -"Når der indlæses, så prøv disse codec i rækkefølge. (for eksempel utf8, " -"iso8859)" +"Den kolonne hvor margenen skal vises i redigeringsprogrammet til versionsstyring af " +"commit-beskeder." -#: ../data/ui/preferences.ui.h:20 +#: ../data/org.gnome.meld.gschema.xml.h:61 +msgid "Automatically hard-wrap commit messages" +msgstr "Automatisk tvungen linjeskift i commit-beskeder" + +#: ../data/org.gnome.meld.gschema.xml.h:62 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." +"If true, the version control commit message editor will hard-wrap (i.e., insert line " +"breaks) at the commit margin before commit." msgstr "" -"Når der udføres mappesammenligninger, kan du filtrere filer og mapper fra " -"efter navn. Hvert mønster er en liste af skallignende jokertegn adskilt af " -"mellemrum." +"Hvis sand vil redigeringsprogrammet til versionsstyring af commit-beskeder indføre " +"tvungen linjeskift ved commit-margen før commit." -# vert mønster er et regulært udtryk i python, der erstatter -# tilsvarende tekst med den tomme streng før sammenligningen udføres. -#: ../data/ui/preferences.ui.h:21 +#: ../data/org.gnome.meld.gschema.xml.h:63 +msgid "Version control status filters" +msgstr "Statusfiltre til versionsstyring" + +#: ../data/org.gnome.meld.gschema.xml.h:64 +msgid "List of statuses used to filter visible files in version control comparison." +msgstr "" +"Oversigt over statusser anvendt til at filtrere synlige filer i " +"versionsstyringssammenligninger." + +#: ../data/org.gnome.meld.gschema.xml.h:65 +msgid "Filename-based filters" +msgstr "Filnavne-baserede filtre" + +#: ../data/org.gnome.meld.gschema.xml.h:66 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." +"List of predefined filename-based filters that, if active, will remove matching " +"files from a folder comparison." msgstr "" -"Når der udføres filsammenligninger, kan du ignorere visse ændringer. Hvert " -"mønster her er et regulært udtryk i python, som erstatter tilsvarende tekst " -"med den tomme streng før sammenligning udføres. Hvis udtrykket indeholder " -"grupper, bliver kun grupperne erstattet. Se brugermanualen for yderligere " -"detaljer." - -# Evt. "Skrifttype i redigeringsprogram" / -# "Redigeringsprogrammets skrifttype" -#: ../data/ui/preferences.ui.h:22 -msgid "_Editor font:" -msgstr "_Skrifttype for redigeringsprogram:" +"Oversigt over foruddefinerede filnavne-baserede filtre, som, hvis aktive, vil fjerne " +"matchende filer i en mappesammenligning." -#: ../data/ui/preferences.ui.h:23 -msgid "_Insert spaces instead of tabs" -msgstr "_Indsæt mellemrum i steden for tabulatorindryk" +#: ../data/org.gnome.meld.gschema.xml.h:67 +msgid "Text-based filters" +msgstr "Tekst-baserede filtre" -#: ../data/ui/preferences.ui.h:24 -msgid "_Tab width:" -msgstr "_Bredde på tabulatorindryk:" +#: ../data/org.gnome.meld.gschema.xml.h:68 +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 "" +"Oversigt over foruddefinerede tekst-baserede regex-filtre, som, hvis aktive, vil " +"forhindre at tekst bruges i en filsammenligning. Teksten vil stadig blive vist, men " +"vil ikke bidrage til selve sammenligningen." -#: ../data/ui/preferences.ui.h:25 -msgid "_Use the system fixed width font" -msgstr "_Brug systemets standardskrifttype med fast bredde" +#: ../data/styles/meld-base.xml.h:1 +msgid "Meld base scheme" +msgstr "Melds basisskema" -#: ../data/ui/vcview.ui.h:1 -msgid "Commit Files" -msgstr "Indsend filer" +#: ../data/styles/meld-base.xml.h:2 +msgid "Base color scheme for Meld highlighting" +msgstr "Basisfarveskema for fremhævning i Meld" -#: ../data/ui/vcview.ui.h:2 -msgid "Compare Options" -msgstr "Sammenlign indstillinger" +#: ../data/styles/meld-dark.xml.h:1 +msgid "Meld dark scheme" +msgstr "Melds mørke skema" -#: ../data/ui/vcview.ui.h:3 -msgid "Date" -msgstr "Dato" +#: ../data/styles/meld-dark.xml.h:2 +msgid "Dark color scheme for Meld highlighting" +msgstr "Mørkt farveskema for fremhævning i Meld" -#: ../data/ui/vcview.ui.h:4 -msgid "Local copy against other remote revision" -msgstr "Lokal kopi mod anden ekstern revision" +#: ../data/ui/application.ui.h:1 +msgid "About Meld" +msgstr "Om Meld" -#: ../data/ui/vcview.ui.h:5 -msgid "Local copy against same remote revision" -msgstr "Lokal kopi mod samme eksterne revision" +#: ../data/ui/application.ui.h:2 +msgid "" +"Copyright © 2002-2009 Stephen Kennedy\n" +"Copyright © 2009-2013 Kai Willadsen" +msgstr "" +"Ophavsret © 2002-2009 Stephen Kennedy\n" +"Ophavsret © 2009-2013 Kai Willadsen" -#: ../data/ui/vcview.ui.h:6 -msgid "Log Message" -msgstr "Logbesked" +#: ../data/ui/application.ui.h:4 +msgid "Website" +msgstr "Websted" -# logpunkter?, logindgange? -#: ../data/ui/vcview.ui.h:7 -msgid "Previous Logs" -msgstr "Forrige logge" +#: ../data/ui/application.ui.h:5 +msgid "translator-credits" +msgstr "" +"Joe Hansen, 2010, 2011.\n" +"Alan Mortensen, 2016.\n" +"\n" +"Dansk-gruppen \n" +"Mere info: http://www.dansk-gruppen.dk" + +#: ../data/ui/application.ui.h:6 +msgid "_Preferences" +msgstr "_Indstillinger" + +#: ../data/ui/application.ui.h:7 +msgid "_Help" +msgstr "_Hjælp" -#: ../data/ui/vcview.ui.h:8 ../meld/vcview.py:179 -msgid "Tag" -msgstr "Mærke" +#: ../data/ui/application.ui.h:8 +msgid "Keyboard Shortcuts" +msgstr "Tastaturgenveje" -#: ../data/ui/vcview.ui.h:9 -msgid "VC Log" -msgstr "Versionsstyringslog" +#: ../data/ui/application.ui.h:9 +msgid "_About" +msgstr "_Om" -#: ../meld/dirdiff.py:215 ../meld/vcview.py:118 +#: ../data/ui/application.ui.h:10 +msgid "_Quit" +msgstr "_Afslut" + +#: ../data/ui/dirdiff.ui.h:1 ../data/ui/vcview.ui.h:1 msgid "_Compare" msgstr "_Sammenlign" -#: ../meld/dirdiff.py:215 ../meld/vcview.py:118 -msgid "Compare selected" -msgstr "Sammenlign det valgte" +#: ../data/ui/dirdiff.ui.h:2 ../data/ui/vcview.ui.h:2 +msgid "Compare selected files" +msgstr "Sammenlign de valgte filer" -#: ../meld/dirdiff.py:216 -#, fuzzy -msgid "Copy _Left" -msgstr "Kopier til venstre" +#: ../data/ui/dirdiff.ui.h:3 +msgid "Copy to _Left" +msgstr "Kopiér til _venstre" -#: ../meld/dirdiff.py:216 -#, fuzzy +#: ../data/ui/dirdiff.ui.h:4 msgid "Copy to left" -msgstr "Kopier til venstre" +msgstr "Kopiér til venstre" -#: ../meld/dirdiff.py:217 -#, fuzzy -msgid "Copy _Right" -msgstr "Kopier til højre" +#: ../data/ui/dirdiff.ui.h:5 +msgid "Copy to _Right" +msgstr "Kopiér til _højre" -#: ../meld/dirdiff.py:217 -#, fuzzy +#: ../data/ui/dirdiff.ui.h:6 msgid "Copy to right" -msgstr "Kopier til højre" +msgstr "Kopiér til højre" -#: ../meld/dirdiff.py:218 +#: ../data/ui/dirdiff.ui.h:7 msgid "Delete selected" msgstr "Slet det valgte" -#: ../meld/dirdiff.py:219 ../meld/filediff.py:998 +#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:858 ../meld/filediff.py:1382 msgid "Hide" msgstr "Skjul" -#: ../meld/dirdiff.py:219 +#: ../data/ui/dirdiff.ui.h:9 msgid "Hide selected" msgstr "Skjul det valgte" -#: ../meld/dirdiff.py:221 ../meld/filediff.py:264 ../meld/vcview.py:119 -msgid "Open selected" -msgstr "Åbn det valgte" - -#: ../meld/dirdiff.py:225 -msgid "Case" -msgstr "Store/små bogstaver" +#: ../data/ui/dirdiff.ui.h:10 +msgid "Ignore Filename Case" +msgstr "Ignorér store/små bogstaver i filnavne" -#: ../meld/dirdiff.py:225 -msgid "Ignore case of entries" -msgstr "Ignorer store/små bogstaver" +#: ../data/ui/dirdiff.ui.h:11 +msgid "" +"Consider differently-cased filenames that are otherwise-identical to be the same" +msgstr "" +"Anse filnavne med forskelle i store/små bogstaver, men ellers er identiske, som " +"værende ens" -#: ../meld/dirdiff.py:226 +#: ../data/ui/dirdiff.ui.h:12 msgid "Same" msgstr "Ens" -#: ../meld/dirdiff.py:226 +#: ../data/ui/dirdiff.ui.h:13 msgid "Show identical" msgstr "Vis ens" -#: ../meld/dirdiff.py:227 +#: ../data/ui/dirdiff.ui.h:14 msgid "New" msgstr "Ny" -#: ../meld/dirdiff.py:227 +#: ../data/ui/dirdiff.ui.h:15 msgid "Show new" msgstr "Vis ny" -#: ../meld/dirdiff.py:228 +#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:76 msgid "Modified" msgstr "Ændret" -#: ../meld/dirdiff.py:228 ../meld/vcview.py:132 +#: ../data/ui/dirdiff.ui.h:17 msgid "Show modified" msgstr "Vis ændret" -#: ../meld/dirdiff.py:230 +#: ../data/ui/dirdiff.ui.h:18 msgid "Filters" msgstr "Filtre" -#: ../meld/dirdiff.py:230 +#: ../data/ui/dirdiff.ui.h:19 msgid "Set active filters" msgstr "Angiv aktivt filter" -#: ../meld/dirdiff.py:347 -#, python-format -msgid "Hide %s" -msgstr "Skjul %s" - -#: ../meld/dirdiff.py:449 ../meld/dirdiff.py:462 ../meld/vcview.py:304 -#: ../meld/vcview.py:332 -#, python-format -msgid "[%s] Scanning %s" -msgstr "[%s] Skanner %s" +#: ../data/ui/EditableList.ui.h:1 +msgid "Editable List" +msgstr "Redigerbar liste" -#: ../meld/dirdiff.py:561 -#, python-format -msgid "[%s] Done" -msgstr "[%s] Færdig" +#: ../data/ui/EditableList.ui.h:2 +msgid "Active" +msgstr "Aktiv" -#: ../meld/dirdiff.py:565 -msgid "Multiple errors occurred while scanning this folder" -msgstr "" +#: ../data/ui/EditableList.ui.h:3 +msgid "Column Name" +msgstr "Kolonnenavn" -#: ../meld/dirdiff.py:566 -#, fuzzy -msgid "Files with invalid encodings found" -msgstr "%s er ikke i kodningen: %s" +#: ../data/ui/EditableList.ui.h:4 ../data/ui/vcview.ui.h:9 +msgid "_Add" +msgstr "_Tilføj" -#. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:568 -msgid "Some files were in an incorrect encoding. The names are something like:" -msgstr "" +#: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11 ../meld/vcview.py:644 +msgid "_Remove" +msgstr "_Fjern" -#: ../meld/dirdiff.py:570 -msgid "Files hidden by case insensitive comparison" -msgstr "" +#: ../data/ui/EditableList.ui.h:6 +msgid "Move item up" +msgstr "Flyt element op" -# Du udfører en sammenligning uden forskel på store og små bogstaver på -# et filsystem, hvor der er forskel på store og små bogstaver. -#. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:572 -#, fuzzy -msgid "" -"You are running a case insensitive comparison on a case sensitive " -"filesystem. The following files in this folder are hidden:" -msgstr "" -"Du udfører en sammenligning, der ikke tager højde for store/små bogstaver på " -"et filsystem, som tager højde for store/små bogstaver. Nogle filer er ikke " -"synlige:\n" -"%s" +#: ../data/ui/EditableList.ui.h:7 +msgid "Move _Up" +msgstr "Flyt _op" -#: ../meld/dirdiff.py:583 -#, python-format -msgid "'%s' hidden by '%s'" -msgstr "\"%s\" skjult af \"%s\"" +#: ../data/ui/EditableList.ui.h:8 +msgid "Move item down" +msgstr "Flyt element ned" -#: ../meld/dirdiff.py:608 ../meld/filediff.py:875 ../meld/filediff.py:1002 -msgid "Hi_de" -msgstr "_Skjul" +#: ../data/ui/EditableList.ui.h:9 +msgid "Move _Down" +msgstr "Flyt _ned" -#: ../meld/dirdiff.py:658 -#, python-format -msgid "" -"'%s' exists.\n" -"Overwrite?" -msgstr "" -"\"%s\" findes.\n" -"Overskriv?" +#. Create icon and filename CellRenderer +#: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35 ../meld/dirdiff.py:373 +msgid "Name" +msgstr "Navn" -#: ../meld/dirdiff.py:665 -#, python-format -msgid "" -"Error copying '%s' to '%s'\n" -"\n" -"%s." -msgstr "" -"Fejl ved kopiering af \"%s\" til \"%s\"\n" -"\n" -"%s." +#: ../data/ui/EditableList.ui.h:11 +msgid "Pattern" +msgstr "Mønster" -#: ../meld/dirdiff.py:683 ../meld/vcview.py:504 -#, python-format -msgid "" -"'%s' is a directory.\n" -"Remove recursively?" -msgstr "" -"\"%s\" er en mappe.\n" -"Fjern rekursivt?" +#: ../data/ui/EditableList.ui.h:12 +msgid "Add new filter" +msgstr "Tilføj nyt filter" -#: ../meld/dirdiff.py:690 ../meld/vcview.py:509 -#, python-format -msgid "" -"Error removing %s\n" -"\n" -"%s." -msgstr "" -"Fejl under fjernelse af %s\n" -"\n" -"%s." +#: ../data/ui/EditableList.ui.h:13 +msgid "Remove selected filter" +msgstr "Fjern det valgte filter" -#: ../meld/dirdiff.py:702 -#, python-format -msgid "%i second" -msgid_plural "%i seconds" -msgstr[0] "%i sekund" -msgstr[1] "%i sekunder" +#: ../data/ui/filediff.ui.h:1 +msgid "Format as Patch..." +msgstr "Formatér som rettelse (patch) …" -#: ../meld/dirdiff.py:703 -#, python-format -msgid "%i minute" -msgid_plural "%i minutes" -msgstr[0] "%i minut" -msgstr[1] "%i minutter" +#: ../data/ui/filediff.ui.h:2 +msgid "Create a patch using differences between files" +msgstr "Opret en rettelse (patch) ud fra forskelle mellem filer" -#: ../meld/dirdiff.py:704 -#, python-format -msgid "%i hour" -msgid_plural "%i hours" -msgstr[0] "%i time" -msgstr[1] "%i timer" +#: ../data/ui/filediff.ui.h:3 +msgid "Save A_ll" +msgstr "Gem a_lle" -#: ../meld/dirdiff.py:705 -#, python-format -msgid "%i day" -msgid_plural "%i days" -msgstr[0] "%i dag" -msgstr[1] "%i dage" +#: ../data/ui/filediff.ui.h:4 +msgid "Save all files in the current comparison" +msgstr "Gem alle filer i den aktuelle sammenligning" -#: ../meld/dirdiff.py:706 -#, python-format -msgid "%i week" -msgid_plural "%i weeks" -msgstr[0] "%i uge" -msgstr[1] "%i uger" +#: ../data/ui/filediff.ui.h:5 +msgid "Revert files to their saved versions" +msgstr "Tilbagefør filer til deres gemte versioner" -#: ../meld/dirdiff.py:707 -#, python-format -msgid "%i month" -msgid_plural "%i months" -msgstr[0] "%i måned" -msgstr[1] "%i måneder" +#: ../data/ui/filediff.ui.h:6 +msgid "Add Synchronization Point" +msgstr "Tilføj synkroniseringspunkt" -#: ../meld/dirdiff.py:708 -#, python-format -msgid "%i year" -msgid_plural "%i years" -msgstr[0] "%i år" -msgstr[1] "%i år" +#: ../data/ui/filediff.ui.h:7 +msgid "Add a synchronization point for changes between files" +msgstr "Tilføj et synkroniseringspunkt for ændringer mellem filer" -#: ../meld/filediff.py:265 -msgid "Format as patch..." -msgstr "Formater som rettelse (patch)..." +#: ../data/ui/filediff.ui.h:8 +msgid "Clear Synchronization Points" +msgstr "Ryd synkroniseringspunkter" -#: ../meld/filediff.py:265 -msgid "Create a patch using differences between files" -msgstr "Opret en rettelse (patch) ud fra forskelle mellem filer" +#: ../data/ui/filediff.ui.h:9 +msgid "Clear sychronization points for changes between files" +msgstr "Ryd synkroniseringspunkter for ændringer mellem filer" -#: ../meld/filediff.py:266 -msgid "Previous conflict" +#: ../data/ui/filediff.ui.h:10 +msgid "Previous Conflict" msgstr "Forrige konflikt" -#: ../meld/filediff.py:266 +#: ../data/ui/filediff.ui.h:11 msgid "Go to the previous conflict" msgstr "Gå til den forrige konflikt" -#: ../meld/filediff.py:267 -msgid "Next conflict" +#: ../data/ui/filediff.ui.h:12 +msgid "Next Conflict" msgstr "Næste konflikt" -#: ../meld/filediff.py:267 +#: ../data/ui/filediff.ui.h:13 msgid "Go to the next conflict" msgstr "Gå til den næste konflikt" -#: ../meld/filediff.py:268 -msgid "Push to left" +#: ../data/ui/filediff.ui.h:14 +msgid "Push to Left" msgstr "Skub til venstre" -#: ../meld/filediff.py:268 +#: ../data/ui/filediff.ui.h:15 msgid "Push current change to the left" msgstr "Skub aktuel ændring til venstre" -#: ../meld/filediff.py:269 -msgid "Push to right" +#: ../data/ui/filediff.ui.h:16 +msgid "Push to Right" msgstr "Skub til højre" -#: ../meld/filediff.py:269 +#: ../data/ui/filediff.ui.h:17 msgid "Push current change to the right" msgstr "Skub aktuel ændring til højre" -#. FIXME: using LAST and FIRST is terrible and unreliable icon abuse -#: ../meld/filediff.py:271 -msgid "Pull from left" +#: ../data/ui/filediff.ui.h:18 +msgid "Pull from Left" msgstr "Træk fra venstre" -#: ../meld/filediff.py:271 +#: ../data/ui/filediff.ui.h:19 msgid "Pull change from the left" msgstr "Træk ændring fra venstre" -#: ../meld/filediff.py:272 -msgid "Pull from right" +#: ../data/ui/filediff.ui.h:20 +msgid "Pull from Right" msgstr "Træk fra højre" -#: ../meld/filediff.py:272 +#: ../data/ui/filediff.ui.h:21 msgid "Pull change from the right" msgstr "Træk ændring fra højre" -#: ../meld/filediff.py:273 -msgid "Copy above left" -msgstr "Kopier ovenfor til venstre" +#: ../data/ui/filediff.ui.h:22 +msgid "Copy Above Left" +msgstr "Kopiér ovenfor til venstre" -#: ../meld/filediff.py:273 +#: ../data/ui/filediff.ui.h:23 msgid "Copy change above the left chunk" -msgstr "Kopier ændring over det store venstre stykke" +msgstr "Kopiér ændring over det store venstre stykke" -#: ../meld/filediff.py:274 -msgid "Copy below left" -msgstr "Kopier nedenfor til venstre" +#: ../data/ui/filediff.ui.h:24 +msgid "Copy Below Left" +msgstr "Kopiér nedenfor til venstre" -#: ../meld/filediff.py:274 +#: ../data/ui/filediff.ui.h:25 msgid "Copy change below the left chunk" -msgstr "Kopier ændring nedenunder det store venstre stykke" +msgstr "Kopiér ændring nedenunder det store venstre stykke" -#: ../meld/filediff.py:275 -msgid "Copy above right" -msgstr "Kopier ovenfor til højre" +#: ../data/ui/filediff.ui.h:26 +msgid "Copy Above Right" +msgstr "Kopiér ovenfor til højre" -#: ../meld/filediff.py:275 +#: ../data/ui/filediff.ui.h:27 msgid "Copy change above the right chunk" -msgstr "Kopier ændring over det store højre stykke" +msgstr "Kopiér ændring over det store højre stykke" -#: ../meld/filediff.py:276 -msgid "Copy below right" -msgstr "Kopier nedenfor til højre" +#: ../data/ui/filediff.ui.h:28 +msgid "Copy Below Right" +msgstr "Kopiér nedenfor til højre" -#: ../meld/filediff.py:276 +#: ../data/ui/filediff.ui.h:29 msgid "Copy change below the right chunk" -msgstr "Kopier ændring nedenunder det store højre stykke" +msgstr "Kopiér ændring nedenunder det store højre stykke" -#: ../meld/filediff.py:277 +#: ../data/ui/filediff.ui.h:30 msgid "Delete" msgstr "Slet" -#: ../meld/filediff.py:277 +#: ../data/ui/filediff.ui.h:31 +msgid "Delete change" +msgstr "Slet ændring" + +#: ../data/ui/filediff.ui.h:32 +msgid "Merge All from Left" +msgstr "Flet alle fra venstre" + +#: ../data/ui/filediff.ui.h:33 +msgid "Merge all non-conflicting changes from the left" +msgstr "Flet alle ændringer, der ikke er i konflikt, fra venstre" + +#: ../data/ui/filediff.ui.h:34 +msgid "Merge All from Right" +msgstr "Flet alle fra højre" + +#: ../data/ui/filediff.ui.h:35 +msgid "Merge all non-conflicting changes from the right" +msgstr "Flet alle ændringer, der ikke er i konflikt, fra højre" + +#: ../data/ui/filediff.ui.h:36 +msgid "Merge All" +msgstr "Flet alle" + +#: ../data/ui/filediff.ui.h:37 +msgid "Merge all non-conflicting changes from left and right panes" +msgstr "Flet alle ændringer, der ikke er i konflikt, fra venstre og højre ruder" + +#: ../data/ui/filediff.ui.h:38 +msgid "Previous Pane" +msgstr "Forrige rude" + +#: ../data/ui/filediff.ui.h:39 +msgid "Move keyboard focus to the previous document in this comparison" +msgstr "Flyt tastaturets fokus til det forrige dokument i denne sammenligning" + +#: ../data/ui/filediff.ui.h:40 +msgid "Next Pane" +msgstr "Næste rude" + +#: ../data/ui/filediff.ui.h:41 +msgid "Move keyboard focus to the next document in this comparison" +msgstr "Flyt tastaturets fokus til det næste dokument i denne sammenligning" + +#: ../data/ui/filediff.ui.h:42 +msgid "Lock Scrolling" +msgstr "Lås rulning" + +#: ../data/ui/filediff.ui.h:43 +msgid "Lock scrolling of all panes" +msgstr "Lås rulning i alle ruder" + +#: ../data/ui/filediff.ui.h:44 +msgid "Save changes to documents before closing?" +msgstr "Gem ændringer i dokumenter, før der lukkes?" + +#: ../data/ui/filediff.ui.h:45 +msgid "If you don't save, changes will be permanently lost." +msgstr "Ændringerne vil gå tabt, hvis ikke du gemmer." + +#: ../data/ui/filediff.ui.h:46 +msgid "Close _without Saving" +msgstr "Luk _uden at gemme" + +#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:940 ../meld/filediff.py:1448 +#: ../meld/filediff.py:1520 +msgid "_Cancel" +msgstr "_Annullér" + +#: ../data/ui/filediff.ui.h:48 +msgid "_Save" +msgstr "_Gem" + +#: ../data/ui/filediff.ui.h:49 +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 "" +"Der kan ikke skrives til denne fil. Du kan klikke her for at låse filen op og " +"alligevel foretage ændringer, men ændringerne skal gemmes til en ny fil." + +#: ../data/ui/filediff.ui.h:50 +msgid "File 3" +msgstr "Fil 3" + +#: ../data/ui/filediff.ui.h:51 +msgid "File 2" +msgstr "Fil 2" + +#: ../data/ui/filediff.ui.h:52 +msgid "File 1" +msgstr "Fil 1" + +#: ../data/ui/filediff.ui.h:53 +msgid "Revert unsaved changes to documents?" +msgstr "Forkast ikke gemte ændringer i dokumentet?" + +#: ../data/ui/filediff.ui.h:54 +msgid "Changes made to the following documents will be permanently lost:\n" +msgstr "Ændringer foretaget i følgende dokumenter vil gå tabt for altid:\n" + +#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:941 ../meld/filediff.py:1449 +msgid "_Replace" +msgstr "_Erstat" + +#: ../data/ui/findbar.ui.h:2 +msgid "Replace _All" +msgstr "Erstat _alle" + +#: ../data/ui/findbar.ui.h:3 +msgid "_Previous" +msgstr "_Forrige" + +#: ../data/ui/findbar.ui.h:4 +msgid "_Next" +msgstr "_Næste" + +#: ../data/ui/findbar.ui.h:5 +msgid "Find:" +msgstr "Find:" + +#: ../data/ui/findbar.ui.h:6 +msgid "Replace _with:" +msgstr "Erstat _med:" + +#: ../data/ui/findbar.ui.h:7 +msgid "_Match case" +msgstr "_Forskel på store/små bogstaver" + +#: ../data/ui/findbar.ui.h:8 +msgid "Who_le word" +msgstr "_Hele ord" + +#: ../data/ui/findbar.ui.h:9 +msgid "Regular e_xpression" +msgstr "Regulært _udtryk" + +#: ../data/ui/findbar.ui.h:10 +msgid "Wrapped" +msgstr "Ombrudt" + +#: ../data/ui/patch-dialog.ui.h:1 +msgid "Format as Patch" +msgstr "Formatér som rettelse (patch)" + +#: ../data/ui/patch-dialog.ui.h:2 +msgid "Copy to Clipboard" +msgstr "Kopiér til udklipsholderen" + +#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:155 +msgid "Save Patch" +msgstr "Gem rettelse (patch)" + +#: ../data/ui/patch-dialog.ui.h:4 +msgid "Use differences between:" +msgstr "Brug forskelle mellem:" + +#: ../data/ui/patch-dialog.ui.h:5 +msgid "Left and middle panes" +msgstr "Ruder til venstre og i midten" + +#: ../data/ui/patch-dialog.ui.h:6 +msgid "Middle and right panes" +msgstr "Ruder i midten og til højre" + +#: ../data/ui/patch-dialog.ui.h:7 +msgid "_Reverse patch direction" +msgstr "_Modsat rettelsesretning" + +#: ../data/ui/preferences.ui.h:1 +msgid "Left is remote, right is local" +msgstr "Venstre er fjern, højre er lokal" + +#: ../data/ui/preferences.ui.h:2 +msgid "Left is local, right is remote" +msgstr "Venstre er lokal, højre er fjern" + +#: ../data/ui/preferences.ui.h:3 +msgid "Remote, merge, local" +msgstr "Fjern, flet, lokal" + +#: ../data/ui/preferences.ui.h:4 +msgid "Local, merge, remote" +msgstr "Lokal, flet, fjern" + +#: ../data/ui/preferences.ui.h:5 +msgid "1ns (ext4)" +msgstr "1ns (ext4)" + +#: ../data/ui/preferences.ui.h:6 +msgid "100ns (NTFS)" +msgstr "100ns (NTFS)" + +#: ../data/ui/preferences.ui.h:7 +msgid "1s (ext2/ext3)" +msgstr "1s (ext2/ext3)" + +#: ../data/ui/preferences.ui.h:8 +msgid "2s (VFAT)" +msgstr "2s (VFAT)" + +#: ../data/ui/preferences.ui.h:9 +msgid "Meld Preferences" +msgstr "Indstillinger for Meld" + +#: ../data/ui/preferences.ui.h:10 +msgid "Font" +msgstr "Skrifttype" + +#: ../data/ui/preferences.ui.h:11 +msgid "_Use the system fixed width font" +msgstr "_Brug systemets standardskrifttype med fast bredde" + +# Det er ikke det eksterne redigeringsprogram, men internt i Meld. +#: ../data/ui/preferences.ui.h:12 +msgid "_Editor font:" +msgstr "_Skrifttype for redigering:" + +#: ../data/ui/preferences.ui.h:13 +msgid "Display" +msgstr "Skærm" + +#: ../data/ui/preferences.ui.h:14 +msgid "_Tab width:" +msgstr "_Bredde på tabulator:" + +#: ../data/ui/preferences.ui.h:15 +msgid "_Insert spaces instead of tabs" +msgstr "_Indsæt mellemrum i stedet for tabulator" + +#: ../data/ui/preferences.ui.h:16 +msgid "Enable text _wrapping" +msgstr "Aktivér _tekstombrydning" + +#: ../data/ui/preferences.ui.h:17 +msgid "Do not _split words over two lines" +msgstr "_Opdel ikke ord over to linjer" + +#: ../data/ui/preferences.ui.h:18 +msgid "Highlight _current line" +msgstr "Fremhæv _aktuelle linje" + +#: ../data/ui/preferences.ui.h:19 +msgid "Show _line numbers" +msgstr "Vis _linjenumre" + +#: ../data/ui/preferences.ui.h:20 +msgid "Show w_hitespace" +msgstr "Vis _blanktegn" + +#: ../data/ui/preferences.ui.h:21 +msgid "Use s_yntax highlighting" +msgstr "Brug _syntaksfremhævning" + +#: ../data/ui/preferences.ui.h:22 +msgid "Syntax highlighting color scheme:" +msgstr "Farveskema for syntaksfremhævning:" + +#: ../data/ui/preferences.ui.h:23 +msgid "External Editor" +msgstr "Eksternt redigeringsprogram" + +# Brug det _normale systemredigeringsprogram +# Brug systemets _standardredigeringsprogram +#: ../data/ui/preferences.ui.h:24 +msgid "Use _default system editor" +msgstr "Brug det _normale systemredigeringsprogram" + +#: ../data/ui/preferences.ui.h:25 +msgid "Edito_r command:" +msgstr "_Kommando for redigeringsprogram:" + +#: ../data/ui/preferences.ui.h:26 +msgid "Editor" +msgstr "Redigeringsprogram" + +#: ../data/ui/preferences.ui.h:27 +msgid "Shallow Comparison" +msgstr "Overfladisk sammenligning" + +#: ../data/ui/preferences.ui.h:28 +msgid "C_ompare files based only on size and timestamp" +msgstr "_Sammenlign kun filer baseret på størrelse og tidsstempel" + +#: ../data/ui/preferences.ui.h:29 +msgid "_Timestamp resolution:" +msgstr "_Tidsstempelopløsning:" + +#: ../data/ui/preferences.ui.h:31 +msgid "Symbolic Links" +msgstr "Symbolske henvisninger" + +#: ../data/ui/preferences.ui.h:33 +msgid "Visible Columns" +msgstr "Synlige kolonner" + +#: ../data/ui/preferences.ui.h:34 +msgid "Folder Comparisons" +msgstr "Mappesammenligninger" + +#: ../data/ui/preferences.ui.h:35 +msgid "Version Comparisons" +msgstr "Versionssammenligninger" + +#: ../data/ui/preferences.ui.h:36 +msgid "_Order when comparing file revisions:" +msgstr "_Rækkefølge ved sammenligning af filrevisioner:" + +#: ../data/ui/preferences.ui.h:37 +msgid "Order when _merging files:" +msgstr "R_ækkefølge når filer flettes:" + +#: ../data/ui/preferences.ui.h:38 +msgid "Commit Messages" +msgstr "Commit-beskeder" + +#: ../data/ui/preferences.ui.h:39 +msgid "Show _right margin at:" +msgstr "Vis _højre margen ved:" + +#: ../data/ui/preferences.ui.h:40 +msgid "Automatically _break lines at right margin on commit" +msgstr "Bryd automatisk linjer ved højre margen ved commit" + +#: ../data/ui/preferences.ui.h:41 +msgid "Version Control" +msgstr "Versionsstyring" + +#: ../data/ui/preferences.ui.h:42 +msgid "Filename filters" +msgstr "Filnavnefiltre" + +#: ../data/ui/preferences.ui.h:43 +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 "" +"Når der udføres mappesammenligninger, kan du filtrere filer og mapper fra efter " +"navn. Hvert mønster er en liste af skallignende jokertegn adskilt af mellemrum." + +#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:104 +msgid "File Filters" +msgstr "Filfiltre" + +#: ../data/ui/preferences.ui.h:45 +msgid "Change trimming" +msgstr "Ændr beskæring" + +#: ../data/ui/preferences.ui.h:46 +msgid "Trim blank line differences from the start and end of changes" +msgstr "Beskær tomme linjer-forskelle fra begyndelsen og slutningen af ændringer" + +#: ../data/ui/preferences.ui.h:47 +msgid "Text filters" +msgstr "Tekstfiltre" + +# vert mønster er et regulært udtryk i python, der erstatter +# tilsvarende tekst med den tomme streng før sammenligningen udføres. +#: ../data/ui/preferences.ui.h:48 +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 "" +"Når der udføres filsammenligninger, kan du ignorere visse ændringer. Hvert mønster " +"her er et regulært udtryk i python, som erstatter tilsvarende tekst med den tomme " +"streng før sammenligning udføres. Hvis udtrykket indeholder grupper, bliver kun " +"grupperne erstattet. Se brugermanualen for yderligere detaljer." + +#: ../data/ui/preferences.ui.h:49 +msgid "Text Filters" +msgstr "Tekstfiltre" + +#: ../data/ui/shortcuts.ui.h:1 +msgctxt "shortcut window" +msgid "General" +msgstr "Generelt" + +#: ../data/ui/shortcuts.ui.h:2 +msgctxt "shortcut window" +msgid "New comparison" +msgstr "Ny sammenligning" + +#: ../data/ui/shortcuts.ui.h:3 +msgctxt "shortcut window" +msgid "Close a comparison" +msgstr "Luk en sammenligning" + +#: ../data/ui/shortcuts.ui.h:4 +msgctxt "shortcut window" +msgid "Quit Meld" +msgstr "Afslut Meld" + +#: ../data/ui/shortcuts.ui.h:5 +msgctxt "shortcut window" +msgid "Stop the current action" +msgstr "Stop den aktuelle handling" + +#: ../data/ui/shortcuts.ui.h:6 +msgctxt "shortcut window" +msgid "Refresh comparison" +msgstr "Opdatér sammenligningen" + +#: ../data/ui/shortcuts.ui.h:7 +msgctxt "shortcut window" +msgid "Fullscreen" +msgstr "Fuldskærm" + +#: ../data/ui/shortcuts.ui.h:8 +msgctxt "shortcut window" +msgid "Tabs" +msgstr "Faneblade" + +#: ../data/ui/shortcuts.ui.h:9 +msgctxt "shortcut window" +msgid "Go to previous tab" +msgstr "Gå til det forrige faneblad" + +#: ../data/ui/shortcuts.ui.h:10 +msgctxt "shortcut window" +msgid "Go to next tab" +msgstr "Gå til det næste faneblad" + +#: ../data/ui/shortcuts.ui.h:11 +msgctxt "shortcut window" +msgid "Switch to tab" +msgstr "Skift til faneblad" + +#: ../data/ui/shortcuts.ui.h:12 +msgctxt "shortcut window" +msgid "Move tab left" +msgstr "Flyt fanebladet til venstre" + +#: ../data/ui/shortcuts.ui.h:13 +msgctxt "shortcut window" +msgid "Move tab right" +msgstr "Flyt fanebladet til højre" + +#: ../data/ui/shortcuts.ui.h:14 +msgctxt "shortcut window" +msgid "Changes" +msgstr "Ændringer" + +#: ../data/ui/shortcuts.ui.h:15 +msgctxt "shortcut window" +msgid "Go to previous change" +msgstr "Gå til den forrige ændring" + +#: ../data/ui/shortcuts.ui.h:16 +msgctxt "shortcut window" +msgid "Go to next change" +msgstr "Gå til den næste ændring" + +#: ../data/ui/shortcuts.ui.h:17 +msgctxt "shortcut window" +msgid "Editing" +msgstr "Redigering" + +#: ../data/ui/shortcuts.ui.h:18 +msgctxt "shortcut window" +msgid "Undo" +msgstr "Fortryd" + +#: ../data/ui/shortcuts.ui.h:19 +msgctxt "shortcut window" +msgid "Redo" +msgstr "Gentag" + +#: ../data/ui/shortcuts.ui.h:20 +msgctxt "shortcut window" +msgid "Cut" +msgstr "Klip" + +#: ../data/ui/shortcuts.ui.h:21 +msgctxt "shortcut window" +msgid "Copy" +msgstr "Kopiér" + +#: ../data/ui/shortcuts.ui.h:22 +msgctxt "shortcut window" +msgid "Paste" +msgstr "Indsæt" + +#: ../data/ui/shortcuts.ui.h:23 +msgctxt "shortcut window" +msgid "Find" +msgstr "Find" + +#: ../data/ui/shortcuts.ui.h:24 +msgctxt "shortcut window" +msgid "Find Next" +msgstr "Find næste" + +#: ../data/ui/shortcuts.ui.h:25 +msgctxt "shortcut window" +msgid "Find Previous" +msgstr "Find forrige" + +#: ../data/ui/shortcuts.ui.h:26 +msgctxt "shortcut window" +msgid "Replace" +msgstr "Erstat" + +#: ../data/ui/shortcuts.ui.h:27 +msgctxt "shortcut window" +msgid "File comparison" +msgstr "Filsammenligning" + +#: ../data/ui/shortcuts.ui.h:28 +msgctxt "shortcut window" +msgid "Save current file" +msgstr "Gem den aktuelle fil" + +#: ../data/ui/shortcuts.ui.h:29 +msgctxt "shortcut window" +msgid "Save current file to new path" +msgstr "Gem den aktuelle fil et andet sted" + +#: ../data/ui/shortcuts.ui.h:30 +msgctxt "shortcut window" +msgid "Save all files in comparison" +msgstr "Gem alle filer i sammenligningen" + +#: ../data/ui/shortcuts.ui.h:31 +msgctxt "shortcut window" +msgid "Previous conflict" +msgstr "Forrige konflikt" + +#: ../data/ui/shortcuts.ui.h:32 +msgctxt "shortcut window" +msgid "Next conflict" +msgstr "Næste konflikt" + +#: ../data/ui/shortcuts.ui.h:33 +msgctxt "shortcut window" +msgid "Push change to left" +msgstr "Skub ændringen til venstre" + +#: ../data/ui/shortcuts.ui.h:34 +msgctxt "shortcut window" +msgid "Push change to right" +msgstr "Skub ændringen til højre" + +#: ../data/ui/shortcuts.ui.h:35 +msgctxt "shortcut window" +msgid "Pull change from left" +msgstr "Træk ændringen fra venstre" + +#: ../data/ui/shortcuts.ui.h:36 +msgctxt "shortcut window" +msgid "Pull change from right" +msgstr "Træk ændringen fra højre" + +#: ../data/ui/shortcuts.ui.h:37 +msgctxt "shortcut window" +msgid "Copy change above left" +msgstr "Kopiér ændringen ovenfor til venstre" + +#: ../data/ui/shortcuts.ui.h:38 +msgctxt "shortcut window" +msgid "Copy change below left" +msgstr "Kopiér ændringen nedenfor til venstre" + +#: ../data/ui/shortcuts.ui.h:39 +msgctxt "shortcut window" +msgid "Copy change above right" +msgstr "Kopiér ændringen ovenfor til højre" + +#: ../data/ui/shortcuts.ui.h:40 +msgctxt "shortcut window" +msgid "Copy change below right" +msgstr "Kopiér ændringen nedenfor til højre" + +#: ../data/ui/shortcuts.ui.h:41 +msgctxt "shortcut window" msgid "Delete change" msgstr "Slet ændring" -#: ../meld/filediff.py:278 -msgid "Merge all changes from left" -msgstr "Flet alle ændringer fra venstre" +#: ../data/ui/shortcuts.ui.h:42 +msgctxt "shortcut window" +msgid "Previous comparison pane" +msgstr "Forrige sammenligningsrude" + +#: ../data/ui/shortcuts.ui.h:43 +msgctxt "shortcut window" +msgid "Next comparison pane" +msgstr "Næste sammenligningsrude" + +#: ../data/ui/shortcuts.ui.h:44 +msgctxt "shortcut window" +msgid "Folder comparison" +msgstr "Mappesammenligning" + +#: ../data/ui/shortcuts.ui.h:45 +msgctxt "shortcut window" +msgid "Copy to left" +msgstr "Kopiér til venstre" + +#: ../data/ui/shortcuts.ui.h:46 +msgctxt "shortcut window" +msgid "Copy to right" +msgstr "Kopiér til højre" + +#: ../data/ui/shortcuts.ui.h:47 +msgctxt "shortcut window" +msgid "Version control comparison" +msgstr "Versionsstyringssammenligning" + +#: ../data/ui/shortcuts.ui.h:48 +msgctxt "shortcut window" +msgid "Commit to version control" +msgstr "Commit til versionsstyring" + +#: ../data/ui/shortcuts.ui.h:49 +msgctxt "shortcut window" +msgid "Show/hide console output" +msgstr "Vis/skjul konsoloutput" + +#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:559 ../meld/newdifftab.py:38 +msgid "New comparison" +msgstr "Ny sammenligning" + +# Sammenligning af _filer +#: ../data/ui/tab-placeholder.ui.h:2 +msgid "File comparison" +msgstr "Filsammenligning" + +# Sammenligning af _mapper +#: ../data/ui/tab-placeholder.ui.h:3 +msgid "Directory comparison" +msgstr "Mappesammenligning" + +#: ../data/ui/tab-placeholder.ui.h:4 +msgid "Version control view" +msgstr "Visning af versionsstyring" + +# Sammenligning af _filer +#: ../data/ui/tab-placeholder.ui.h:5 +msgid "_3-way comparison" +msgstr "_Trevejssammenligning" + +#: ../data/ui/tab-placeholder.ui.h:6 +msgid "Select Third File" +msgstr "Vælg den 3. fil" + +#: ../data/ui/tab-placeholder.ui.h:7 +msgid "Select Second File" +msgstr "Vælg den 2. fil" + +#: ../data/ui/tab-placeholder.ui.h:8 +msgid "Select First File" +msgstr "Vælg den 1. fil" + +#: ../data/ui/tab-placeholder.ui.h:9 +msgid "Select First Folder" +msgstr "Vælg den 1. mappe" + +#: ../data/ui/tab-placeholder.ui.h:10 +msgid "Select Second Folder" +msgstr "Vælg den 2. mappe" + +#: ../data/ui/tab-placeholder.ui.h:11 +msgid "Select Third Folder" +msgstr "Vælg den 3. mappe" + +#: ../data/ui/tab-placeholder.ui.h:12 +msgid "Select A Version-Controlled Folder" +msgstr "Vælg en versionsstyret mappe" + +#: ../data/ui/tab-placeholder.ui.h:13 +msgid "_Blank comparison" +msgstr "_Tom sammenligning" + +#: ../data/ui/tab-placeholder.ui.h:14 +msgid "C_ompare" +msgstr "_Sammenlign" + +#: ../data/ui/vcview.ui.h:3 +msgid "Co_mmit..." +msgstr "Co_mmit …" + +#: ../data/ui/vcview.ui.h:4 +msgid "Commit changes to version control" +msgstr "Commit ændringer til versionsstyring" + +#: ../data/ui/vcview.ui.h:5 +msgid "_Update" +msgstr "_Opdatér" + +#: ../data/ui/vcview.ui.h:6 +msgid "Update working copy from version control" +msgstr "Opdatér arbejdskopi fra versionsstyring" + +#: ../data/ui/vcview.ui.h:7 +msgid "_Push" +msgstr "_Skub" + +#: ../data/ui/vcview.ui.h:8 +msgid "Push local changes to remote" +msgstr "Skub lokale ændringer til fjern" + +#: ../data/ui/vcview.ui.h:10 +msgid "Add to version control" +msgstr "Tilføj til versionsstyring" + +#: ../data/ui/vcview.ui.h:12 +msgid "Remove from version control" +msgstr "Fjern fra versionsstyring" + +#: ../data/ui/vcview.ui.h:13 +msgid "Mar_k as Resolved" +msgstr "Markér som l_øst" + +#: ../data/ui/vcview.ui.h:14 +msgid "Mark as resolved in version control" +msgstr "Markér som løst i versionsstyring" + +#: ../data/ui/vcview.ui.h:15 +msgid "Re_vert" +msgstr "_Gendan" + +# "Gendan til oprindelig" / "Gendan oprindelig" / "Gendan tidligere" +#: ../data/ui/vcview.ui.h:16 +msgid "Revert working copy to original state" +msgstr "Gendan arbejdskopi til oprindelig tilstand" + +#: ../data/ui/vcview.ui.h:17 +msgid "Delete from working copy" +msgstr "Slet fra arbejdskopi" + +#: ../data/ui/vcview.ui.h:18 +msgid "Console" +msgstr "Konsol" + +#: ../data/ui/vcview.ui.h:19 +msgid "Show or hide the version control console output pane" +msgstr "Vis eller skjul versionsstyringskonsollens outputrude" + +#: ../data/ui/vcview.ui.h:20 +msgid "_Flatten" +msgstr "_Fladgør" + +#: ../data/ui/vcview.ui.h:21 +msgid "Flatten directories" +msgstr "Fladgør mapper" + +#: ../data/ui/vcview.ui.h:22 +msgid "_Modified" +msgstr "_Ændret" + +#: ../data/ui/vcview.ui.h:23 +msgid "Show modified files" +msgstr "Vis ændrede filer" + +#: ../data/ui/vcview.ui.h:24 +msgid "_Normal" +msgstr "_Normal" + +#: ../data/ui/vcview.ui.h:25 +msgid "Show normal files" +msgstr "Vis normale filer" + +#: ../data/ui/vcview.ui.h:26 +msgid "Un_versioned" +msgstr "Ikke _versioneret" + +# "Vis ikke-versionsstyrede filer" +#: ../data/ui/vcview.ui.h:27 +msgid "Show unversioned files" +msgstr "Vis filer uden versionering" + +#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69 +msgid "Ignored" +msgstr "Ignoreret" + +#: ../data/ui/vcview.ui.h:29 +msgid "Show ignored files" +msgstr "Vis ignorerede filer" + +#: ../data/ui/vcview.ui.h:30 +msgid "Commit" +msgstr "Commit" + +#: ../data/ui/vcview.ui.h:31 +msgid "Commit Files" +msgstr "Commit filer" + +#: ../data/ui/vcview.ui.h:32 +msgid "Log Message" +msgstr "Logbesked" + +# logpunkter?, logindgange? +#: ../data/ui/vcview.ui.h:33 +msgid "Previous logs:" +msgstr "Forrige logge:" + +#: ../data/ui/vcview.ui.h:34 +msgid "Co_mmit" +msgstr "Co_mmit" + +#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:332 +msgid "Location" +msgstr "Sted" + +#: ../data/ui/vcview.ui.h:37 +msgid "Status" +msgstr "Status" + +#: ../data/ui/vcview.ui.h:38 +msgid "Extra" +msgstr "Ekstra" + +#: ../data/ui/vcview.ui.h:39 +msgid "Console output" +msgstr "Konsoloutput" + +#: ../data/ui/vcview.ui.h:40 +msgid "Push local commits to remote?" +msgstr "Skub lokale commit'er til fjern?" + +#: ../data/ui/vcview.ui.h:41 +msgid "The commits to be pushed are determined by your version control system." +msgstr "Hvilke commit'er, der skubbes, bestemmes af dit versionsstyringssystem." + +#: ../data/ui/vcview.ui.h:42 +msgid "_Push commits" +msgstr "_Skub commit'er" + +#: ../meld/const.py:12 +msgid "UNIX (LF)" +msgstr "UNIX (LF)" + +#: ../meld/const.py:13 +msgid "DOS/Windows (CR-LF)" +msgstr "DOS/Windows (CR-LF)" + +#: ../meld/const.py:14 +msgid "Mac OS (CR)" +msgstr "Mac OS (CR)" + +#. Create file size CellRenderer +#: ../meld/dirdiff.py:391 ../meld/preferences.py:82 +msgid "Size" +msgstr "Størrelse" + +#. Create date-time CellRenderer +#: ../meld/dirdiff.py:399 ../meld/preferences.py:83 +msgid "Modification time" +msgstr "Ændringstidspunkt" + +#. Create permissions CellRenderer +#: ../meld/dirdiff.py:407 ../meld/preferences.py:84 +msgid "Permissions" +msgstr "Rettigheder" + +#: ../meld/dirdiff.py:537 +#, python-format +msgid "Hide %s" +msgstr "Skjul %s" + +#: ../meld/dirdiff.py:669 ../meld/dirdiff.py:693 +#, python-format +msgid "[%s] Scanning %s" +msgstr "[%s] Skanner %s" + +#: ../meld/dirdiff.py:825 +#, python-format +msgid "[%s] Done" +msgstr "[%s] Færdig" + +#: ../meld/dirdiff.py:833 +msgid "Folders have no differences" +msgstr "Der er ingen forskelle på mapperne" + +#: ../meld/dirdiff.py:835 +msgid "Contents of scanned files in folders are identical." +msgstr "Indholdet af de skannede filer i mapperne er ens." + +#: ../meld/dirdiff.py:837 +msgid "Scanned files in folders appear identical, but contents have not been scanned." +msgstr "" +"De skannede filer i mapperne ser ud til at være ens, men indholdet er ikke blevet " +"skannet." + +#: ../meld/dirdiff.py:840 +msgid "File filters are in use, so not all files have been scanned." +msgstr "Ikke alle filer er blevet skannet, da filfiltre er i brug." + +#: ../meld/dirdiff.py:842 +msgid "Text filters are in use and may be masking content differences." +msgstr "Tekstfiltre er i brug og kan maskere forskelle i indhold." + +#: ../meld/dirdiff.py:860 ../meld/filediff.py:1384 ../meld/filediff.py:1414 +#: ../meld/filediff.py:1416 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 +msgid "Hi_de" +msgstr "_Skjul" + +#: ../meld/dirdiff.py:870 +msgid "Multiple errors occurred while scanning this folder" +msgstr "Der opstod flere fejl, under skanning af mappen" + +#: ../meld/dirdiff.py:871 +msgid "Files with invalid encodings found" +msgstr "Fandt filer med ugyldige kodninger" + +#. TRANSLATORS: This is followed by a list of files +#: ../meld/dirdiff.py:873 +msgid "Some files were in an incorrect encoding. The names are something like:" +msgstr "Nogle filer var ikke kodet korrekt. Navnene er noget lignende dette:" + +#: ../meld/dirdiff.py:875 +msgid "Files hidden by case insensitive comparison" +msgstr "Filer skjult af søgning, som ikke tager højde for store/små bogstaver" -#: ../meld/filediff.py:278 -msgid "Merge all non-conflicting changes from the left" -msgstr "Flet alle ændringer der ikke er i konflikt fra venstre" +# Du udfører en sammenligning uden forskel på store og små bogstaver på +# et filsystem, hvor der er forskel på store og små bogstaver. +#. TRANSLATORS: This is followed by a list of files +#: ../meld/dirdiff.py:877 +msgid "" +"You are running a case insensitive comparison on a case sensitive filesystem. The " +"following files in this folder are hidden:" +msgstr "" +"Du udfører en sammenligning, der ikke tager højde for store/små bogstaver, på et " +"filsystem, som tager højde for store/små bogstaver. Følgende filer i denne mappe er " +"skjulte:" -#: ../meld/filediff.py:279 -msgid "Merge all changes from right" -msgstr "Flet alle ændringer fra højre" +#: ../meld/dirdiff.py:888 +#, python-format +msgid "'%s' hidden by '%s'" +msgstr "\"%s\" skjult af \"%s\"" -#: ../meld/filediff.py:279 -msgid "Merge all non-conflicting changes from the right" -msgstr "Flet alle ændringer der ikke er i konflikt fra højre" +#: ../meld/dirdiff.py:944 +#, python-format +msgid "Replace folder “%s”?" +msgstr "Erstat mappen \"%s\"?" -#: ../meld/filediff.py:280 -msgid "Merge all non-conflicting" -msgstr "Flet alle der ikke er i konflikt" +#: ../meld/dirdiff.py:946 +#, 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 "" +"En mappe med det samme navn findes allerede i \"%s\".\n" +"Hvis du erstatter den eksisterende mappe, vil alle filer i den gå tabt." -#: ../meld/filediff.py:280 -msgid "Merge all non-conflicting changes from left and right panes" -msgstr "Flet alle ændringer der ikke er i konflikt fra venstre og højre ruder" +#: ../meld/dirdiff.py:959 +msgid "Error copying file" +msgstr "Fejl ved kopiering af fil" -#: ../meld/filediff.py:284 -msgid "Lock scrolling" +#: ../meld/dirdiff.py:960 +#, python-format +msgid "" +"Couldn't copy %s\n" +"to %s.\n" +"\n" +"%s" msgstr "" +"Kunne ikke kopiere %s\n" +"til %s.\n" +"\n" +"%s" -#: ../meld/filediff.py:285 -msgid "Lock scrolling of all panes" -msgstr "" +#: ../meld/dirdiff.py:983 +#, python-format +msgid "Error deleting %s" +msgstr "Fejl ved sletning af %s" + +#: ../meld/dirdiff.py:1488 +msgid "No folder" +msgstr "Ingen mappe" #. Abbreviations for insert and overwrite that fit in the status bar -#: ../meld/filediff.py:365 +#: ../meld/filediff.py:355 msgid "INS" msgstr "INDS" -#: ../meld/filediff.py:365 +#: ../meld/filediff.py:355 msgid "OVR" msgstr "OVS." #. Abbreviation for line, column so that it will fit in the status bar -#: ../meld/filediff.py:367 +#: ../meld/filediff.py:357 #, python-format msgid "Ln %i, Col %i" msgstr "Lin. %i, kol. %i" -#: ../meld/filediff.py:570 -#, fuzzy, python-format +#: ../meld/filediff.py:782 +msgid "Comparison results will be inaccurate" +msgstr "Resultatet af sammenligningen vil være unøjagtigt" + +#: ../meld/filediff.py:784 msgid "" -"Filter '%s' changed the number of lines in the file. Comparison will be " -"incorrect. See the user manual for more details." +"A filter changed the number of lines in the file, which is unsupported. The " +"comparison will not be accurate." msgstr "" -"Regulært udtryk \"%s\" ændrede antallet af linjer i filen. Sammenligning vil " -"være forkert. Se brugermanualen for yderligere detaljer." +"Et filter ændrede antallet af linjer i filen, hvilket ikke understøttes. " +"Sammenligningen vil ikke være nøjagtig." -#. TRANSLATORS: this is the name of a new file which has not yet been saved -#: ../meld/filediff.py:673 -msgid "" -msgstr "" +#: ../meld/filediff.py:840 +msgid "Mark conflict as resolved?" +msgstr "Markér konflikt som løst?" -#: ../meld/filediff.py:863 -#, python-format -msgid "[%s] Set num panes" -msgstr "[%s] Angiv antal ruder" +#: ../meld/filediff.py:842 +msgid "If the conflict was resolved successfully, you may mark it as resolved now." +msgstr "Hvis konflikten blev løst, kan du nu markere den som løst." -#: ../meld/filediff.py:869 -#, python-format -msgid "[%s] Opening files" -msgstr "[%s] Åbner filer" +#: ../meld/filediff.py:844 +msgid "Cancel" +msgstr "Annullér" -#: ../meld/filediff.py:893 ../meld/filediff.py:902 ../meld/filediff.py:914 -#: ../meld/filediff.py:920 -msgid "Could not read file" -msgstr "Kunne ikke læse fil" +#: ../meld/filediff.py:845 +msgid "Mark _Resolved" +msgstr "Markér som _løst" -#: ../meld/filediff.py:894 +#: ../meld/filediff.py:1093 #, python-format -msgid "[%s] Reading files" -msgstr "[%s] Læser filer" +msgid "There was a problem opening the file “%s”." +msgstr "Der var et problem med at åbne filen \"%s\"." -#: ../meld/filediff.py:903 +#: ../meld/filediff.py:1101 #, python-format -msgid "%s appears to be a binary file." -msgstr "%s ser ud til at være en binær fil." +msgid "File %s appears to be a binary file." +msgstr "Filen %s ser ud til at være en binær fil." -#: ../meld/filediff.py:915 -#, python-format -msgid "%s is not in encodings: %s" -msgstr "%s er ikke i kodningen: %s" +#: ../meld/filediff.py:1103 +msgid "Do you want to open the file using the default application?" +msgstr "Vil du åbne filen med standardprogrammet?" -#: ../meld/filediff.py:945 ../meld/filemerge.py:67 +#: ../meld/filediff.py:1105 +msgid "Open" +msgstr "Åbn" + +#: ../meld/filediff.py:1121 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Beregner forskelle" -#: ../meld/filediff.py:996 +#: ../meld/filediff.py:1186 +#, python-format +msgid "File %s has changed on disk" +msgstr "Filen %s er blevet ændret på disken" + +#: ../meld/filediff.py:1187 +msgid "Do you want to reload the file?" +msgstr "Vil du genindlæse filen?" + +#: ../meld/filediff.py:1189 +msgid "_Reload" +msgstr "_Genindlæs" + +#: ../meld/filediff.py:1347 msgid "Files are identical" msgstr "Filer er identiske" -#: ../meld/filediff.py:1150 -#, python-format +#: ../meld/filediff.py:1360 msgid "" -"\"%s\" exists!\n" -"Overwrite?" +"Text filters are being used, and may be masking differences between files. Would you " +"like to compare the unfiltered files?" msgstr "" -"\"%s\" findes!\n" -"Overskriv?" +"Tekstfiltre er i brug og kan maskere forskelle mellem filer. Vil du sammenligne de " +"ikke-filtrerede filer?" + +#: ../meld/filediff.py:1365 +msgid "Files differ in line endings only" +msgstr "Filer er kun forskellige i slutningen af linjerne" -#: ../meld/filediff.py:1163 +#: ../meld/filediff.py:1367 #, python-format msgid "" -"Error writing to %s\n" -"\n" -"%s." +"Files are identical except for differing line endings:\n" +"%s" msgstr "" -"Fejl under skrivning til %s\n" -"\n" -"%s." +"Filerne er ens bortset fra forskelle i slutningen af linjerne:\n" +"%s" + +#: ../meld/filediff.py:1387 +msgid "Show without filters" +msgstr "Vis uden filtre" + +#: ../meld/filediff.py:1409 +msgid "Change highlighting incomplete" +msgstr "Fremhævning af ændringer ufuldstændig" + +#: ../meld/filediff.py:1410 +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 "" +"Nogle ændringer blev ikke fremhævet, fordi de var for store. Du kan tvinge Meld til " +"at bruge længere tid på at fremhæve større ændringer, selvom det kan være langsomt." + +#: ../meld/filediff.py:1418 +msgid "Keep highlighting" +msgstr "Bliv ved med at fremhæve" -#: ../meld/filediff.py:1172 +#: ../meld/filediff.py:1420 +msgid "_Keep highlighting" +msgstr "_Bliv ved med at fremhæve" + +#: ../meld/filediff.py:1452 #, python-format -msgid "Choose a name for buffer %i." -msgstr "Vælg et navn for mellemlageret %i." +msgid "Replace file “%s”?" +msgstr "Erstat filen \"%s\"?" -#: ../meld/filediff.py:1187 +#: ../meld/filediff.py:1454 #, python-format msgid "" -"This file '%s' contains a mixture of line endings.\n" -"\n" -"Which format would you like to use?" +"A file with this name already exists in “%s”.\n" +"If you replace the existing file, its contents will be lost." msgstr "" -"Denne fil \"%s\" indeholder en blanding af linjeafslutninger.\n" -"\n" -"Hvilket format ønsker du at bruge?" +"Der er allerede en fil med dette navn i \"%s\".\n" +"Hvis du erstatter den eksisterende fil, vil dens indhold gå tabt." + +#: ../meld/filediff.py:1471 +msgid "Save Left Pane As" +msgstr "Gem venstre rude som" + +#: ../meld/filediff.py:1473 +msgid "Save Middle Pane As" +msgstr "Gem midterste rude som" + +#: ../meld/filediff.py:1475 +msgid "Save Right Pane As" +msgstr "Gem højre rude som" + +#: ../meld/filediff.py:1489 +#, python-format +msgid "File %s has changed on disk since it was opened" +msgstr "Filen %s er blevet ændret på disken, siden den blev åbnet" + +#: ../meld/filediff.py:1491 +msgid "If you save it, any external changes will be lost." +msgstr "Hvis du gemmer den, vil alle ændringer, som er foretaget eksternt, gå tabt." + +#: ../meld/filediff.py:1494 +msgid "Save Anyway" +msgstr "Gem alligevel" + +#: ../meld/filediff.py:1495 +msgid "Don't Save" +msgstr "Gem ikke" + +#: ../meld/filediff.py:1521 +msgid "_Save as UTF-8" +msgstr "_Gem som UTF-8" + +#: ../meld/filediff.py:1524 +#, python-format +msgid "Couldn't encode text as “%s”" +msgstr "Kunne ikke kode teksten som \"%s\"" -#: ../meld/filediff.py:1203 +#: ../meld/filediff.py:1526 #, python-format msgid "" -"'%s' contains characters not encodable with '%s'\n" +"File “%s” contains characters that can't be encoded using encoding “%s”.\n" "Would you like to save as UTF-8?" msgstr "" -"\"%s\" indeholder tegn som ikke kan kodes i \"%s\"\n" +"Filen \"%s\" indeholder tegn, som ikke kan kodes med kodningen \"%s\".\n" "Ønsker du at gemme som UTF-8?" -#: ../meld/filediff.py:1262 +#: ../meld/filediff.py:1566 ../meld/patchdialog.py:131 +#, python-format +msgid "Could not save file %s." +msgstr "Kunne ikke gemme filen %s." + +#: ../meld/filediff.py:1567 ../meld/patchdialog.py:132 #, python-format msgid "" -"Reloading will discard changes in:\n" -"%s\n" -"\n" -"You cannot undo this operation." +"Couldn't save file due to:\n" +"%s" msgstr "" -"Genindlæsning vil fjerne ændringer i:\n" -"%s\n" -"\n" -"Du kan ikke fortryde denne handling." +"Kunne ikke gemme filen pga.:\n" +"%s" + +#: ../meld/filediff.py:1913 +msgid "Live comparison updating disabled" +msgstr "Liveopdatering af sammenligninger deaktiveret" -#: ../meld/filemerge.py:82 +#: ../meld/filediff.py:1914 +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 "" +"Liveopdatering af sammenligninger er deaktiveret, når synkroniseringspunkter er " +"aktive. Du kan stadig opdatere sammenligningen manuelt, og liveopdatering vil " +"fortsætte, når synkroniseringspunkterne er blevet ryddet." + +#: ../meld/filemerge.py:37 #, python-format msgid "[%s] Merging files" msgstr "[%s] Fletter filer" -#: ../meld/meldapp.py:149 +#: ../meld/gutterrendererchunk.py:159 +msgid "Copy _up" +msgstr "Kopiér _op" + +#: ../meld/gutterrendererchunk.py:160 +msgid "Copy _down" +msgstr "Kopiér _ned" + +#: ../meld/meldapp.py:175 msgid "wrong number of arguments supplied to --diff" msgstr "forkert antal argumenter angivet til --diff" -#: ../meld/meldapp.py:153 +#: ../meld/meldapp.py:180 msgid "Start with an empty window" msgstr "Start med et tomt vindue" -#: ../meld/meldapp.py:154 ../meld/meldapp.py:155 ../meld/meldapp.py:157 +#: ../meld/meldapp.py:181 ../meld/meldapp.py:183 msgid "file" msgstr "fil" -#: ../meld/meldapp.py:154 ../meld/meldapp.py:156 ../meld/meldapp.py:157 -msgid "dir" -msgstr "map" +#: ../meld/meldapp.py:181 ../meld/meldapp.py:185 +msgid "folder" +msgstr "mappe" -#: ../meld/meldapp.py:154 +#: ../meld/meldapp.py:182 msgid "Start a version control comparison" msgstr "Start en sammenligning af versioner" -#: ../meld/meldapp.py:155 +#: ../meld/meldapp.py:184 msgid "Start a 2- or 3-way file comparison" msgstr "Sammenlign to eller tre filer" -#: ../meld/meldapp.py:156 -msgid "Start a 2- or 3-way directory comparison" +#: ../meld/meldapp.py:186 +msgid "Start a 2- or 3-way folder comparison" msgstr "Sammenlign to eller tre mapper" -#: ../meld/meldapp.py:157 -msgid "Start a comparison between file and dir/file" -msgstr "Start en sammenligning mellem fil og mappe/fil" +#: ../meld/meldapp.py:229 +#, python-format +msgid "Error: %s\n" +msgstr "Fejl: %s\n" -#: ../meld/meldapp.py:163 +#: ../meld/meldapp.py:236 msgid "Meld is a file and directory comparison tool." msgstr "Meld er et sammenligningsværktøj for filer og mapper." -#: ../meld/meldapp.py:166 +#: ../meld/meldapp.py:240 msgid "Set label to use instead of file name" -msgstr "Angiv etiket der skal bruges i steden for filnavn" +msgstr "Angiv etiket, der skal bruges i stedet for filnavn" -#: ../meld/meldapp.py:168 +#: ../meld/meldapp.py:243 +msgid "Open a new tab in an already running instance" +msgstr "Åbn et nyt faneblad i en allerede kørende forekomst" + +#: ../meld/meldapp.py:246 msgid "Automatically compare all differing files on startup" msgstr "Sammenlign automatisk alle filer der har forskelle ved opstart" -#: ../meld/meldapp.py:171 +#: ../meld/meldapp.py:249 +msgid "Ignored for compatibility" +msgstr "Ignoreret pga. kompatibilitet" + +#: ../meld/meldapp.py:253 msgid "Set the target file for saving a merge result" msgstr "Angiv målfilen hvor resultatet af en fletning skal gemmes" +#: ../meld/meldapp.py:256 +msgid "Automatically merge files" +msgstr "Flet automatisk filer" + +#: ../meld/meldapp.py:260 +msgid "Load a saved comparison from a Meld comparison file" +msgstr "Indlæs en gemt sammenligning fra en Meld-sammenligningsfil" + # Tab is a common term for a widget used to provide page-based switching in GUIs, # as seen in gedit, epiphany, firefox, etc. # https://secure.wikimedia.org/wikipedia/en/wiki/Tab_%28GUI%29 -#: ../meld/meldapp.py:174 -msgid "Creates a diff tab for up to 3 supplied files or directories." -msgstr "" -"Opretter et forskelsfaneblad for op til tre angivne filer eller mapper." +#: ../meld/meldapp.py:264 +msgid "Create a diff tab for the supplied files or folders" +msgstr "Opret et forskelsfaneblad for de angivne filer eller mapper." + +#: ../meld/meldapp.py:284 +#, python-format +msgid "too many arguments (wanted 0-3, got %d)" +msgstr "for mange argumenter (ønskede 0-3, fik %d)" + +#: ../meld/meldapp.py:287 +msgid "can't auto-merge less than 3 files" +msgstr "kan ikke auto-flette mindre end tre filer" + +#: ../meld/meldapp.py:289 +msgid "can't auto-merge directories" +msgstr "kan ikke auto-flette mapper" + +#: ../meld/meldapp.py:303 +msgid "Error reading saved comparison file" +msgstr "Fejl ved læsning af gemt sammenligningsfil" -#: ../meld/meldapp.py:177 +#: ../meld/meldapp.py:330 #, python-format -msgid "too many arguments (wanted 0-4, got %d)" -msgstr "for mange argumenter (ønskede 0-4, fik %d)" +msgid "invalid path or URI \"%s\"" +msgstr "ugyldig sti eller URI \"%s\"" -#: ../meld/melddoc.py:51 ../meld/melddoc.py:52 +#. TRANSLATORS: This is the label of a new, currently-unnamed file. +#: ../meld/meldbuffer.py:131 +msgid "" +msgstr "" + +#: ../meld/melddoc.py:64 msgid "untitled" msgstr "uden titel" -#: ../meld/meldwindow.py:125 +#: ../meld/meldwindow.py:49 msgid "_File" msgstr "_Fil" -#: ../meld/meldwindow.py:126 -msgid "_New..." -msgstr "_Ny..." +# Sammenligning af _filer +#: ../meld/meldwindow.py:50 +msgid "_New Comparison..." +msgstr "_Ny sammenligning …" -#: ../meld/meldwindow.py:126 +#: ../meld/meldwindow.py:51 msgid "Start a new comparison" msgstr "Start en ny sammenligning" -#: ../meld/meldwindow.py:127 +#: ../meld/meldwindow.py:54 msgid "Save the current file" msgstr "Gem den aktuelle fil" -#: ../meld/meldwindow.py:129 +#: ../meld/meldwindow.py:56 +msgid "Save As..." +msgstr "Gem som …" + +#: ../meld/meldwindow.py:57 +msgid "Save the current file with a different name" +msgstr "Gem den aktuelle fil under et andet navn" + +#: ../meld/meldwindow.py:60 msgid "Close the current file" msgstr "Luk den aktuelle fil" -#: ../meld/meldwindow.py:130 -msgid "Quit the program" -msgstr "Afslut programmet" - -#: ../meld/meldwindow.py:132 +#: ../meld/meldwindow.py:63 msgid "_Edit" -msgstr "_Rediger" +msgstr "_Redigér" -#: ../meld/meldwindow.py:133 +#: ../meld/meldwindow.py:65 msgid "Undo the last action" msgstr "Fortryd sidste handling" -#: ../meld/meldwindow.py:134 +#: ../meld/meldwindow.py:68 msgid "Redo the last undone action" msgstr "Gendan den sidste fortrydelseshandling" -#: ../meld/meldwindow.py:135 +#: ../meld/meldwindow.py:70 msgid "Cut the selection" msgstr "Klip markeringen" -#: ../meld/meldwindow.py:136 +#: ../meld/meldwindow.py:72 msgid "Copy the selection" -msgstr "Kopier markeringen" +msgstr "Kopiér markeringen" -#: ../meld/meldwindow.py:137 +#: ../meld/meldwindow.py:74 msgid "Paste the clipboard" msgstr "Indsæt fra udklipsholderen" -#: ../meld/meldwindow.py:138 +#: ../meld/meldwindow.py:76 +msgid "Find..." +msgstr "Find …" + +#: ../meld/meldwindow.py:76 msgid "Search for text" msgstr "Søg efter tekst" -#: ../meld/meldwindow.py:139 +#: ../meld/meldwindow.py:78 msgid "Find Ne_xt" msgstr "Find _næste" -#: ../meld/meldwindow.py:139 +#: ../meld/meldwindow.py:79 msgid "Search forwards for the same text" -msgstr "Søg fremad efter samme tekst" +msgstr "Søg fremad efter den samme tekst" -#: ../meld/meldwindow.py:140 -msgid "Find and replace text" -msgstr "Find og erstat tekst" +#: ../meld/meldwindow.py:81 +msgid "Find _Previous" +msgstr "Find _forrige" -#: ../meld/meldwindow.py:141 -msgid "Prefere_nces" -msgstr "_Indstillinger" +#: ../meld/meldwindow.py:82 +msgid "Search backwards for the same text" +msgstr "Søg bagud efter den samme tekst" -#: ../meld/meldwindow.py:141 -msgid "Configure the application" -msgstr "Konfigurer programmet" +#: ../meld/meldwindow.py:85 +msgid "_Replace..." +msgstr "_Erstat …" -#: ../meld/meldwindow.py:143 +#: ../meld/meldwindow.py:86 +msgid "Find and replace text" +msgstr "Find og erstat tekst" + +#: ../meld/meldwindow.py:89 msgid "_Changes" msgstr "_Ændringer" -#: ../meld/meldwindow.py:144 -msgid "Next change" +#: ../meld/meldwindow.py:90 +msgid "Next Change" msgstr "Næste ændring" -#: ../meld/meldwindow.py:144 +#: ../meld/meldwindow.py:91 msgid "Go to the next change" msgstr "Gå til den næste ændring" -#: ../meld/meldwindow.py:145 -msgid "Previous change" +#: ../meld/meldwindow.py:93 +msgid "Previous Change" msgstr "Forrige ændring" -#: ../meld/meldwindow.py:145 +#: ../meld/meldwindow.py:94 msgid "Go to the previous change" msgstr "Gå til den forrige ændring" -#: ../meld/meldwindow.py:147 +#: ../meld/meldwindow.py:96 +msgid "Open Externally" +msgstr "Åbn eksternt" + +#: ../meld/meldwindow.py:97 +msgid "Open selected file or directory in the default external application" +msgstr "Åbn den valgte fil eller mappe i det eksterne standardprogram" + +#: ../meld/meldwindow.py:101 msgid "_View" msgstr "_Vis" -#: ../meld/meldwindow.py:148 -msgid "File status" +#: ../meld/meldwindow.py:102 +msgid "File Status" msgstr "Filstatus" -#: ../meld/meldwindow.py:149 -msgid "Version status" +#: ../meld/meldwindow.py:103 +msgid "Version Status" msgstr "Versionsstatus" -#: ../meld/meldwindow.py:150 -msgid "File filters" -msgstr "Filfiltre" - -#: ../meld/meldwindow.py:151 +#: ../meld/meldwindow.py:106 msgid "Stop the current action" msgstr "Stop den aktuelle handling" -#: ../meld/meldwindow.py:152 +#: ../meld/meldwindow.py:109 msgid "Refresh the view" -msgstr "Opdater visningen" +msgstr "Opdatér visningen" -#: ../meld/meldwindow.py:153 -msgid "Reload" -msgstr "Genindlæs" +#: ../meld/meldwindow.py:113 +msgid "Fullscreen" +msgstr "Fuldskærm" -#: ../meld/meldwindow.py:153 -msgid "Reload the comparison" -msgstr "Genindlæs sammenligningen" +#: ../meld/meldwindow.py:114 +msgid "View the comparison in fullscreen" +msgstr "Vis sammenligningen i fuldskærm" -#: ../meld/meldwindow.py:155 -msgid "_Help" -msgstr "_Hjælp" +#: ../meld/meldwindow.py:116 +msgid "_Toolbar" +msgstr "_Værktøjsbjælke" -#: ../meld/meldwindow.py:156 -msgid "_Contents" -msgstr "_Indhold" +#: ../meld/meldwindow.py:117 +msgid "Show or hide the toolbar" +msgstr "Vis eller skjul værktøjsbjælken" -#: ../meld/meldwindow.py:156 -msgid "Open the Meld manual" -msgstr "Åbn manualen til Meld" +#: ../meld/meldwindow.py:127 +msgid "Open Recent" +msgstr "Åbn seneste" -#: ../meld/meldwindow.py:157 -msgid "Report _Bug" -msgstr "Rapporter en _fejl" +#: ../meld/meldwindow.py:128 +msgid "Open recent files" +msgstr "Åbn seneste filer" -#: ../meld/meldwindow.py:157 -msgid "Report a bug in Meld" -msgstr "Rapporter en fejl i Meld" +#: ../meld/meldwindow.py:150 +msgid "_Meld" +msgstr "_Meld" -#: ../meld/meldwindow.py:158 -msgid "About this program" -msgstr "Om dette program" +#: ../meld/meldwindow.py:151 +msgid "Quit the program" +msgstr "Afslut programmet" -#: ../meld/meldwindow.py:161 -msgid "Full Screen" -msgstr "Fuldskærm" +#: ../meld/meldwindow.py:153 +msgid "Prefere_nces" +msgstr "_Indstillinger" -#: ../meld/meldwindow.py:161 -msgid "View the comparison in full screen" -msgstr "Vis sammenligningen i fuldskærm" +#: ../meld/meldwindow.py:154 +msgid "Configure the application" +msgstr "Konfigurér programmet" -#: ../meld/meldwindow.py:162 -msgid "_Toolbar" -msgstr "_Værktøjsbjælke" +#: ../meld/meldwindow.py:156 +msgid "_Contents" +msgstr "_Indhold" -#: ../meld/meldwindow.py:162 -msgid "Show or hide the toolbar" -msgstr "Vis eller skjul værktøjsbjælken" +#: ../meld/meldwindow.py:157 +msgid "Open the Meld manual" +msgstr "Åbn manualen til Meld" -#: ../meld/meldwindow.py:163 -msgid "_Statusbar" -msgstr "_Statusbjælke" +#: ../meld/meldwindow.py:159 +msgid "About this application" +msgstr "Om programmet" -#: ../meld/meldwindow.py:163 -msgid "Show or hide the statusbar" -msgstr "Vis eller skjul statusbjælken" +#: ../meld/meldwindow.py:593 +#, python-format +msgid "Need three files to auto-merge, got: %r" +msgstr "Behøver tre filer for at auto-flette, fik: %r" + +#: ../meld/meldwindow.py:607 +msgid "Cannot compare a mixture of files and directories" +msgstr "Kan ikke sammenligne en blanding af filer og mapper" -#. exit at first non found directory + file -#: ../meld/meldwindow.py:537 -msgid "Cannot compare a mixture of files and directories.\n" -msgstr "Kan ikke sammenligne en blanding af filer og mapper.\n" +#: ../meld/misc.py:203 +#, python-format +msgid "Couldn't find colour scheme details for %s-%s; this is a bad install" +msgstr "Kunne ikke finde farveskemadetaljer for %s-%s; dette er en dårlig installation" #. no common path. empty names get changed to "[None]" -#: ../meld/misc.py:174 +#: ../meld/misc.py:263 msgid "[None]" msgstr "[Ingen]" -#: ../meld/patchdialog.py:122 -msgid "Save Patch As..." -msgstr "Gem rettelse (patch) som..." - -#: ../meld/preferences.py:37 +#: ../meld/preferences.py:33 msgid "label" msgstr "etiket" -#: ../meld/preferences.py:37 +#: ../meld/preferences.py:33 msgid "pattern" msgstr "mønster" -#: ../meld/preferences.py:105 -msgid "Only available if you have gnome-python-desktop installed" -msgstr "Kun tilgængelig hvis du har gnome-python-dekstop installeret" +#: ../meld/recent.py:114 +msgid "Version control:" +msgstr "Versionsstyring:" -#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact -#: ../meld/preferences.py:232 -msgid "Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n" -msgstr "Sikkerhedskopier\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n" +#: ../meld/ui/notebooklabel.py:63 +msgid "Close tab" +msgstr "Luk faneblad" -#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact -#: ../meld/preferences.py:234 +#: ../meld/ui/vcdialogs.py:48 +msgid "No files will be committed" +msgstr "Ingen filer vil blive commit'et" + +#. Translators: First %s is replaced by translated "%d unpushed +#. commits", second %s is replaced by translated "%d branches" +#: ../meld/vc/git.py:94 #, python-format -msgid "Version Control\t1\t%s\n" -msgstr "Versionskontrol\t1\t%s\n" - -#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact -#: ../meld/preferences.py:236 -msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n" -msgstr "Binære filer\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n" - -#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact -#: ../meld/preferences.py:238 -msgid "Media\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}" -msgstr "Medie\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}" - -#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact -#: ../meld/preferences.py:240 -msgid "CVS keywords\t0\t\\$\\w+(:[^\\n$]+)?\\$\n" -msgstr "CVS-nøgleord\t0\t\\$\\w+(:[^\\n$]+)?\\$\n" - -#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact -#: ../meld/preferences.py:242 -msgid "C++ comment\t0\t//.*\n" -msgstr "C++-kommentar\t0\t//.*\n" - -#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact -#: ../meld/preferences.py:244 -msgid "C comment\t0\t/\\*.*?\\*/\n" -msgstr "C-kommentar\t0\t/\\*.*?\\*/\n" +msgid "%s in %s" +msgstr "%s i %s" -# Evt. "blanktegn" -#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact -#: ../meld/preferences.py:246 -msgid "All whitespace\t0\t[ \\t\\r\\f\\v]*\n" -msgstr "Alle blanke tegn\t0\t[ \\t\\r\\f\\v]*\n" +#. Translators: These messages cover the case where there is +#. only one branch, and are not part of another message. +#: ../meld/vc/git.py:95 ../meld/vc/git.py:102 +#, python-format +msgid "%d unpushed commit" +msgid_plural "%d unpushed commits" +msgstr[0] "%d ikke skubbet commit" +msgstr[1] "%d ikke skubbet commit'er" -# Evt. "blanktegn" -#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact -#: ../meld/preferences.py:248 -msgid "Leading whitespace\t0\t^[ \\t\\r\\f\\v]*\n" -msgstr "Foranstillet blankt tegn\t0\t^[ \\t\\r\\f\\v]*\n" +#: ../meld/vc/git.py:97 +#, python-format +msgid "%d branch" +msgid_plural "%d branches" +msgstr[0] "%d gren" +msgstr[1] "%d grene" -#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact -#: ../meld/preferences.py:250 -msgid "Script comment\t0\t#.*" -msgstr "Skriptkommentar\t0\t#.*" +#: ../meld/vc/git.py:330 +#, python-format +msgid "Mode changed from %s to %s" +msgstr "Tilstand skiftede fra %s til %s" -#: ../meld/vcview.py:120 -#, fuzzy -msgid "Co_mmit" -msgstr "Indsend (commit)" +#: ../meld/vc/git.py:338 +msgid "Partially staged" +msgstr "Delvist staged" -#: ../meld/vcview.py:120 -msgid "Commit" -msgstr "Indsend (commit)" +#: ../meld/vc/git.py:338 +msgid "Staged" +msgstr "Staged" -#: ../meld/vcview.py:121 -msgid "_Update" -msgstr "_Opdater" +#. 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 "Ingen" -#: ../meld/vcview.py:121 -msgid "Update" -msgstr "Opdater" +#: ../meld/vc/svn.py:204 +#, python-format +msgid "Rev %s" +msgstr "Rev. %s" -#: ../meld/vcview.py:122 -msgid "Add to VC" -msgstr "Tilføj til versionsstyring" +#: ../meld/vc/_vc.py:54 +msgid "Merged" +msgstr "Flettet" -#: ../meld/vcview.py:123 -msgid "Add _Binary" -msgstr "Tilføj _binær fil" +#: ../meld/vc/_vc.py:54 +msgid "Base" +msgstr "Base" -#: ../meld/vcview.py:123 -msgid "Add binary to VC" -msgstr "Tilføj binær fil til versionsstyring" +#: ../meld/vc/_vc.py:54 +msgid "Local" +msgstr "Lokal" -#: ../meld/vcview.py:124 -msgid "Remove from VC" -msgstr "Fjern fra versionsstyring" +#: ../meld/vc/_vc.py:54 +msgid "Remote" +msgstr "Fjern" -#: ../meld/vcview.py:125 -msgid "_Resolved" -msgstr "_Løst" +# "Vis ikke-versionsstyrede filer" +#: ../meld/vc/_vc.py:70 +msgid "Unversioned" +msgstr "Uden versionering" + +#: ../meld/vc/_vc.py:73 +msgid "Error" +msgstr "Fejl" + +#: ../meld/vc/_vc.py:75 +msgid "Newly added" +msgstr "Nyligt tilføjet" + +#: ../meld/vc/_vc.py:77 +msgid "Renamed" +msgstr "Omdøbt" + +#: ../meld/vc/_vc.py:78 +msgid "Conflict" +msgstr "Konflikt" + +#: ../meld/vc/_vc.py:79 +msgid "Removed" +msgstr "Fjernet" + +# Manglende? +#: ../meld/vc/_vc.py:80 +msgid "Missing" +msgstr "Mangler" + +#: ../meld/vc/_vc.py:81 +msgid "Not present" +msgstr "Ikke tilstedeværende" + +#. Translators: This error message is shown when a version +#. control binary isn't installed. +#: ../meld/vcview.py:251 +#, python-format +msgid "%(name)s (%(cmd)s not installed)" +msgstr "%(name)s (%(cmd)s ikke installeret)" -#: ../meld/vcview.py:125 -msgid "Mark as resolved for VC" -msgstr "Marker som løst for versionsstyring" +#. Translators: This error message is shown when a version +#. controlled repository is invalid. +#: ../meld/vcview.py:255 +#, python-format +msgid "%(name)s (Invalid repository)" +msgstr "%(name)s (ugyldigt arkiv)" -# "Gendan til oprindelig" / "Gendan oprindelig" / "Gendan tidligere" -#: ../meld/vcview.py:126 -msgid "Revert to original" -msgstr "Gendan oprindelig" +#: ../meld/vcview.py:276 +msgid "No valid version control system found in this folder" +msgstr "Fandt ikke et gyldigt versionsstyringssystem i denne mappe" -#: ../meld/vcview.py:127 -msgid "Delete locally" -msgstr "Slet lokalt" +#: ../meld/vcview.py:278 +msgid "Only one version control system found in this folder" +msgstr "Fandt kun ét versionsstyringssystem i denne mappe" -#: ../meld/vcview.py:131 -msgid "_Flatten" -msgstr "_Fladgør" +#: ../meld/vcview.py:280 +msgid "Choose which version control system to use" +msgstr "Vælg hvilket versionsstyringssystem, der skal anvendes" -#: ../meld/vcview.py:131 -msgid "Flatten directories" -msgstr "Fladgør mapper" +#. TRANSLATORS: This is the location of the directory being viewed +#: ../meld/vcview.py:332 +#, python-format +msgid "%s: %s" +msgstr "%s: %s" -#: ../meld/vcview.py:132 -msgid "_Modified" -msgstr "_Ændret" +#: ../meld/vcview.py:352 +#, python-format +msgid "Scanning %s" +msgstr "Skanner %s" -#: ../meld/vcview.py:133 -msgid "_Normal" -msgstr "_Normal" +#: ../meld/vcview.py:391 +msgid "(Empty)" +msgstr "(tom)" -#: ../meld/vcview.py:133 -msgid "Show normal" -msgstr "Vis normal" +#: ../meld/vcview.py:435 +#, python-format +msgid "%s — local" +msgstr "%s — lokal" -#: ../meld/vcview.py:134 -msgid "Non _VC" -msgstr "Ikke-_versionsstyret" +#: ../meld/vcview.py:436 +#, python-format +msgid "%s — remote" +msgstr "%s — fjern" -# "Vis ikke-versionsstyrede filer" -#: ../meld/vcview.py:134 -msgid "Show unversioned files" -msgstr "Vis filer uden versionering" +#: ../meld/vcview.py:444 +#, python-format +msgid "%s (local, merge, remote)" +msgstr "%s (lokal, flet, fjern)" -#: ../meld/vcview.py:135 -msgid "Ignored" -msgstr "Ignoreret" +#: ../meld/vcview.py:449 +#, python-format +msgid "%s (remote, merge, local)" +msgstr "%s (fjern, flet, lokal)" -#: ../meld/vcview.py:135 -msgid "Show ignored files" -msgstr "Vis ignorerede filer" +#: ../meld/vcview.py:460 +#, python-format +msgid "%s — repository" +msgstr "%s — arkiv" -#: ../meld/vcview.py:176 ../meld/vcview.py:300 -msgid "Location" -msgstr "Sted" +# arbejdskopi? +#: ../meld/vcview.py:466 +#, python-format +msgid "%s (working, repository)" +msgstr "%s (arbejdskopi, arkiv)" -#: ../meld/vcview.py:177 -msgid "Status" -msgstr "Status" +#: ../meld/vcview.py:470 +#, python-format +msgid "%s (repository, working)" +msgstr "%s (arkiv, arbejdskopi)" -#: ../meld/vcview.py:178 -msgid "Rev" -msgstr "Rev." +#: ../meld/vcview.py:638 +msgid "Remove folder and all its files?" +msgstr "Fjern mappen og alle dens filer?" -#: ../meld/vcview.py:180 -msgid "Options" -msgstr "Indstillinger" +#: ../meld/vcview.py:640 +msgid "" +"This will remove all selected files and folders, and all files within any selected " +"folders, from version control." +msgstr "" +"Dette vil fjerne alle valgte filer og mapper, samt alle filer i de valgte mapper, " +"fra versionsstyring." -#: ../meld/vcview.py:232 -msgid "Choose one Version Control" -msgstr "Vælg en versionskontrol" +#: ../meld/vcview.py:665 +#, python-format +msgid "Error removing %s" +msgstr "Fejl ved fjernelse af %s" -#: ../meld/vcview.py:233 -msgid "Only one Version Control in this directory" -msgstr "Kun en versionskontrol i denne mappe" +#: ../meld/vcview.py:745 +msgid "Clear" +msgstr "Ryd" -#. TRANSLATORS: this is an error message when a version control -#. application isn't installed or can't be found -#: ../meld/vcview.py:246 -#, python-format -msgid "%s Not Installed" -msgstr "%s ikke installeret" +#~ msgid "" +#~ "Some files have been modified.\n" +#~ "Which ones would you like to save?" +#~ msgstr "" +#~ "Nogle filer er blevet ændret.\n" +#~ "Hvilke ønsker du at gemme?" -#. TRANSLATORS: this is an error message when a version -#. controlled repository is invalid or corrupted -#: ../meld/vcview.py:250 -msgid "Invalid Repository" -msgstr "Ugyldigt arkiv" +# Fjern, gem ikke, kasser, forkast +#~ msgid "_Discard Changes" +#~ msgstr "_Kasser ændringer" -#: ../meld/vcview.py:259 -#, python-format -msgid "%s (%s)" -msgstr "%s (%s)" +#~ msgid "_Save Selected" +#~ msgstr "_Gem valgte" -#. TRANSLATORS: This is the location of the directory the user is diffing -#: ../meld/vcview.py:300 -#, python-format -msgid "%s: %s" -msgstr "%s: %s" +#~ msgid "_Search for" +#~ msgstr "_Søg efter" -#: ../meld/vcview.py:348 -msgid "(Empty)" -msgstr "(Tom)" +#~ msgid "Choose Files" +#~ msgstr "Vælg filer" -#: ../meld/vcview.py:386 -#, python-format -msgid "[%s] Fetching differences" -msgstr "[%s] Henter forskelle" +#~ msgid "Directory" +#~ msgstr "Mappe" -#: ../meld/vcview.py:394 -#, python-format -msgid "[%s] Applying patch" -msgstr "[%s] Anvender rettelse (patch)" +#~ msgid "Mine" +#~ msgstr "Min" -#: ../meld/vcview.py:479 -msgid "Select some files first." -msgstr "Vælg nogle filer først." +#~ msgid "Original" +#~ msgstr "Oprindelig" -#: ../meld/vcview.py:552 -#, python-format -msgid "" -"\n" -" Invoking 'patch' failed.\n" -" \n" -" Maybe you don't have 'GNU patch' installed,\n" -" or you use an untested version of %s.\n" -" \n" -" Please send email bug report to:\n" -" meld-list@gnome.org\n" -" \n" -" Containing the following information:\n" -" \n" -" - meld version: '%s'\n" -" - source control software type: '%s'\n" -" - source control software version: 'X.Y.Z'\n" -" - the output of '%s somefile.txt'\n" -" - patch command: '%s'\n" -" (no need to actually run it, just provide\n" -" the command line) \n" -" \n" -" Replace 'X.Y.Z' by the actual version for the\n" -" source control software you use.\n" -" " -msgstr "" -"\n" -" Kald af kommandoen 'patch' fejlede.\n" -" \n" -" Måske har du ikke 'GNU patch' installeret,\n" -" eller du bruger en utestet version af %s.\n" -" \n" -" Send venligst en fejlrapport via e-post til:\n" -" meld-list@gnome.org\n" -" \n" -" der indeholder følgende information:\n" -" \n" -" - version af meld: '%s'\n" -" - softwaretype for versionsstyringssystem: '%s'\n" -" - versionsstyringssystemets version: 'X.Y.Z'\n" -" - uddata for '%s enfil.txt'\n" -" - patchkommando: '%s'\n" -" (du behøver ikke at udføre kommandoen igen, bare\n" -" angiv kommandolinjen) \n" -" \n" -" Erstat 'X.Y.Z' med den aktuelle version af den\n" -" versionsstyringssoftware du bruger.\n" -" " - -#: ../meld/ui/findbar.py:120 -#, python-format -msgid "" -"Regular expression error\n" -"'%s'" -msgstr "" -"Fejl i regulært udtryk\n" -"'%s'" +#~ msgid "Other" +#~ msgstr "Anden" + +#~ msgid "Select VC Directory" +#~ msgstr "Vælg versionsstyringsmappe" -#: ../meld/ui/historyentry.py:293 -msgid "_Browse..." -msgstr "_Gennemse..." +# Evt. "Sammenlign tre filer eller mapper +#~ msgid "_Three Way Compare" +#~ msgstr "_Trepunktssammenligning" -#: ../meld/ui/historyentry.py:301 -msgid "Path" -msgstr "Sti" +#~ msgid "Create Patch" +#~ msgstr "Opret rettelse (patch)" -#: ../meld/ui/historyentry.py:302 -msgid "Path to file" -msgstr "Sti til fil" +#~ msgid "Create a patch" +#~ msgstr "Opret en rettelse (patch)" -#: ../meld/ui/historyentry.py:303 -msgid "Pop up a file selector to choose a file" -msgstr "Vis en filvælger, så en fil kan vælges" +#~ msgid "Encoding" +#~ msgstr "Kodning" -#: ../meld/ui/historyentry.py:441 -msgid "Select directory" -msgstr "Vælg mappe" +#~ msgid "Ignore changes which insert or delete blank lines" +#~ msgstr "Ignorer ændringer der indsætter eller sletter tomme linjer" -#: ../meld/ui/historyentry.py:445 -msgid "Select file" -msgstr "Vælg fil" +#~ msgid "Loading" +#~ msgstr "Indlæser" -#: ../meld/ui/notebooklabel.py:60 -msgid "Close tab" -msgstr "Luk faneblad" +#~ msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)" +#~ msgstr "" +#~ "Når der indlæses, så prøv disse codec i rækkefølge. (for eksempel utf8, iso8859)" + +#~ msgid "Compare Options" +#~ msgstr "Sammenlign indstillinger" + +#~ msgid "Date" +#~ msgstr "Dato" + +#~ msgid "Local copy against other remote revision" +#~ msgstr "Lokal kopi mod anden ekstern revision" + +#~ msgid "Local copy against same remote revision" +#~ msgstr "Lokal kopi mod samme eksterne revision" + +#~ msgid "Tag" +#~ msgstr "Mærke" + +#~ msgid "VC Log" +#~ msgstr "Versionsstyringslog" + +#, fuzzy +#~ msgid "Copy _Right" +#~ msgstr "Kopier til højre" + +#~ msgid "Case" +#~ msgstr "Store/små bogstaver" + +#~ msgid "Ignore case of entries" +#~ msgstr "Ignorer store/små bogstaver" + +#~ msgid "" +#~ "'%s' exists.\n" +#~ "Overwrite?" +#~ msgstr "" +#~ "\"%s\" findes.\n" +#~ "Overskriv?" + +#~ msgid "" +#~ "'%s' is a directory.\n" +#~ "Remove recursively?" +#~ msgstr "" +#~ "\"%s\" er en mappe.\n" +#~ "Fjern rekursivt?" + +#~ msgid "%i second" +#~ msgid_plural "%i seconds" +#~ msgstr[0] "%i sekund" +#~ msgstr[1] "%i sekunder" + +#~ msgid "%i minute" +#~ msgid_plural "%i minutes" +#~ msgstr[0] "%i minut" +#~ msgstr[1] "%i minutter" + +#~ msgid "%i hour" +#~ msgid_plural "%i hours" +#~ msgstr[0] "%i time" +#~ msgstr[1] "%i timer" + +#~ msgid "%i day" +#~ msgid_plural "%i days" +#~ msgstr[0] "%i dag" +#~ msgstr[1] "%i dage" + +#~ msgid "%i week" +#~ msgid_plural "%i weeks" +#~ msgstr[0] "%i uge" +#~ msgstr[1] "%i uger" + +#~ msgid "%i month" +#~ msgid_plural "%i months" +#~ msgstr[0] "%i måned" +#~ msgstr[1] "%i måneder" + +#~ msgid "%i year" +#~ msgid_plural "%i years" +#~ msgstr[0] "%i år" +#~ msgstr[1] "%i år" + +#~ msgid "Merge all non-conflicting" +#~ msgstr "Flet alle der ikke er i konflikt" + +#~ msgid "[%s] Set num panes" +#~ msgstr "[%s] Angiv antal ruder" + +#~ msgid "[%s] Opening files" +#~ msgstr "[%s] Åbner filer" + +#~ msgid "[%s] Reading files" +#~ msgstr "[%s] Læser filer" + +#~ msgid "%s is not in encodings: %s" +#~ msgstr "%s er ikke i kodningen: %s" + +#~ msgid "" +#~ "\"%s\" exists!\n" +#~ "Overwrite?" +#~ msgstr "" +#~ "\"%s\" findes!\n" +#~ "Overskriv?" + +#~ msgid "" +#~ "Error writing to %s\n" +#~ "\n" +#~ "%s." +#~ msgstr "" +#~ "Fejl under skrivning til %s\n" +#~ "\n" +#~ "%s." + +#~ msgid "Choose a name for buffer %i." +#~ msgstr "Vælg et navn for mellemlageret %i." + +#~ msgid "" +#~ "This file '%s' contains a mixture of line endings.\n" +#~ "\n" +#~ "Which format would you like to use?" +#~ msgstr "" +#~ "Denne fil \"%s\" indeholder en blanding af linjeafslutninger.\n" +#~ "\n" +#~ "Hvilket format ønsker du at bruge?" + +#~ msgid "" +#~ "Reloading will discard changes in:\n" +#~ "%s\n" +#~ "\n" +#~ "You cannot undo this operation." +#~ msgstr "" +#~ "Genindlæsning vil fjerne ændringer i:\n" +#~ "%s\n" +#~ "\n" +#~ "Du kan ikke fortryde denne handling." + +#~ msgid "dir" +#~ msgstr "map" + +#~ msgid "Start a 2- or 3-way directory comparison" +#~ msgstr "Sammenlign to eller tre mapper" + +#~ msgid "Start a comparison between file and dir/file" +#~ msgstr "Start en sammenligning mellem fil og mappe/fil" + +#~ msgid "_New..." +#~ msgstr "_Ny..." + +#~ msgid "Report _Bug" +#~ msgstr "Rapporter en _fejl" + +#~ msgid "Report a bug in Meld" +#~ msgstr "Rapporter en fejl i Meld" + +#~ msgid "About this program" +#~ msgstr "Om dette program" + +#~ msgid "Show or hide the statusbar" +#~ msgstr "Vis eller skjul statusbjælken" + +#~ msgid "Only available if you have gnome-python-desktop installed" +#~ msgstr "Kun tilgængelig hvis du har gnome-python-dekstop installeret" + +#~ msgid "Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n" +#~ msgstr "Sikkerhedskopier\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n" + +#~ msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n" +#~ msgstr "Binære filer\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n" + +#~ msgid "Media\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}" +#~ msgstr "Medie\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}" + +#~ msgid "CVS keywords\t0\t\\$\\w+(:[^\\n$]+)?\\$\n" +#~ msgstr "CVS-nøgleord\t0\t\\$\\w+(:[^\\n$]+)?\\$\n" + +#~ msgid "C++ comment\t0\t//.*\n" +#~ msgstr "C++-kommentar\t0\t//.*\n" + +#~ msgid "C comment\t0\t/\\*.*?\\*/\n" +#~ msgstr "C-kommentar\t0\t/\\*.*?\\*/\n" + +# Evt. "blanktegn" +#~ msgid "All whitespace\t0\t[ \\t\\r\\f\\v]*\n" +#~ msgstr "Alle blanke tegn\t0\t[ \\t\\r\\f\\v]*\n" + +# Evt. "blanktegn" +#~ msgid "Leading whitespace\t0\t^[ \\t\\r\\f\\v]*\n" +#~ msgstr "Foranstillet blankt tegn\t0\t^[ \\t\\r\\f\\v]*\n" + +#~ msgid "Script comment\t0\t#.*" +#~ msgstr "Skriptkommentar\t0\t#.*" + +#~ msgid "Update" +#~ msgstr "Opdater" + +#~ msgid "Add to VC" +#~ msgstr "Tilføj til versionsstyring" + +#~ msgid "Add _Binary" +#~ msgstr "Tilføj _binær fil" + +#~ msgid "Add binary to VC" +#~ msgstr "Tilføj binær fil til versionsstyring" + +#~ msgid "Remove from VC" +#~ msgstr "Fjern fra versionsstyring" + +#~ msgid "Delete locally" +#~ msgstr "Slet lokalt" + +#~ msgid "Show normal" +#~ msgstr "Vis normal" + +#~ msgid "Non _VC" +#~ msgstr "Ikke-_versionsstyret" + +#~ msgid "Rev" +#~ msgstr "Rev." + +#~ msgid "Options" +#~ msgstr "Indstillinger" + +#~ msgid "%s Not Installed" +#~ msgstr "%s ikke installeret" + +#~ msgid "%s (%s)" +#~ msgstr "%s (%s)" + +#~ msgid "[%s] Applying patch" +#~ msgstr "[%s] Anvender rettelse (patch)" + +#~ msgid "Select some files first." +#~ msgstr "Vælg nogle filer først." + +#~ msgid "" +#~ "\n" +#~ " Invoking 'patch' failed.\n" +#~ " \n" +#~ " Maybe you don't have 'GNU patch' installed,\n" +#~ " or you use an untested version of %s.\n" +#~ " \n" +#~ " Please send email bug report to:\n" +#~ " meld-list@gnome.org\n" +#~ " \n" +#~ " Containing the following information:\n" +#~ " \n" +#~ " - meld version: '%s'\n" +#~ " - source control software type: '%s'\n" +#~ " - source control software version: 'X.Y.Z'\n" +#~ " - the output of '%s somefile.txt'\n" +#~ " - patch command: '%s'\n" +#~ " (no need to actually run it, just provide\n" +#~ " the command line) \n" +#~ " \n" +#~ " Replace 'X.Y.Z' by the actual version for the\n" +#~ " source control software you use.\n" +#~ " " +#~ msgstr "" +#~ "\n" +#~ " Kald af kommandoen 'patch' fejlede.\n" +#~ " \n" +#~ " Måske har du ikke 'GNU patch' installeret,\n" +#~ " eller du bruger en utestet version af %s.\n" +#~ " \n" +#~ " Send venligst en fejlrapport via e-post til:\n" +#~ " meld-list@gnome.org\n" +#~ " \n" +#~ " der indeholder følgende information:\n" +#~ " \n" +#~ " - version af meld: '%s'\n" +#~ " - softwaretype for versionsstyringssystem: '%s'\n" +#~ " - versionsstyringssystemets version: 'X.Y.Z'\n" +#~ " - uddata for '%s enfil.txt'\n" +#~ " - patchkommando: '%s'\n" +#~ " (du behøver ikke at udføre kommandoen igen, bare\n" +#~ " angiv kommandolinjen) \n" +#~ " \n" +#~ " Erstat 'X.Y.Z' med den aktuelle version af den\n" +#~ " versionsstyringssoftware du bruger.\n" +#~ " " + +#~ msgid "" +#~ "Regular expression error\n" +#~ "'%s'" +#~ msgstr "" +#~ "Fejl i regulært udtryk\n" +#~ "'%s'" + +#~ msgid "_Browse..." +#~ msgstr "_Gennemse..." + +#~ msgid "Path" +#~ msgstr "Sti" + +#~ msgid "Path to file" +#~ msgstr "Sti til fil" + +#~ msgid "Pop up a file selector to choose a file" +#~ msgstr "Vis en filvælger, så en fil kan vælges" # "Uden_version" -> "Uversioneret" / "Versionsløs" -#. These are the possible states of files. Be sure to get the colons correct. -#: ../meld/vc/_vc.py:40 -msgid "" -"Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:Missing" -msgstr "Ignoreret:Versionsløs:::Fejl::Seneste:Ændret:Konflikt:Fjernet:Mangler" +#~ msgid "Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:Missing" +#~ msgstr "Ignoreret:Versionsløs:::Fejl::Seneste:Ændret:Konflikt:Fjernet:Mangler" # evt. "Mønstret var" -#: ../meld/vc/cvs.py:163 -#, python-format -msgid "" -"Error converting to a regular expression\n" -"The pattern was '%s'\n" -"The error was '%s'" -msgstr "" -"Fejl ved konvertering til et regulært udtryk\n" -"Mønsteret var \"%s\"\n" -"Fejlen var \"%s\"" +#~ msgid "" +#~ "Error converting to a regular expression\n" +#~ "The pattern was '%s'\n" +#~ "The error was '%s'" +#~ msgstr "" +#~ "Fejl ved konvertering til et regulært udtryk\n" +#~ "Mønsteret var \"%s\"\n" +#~ "Fejlen var \"%s\"" #~ msgid "Left" #~ msgstr "Venstre" From de26c82ff620a7a9bfba0e3ffbdac9312dfffb8e Mon Sep 17 00:00:00 2001 From: Daniel Mustieles Date: Thu, 22 Dec 2016 20:20:36 +0100 Subject: [PATCH 0106/1316] Updated Spanish translation --- po/es.po | 402 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 209 insertions(+), 193 deletions(-) diff --git a/po/es.po b/po/es.po index e593b482..b1a19cd2 100644 --- a/po/es.po +++ b/po/es.po @@ -3,10 +3,10 @@ # Traducción de Meld al español # This file is distributed under the same license as the PACKAGE package. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. -# +# # Francisco Javier F. Serrador , 2004, 2006. # Jorge González , 2004, 2005, 2007, 2008, 2009, 2010, 2011. -# +# # Luisa Ceron , 2016. # Daniel Mustieles , 2011, 2012, 2013, 2014, 2015, 2016. # @@ -15,10 +15,10 @@ msgstr "" "Project-Id-Version: meld.master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=meld&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-08-29 12:25+0000\n" -"PO-Revision-Date: 2016-08-29 14:20+0200\n" +"POT-Creation-Date: 2016-12-17 21:39+0000\n" +"PO-Revision-Date: 2016-12-22 13:05+0100\n" "Last-Translator: Daniel Mustieles \n" -"Language-Team: Español; Castellano \n" +"Language-Team: es \n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -35,7 +35,7 @@ msgstr "No se pudo importar: " msgid "Meld requires %s or higher." msgstr "Meld requiere %s o superior." -#: ../bin/meld:194 +#: ../bin/meld:191 #, c-format msgid "" "Couldn't load Meld-specific CSS (%s)\n" @@ -96,34 +96,46 @@ msgid "Meld comparison description" msgstr "Descripción de la comparación de Meld" #: ../data/org.gnome.meld.gschema.xml.h:1 -msgid "Default window size" -msgstr "Tamaño de predeterminado de la ventana" +#| msgid "Default window size" +msgid "Default window width" +msgstr "Anchura predeterminada de ventana" #: ../data/org.gnome.meld.gschema.xml.h:2 -msgid "Default window state" -msgstr "Estado predeterminado de la ventana" +#| msgid "Default window size" +msgid "Default window height" +msgstr "Altura predeterminada de ventana" #: ../data/org.gnome.meld.gschema.xml.h:3 +#| msgid "Default window state" +msgid "Default window maximised state" +msgstr "Estado predeterminado de la ventana maximizada" + +#: ../data/org.gnome.meld.gschema.xml.h:4 +#| msgid "Default window state" +msgid "Default window fullscreen state" +msgstr "Estado predeterminado de la ventana a pantalla completa" + +#: ../data/org.gnome.meld.gschema.xml.h:5 msgid "Show toolbar" msgstr "Mostrar la barra de herramientas" -#: ../data/org.gnome.meld.gschema.xml.h:4 +#: ../data/org.gnome.meld.gschema.xml.h:6 msgid "If true, the window toolbar is visible." msgstr "Si es cierto, la barra de herramientas es visible." -#: ../data/org.gnome.meld.gschema.xml.h:5 +#: ../data/org.gnome.meld.gschema.xml.h:7 msgid "Show statusbar" msgstr "Mostrar la barra de estado" -#: ../data/org.gnome.meld.gschema.xml.h:6 +#: ../data/org.gnome.meld.gschema.xml.h:8 msgid "If true, the window statusbar is visible." msgstr "Si es cierto, la barra de estado es visible." -#: ../data/org.gnome.meld.gschema.xml.h:7 +#: ../data/org.gnome.meld.gschema.xml.h:9 msgid "Additional automatically detected text encodings" msgstr "Codificaciones del texto detectadas automáticamente" -#: ../data/org.gnome.meld.gschema.xml.h:8 +#: ../data/org.gnome.meld.gschema.xml.h:10 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 " @@ -136,37 +148,37 @@ msgstr "" "de la configuración regional; se pueden probar otras, dependiendo de la " "configuración regional del usuario." -#: ../data/org.gnome.meld.gschema.xml.h:9 +#: ../data/org.gnome.meld.gschema.xml.h:11 msgid "Width of an indentation step" msgstr "Anchura de un único sangrado" -#: ../data/org.gnome.meld.gschema.xml.h:10 +#: ../data/org.gnome.meld.gschema.xml.h:12 msgid "The number of spaces to use for a single indent step" msgstr "El número de espacios que usar para un solo sangrado" -#: ../data/org.gnome.meld.gschema.xml.h:11 +#: ../data/org.gnome.meld.gschema.xml.h:13 msgid "Whether to indent using spaces or tabs" msgstr "Indica si se debe sangrar usando espacios o tabuladores" -#: ../data/org.gnome.meld.gschema.xml.h:12 +#: ../data/org.gnome.meld.gschema.xml.h:14 msgid "If true, any new indentation will use spaces instead of tabs." msgstr "" "Si es cierto, cualquier sangrado nuevo usará espacios en lugar de " "tabuladores." -#: ../data/org.gnome.meld.gschema.xml.h:13 +#: ../data/org.gnome.meld.gschema.xml.h:15 msgid "Show line numbers" msgstr "Mostrar los números de línea" -#: ../data/org.gnome.meld.gschema.xml.h:14 +#: ../data/org.gnome.meld.gschema.xml.h:16 msgid "If true, line numbers will be shown in the gutter of file comparisons." msgstr "Si es cierto, los números de línea de mostrarán al comparar archivos." -#: ../data/org.gnome.meld.gschema.xml.h:15 +#: ../data/org.gnome.meld.gschema.xml.h:17 msgid "Highlight syntax" msgstr "Resaltar la sintaxis" -#: ../data/org.gnome.meld.gschema.xml.h:16 +#: ../data/org.gnome.meld.gschema.xml.h:18 msgid "" "Whether to highlight syntax in comparisons. Because of Meld's own color " "highlighting, this is off by default." @@ -175,21 +187,21 @@ msgstr "" "propio color de resaltado de Meld, esto está desactivado de manera " "predeterminada." -#: ../data/org.gnome.meld.gschema.xml.h:17 +#: ../data/org.gnome.meld.gschema.xml.h:19 msgid "Color scheme to use for syntax highlighting" msgstr "Esquema de color que usar para el resaltado de sintaxis" -#: ../data/org.gnome.meld.gschema.xml.h:18 +#: ../data/org.gnome.meld.gschema.xml.h:20 msgid "Used by GtkSourceView to determine colors for syntax highlighting" msgstr "" "Usado por GtkSourceView para determinar los colores para le resaltado de " "sintaxis" -#: ../data/org.gnome.meld.gschema.xml.h:19 +#: ../data/org.gnome.meld.gschema.xml.h:21 msgid "Displayed whitespace" msgstr "Espacio en blanco mostrado" -#: ../data/org.gnome.meld.gschema.xml.h:20 +#: ../data/org.gnome.meld.gschema.xml.h:22 msgid "" "Selector for individual whitespace character types to be shown. Possible " "values are 'space', 'tab', 'newline' and 'nbsp'." @@ -197,11 +209,11 @@ msgstr "" "Selector para tipos de caracteres de espacios en blanco individuales que " "mostrar. Los valores posibles son «space», «tab», «newline» y «nbsp»." -#: ../data/org.gnome.meld.gschema.xml.h:21 +#: ../data/org.gnome.meld.gschema.xml.h:23 msgid "Wrap mode" msgstr "Volver al principio" -#: ../data/org.gnome.meld.gschema.xml.h:22 +#: ../data/org.gnome.meld.gschema.xml.h:24 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 " @@ -211,11 +223,11 @@ msgstr "" "configuración: ninguna («none»), en cualquier carácter («char») o sólo al " "final de las palabras («word»)." -#: ../data/org.gnome.meld.gschema.xml.h:23 +#: ../data/org.gnome.meld.gschema.xml.h:25 msgid "Highlight current line" msgstr "Resaltar la línea actual" -#: ../data/org.gnome.meld.gschema.xml.h:24 +#: ../data/org.gnome.meld.gschema.xml.h:26 msgid "" "If true, the line containing the cursor will be highlighted in file " "comparisons." @@ -223,22 +235,22 @@ msgstr "" "Si es cierto, la línea que contenga el cursos se resaltará en las " "comparaciones de archivos." -#: ../data/org.gnome.meld.gschema.xml.h:25 +#: ../data/org.gnome.meld.gschema.xml.h:27 msgid "Use the system default monospace font" msgstr "Usar la tipografía monoespaciada predeterminada del sistema" -#: ../data/org.gnome.meld.gschema.xml.h:26 +#: ../data/org.gnome.meld.gschema.xml.h:28 msgid "" "If false, custom-font will be used instead of the system monospace font." msgstr "" "Si es falso, se usará la tipografía personalizada en lugar de la tipografía " "monoespaciada del sistema." -#: ../data/org.gnome.meld.gschema.xml.h:27 +#: ../data/org.gnome.meld.gschema.xml.h:29 msgid "Custom font" msgstr "Tipografía personalizada" -#: ../data/org.gnome.meld.gschema.xml.h:28 +#: ../data/org.gnome.meld.gschema.xml.h:30 msgid "" "The custom font to use, stored as a string and parsed as a Pango font " "description." @@ -246,22 +258,22 @@ msgstr "" "La tipografía personalizada que usar, guardad como una cadena y analizada " "como una descripción de tipografía de Pango." -#: ../data/org.gnome.meld.gschema.xml.h:29 +#: ../data/org.gnome.meld.gschema.xml.h:31 msgid "Ignore blank lines when comparing files" msgstr "Ignorar líneas en blanco al comparar archivos" -#: ../data/org.gnome.meld.gschema.xml.h:30 +#: ../data/org.gnome.meld.gschema.xml.h:32 msgid "" "If true, blank lines will be trimmed when highlighting changes between files." msgstr "" "Si es cierto, las líneas en blanco se eliminarán al resaltar los cambios " "entre archivos." -#: ../data/org.gnome.meld.gschema.xml.h:31 +#: ../data/org.gnome.meld.gschema.xml.h:33 msgid "Use the system default editor" msgstr "Usar el editor predeterminado del sistema" -#: ../data/org.gnome.meld.gschema.xml.h:32 +#: ../data/org.gnome.meld.gschema.xml.h:34 msgid "" "If false, custom-editor-command will be used instead of the system editor " "when opening files externally." @@ -269,11 +281,11 @@ msgstr "" "Si es falso, se usará el editor personalizado en lugar del editor del " "sistema al abrir archivos externos." -#: ../data/org.gnome.meld.gschema.xml.h:33 +#: ../data/org.gnome.meld.gschema.xml.h:35 msgid "The custom editor launch command" msgstr "El comando para ejecutar el editor personalizado" -#: ../data/org.gnome.meld.gschema.xml.h:34 +#: ../data/org.gnome.meld.gschema.xml.h:36 msgid "" "The command used to launch a custom editor. Some limited templating is " "supported here; at the moment '{file}' and '{line}' are recognised tokens." @@ -282,11 +294,11 @@ msgstr "" "plantillas limitadas; por el momento, se reconocen las palabras reservadas " "«{file}» y «{line}»." -#: ../data/org.gnome.meld.gschema.xml.h:35 +#: ../data/org.gnome.meld.gschema.xml.h:37 msgid "Columns to display" msgstr "Columnas que mostrar" -#: ../data/org.gnome.meld.gschema.xml.h:36 +#: ../data/org.gnome.meld.gschema.xml.h:38 msgid "" "List of column names in folder comparison and whether they should be " "displayed." @@ -294,11 +306,11 @@ msgstr "" "Lista de nombres de columnas en comparación de carpetas y si deberían " "mostrarse." -#: ../data/org.gnome.meld.gschema.xml.h:37 ../data/ui/preferences.ui.h:32 +#: ../data/org.gnome.meld.gschema.xml.h:39 ../data/ui/preferences.ui.h:32 msgid "Ignore symbolic links" msgstr "Ignorar enlaces simbólicos" -#: ../data/org.gnome.meld.gschema.xml.h:38 +#: ../data/org.gnome.meld.gschema.xml.h:40 msgid "" "If true, folder comparisons do not follow symbolic links when traversing the " "folder tree." @@ -306,11 +318,11 @@ msgstr "" "Si es cierto, la comparación de carpetas no seguirá los enlaces simbólicos " "al recorrer el árbol de carpetas." -#: ../data/org.gnome.meld.gschema.xml.h:39 +#: ../data/org.gnome.meld.gschema.xml.h:41 msgid "Use shallow comparison" msgstr "Usar una comparación superficial" -#: ../data/org.gnome.meld.gschema.xml.h:40 +#: ../data/org.gnome.meld.gschema.xml.h:42 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 " @@ -320,11 +332,11 @@ msgstr "" "y la hora de modificación, considerando que los archivos son idénticos si el " "tamaño y la hora de modificación coinciden, y diferentes si no es así." -#: ../data/org.gnome.meld.gschema.xml.h:41 +#: ../data/org.gnome.meld.gschema.xml.h:43 msgid "File timestamp resolution" msgstr "Resolución de marca de tiempo del archivo" -#: ../data/org.gnome.meld.gschema.xml.h:42 +#: ../data/org.gnome.meld.gschema.xml.h:44 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 " @@ -336,11 +348,11 @@ msgstr "" "diferentes horas de modificación. Esto es útil para comparar archivos entre " "sistemas de archivos con diferente resolución de marca de tiempo." -#: ../data/org.gnome.meld.gschema.xml.h:43 ../data/ui/preferences.ui.h:30 +#: ../data/org.gnome.meld.gschema.xml.h:45 ../data/ui/preferences.ui.h:30 msgid "Apply text filters during folder comparisons" msgstr "Aplicar filtros de texto durante la comparación de carpetas" -#: ../data/org.gnome.meld.gschema.xml.h:44 +#: ../data/org.gnome.meld.gschema.xml.h:46 msgid "" "If true, folder comparisons that compare file contents also apply active " "text filters and the blank line trimming option, and ignore newline " @@ -350,21 +362,21 @@ msgstr "" "archivos también aplica filtros de texto activos y la opción de eliminar " "líneas en blanco, e ignorar las diferencias entre líneas nuevas." -#: ../data/org.gnome.meld.gschema.xml.h:45 +#: ../data/org.gnome.meld.gschema.xml.h:47 msgid "File status filters" msgstr "Filtros del estado del archivo" -#: ../data/org.gnome.meld.gschema.xml.h:46 +#: ../data/org.gnome.meld.gschema.xml.h:48 msgid "List of statuses used to filter visible files in folder comparison." msgstr "" "Lista de estados usados para filtrar los archivos visibles en la comparación " "de carpetas." -#: ../data/org.gnome.meld.gschema.xml.h:47 +#: ../data/org.gnome.meld.gschema.xml.h:49 msgid "Show the version control console output" msgstr "Mostrar la salida de la consola del control de versiones" -#: ../data/org.gnome.meld.gschema.xml.h:48 +#: ../data/org.gnome.meld.gschema.xml.h:50 msgid "" "If true, a console output section will be shown in version control views, " "showing the commands run for version control operations." @@ -373,11 +385,11 @@ msgstr "" "control de versiones, que mostrará el comando ejecutado en las operaciones " "del control de versiones." -#: ../data/org.gnome.meld.gschema.xml.h:49 +#: ../data/org.gnome.meld.gschema.xml.h:51 msgid "Version control pane position" msgstr "Posición del panel de control de versiones" -#: ../data/org.gnome.meld.gschema.xml.h:50 +#: ../data/org.gnome.meld.gschema.xml.h:52 msgid "" "This is the height of the main version control tree when the console pane is " "shown." @@ -385,12 +397,12 @@ msgstr "" "Esto es la altura del árbol de control de versiones principal cuando se " "muestra el panel de la consola." -#: ../data/org.gnome.meld.gschema.xml.h:51 +#: ../data/org.gnome.meld.gschema.xml.h:53 msgid "Present version comparisons as left-local/right-remote" msgstr "" "Presentar la comparación de versiones como izquierda-local/derecha-remoto" -#: ../data/org.gnome.meld.gschema.xml.h:52 +#: ../data/org.gnome.meld.gschema.xml.h:54 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, " @@ -401,13 +413,13 @@ msgstr "" "presentar los archivos en los paneles. De otro modo, se usará el esquema " "«izquierda es el otro», «derecha es el mío»." -#: ../data/org.gnome.meld.gschema.xml.h:53 +#: ../data/org.gnome.meld.gschema.xml.h:55 msgid "Order for files in three-way version control merge comparisons" msgstr "" "Orden de los archivos en comparaciones de mezcla de control de versiones de " "tres vías" -#: ../data/org.gnome.meld.gschema.xml.h:54 +#: ../data/org.gnome.meld.gschema.xml.h:56 msgid "" "Choices for file order are remote/merged/local and local/merged/remote. This " "preference only affects three-way comparisons launched from the version " @@ -418,11 +430,11 @@ msgstr "" "lanzadas desde la vista del control de versiones, por lo que se usa " "solamente para la resolución de mezclas/conflictos en Meld." -#: ../data/org.gnome.meld.gschema.xml.h:55 +#: ../data/org.gnome.meld.gschema.xml.h:57 msgid "Show margin in commit message editor" msgstr "Mostrar el margen en el editor de mensajes de «commit»" -#: ../data/org.gnome.meld.gschema.xml.h:56 +#: ../data/org.gnome.meld.gschema.xml.h:58 msgid "" "If true, a guide will be displayed to show what column the margin is at in " "the version control commit message editor." @@ -430,11 +442,11 @@ msgstr "" "Si es cierto, se mostrará una guía para indicar en qué columna está el " "margen en el editor de mensajes de «commit» del control de versiones." -#: ../data/org.gnome.meld.gschema.xml.h:57 +#: ../data/org.gnome.meld.gschema.xml.h:59 msgid "Margin column in commit message editor" msgstr "Columna de margen en el editor de mensajes de «commit»" -#: ../data/org.gnome.meld.gschema.xml.h:58 +#: ../data/org.gnome.meld.gschema.xml.h:60 msgid "" "The column at which to show the margin in the version control commit message " "editor." @@ -442,35 +454,38 @@ msgstr "" "La columna en la que mostrar el margen en el editor de mensajes de «commit» " "del control de versiones." -#: ../data/org.gnome.meld.gschema.xml.h:59 +#: ../data/org.gnome.meld.gschema.xml.h:61 msgid "Automatically hard-wrap commit messages" msgstr "Recortar automáticamente los mensajes de «commit»" -#: ../data/org.gnome.meld.gschema.xml.h:60 +#: ../data/org.gnome.meld.gschema.xml.h:62 +#| msgid "" +#| "If true, the version control commit message editor will hard-wrap (i.e, " +#| "insert line breaks) at the commit margin before commit." msgid "" -"If true, the version control commit message editor will hard-wrap (i.e, " +"If true, the version control commit message editor will hard-wrap (i.e., " "insert line breaks) at the commit margin before commit." msgstr "" "Si es cierto, el editor de mensajes de «commit» del control de versiones " "recortará los mensajes (es decir, insertará saltos de línea) en el margen " "definido antes de aplicar." -#: ../data/org.gnome.meld.gschema.xml.h:61 +#: ../data/org.gnome.meld.gschema.xml.h:63 msgid "Version control status filters" msgstr "Filtros del estado del control de versiones" -#: ../data/org.gnome.meld.gschema.xml.h:62 +#: ../data/org.gnome.meld.gschema.xml.h:64 msgid "" "List of statuses used to filter visible files in version control comparison." msgstr "" "Lista de estados usados para filtrar los archivos visibles en la comparación " "del control de versiones." -#: ../data/org.gnome.meld.gschema.xml.h:63 +#: ../data/org.gnome.meld.gschema.xml.h:65 msgid "Filename-based filters" msgstr "Filtros basados en el nombre del archivo" -#: ../data/org.gnome.meld.gschema.xml.h:64 +#: ../data/org.gnome.meld.gschema.xml.h:66 msgid "" "List of predefined filename-based filters that, if active, will remove " "matching files from a folder comparison." @@ -478,11 +493,11 @@ msgstr "" "Lista de filtros de expresiones basadas en nombres de archivos que, si está " "activa, eliminará los archivos coincidentes en una comparación de carpetas." -#: ../data/org.gnome.meld.gschema.xml.h:65 +#: ../data/org.gnome.meld.gschema.xml.h:67 msgid "Text-based filters" msgstr "Filtros basados en texto" -#: ../data/org.gnome.meld.gschema.xml.h:66 +#: ../data/org.gnome.meld.gschema.xml.h:68 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, " @@ -579,7 +594,7 @@ msgstr "Copiar a la derecha" msgid "Delete selected" msgstr "Eliminar seleccionados" -#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:859 ../meld/filediff.py:1381 +#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:858 ../meld/filediff.py:1336 msgid "Hide" msgstr "Ocultar" @@ -873,8 +888,8 @@ msgstr "Los cambios se perderán permanentemente si no los guarda." msgid "Close _without Saving" msgstr "Cerrar _sin guardar" -#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:941 ../meld/filediff.py:1447 -#: ../meld/filediff.py:1515 +#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:940 ../meld/filediff.py:1402 +#: ../meld/filediff.py:1474 msgid "_Cancel" msgstr "_Cancelar" @@ -913,7 +928,7 @@ msgstr "" "Los cambios realizados a los siguientes documentos se perderán para " "siempre:\n" -#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:942 ../meld/filediff.py:1448 +#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:941 ../meld/filediff.py:1403 msgid "_Replace" msgstr "_Reemplazar" @@ -961,7 +976,7 @@ msgstr "Formatear como parche" msgid "Copy to Clipboard" msgstr "Copiar al portapapeles" -#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:155 +#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:154 msgid "Save Patch" msgstr "Guardar parche" @@ -1151,7 +1166,7 @@ msgstr "" "carpetas por nombre. Cada patrón es una lista de comodines al estilo shell " "separados por espacios." -#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:103 +#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:104 msgid "File Filters" msgstr "Filtros de archivos" @@ -1432,7 +1447,7 @@ msgctxt "shortcut window" msgid "Show/hide console output" msgstr "Mostrar/ocultar la salida de la consola" -#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:570 +#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:559 #: ../meld/newdifftab.py:38 msgid "New comparison" msgstr "Nueva comparación" @@ -1676,20 +1691,20 @@ msgstr "Ocultar %s" msgid "[%s] Scanning %s" msgstr "[%s] Buscando %s" -#: ../meld/dirdiff.py:826 +#: ../meld/dirdiff.py:825 #, python-format msgid "[%s] Done" msgstr "[%s] Hecho" -#: ../meld/dirdiff.py:834 +#: ../meld/dirdiff.py:833 msgid "Folders have no differences" msgstr "No hay diferencias entre las carpetas" -#: ../meld/dirdiff.py:836 +#: ../meld/dirdiff.py:835 msgid "Contents of scanned files in folders are identical." msgstr "El contenido de los archivos analizados en carpetas es idéntico." -#: ../meld/dirdiff.py:838 +#: ../meld/dirdiff.py:837 msgid "" "Scanned files in folders appear identical, but contents have not been " "scanned." @@ -1697,44 +1712,45 @@ msgstr "" "Los archivos analizados en las carpetas parecen idénticos, pero no se ha " "analizado el contenido." -#: ../meld/dirdiff.py:841 +#: ../meld/dirdiff.py:840 msgid "File filters are in use, so not all files have been scanned." msgstr "" "Se están usando filtros de archivos, por lo que no se han analizado todos " "los archivos." -#: ../meld/dirdiff.py:843 +#: ../meld/dirdiff.py:842 msgid "Text filters are in use and may be masking content differences." msgstr "" "Se están usando filtros de texto, y pueden estar ocultando diferencias entre " "archivos." -#: ../meld/dirdiff.py:861 ../meld/filediff.py:1383 ../meld/filediff.py:1413 -#: ../meld/filediff.py:1415 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 +#: ../meld/dirdiff.py:860 ../meld/filediff.py:1338 ../meld/filediff.py:1368 +#: ../meld/filediff.py:1370 ../meld/ui/msgarea.py:109 +#: ../meld/ui/msgarea.py:122 msgid "Hi_de" msgstr "_Ocultar" -#: ../meld/dirdiff.py:871 +#: ../meld/dirdiff.py:870 msgid "Multiple errors occurred while scanning this folder" msgstr "Ocurrieron varios errores al escanear esta carpeta" -#: ../meld/dirdiff.py:872 +#: ../meld/dirdiff.py:871 msgid "Files with invalid encodings found" msgstr "Se encontraron archivos con codificaciones no válidas" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:874 +#: ../meld/dirdiff.py:873 msgid "Some files were in an incorrect encoding. The names are something like:" msgstr "" "Algunos archivos tienen una codificación incorrecta. Los nombres son como " "esto:" -#: ../meld/dirdiff.py:876 +#: ../meld/dirdiff.py:875 msgid "Files hidden by case insensitive comparison" msgstr "Archivos ocultos por una comparación no sensible a capitalización" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:878 +#: ../meld/dirdiff.py:877 msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. The following files in this folder are hidden:" @@ -1743,17 +1759,17 @@ msgstr "" "sensible a capitalización. Los siguientes archivos de esta carpeta archivos " "están ocultos:" -#: ../meld/dirdiff.py:889 +#: ../meld/dirdiff.py:888 #, python-format msgid "'%s' hidden by '%s'" msgstr "«%s» oculto por «%s»" -#: ../meld/dirdiff.py:945 +#: ../meld/dirdiff.py:944 #, python-format msgid "Replace folder “%s”?" msgstr "¿Reemplazar la carpeta «%s»?" -#: ../meld/dirdiff.py:947 +#: ../meld/dirdiff.py:946 #, python-format msgid "" "Another folder with the same name already exists in “%s”.\n" @@ -1762,11 +1778,11 @@ msgstr "" "Ya existe otra carpeta con el mismo nombre en «%s».\n" "Si reemplaza la carpeta existente, se perderán todos sus archivos." -#: ../meld/dirdiff.py:960 +#: ../meld/dirdiff.py:959 msgid "Error copying file" msgstr "Error al copiar el archivo" -#: ../meld/dirdiff.py:961 +#: ../meld/dirdiff.py:960 #, python-format msgid "" "Couldn't copy %s\n" @@ -1779,35 +1795,35 @@ msgstr "" "\n" "%s" -#: ../meld/dirdiff.py:984 +#: ../meld/dirdiff.py:983 #, python-format msgid "Error deleting %s" msgstr "Error al eliminar %s" -#: ../meld/dirdiff.py:1489 +#: ../meld/dirdiff.py:1488 msgid "No folder" msgstr "No hay ninguna carpeta" #. Abbreviations for insert and overwrite that fit in the status bar -#: ../meld/filediff.py:354 +#: ../meld/filediff.py:311 msgid "INS" msgstr "INS" -#: ../meld/filediff.py:354 +#: ../meld/filediff.py:311 msgid "OVR" msgstr "SOB" #. Abbreviation for line, column so that it will fit in the status bar -#: ../meld/filediff.py:356 +#: ../meld/filediff.py:313 #, python-format msgid "Ln %i, Col %i" msgstr "Lín %i, Col %i" -#: ../meld/filediff.py:781 +#: ../meld/filediff.py:738 msgid "Comparison results will be inaccurate" msgstr "Los resultados de la comparación pueden no ser precisos" -#: ../meld/filediff.py:783 +#: ../meld/filediff.py:740 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1815,65 +1831,65 @@ msgstr "" "Un filtro cambia el número de líneas en el archivo, lo que no está " "soportado. La comparación no será exacta." -#: ../meld/filediff.py:839 +#: ../meld/filediff.py:796 msgid "Mark conflict as resolved?" msgstr "¿Marcar conflicto como resuelto?" -#: ../meld/filediff.py:841 +#: ../meld/filediff.py:798 msgid "" "If the conflict was resolved successfully, you may mark it as resolved now." msgstr "" "Si el conflicto se ha resuelto con éxito, debe marcarlo como resuelto ahora." -#: ../meld/filediff.py:843 +#: ../meld/filediff.py:800 msgid "Cancel" msgstr "Cancelar" -#: ../meld/filediff.py:844 +#: ../meld/filediff.py:801 msgid "Mark _Resolved" msgstr "Mar_car como resuelto" -#: ../meld/filediff.py:1092 +#: ../meld/filediff.py:1049 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Ha habido un problema al abrir el archivo «%s»." -#: ../meld/filediff.py:1100 +#: ../meld/filediff.py:1057 #, python-format msgid "File %s appears to be a binary file." msgstr "El archivo %s parece ser un archivo binario." -#: ../meld/filediff.py:1102 +#: ../meld/filediff.py:1059 msgid "Do you want to open the file using the default application?" msgstr "¿Quiere abrir el archivo usando la aplicación predeterminada?" -#: ../meld/filediff.py:1104 +#: ../meld/filediff.py:1061 msgid "Open" msgstr "Abrir" -#: ../meld/filediff.py:1120 +#: ../meld/filediff.py:1077 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Calculando las diferencias" -#: ../meld/filediff.py:1185 +#: ../meld/filediff.py:1142 #, python-format msgid "File %s has changed on disk" msgstr "El archivo %s ha cambiado en el disco" -#: ../meld/filediff.py:1186 +#: ../meld/filediff.py:1143 msgid "Do you want to reload the file?" msgstr "¿Quiere recargar el archivo?" -#: ../meld/filediff.py:1188 +#: ../meld/filediff.py:1145 msgid "_Reload" msgstr "_Recargar" -#: ../meld/filediff.py:1346 +#: ../meld/filediff.py:1301 msgid "Files are identical" msgstr "Los campos son idénticos" -#: ../meld/filediff.py:1359 +#: ../meld/filediff.py:1314 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1881,11 +1897,11 @@ msgstr "" "Se están usando filtros de texto, y pueden estar ocultando diferencias entre " "archivos. ¿Quiere comprar los archivos no filtrados?" -#: ../meld/filediff.py:1364 +#: ../meld/filediff.py:1319 msgid "Files differ in line endings only" msgstr "Los archivos difieren en los finales de línea" -#: ../meld/filediff.py:1366 +#: ../meld/filediff.py:1321 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1894,15 +1910,15 @@ msgstr "" "Los archivos son idénticos excepto por los finales de línea:\n" "%s" -#: ../meld/filediff.py:1386 +#: ../meld/filediff.py:1341 msgid "Show without filters" msgstr "Mostrar sin filtros" -#: ../meld/filediff.py:1408 +#: ../meld/filediff.py:1363 msgid "Change highlighting incomplete" msgstr "Cambiar el resaltado incompleto" -#: ../meld/filediff.py:1409 +#: ../meld/filediff.py:1364 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." @@ -1911,20 +1927,20 @@ msgstr "" "forzar a Meld para que resalte los cambios largos, aunque esto haga que sea " "más lento." -#: ../meld/filediff.py:1417 +#: ../meld/filediff.py:1372 msgid "Keep highlighting" msgstr "Mantener el resaltado" -#: ../meld/filediff.py:1419 +#: ../meld/filediff.py:1374 msgid "_Keep highlighting" msgstr "_Mantener el resaltado" -#: ../meld/filediff.py:1451 +#: ../meld/filediff.py:1406 #, python-format msgid "Replace file “%s”?" msgstr "¿Reemplazar el archivo «%s»?" -#: ../meld/filediff.py:1453 +#: ../meld/filediff.py:1408 #, python-format msgid "" "A file with this name already exists in “%s”.\n" @@ -1933,45 +1949,45 @@ msgstr "" "Ya existe un archivo con el mismo nombre en «%s».\n" "Si reemplaza el archivo existente, se perderá su contenido." -#: ../meld/filediff.py:1470 +#: ../meld/filediff.py:1425 msgid "Save Left Pane As" msgstr "Guardar panel izquierdo como" -#: ../meld/filediff.py:1472 +#: ../meld/filediff.py:1427 msgid "Save Middle Pane As" msgstr "Guardar el panel central como" -#: ../meld/filediff.py:1474 +#: ../meld/filediff.py:1429 msgid "Save Right Pane As" msgstr "Guardar el panel derecho como" -#: ../meld/filediff.py:1488 +#: ../meld/filediff.py:1443 #, python-format msgid "File %s has changed on disk since it was opened" msgstr "El archivo %s ha cambiado en el disco desde que se abrió" -#: ../meld/filediff.py:1490 +#: ../meld/filediff.py:1445 msgid "If you save it, any external changes will be lost." msgstr "Si lo guarda, los cambios externos se perderán." -#: ../meld/filediff.py:1493 +#: ../meld/filediff.py:1448 msgid "Save Anyway" msgstr "Guardar de todas formas" -#: ../meld/filediff.py:1494 +#: ../meld/filediff.py:1449 msgid "Don't Save" msgstr "No guardar" -#: ../meld/filediff.py:1516 +#: ../meld/filediff.py:1475 msgid "_Save as UTF-8" msgstr "_Guardar como UTF-8" -#: ../meld/filediff.py:1519 +#: ../meld/filediff.py:1478 #, python-format msgid "Couldn't encode text as “%s”" msgstr "No se pudo codificar el texto como «%s»" -#: ../meld/filediff.py:1521 +#: ../meld/filediff.py:1480 #, python-format msgid "" "File “%s” contains characters that can't be encoded using encoding “%s”.\n" @@ -1980,12 +1996,12 @@ msgstr "" "El archivo «%s» contiene caracteres no codificables con «%s».\n" "¿Quiere guardarlos como UTF-8?" -#: ../meld/filediff.py:1561 ../meld/patchdialog.py:131 +#: ../meld/filediff.py:1520 ../meld/patchdialog.py:130 #, python-format msgid "Could not save file %s." msgstr "No se pudo guardar el archivo %s." -#: ../meld/filediff.py:1562 ../meld/patchdialog.py:132 +#: ../meld/filediff.py:1521 ../meld/patchdialog.py:131 #, python-format msgid "" "Couldn't save file due to:\n" @@ -1994,11 +2010,11 @@ msgstr "" "No se pudo guardar el archivo debido a:\n" "%s" -#: ../meld/filediff.py:1907 +#: ../meld/filediff.py:1867 msgid "Live comparison updating disabled" msgstr "Actualización de la comparación en directo desactivada" -#: ../meld/filediff.py:1908 +#: ../meld/filediff.py:1868 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -2014,11 +2030,11 @@ msgstr "" msgid "[%s] Merging files" msgstr "[%s] Mezclando archivos" -#: ../meld/gutterrendererchunk.py:159 +#: ../meld/gutterrendererchunk.py:208 msgid "Copy _up" msgstr "Copiar hacia _arriba" -#: ../meld/gutterrendererchunk.py:160 +#: ../meld/gutterrendererchunk.py:209 msgid "Copy _down" msgstr "Copiar hacia a_bajo" @@ -2124,198 +2140,198 @@ msgstr "" msgid "untitled" msgstr "sin título" -#: ../meld/meldwindow.py:48 +#: ../meld/meldwindow.py:49 msgid "_File" msgstr "_Archivo" -#: ../meld/meldwindow.py:49 +#: ../meld/meldwindow.py:50 msgid "_New Comparison..." msgstr "_Nueva comparación…" -#: ../meld/meldwindow.py:50 +#: ../meld/meldwindow.py:51 msgid "Start a new comparison" msgstr "Iniciar una nueva comparación" -#: ../meld/meldwindow.py:53 +#: ../meld/meldwindow.py:54 msgid "Save the current file" msgstr "Guardar el archivo actual" -#: ../meld/meldwindow.py:55 +#: ../meld/meldwindow.py:56 msgid "Save As..." msgstr "Guardar como…" -#: ../meld/meldwindow.py:56 +#: ../meld/meldwindow.py:57 msgid "Save the current file with a different name" msgstr "Guardar el archivo actual con un nombre diferente" -#: ../meld/meldwindow.py:59 +#: ../meld/meldwindow.py:60 msgid "Close the current file" msgstr "Cerrar el archivo actual" -#: ../meld/meldwindow.py:62 +#: ../meld/meldwindow.py:63 msgid "_Edit" msgstr "_Editar" -#: ../meld/meldwindow.py:64 +#: ../meld/meldwindow.py:65 msgid "Undo the last action" msgstr "Deshacer la última acción" -#: ../meld/meldwindow.py:67 +#: ../meld/meldwindow.py:68 msgid "Redo the last undone action" msgstr "Rehacer la última acción deshecha" -#: ../meld/meldwindow.py:69 +#: ../meld/meldwindow.py:70 msgid "Cut the selection" msgstr "Cortar la selección" -#: ../meld/meldwindow.py:71 +#: ../meld/meldwindow.py:72 msgid "Copy the selection" msgstr "Copiar la selección" -#: ../meld/meldwindow.py:73 +#: ../meld/meldwindow.py:74 msgid "Paste the clipboard" msgstr "Pegar del portapapeles" -#: ../meld/meldwindow.py:75 +#: ../meld/meldwindow.py:76 msgid "Find..." msgstr "Buscar…" -#: ../meld/meldwindow.py:75 +#: ../meld/meldwindow.py:76 msgid "Search for text" msgstr "Buscar el texto" -#: ../meld/meldwindow.py:77 +#: ../meld/meldwindow.py:78 msgid "Find Ne_xt" msgstr "Buscar _siguiente" -#: ../meld/meldwindow.py:78 +#: ../meld/meldwindow.py:79 msgid "Search forwards for the same text" msgstr "Buscar el mismo texto hacia adelante" -#: ../meld/meldwindow.py:80 +#: ../meld/meldwindow.py:81 msgid "Find _Previous" msgstr "Buscar _anterior" -#: ../meld/meldwindow.py:81 +#: ../meld/meldwindow.py:82 msgid "Search backwards for the same text" msgstr "Buscar hacia atrás el mismo texto" -#: ../meld/meldwindow.py:84 +#: ../meld/meldwindow.py:85 msgid "_Replace..." msgstr "_Reemplazar…" -#: ../meld/meldwindow.py:85 +#: ../meld/meldwindow.py:86 msgid "Find and replace text" msgstr "Buscar y reemplazar texto" -#: ../meld/meldwindow.py:88 +#: ../meld/meldwindow.py:89 msgid "_Changes" msgstr "_Cambios" -#: ../meld/meldwindow.py:89 +#: ../meld/meldwindow.py:90 msgid "Next Change" msgstr "Siguiente cambio" -#: ../meld/meldwindow.py:90 +#: ../meld/meldwindow.py:91 msgid "Go to the next change" msgstr "Ir al siguiente cambio" -#: ../meld/meldwindow.py:92 +#: ../meld/meldwindow.py:93 msgid "Previous Change" msgstr "Cambio anterior" -#: ../meld/meldwindow.py:93 +#: ../meld/meldwindow.py:94 msgid "Go to the previous change" msgstr "Ir al cambio anterior" -#: ../meld/meldwindow.py:95 +#: ../meld/meldwindow.py:96 msgid "Open Externally" msgstr "Abrir externamente" -#: ../meld/meldwindow.py:96 +#: ../meld/meldwindow.py:97 msgid "Open selected file or directory in the default external application" msgstr "" "Abrir el archivo o la carpeta seleccionada en la aplicación externa " "predeterminada" -#: ../meld/meldwindow.py:100 +#: ../meld/meldwindow.py:101 msgid "_View" msgstr "_Ver" -#: ../meld/meldwindow.py:101 +#: ../meld/meldwindow.py:102 msgid "File Status" msgstr "Estado del archivo" -#: ../meld/meldwindow.py:102 +#: ../meld/meldwindow.py:103 msgid "Version Status" msgstr "Estado de la versión" -#: ../meld/meldwindow.py:105 +#: ../meld/meldwindow.py:106 msgid "Stop the current action" msgstr "Parar la acción actual" -#: ../meld/meldwindow.py:108 +#: ../meld/meldwindow.py:109 msgid "Refresh the view" msgstr "Actualizar la vista" -#: ../meld/meldwindow.py:112 +#: ../meld/meldwindow.py:113 msgid "Fullscreen" msgstr "Pantalla completa" -#: ../meld/meldwindow.py:113 +#: ../meld/meldwindow.py:114 msgid "View the comparison in fullscreen" msgstr "Ver la comparación a pantalla completa" -#: ../meld/meldwindow.py:115 +#: ../meld/meldwindow.py:116 msgid "_Toolbar" msgstr "Barra de _herramientas" -#: ../meld/meldwindow.py:116 +#: ../meld/meldwindow.py:117 msgid "Show or hide the toolbar" msgstr "Mostrar u ocultar la barra de herramientas" -#: ../meld/meldwindow.py:126 +#: ../meld/meldwindow.py:127 msgid "Open Recent" msgstr "Abrir recientes" -#: ../meld/meldwindow.py:127 +#: ../meld/meldwindow.py:128 msgid "Open recent files" msgstr "Abrir archivos recientes" -#: ../meld/meldwindow.py:149 +#: ../meld/meldwindow.py:150 msgid "_Meld" msgstr "_Meld" -#: ../meld/meldwindow.py:150 +#: ../meld/meldwindow.py:151 msgid "Quit the program" msgstr "Salir del programa" -#: ../meld/meldwindow.py:152 +#: ../meld/meldwindow.py:153 msgid "Prefere_nces" msgstr "Prefere_ncias" -#: ../meld/meldwindow.py:153 +#: ../meld/meldwindow.py:154 msgid "Configure the application" msgstr "Configurar la aplicación" -#: ../meld/meldwindow.py:155 +#: ../meld/meldwindow.py:156 msgid "_Contents" msgstr "Índ_ice" -#: ../meld/meldwindow.py:156 +#: ../meld/meldwindow.py:157 msgid "Open the Meld manual" msgstr "Abrir el manual de Meld" -#: ../meld/meldwindow.py:158 +#: ../meld/meldwindow.py:159 msgid "About this application" msgstr "Acerca de esta aplicación" -#: ../meld/meldwindow.py:604 +#: ../meld/meldwindow.py:593 #, python-format msgid "Need three files to auto-merge, got: %r" msgstr "Se necesita tres archivos para la mezcla automática, se obtuvieron: %r" -#: ../meld/meldwindow.py:618 +#: ../meld/meldwindow.py:607 msgid "Cannot compare a mixture of files and directories" msgstr "No se puede comparar una mezcla de archivos y carpetas" From bb4fdc0a333b9130eedb8a272984d735090de914 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sat, 24 Dec 2016 07:27:27 +1000 Subject: [PATCH 0107/1316] dirdiff: Reduce useless display of newer emblem and fix multiple newest Prior to this commit, we would always display a small star to indicate when the file/folder in a column was the newest in the comparison. This mostly makes sense for e.g., modified files, but makes no sense in a couple of scenarios: * We'd show this when there was only one file in the comparison, for example when we were in a two-way comparison and the file was missing on the other side. Clearly this is pointless, since that was already marked as new, so there's no additional information. * We'd show the star on the first column whenever both columns had the same mtime, which is very misleading. This handles both of these cases, and also handles three-way comparisons correctly, so that if two of the three columns have the same mtime, we'll actually show that *both* of those are newer than the other. --- meld/dirdiff.py | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/meld/dirdiff.py b/meld/dirdiff.py index db53951c..12730a53 100644 --- a/meld/dirdiff.py +++ b/meld/dirdiff.py @@ -1300,11 +1300,17 @@ def stat(f): sizes = [s.st_size if s else 0 for s in stats] perms = [s.st_mode if s else 0 for s in stats] - # find the newest file, checking also that they differ mod_times = [s.st_mtime if s else 0 for s in stats] - newest_index = mod_times.index( max(mod_times) ) - if mod_times.count( max(mod_times) ) == len(mod_times): - newest_index = -1 # all same + existing_times = [s.st_mtime for s in stats if s] + newest_time = max(existing_times) + if existing_times.count(newest_time) == len(existing_times): + # If all actually-present files have the same mtime, don't + # pretend that any are "newer", and do the same if e.g., + # there's only one file. + newest = set() + else: + newest = {i for i, t in enumerate(mod_times) if t == newest_time} + all_present = 0 not in mod_times if all_present: all_same = self.file_compare(files, regexes) @@ -1336,9 +1342,9 @@ def stat(f): # Different and DodgyDifferent else: self.model.set_path_state(it, j, tree.STATE_MODIFIED, isdir) - self.model.set_value(it, - self.model.column_index(COL_EMBLEM, j), - j == newest_index and "emblem-meld-newer-file" or None) + emblem = "emblem-meld-newer-file" if j in newest else None + self.model.set_value( + it, self.model.column_index(COL_EMBLEM, j), emblem) one_isdir[j] = isdir # A DateCellRenderer would be nicer, but potentially very slow From 50d6d71ce29714fba38155a3129179ee4e895d5a Mon Sep 17 00:00:00 2001 From: Anders Jonsson Date: Mon, 26 Dec 2016 23:14:34 +0000 Subject: [PATCH 0108/1316] Update Swedish translation --- help/sv/sv.po | 71 ++++++++++++++++++++++----------------------------- 1 file changed, 31 insertions(+), 40 deletions(-) diff --git a/help/sv/sv.po b/help/sv/sv.po index 42197dcb..53937ff2 100644 --- a/help/sv/sv.po +++ b/help/sv/sv.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: meld master\n" -"POT-Creation-Date: 2016-09-17 21:06+0000\n" -"PO-Revision-Date: 2016-09-20 23:04+0200\n" +"POT-Creation-Date: 2016-12-17 21:39+0000\n" +"PO-Revision-Date: 2016-12-27 00:13+0100\n" "Last-Translator: Anders Jonsson \n" "Language-Team: Swedish \n" "Language: sv\n" @@ -14,7 +14,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 1.8.9\n" +"X-Generator: Poedit 1.8.11\n" #. Put one translator per line, in the form NAME , YEAR1, YEAR2 msgctxt "_" @@ -57,61 +57,31 @@ msgstr "Meld stöder ett brett urval av versionshanteringssystem:" #. (itstool) path: item/p #: C/vc-supported.page:22 -msgid "Arch" -msgstr "Arch" - -#. (itstool) path: item/p -#: C/vc-supported.page:23 msgid "Bazaar" msgstr "Bazaar" #. (itstool) path: item/p -#: C/vc-supported.page:24 -msgid "Codeville" -msgstr "Codeville" - -#. (itstool) path: item/p -#: C/vc-supported.page:25 -msgid "CVS" -msgstr "CVS" - -#. (itstool) path: item/p -#: C/vc-supported.page:26 -msgid "Fossil" -msgstr "Fossil" +#: C/vc-supported.page:23 +msgid "Darcs" +msgstr "Darcs" #. (itstool) path: item/p -#: C/vc-supported.page:27 +#: C/vc-supported.page:24 msgid "Git" msgstr "Git" #. (itstool) path: item/p -#: C/vc-supported.page:28 +#: C/vc-supported.page:25 msgid "Mercurial" msgstr "Mercurial" #. (itstool) path: item/p -#: C/vc-supported.page:29 -msgid "Monotone" -msgstr "Monotone" - -#. (itstool) path: item/p -#: C/vc-supported.page:30 -msgid "RCS" -msgstr "RCS" - -#. (itstool) path: item/p -#: C/vc-supported.page:31 -msgid "SVK" -msgstr "SVK" - -#. (itstool) path: item/p -#: C/vc-supported.page:32 +#: C/vc-supported.page:26 msgid "SVN" msgstr "SVN" #. (itstool) path: page/p -#: C/vc-supported.page:35 +#: C/vc-supported.page:29 msgid "" "Less common version control systems or unusual configurations may not be " "properly tested; please report any version control support bugs to meld --help for a list of all command line options." msgstr "Kör meld --help för en lista över alla kommandoradsflaggor." +#~ msgid "Arch" +#~ msgstr "Arch" + +#~ msgid "Codeville" +#~ msgstr "Codeville" + +#~ msgid "CVS" +#~ msgstr "CVS" + +#~ msgid "Fossil" +#~ msgstr "Fossil" + +#~ msgid "Monotone" +#~ msgstr "Monotone" + +#~ msgid "RCS" +#~ msgstr "RCS" + +#~ msgid "SVK" +#~ msgstr "SVK" + #~ msgid "Non VC" #~ msgstr "Ej VH" From e7a35ad195688e6e376cc6187b4728ba36c87882 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Fri, 30 Dec 2016 11:22:40 +1000 Subject: [PATCH 0109/1316] misc: Add error mapping to colour theme lookups (bgo#776499) --- meld/misc.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meld/misc.py b/meld/misc.py index 34057b5d..60ef8a21 100644 --- a/meld/misc.py +++ b/meld/misc.py @@ -214,6 +214,7 @@ def get_common_theme(): "delete": lookup("meld:insert", "background"), "conflict": lookup("meld:conflict", "background"), "replace": lookup("meld:replace", "background"), + "error": lookup("meld:error", "background"), "current-chunk-highlight": lookup( "meld:current-chunk-highlight", "background") } @@ -222,6 +223,7 @@ def get_common_theme(): "delete": lookup("meld:insert", "line-background"), "conflict": lookup("meld:conflict", "line-background"), "replace": lookup("meld:replace", "line-background"), + "error": lookup("meld:error", "line-background"), } return fill_colours, line_colours From 69780baedef1c22886de898a95b1d1343afcfd8e Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sat, 31 Dec 2016 07:34:09 +1000 Subject: [PATCH 0110/1316] help: Update folder docs to describe the actual emblem (bgo#691317) We actually ship this icon, so it's not theme-specific. While it would be nice to have a graphical representation of the state, that's not really practical unless Mallard/Yelp get some way of pulling theme details out, and even then we'd need it to handle sourceview themes. --- help/C/folder-mode.page | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/help/C/folder-mode.page b/help/C/folder-mode.page index 4cdf87bc..ab120576 100644 --- a/help/C/folder-mode.page +++ b/help/C/folder-mode.page @@ -221,7 +221,7 @@ files that have been Modified. You can read more about this in

-Finally, the most recently modified file/folder has an emblem +Finally, the most recently modified file/folder has an small star emblem attached to it.

From 1fb08062e4eb476d338c12eeac324035c86069b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20=C4=8Cernock=C3=BD?= Date: Sat, 31 Dec 2016 13:21:58 +0100 Subject: [PATCH 0111/1316] Updated Czech translation --- help/cs/cs.po | 31 +++++++------------------------ 1 file changed, 7 insertions(+), 24 deletions(-) diff --git a/help/cs/cs.po b/help/cs/cs.po index 8335fd4c..8064c792 100644 --- a/help/cs/cs.po +++ b/help/cs/cs.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: meld master\n" -"POT-Creation-Date: 2016-12-13 23:11+0000\n" -"PO-Revision-Date: 2016-12-17 16:30+0100\n" +"POT-Creation-Date: 2016-12-30 21:36+0000\n" +"PO-Revision-Date: 2016-12-31 13:21+0100\n" "Last-Translator: Marek Černocký \n" "Language-Team: čeština \n" "Language: cs\n" @@ -1708,8 +1708,11 @@ msgstr "" #. (itstool) path: section/p #: C/folder-mode.page:223 msgid "" -"Finally, the most recently modified file/folder has an emblem attached to it." -msgstr "Navíc mají nejnověji změněné soubory/složky připojen symbol." +"Finally, the most recently modified file/folder has an small star emblem " +"attached to it." +msgstr "" +"Navíc mají nejnověji změněné soubory/složky připojen symbol v podobě " +"hvězdičky." #. (itstool) path: page/title #: C/missing-functionality.page:15 @@ -1818,23 +1821,3 @@ msgstr "" "Spuštěním meld --help si můžete vypsat všechny možnosti " "příkazového řádku." -#~ msgid "Arch" -#~ msgstr "Arch" - -#~ msgid "Codeville" -#~ msgstr "Codeville" - -#~ msgid "CVS" -#~ msgstr "CVS" - -#~ msgid "Fossil" -#~ msgstr "Fossil" - -#~ msgid "Monotone" -#~ msgstr "Monotone" - -#~ msgid "RCS" -#~ msgstr "RCS" - -#~ msgid "SVK" -#~ msgstr "SVK" From e03de3c2609cef82b7c8f61edb7e707fffc7faa7 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Wed, 4 Jan 2017 19:24:47 +1000 Subject: [PATCH 0112/1316] README: Update to indicate that you need to be installing with Python 3 --- README | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README b/README index dc157ec3..747e839d 100644 --- a/README +++ b/README @@ -41,11 +41,11 @@ Meld can be run directly from this directory. Just type: Alternatively, you can install Meld system-wide by running: - * `python setup.py install` + * `python3 setup.py install` or if you're on Ubuntu, instead try: - * `python setup.py install --prefix=/usr` + * `python3 setup.py install --prefix=/usr` ...but you should probably just get a RPM/deb/installer instead, depending on your system. Meld packages are available for just about every \*nix @@ -75,11 +75,11 @@ such as: These arguments need to be passed to `setup.py` itself, *not* to the install command. In other words, do this: - python setup.py --no-compile-schemas install + python3 setup.py --no-compile-schemas install **not** this: - python setup.py install --no-compile-schemas + python3 setup.py install --no-compile-schemas Contacting From 7cdc72d85f01b3e491f7943a0fe630923a818106 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Tue, 10 Jan 2017 06:04:30 +1000 Subject: [PATCH 0113/1316] README: Update the requirements list to mention Python 3.3 --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 747e839d..f1e142bc 100644 --- a/README +++ b/README @@ -16,7 +16,7 @@ Meld is licensed under the GPL v2 or later. Requirements ------------ -* Python 2.7 +* Python 3.3 * GTK+ 3.14 * GLib 2.36 * PyGObject 3.14 From c2c20fefe03861105c1330253a525f281cd47107 Mon Sep 17 00:00:00 2001 From: Vasily Galkin Date: Sat, 7 Jan 2017 05:37:24 +0300 Subject: [PATCH 0114/1316] Try showing GUI message for failed requirements check (bgo#776453) The messagebox is trying to be shown with both Gtk and tkinter, because for windows platfrom python almost always has tkinter, but can lack Gtk, and for linux the situation is opposite. Nevertheless both methods are platform-independent. --- bin/meld | 41 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/bin/meld b/bin/meld index bc6a4df5..4b4c5f6e 100755 --- a/bin/meld +++ b/bin/meld @@ -129,6 +129,42 @@ except WindowsError as e: print("Couldn't bind the translation domain. Some translations won't work.") print(e) +def show_error_and_exit(error_text): + """ + Show error in a robust way: always print to stdout and try to + display gui message via gtk or tkinter (first available). + Empty toplevel window is used as message box parent since + parentless message box cause toolkit and windowing system problems. + This function is both python 2 and python 3 compatible since it is used + to display wrong python version. + """ + print(error_text) + try: + import gi + gi.require_version("Gtk", "3.0") + from gi.repository import Gtk + toplevel = Gtk.Window(title = "Meld") + toplevel.show() + Gtk.MessageDialog( + toplevel, 0, Gtk.MessageType.ERROR, + Gtk.ButtonsType.CLOSE, error_text).run() + except Exception: + # Although tkinter is imported here, it isn't meld's dependency: + # if found it is used to show GUI error about lacking true dependecies. + try: + if sys.version_info < (3, 0): + from Tkinter import Tk, Toplevel + from tkMessageBox import showerror + else: + from tkinter import Tk, Toplevel + from tkinter.messagebox import showerror + toplevel = Tk(className = "Meld") + toplevel.wait_visibility() + showerror("Meld", error_text, parent = toplevel) + except Exception: + # Displaying with tkinter failed too, just exit. + pass + sys.exit(1) def check_requirements(): @@ -139,11 +175,10 @@ def check_requirements(): def missing_reqs(mod, ver, exception=None): if isinstance(exception, ImportError): - print(_("Cannot import: ") + mod + "\n" + str(e)) + show_error_and_exit(_("Cannot import: ") + mod + "\n" + str(e)) else: modver = mod + " " + ".".join(map(str, ver)) - print(_("Meld requires %s or higher.") % modver) - sys.exit(1) + show_error_and_exit(_("Meld requires %s or higher.") % modver) if sys.version_info[:2] < pyver: missing_reqs("Python", pyver) From f0246c801fc21f794d5b72207fd1bf0ff8fd516a Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 15 Jan 2017 07:22:01 +1000 Subject: [PATCH 0115/1316] bin/meld: PEP8 --- bin/meld | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/bin/meld b/bin/meld index 4b4c5f6e..483b7055 100755 --- a/bin/meld +++ b/bin/meld @@ -129,6 +129,7 @@ except WindowsError as e: print("Couldn't bind the translation domain. Some translations won't work.") print(e) + def show_error_and_exit(error_text): """ Show error in a robust way: always print to stdout and try to @@ -143,7 +144,7 @@ def show_error_and_exit(error_text): import gi gi.require_version("Gtk", "3.0") from gi.repository import Gtk - toplevel = Gtk.Window(title = "Meld") + toplevel = Gtk.Window(title="Meld") toplevel.show() Gtk.MessageDialog( toplevel, 0, Gtk.MessageType.ERROR, @@ -153,19 +154,20 @@ def show_error_and_exit(error_text): # if found it is used to show GUI error about lacking true dependecies. try: if sys.version_info < (3, 0): - from Tkinter import Tk, Toplevel + from Tkinter import Tk from tkMessageBox import showerror else: - from tkinter import Tk, Toplevel + from tkinter import Tk from tkinter.messagebox import showerror - toplevel = Tk(className = "Meld") + toplevel = Tk(className="Meld") toplevel.wait_visibility() - showerror("Meld", error_text, parent = toplevel) + showerror("Meld", error_text, parent=toplevel) except Exception: # Displaying with tkinter failed too, just exit. pass sys.exit(1) + def check_requirements(): pyver = (3, 3) From 691cb53327b199e929ef51fe7d2116560146b83f Mon Sep 17 00:00:00 2001 From: Vasily Galkin Date: Wed, 18 Jan 2017 22:34:04 +0300 Subject: [PATCH 0116/1316] Add checking for python version in Setup.py, like meld itself (bgo#772934). Also setup.py PyPI classifier updated according to 2->3 porting guide. --- bin/meld | 5 ++--- meld/conf.py | 1 + setup.py | 6 +++++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/bin/meld b/bin/meld index 483b7055..21c47d46 100755 --- a/bin/meld +++ b/bin/meld @@ -170,7 +170,6 @@ def show_error_and_exit(error_text): def check_requirements(): - pyver = (3, 3) gtk_requirement = (3, 14) glib_requirement = (2, 36, 0) gtksourceview_requirement = (3, 14, 0) @@ -182,8 +181,8 @@ def check_requirements(): modver = mod + " " + ".".join(map(str, ver)) show_error_and_exit(_("Meld requires %s or higher.") % modver) - if sys.version_info[:2] < pyver: - missing_reqs("Python", pyver) + if sys.version_info[:2] < meld.conf.PYTHON_REQUIREMENT_TUPLE: + missing_reqs("Python", meld.conf.PYTHON_REQUIREMENT_TUPLE) # gtk+ and related imports try: diff --git a/meld/conf.py b/meld/conf.py index 6c8f2cd9..2aafddef 100644 --- a/meld/conf.py +++ b/meld/conf.py @@ -11,6 +11,7 @@ # END UNINSTALLED = False UNINSTALLED_SCHEMA = False +PYTHON_REQUIREMENT_TUPLE = (3, 3) # Installed from main script _ = lambda x: x diff --git a/setup.py b/setup.py index 05f0af69..abb768ee 100755 --- a/setup.py +++ b/setup.py @@ -2,10 +2,14 @@ from distutils.core import setup import glob +import sys import meld.build_helpers import meld.conf +if sys.version_info[:2] < meld.conf.PYTHON_REQUIREMENT_TUPLE: + version = ".".join(map(str, meld.conf.PYTHON_REQUIREMENT_TUPLE)) + raise Exception("Meld setup requires Python %s or higher." % version) setup( name=meld.conf.__package__, @@ -22,7 +26,7 @@ 'Intended Audience :: System Administrators', 'License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)', 'Programming Language :: Python', - 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 3 :: Only', 'Topic :: Desktop Environment :: Gnome', 'Topic :: Software Development', 'Topic :: Software Development :: Version Control', From 1e88915f109a1c7fda2bc58be90a69a487d6836e Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 22 Jan 2017 07:24:21 +1000 Subject: [PATCH 0117/1316] gutterrendererchunk: Fix button alignment in wrapped lines (bgo#777553) --- meld/gutterrendererchunk.py | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/meld/gutterrendererchunk.py b/meld/gutterrendererchunk.py index a31bee36..de95821c 100644 --- a/meld/gutterrendererchunk.py +++ b/meld/gutterrendererchunk.py @@ -38,6 +38,8 @@ GtkSource.GutterRendererState.SELECTED: Gtk.StateFlags.SELECTED, } +ALIGN_MODE_FIRST = GtkSource.GutterRendererAlignmentMode.FIRST + def load(icon_name): icon_theme = Gtk.IconTheme.get_default() @@ -250,10 +252,19 @@ def do_draw(self, context, background_area, cell_area, start, end, state): pixbuf = self.props.pixbuf pix_width, pix_height = pixbuf.props.width, pixbuf.props.height - Gtk.render_icon( - style_context, context, pixbuf, - x + (width - pix_width) // 2, - y + (height - pix_height) // 2) + + xalign, yalign = self.get_alignment() + align_mode = self.get_alignment_mode() + if align_mode == GtkSource.GutterRendererAlignmentMode.CELL: + icon_x = x + (width - pix_width) // 2 + icon_y = y + (height - pix_height) // 2 + else: + line_iter = start if align_mode == ALIGN_MODE_FIRST else end + loc = self.get_view().get_iter_location(line_iter) + icon_x = cell_area.x + (cell_area.width - pix_width) * xalign + icon_y = loc.y + (loc.height - pix_height) * yalign + + Gtk.render_icon(style_context, context, pixbuf, icon_x, icon_y) self.draw_chunks( context, background_area, cell_area, start, end, state) From 22e343ef643ab0cb635148cc8e4d2895bbb36c49 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 22 Jan 2017 08:39:28 +1000 Subject: [PATCH 0118/1316] data: Re-save preferences.ui with new glade --- data/ui/preferences.ui | 214 +++++++++++++++++++++-------------------- 1 file changed, 112 insertions(+), 102 deletions(-) diff --git a/data/ui/preferences.ui b/data/ui/preferences.ui index 339afc9e..9386d121 100644 --- a/data/ui/preferences.ui +++ b/data/ui/preferences.ui @@ -1,6 +1,7 @@ + - + 1 8 @@ -15,83 +16,13 @@ 1 10 - - - - - - - - - - - - - - - - - - False - Left is remote, right is local - - - True - Left is local, right is remote - - - - - - - - - - - - - remote-merge-local - Remote, merge, local - - - local-merge-remote - Local, merge, remote - - - - - - - - - - - - - 1 - 1ns (ext4) - - - 100 - 100ns (NTFS) - - - 1000000000 - 1s (ext2/ext3) - - - 2000000000 - 2s (VFAT) - - - + False 0 - True - False Meld Preferences + False + True dialog - 1 @@ -99,6 +30,16 @@ False vertical 0 + + + False + + + False + False + 0 + + True @@ -119,9 +60,9 @@ True False - 0 Font True + 0 @@ -179,10 +120,10 @@ True False - 0 _Editor font: True fontpicker + 0 False @@ -195,7 +136,7 @@ True True False - Monospace 12 + Monospace 12 True @@ -241,9 +182,9 @@ True False - 0 Display True + 0 @@ -284,10 +225,10 @@ True False - 0 _Tab width: True spinbutton_tabsize + 0 False @@ -453,7 +394,6 @@ True True - 0 0 @@ -513,9 +453,9 @@ True False - 0 External Editor True + 0 @@ -572,10 +512,10 @@ True False - 0 Edito_r command: True custom_edit_command_entry + 0 False @@ -649,9 +589,9 @@ True False - 0 Shallow Comparison True + 0 @@ -708,10 +648,10 @@ True False - 0 _Timestamp resolution: True combo_timestamp + 0 False @@ -792,9 +732,9 @@ True False - 0 Symbolic Links True + 0 @@ -860,9 +800,9 @@ True False - 0 Visible Columns True + 0 @@ -949,9 +889,9 @@ True False - 0 Version Comparisons True + 0 @@ -992,10 +932,10 @@ True False - 0 _Order when comparing file revisions: True combo_file_order + 0 False @@ -1039,10 +979,10 @@ True False - 0 Order when _merging files: True combo_merge_order + 0 False @@ -1107,9 +1047,9 @@ True False - 0 Commit Messages True + 0 @@ -1261,9 +1201,9 @@ True False - 0 Filename filters True + 0 @@ -1299,10 +1239,10 @@ True False - 0 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. True - 40 + 40 + 0 False @@ -1366,9 +1306,9 @@ True False - 0 Change trimming True + 0 @@ -1446,9 +1386,9 @@ True False - 0 Text filters True + 0 @@ -1484,11 +1424,11 @@ True False - 0 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. True True - 40 + 40 + 0 False @@ -1553,16 +1493,86 @@ + + + + + + - - - - - + + + + + + + + + + False + Left is remote, right is local + + + True + Left is local, right is remote + + + + + + + + + + + + + remote-merge-local + Remote, merge, local + + + local-merge-remote + Local, merge, remote + + + + + + + + + + + + + + + + + + + + + 1 + 1ns (ext4) + + + 100 + 100ns (NTFS) + + + 1000000000 + 1s (ext2/ext3) + + + 2000000000 + 2s (VFAT) + + From 032b3d84d6069ddb8fd97e6ea559a5d005bdc214 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 22 Jan 2017 09:10:50 +1000 Subject: [PATCH 0119/1316] data: Add note on filter performance in folder preferences (bgo#776858) --- data/ui/preferences.ui | 47 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 38 insertions(+), 9 deletions(-) diff --git a/data/ui/preferences.ui b/data/ui/preferences.ui index 9386d121..5d2d1ffe 100644 --- a/data/ui/preferences.ui +++ b/data/ui/preferences.ui @@ -687,18 +687,47 @@ - - Apply text filters during folder comparisons + True - True - False - True - 0 - True + False + vertical + + + Apply text filters during folder comparisons + True + True + False + True + 0 + True + + + False + False + 0 + + + + + True + False + 24 + Note: enabling text filters may make comparing large files much slower + 0 + + + + False + True + 1 + + - False - False + True + True 2 From 8210841f83e87f4947815b05bd4de7f6d71821ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Dr=C4=85g?= Date: Sun, 22 Jan 2017 21:32:49 +0100 Subject: [PATCH 0120/1316] Update Polish translation --- po/pl.po | 276 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 141 insertions(+), 135 deletions(-) diff --git a/po/pl.po b/po/pl.po index 30104d39..27959bb4 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1,16 +1,16 @@ # Polish translation for meld. -# Copyright © 2011-2016 the meld authors. +# Copyright © 2011-2017 the meld authors. # This file is distributed under the same license as the meld package. # Marcin Floryan , 2011. -# Piotr Drąg , 2011-2016. -# Aviary.pl , 2011-2016. +# Piotr Drąg , 2011-2017. +# Aviary.pl , 2011-2017. # msgid "" msgstr "" "Project-Id-Version: meld\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-10-02 12:49+0200\n" -"PO-Revision-Date: 2016-10-02 12:50+0200\n" +"POT-Creation-Date: 2017-01-22 21:31+0100\n" +"PO-Revision-Date: 2017-01-22 21:32+0100\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "Language: pl\n" @@ -20,16 +20,16 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -#: ../bin/meld:142 +#: ../bin/meld:179 msgid "Cannot import: " msgstr "Nie można zaimportować: " -#: ../bin/meld:145 +#: ../bin/meld:182 #, c-format msgid "Meld requires %s or higher." msgstr "Program Meld wymaga wersji %s lub nowszej." -#: ../bin/meld:191 +#: ../bin/meld:227 #, c-format msgid "" "Couldn't load Meld-specific CSS (%s)\n" @@ -296,7 +296,7 @@ msgid "" msgstr "" "Lista nazwa kolumn w porównaniu katalogów i czy powinny być wyświetlane." -#: ../data/org.gnome.meld.gschema.xml.h:39 ../data/ui/preferences.ui.h:32 +#: ../data/org.gnome.meld.gschema.xml.h:39 ../data/ui/preferences.ui.h:25 msgid "Ignore symbolic links" msgstr "Ignorowanie dowiązań symbolicznych" @@ -338,7 +338,7 @@ msgstr "" "Jest to przydatne podczas porównywania plików między systemami plików " "z różnym rozwiązywaniem czasu modyfikacji." -#: ../data/org.gnome.meld.gschema.xml.h:45 ../data/ui/preferences.ui.h:30 +#: ../data/org.gnome.meld.gschema.xml.h:45 ../data/ui/preferences.ui.h:22 msgid "Apply text filters during folder comparisons" msgstr "Zastosowywanie filtrów tekstowych podczas porównywania katalogów" @@ -533,8 +533,8 @@ msgstr "Witryna" msgid "translator-credits" msgstr "" "Marcin Floryan , 2011\n" -"Piotr Drąg , 2011-2016\n" -"Aviary.pl , 2011-2016" +"Piotr Drąg , 2011-2017\n" +"Aviary.pl , 2011-2017" #: ../data/ui/application.ui.h:6 msgid "_Preferences" @@ -584,7 +584,7 @@ msgstr "Kopiuje element na prawo" msgid "Delete selected" msgstr "Usuwa zaznaczone" -#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:858 ../meld/filediff.py:1382 +#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:858 ../meld/filediff.py:1336 msgid "Hide" msgstr "Ukryj" @@ -874,8 +874,8 @@ msgstr "" msgid "Close _without Saving" msgstr "Zamknij _bez zapisywania" -#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:940 ../meld/filediff.py:1448 -#: ../meld/filediff.py:1520 +#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:940 ../meld/filediff.py:1402 +#: ../meld/filediff.py:1474 msgid "_Cancel" msgstr "_Anuluj" @@ -912,7 +912,7 @@ msgid "Changes made to the following documents will be permanently lost:\n" msgstr "" "Zmiany naniesione do poniższych dokumentów zostaną bezpowrotnie utracone:\n" -#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:941 ../meld/filediff.py:1449 +#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:941 ../meld/filediff.py:1403 msgid "_Replace" msgstr "Z_amień" @@ -960,7 +960,7 @@ msgstr "Sformatowanie jako poprawka" msgid "Copy to Clipboard" msgstr "Skopiuj do schowka" -#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:155 +#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:154 msgid "Save Patch" msgstr "Zapisz poprawkę" @@ -981,167 +981,141 @@ msgid "_Reverse patch direction" msgstr "Przeciwny kie_runek porównania" #: ../data/ui/preferences.ui.h:1 -msgid "Left is remote, right is local" -msgstr "Zdalne po lewej, lokalne po prawej" - -#: ../data/ui/preferences.ui.h:2 -msgid "Left is local, right is remote" -msgstr "Lokalne po lewej, zdalne po prawej" - -#: ../data/ui/preferences.ui.h:3 -msgid "Remote, merge, local" -msgstr "Zdalne, scalanie, lokalne" - -#: ../data/ui/preferences.ui.h:4 -msgid "Local, merge, remote" -msgstr "Lokalne, scalanie, zdalne" - -#: ../data/ui/preferences.ui.h:5 -msgid "1ns (ext4)" -msgstr "1 ns (ext4)" - -#: ../data/ui/preferences.ui.h:6 -msgid "100ns (NTFS)" -msgstr "100 ns (NTFS)" - -#: ../data/ui/preferences.ui.h:7 -msgid "1s (ext2/ext3)" -msgstr "1 s (ext2/ext3)" - -#: ../data/ui/preferences.ui.h:8 -msgid "2s (VFAT)" -msgstr "2 s (VFAT)" - -#: ../data/ui/preferences.ui.h:9 msgid "Meld Preferences" msgstr "Preferencje programu Meld" -#: ../data/ui/preferences.ui.h:10 +#: ../data/ui/preferences.ui.h:2 msgid "Font" msgstr "Czcionka" -#: ../data/ui/preferences.ui.h:11 +#: ../data/ui/preferences.ui.h:3 msgid "_Use the system fixed width font" msgstr "Systemowa o stałej s_zerokości" -#: ../data/ui/preferences.ui.h:12 +#: ../data/ui/preferences.ui.h:4 msgid "_Editor font:" msgstr "Czcionka _edytora:" -#: ../data/ui/preferences.ui.h:13 +#: ../data/ui/preferences.ui.h:5 msgid "Display" msgstr "Wyświetlanie" -#: ../data/ui/preferences.ui.h:14 +#: ../data/ui/preferences.ui.h:6 msgid "_Tab width:" msgstr "Szerokość _tabulacji:" -#: ../data/ui/preferences.ui.h:15 +#: ../data/ui/preferences.ui.h:7 msgid "_Insert spaces instead of tabs" msgstr "_Spacje zamiast tabulacji" -#: ../data/ui/preferences.ui.h:16 +#: ../data/ui/preferences.ui.h:8 msgid "Enable text _wrapping" msgstr "Zawijanie _wierszy" -#: ../data/ui/preferences.ui.h:17 +#: ../data/ui/preferences.ui.h:9 msgid "Do not _split words over two lines" msgstr "Bez _dzielenia wyrazów między wierszami" -#: ../data/ui/preferences.ui.h:18 +#: ../data/ui/preferences.ui.h:10 msgid "Highlight _current line" msgstr "Wyróż_nianie bieżącego wiersza" -#: ../data/ui/preferences.ui.h:19 +#: ../data/ui/preferences.ui.h:11 msgid "Show _line numbers" msgstr "_Numery wierszy" -#: ../data/ui/preferences.ui.h:20 +#: ../data/ui/preferences.ui.h:12 msgid "Show w_hitespace" msgstr "_Białe znaki" -#: ../data/ui/preferences.ui.h:21 +#: ../data/ui/preferences.ui.h:13 msgid "Use s_yntax highlighting" msgstr "Wyróżnianie elementów s_kładni" -#: ../data/ui/preferences.ui.h:22 +#: ../data/ui/preferences.ui.h:14 msgid "Syntax highlighting color scheme:" msgstr "Schemat kolorów wyróżniania elementów składni:" -#: ../data/ui/preferences.ui.h:23 +#: ../data/ui/preferences.ui.h:15 msgid "External Editor" msgstr "Zewnętrzny edytor" -#: ../data/ui/preferences.ui.h:24 +#: ../data/ui/preferences.ui.h:16 msgid "Use _default system editor" msgstr "_Domyślny edytor systemowy" -#: ../data/ui/preferences.ui.h:25 +#: ../data/ui/preferences.ui.h:17 msgid "Edito_r command:" msgstr "Polecenie uruchamiające edyto_r:" -#: ../data/ui/preferences.ui.h:26 +#: ../data/ui/preferences.ui.h:18 msgid "Editor" msgstr "Edytor" -#: ../data/ui/preferences.ui.h:27 +#: ../data/ui/preferences.ui.h:19 msgid "Shallow Comparison" msgstr "Płytkie porównanie" -#: ../data/ui/preferences.ui.h:28 +#: ../data/ui/preferences.ui.h:20 msgid "C_ompare files based only on size and timestamp" msgstr "P_orównywanie plików tylko na podstawie rozmiaru i czasu modyfikacji" -#: ../data/ui/preferences.ui.h:29 +#: ../data/ui/preferences.ui.h:21 msgid "_Timestamp resolution:" msgstr "Rozwiązywanie _czasu modyfikacji:" -#: ../data/ui/preferences.ui.h:31 +#: ../data/ui/preferences.ui.h:23 +msgid "Note: enabling text filters may make comparing large files much slower" +msgstr "" +"Uwaga: włączenie filtrów tekstowych może znacznie spowolnić porównywanie " +"dużych plików" + +#: ../data/ui/preferences.ui.h:24 msgid "Symbolic Links" msgstr "Dowiązania symboliczne" -#: ../data/ui/preferences.ui.h:33 +#: ../data/ui/preferences.ui.h:26 msgid "Visible Columns" msgstr "Widoczne kolumny" -#: ../data/ui/preferences.ui.h:34 +#: ../data/ui/preferences.ui.h:27 msgid "Folder Comparisons" msgstr "Porównywanie katalogów" -#: ../data/ui/preferences.ui.h:35 +#: ../data/ui/preferences.ui.h:28 msgid "Version Comparisons" msgstr "Porównywanie wersji" -#: ../data/ui/preferences.ui.h:36 +#: ../data/ui/preferences.ui.h:29 msgid "_Order when comparing file revisions:" msgstr "_Kolejność podczas porównywania wersji plików:" -#: ../data/ui/preferences.ui.h:37 +#: ../data/ui/preferences.ui.h:30 msgid "Order when _merging files:" msgstr "K_olejność podczas scalania plików:" -#: ../data/ui/preferences.ui.h:38 +#: ../data/ui/preferences.ui.h:31 msgid "Commit Messages" msgstr "Opisy zatwierdzeń" -#: ../data/ui/preferences.ui.h:39 +#: ../data/ui/preferences.ui.h:32 msgid "Show _right margin at:" msgstr "P_rawy margines w kolumnie:" -#: ../data/ui/preferences.ui.h:40 +#: ../data/ui/preferences.ui.h:33 msgid "Automatically _break lines at right margin on commit" msgstr "" "Automatyczne łamanie _wierszy na prawym marginesie podczas zatwierdzania" -#: ../data/ui/preferences.ui.h:41 +#: ../data/ui/preferences.ui.h:34 msgid "Version Control" msgstr "System kontroli wersji" -#: ../data/ui/preferences.ui.h:42 +#: ../data/ui/preferences.ui.h:35 msgid "Filename filters" msgstr "Filtry nazw plików" -#: ../data/ui/preferences.ui.h:43 +#: ../data/ui/preferences.ui.h:36 msgid "" "When performing directory comparisons, you may filter out files and " "directories by name. Each pattern is a list of shell style wildcards " @@ -1151,23 +1125,23 @@ msgstr "" "podstawie nazwy. Każdy wzorzec jest listą symboli wieloznacznych powłoki " "rozdzieloną spacjami." -#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:104 +#: ../data/ui/preferences.ui.h:37 ../meld/meldwindow.py:104 msgid "File Filters" msgstr "Filtry plików" -#: ../data/ui/preferences.ui.h:45 +#: ../data/ui/preferences.ui.h:38 msgid "Change trimming" msgstr "Obcinanie zmian" -#: ../data/ui/preferences.ui.h:46 +#: ../data/ui/preferences.ui.h:39 msgid "Trim blank line differences from the start and end of changes" msgstr "Obcinanie różnic pustych wierszy z początku i końca zmian" -#: ../data/ui/preferences.ui.h:47 +#: ../data/ui/preferences.ui.h:40 msgid "Text filters" msgstr "Filtry tekstu" -#: ../data/ui/preferences.ui.h:48 +#: ../data/ui/preferences.ui.h:41 msgid "" "When performing file comparisons, you may ignore certain types of changes. " "Each pattern here is a python regular expression which replaces matching " @@ -1181,10 +1155,42 @@ msgstr "" "zawiera grupy, tylko grupy są zamieniane. Więcej informacji dostępne jest " "w podręczniku użytkownika." -#: ../data/ui/preferences.ui.h:49 +#: ../data/ui/preferences.ui.h:42 msgid "Text Filters" msgstr "Filtry plików tekstowych" +#: ../data/ui/preferences.ui.h:43 +msgid "Left is remote, right is local" +msgstr "Zdalne po lewej, lokalne po prawej" + +#: ../data/ui/preferences.ui.h:44 +msgid "Left is local, right is remote" +msgstr "Lokalne po lewej, zdalne po prawej" + +#: ../data/ui/preferences.ui.h:45 +msgid "Remote, merge, local" +msgstr "Zdalne, scalanie, lokalne" + +#: ../data/ui/preferences.ui.h:46 +msgid "Local, merge, remote" +msgstr "Lokalne, scalanie, zdalne" + +#: ../data/ui/preferences.ui.h:47 +msgid "1ns (ext4)" +msgstr "1 ns (ext4)" + +#: ../data/ui/preferences.ui.h:48 +msgid "100ns (NTFS)" +msgstr "100 ns (NTFS)" + +#: ../data/ui/preferences.ui.h:49 +msgid "1s (ext2/ext3)" +msgstr "1 s (ext2/ext3)" + +#: ../data/ui/preferences.ui.h:50 +msgid "2s (VFAT)" +msgstr "2 s (VFAT)" + #: ../data/ui/shortcuts.ui.h:1 msgctxt "shortcut window" msgid "General" @@ -1702,8 +1708,8 @@ 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:860 ../meld/filediff.py:1384 ../meld/filediff.py:1414 -#: ../meld/filediff.py:1416 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 +#: ../meld/dirdiff.py:860 ../meld/filediff.py:1338 ../meld/filediff.py:1368 +#: ../meld/filediff.py:1370 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 msgid "Hi_de" msgstr "_Ukryj" @@ -1777,30 +1783,30 @@ msgstr "" msgid "Error deleting %s" msgstr "Błąd podczas usuwania %s" -#: ../meld/dirdiff.py:1488 +#: ../meld/dirdiff.py:1494 msgid "No folder" msgstr "Brak katalogu" #. Abbreviations for insert and overwrite that fit in the status bar -#: ../meld/filediff.py:355 +#: ../meld/filediff.py:311 msgid "INS" msgstr "WST" -#: ../meld/filediff.py:355 +#: ../meld/filediff.py:311 msgid "OVR" msgstr "ZAS" #. Abbreviation for line, column so that it will fit in the status bar -#: ../meld/filediff.py:357 +#: ../meld/filediff.py:313 #, python-format msgid "Ln %i, Col %i" msgstr "Wrsz %i, kol %i" -#: ../meld/filediff.py:782 +#: ../meld/filediff.py:738 msgid "Comparison results will be inaccurate" msgstr "Wyniki porównania będą niepoprawne" -#: ../meld/filediff.py:784 +#: ../meld/filediff.py:740 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1808,66 +1814,66 @@ msgstr "" "Filtr zmienił liczbę wierszy w pliku, co nie jest obsługiwane. Porównanie " "będzie niepoprawne." -#: ../meld/filediff.py:840 +#: ../meld/filediff.py:796 msgid "Mark conflict as resolved?" msgstr "Oznaczyć konflikt jako rozwiązany?" -#: ../meld/filediff.py:842 +#: ../meld/filediff.py:798 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:844 +#: ../meld/filediff.py:800 msgid "Cancel" msgstr "Anuluj" -#: ../meld/filediff.py:845 +#: ../meld/filediff.py:801 msgid "Mark _Resolved" msgstr "Oznacz jako _rozwiązane" -#: ../meld/filediff.py:1093 +#: ../meld/filediff.py:1049 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Wystąpił problem podczas otwierania pliku „%s”." -#: ../meld/filediff.py:1101 +#: ../meld/filediff.py:1057 #, python-format msgid "File %s appears to be a binary file." msgstr "Plik %s wygląda na plik binarny." -#: ../meld/filediff.py:1103 +#: ../meld/filediff.py:1059 msgid "Do you want to open the file using the default application?" msgstr "Otworzyć go w domyślnym programie?" -#: ../meld/filediff.py:1105 +#: ../meld/filediff.py:1061 msgid "Open" msgstr "Otwórz" -#: ../meld/filediff.py:1121 +#: ../meld/filediff.py:1077 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Analizowanie różnic" -#: ../meld/filediff.py:1186 +#: ../meld/filediff.py:1142 #, python-format msgid "File %s has changed on disk" msgstr "Plik %s został zmieniony na dysku" -#: ../meld/filediff.py:1187 +#: ../meld/filediff.py:1143 msgid "Do you want to reload the file?" msgstr "Ponownie wczytać plik?" -#: ../meld/filediff.py:1189 +#: ../meld/filediff.py:1145 msgid "_Reload" msgstr "_Wczytaj ponownie" -#: ../meld/filediff.py:1347 +#: ../meld/filediff.py:1301 msgid "Files are identical" msgstr "Pliki są identyczne" -#: ../meld/filediff.py:1360 +#: ../meld/filediff.py:1314 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1875,11 +1881,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:1365 +#: ../meld/filediff.py:1319 msgid "Files differ in line endings only" msgstr "Pliki różnią się tylko znacznikami końca wierszy" -#: ../meld/filediff.py:1367 +#: ../meld/filediff.py:1321 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1888,15 +1894,15 @@ msgstr "" "Pliki są identyczne, z wyjątkiem różnych znaczników końca wierszy:\n" "%s" -#: ../meld/filediff.py:1387 +#: ../meld/filediff.py:1341 msgid "Show without filters" msgstr "Wyświetl bez filtrów" -#: ../meld/filediff.py:1409 +#: ../meld/filediff.py:1363 msgid "Change highlighting incomplete" msgstr "Wyróżnianie zmian jest niepełne" -#: ../meld/filediff.py:1410 +#: ../meld/filediff.py:1364 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." @@ -1904,20 +1910,20 @@ 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:1418 +#: ../meld/filediff.py:1372 msgid "Keep highlighting" msgstr "Wyróżniaj dalej" -#: ../meld/filediff.py:1420 +#: ../meld/filediff.py:1374 msgid "_Keep highlighting" msgstr "_Wyróżniaj dalej" -#: ../meld/filediff.py:1452 +#: ../meld/filediff.py:1406 #, python-format msgid "Replace file “%s”?" msgstr "Zastąpić plik „%s”?" -#: ../meld/filediff.py:1454 +#: ../meld/filediff.py:1408 #, python-format msgid "" "A file with this name already exists in “%s”.\n" @@ -1926,47 +1932,47 @@ msgstr "" "Plik o tej samej nazwie już istnieje w „%s”.\n" "Zastąpienie istniejącego pliku spowoduje utratę jego zawartości." -#: ../meld/filediff.py:1471 +#: ../meld/filediff.py:1425 msgid "Save Left Pane As" msgstr "Zapis lewego panelu jako" -#: ../meld/filediff.py:1473 +#: ../meld/filediff.py:1427 msgid "Save Middle Pane As" msgstr "Zapis środkowego panelu jako" -#: ../meld/filediff.py:1475 +#: ../meld/filediff.py:1429 msgid "Save Right Pane As" msgstr "Zapis prawego panelu jako" -#: ../meld/filediff.py:1489 +#: ../meld/filediff.py:1443 #, 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:1491 +#: ../meld/filediff.py:1445 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:1494 +#: ../meld/filediff.py:1448 msgid "Save Anyway" msgstr "Zapisz mimo to" -#: ../meld/filediff.py:1495 +#: ../meld/filediff.py:1449 msgid "Don't Save" msgstr "Nie zapisuj" -#: ../meld/filediff.py:1521 +#: ../meld/filediff.py:1475 msgid "_Save as UTF-8" msgstr "_Zapisz za pomocą UTF-8" -#: ../meld/filediff.py:1524 +#: ../meld/filediff.py:1478 #, python-format msgid "Couldn't encode text as “%s”" msgstr "Nie można zakodować tekstu za pomocą „%s”" -#: ../meld/filediff.py:1526 +#: ../meld/filediff.py:1480 #, python-format msgid "" "File “%s” contains characters that can't be encoded using encoding “%s”.\n" @@ -1976,12 +1982,12 @@ msgstr "" "„%s”.\n" "Zapisać za pomocą kodowania UTF-8?" -#: ../meld/filediff.py:1566 ../meld/patchdialog.py:131 +#: ../meld/filediff.py:1520 ../meld/patchdialog.py:130 #, python-format msgid "Could not save file %s." msgstr "Nie można zapisać pliku %s." -#: ../meld/filediff.py:1567 ../meld/patchdialog.py:132 +#: ../meld/filediff.py:1521 ../meld/patchdialog.py:131 #, python-format msgid "" "Couldn't save file due to:\n" @@ -1990,11 +1996,11 @@ msgstr "" "Nie można zapisać pliku z powodu:\n" "%s" -#: ../meld/filediff.py:1913 +#: ../meld/filediff.py:1867 msgid "Live comparison updating disabled" msgstr "Wyłączono aktualizowanie porównań na żywo" -#: ../meld/filediff.py:1914 +#: ../meld/filediff.py:1868 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -2009,11 +2015,11 @@ msgstr "" msgid "[%s] Merging files" msgstr "[%s] Scalanie plików" -#: ../meld/gutterrendererchunk.py:188 +#: ../meld/gutterrendererchunk.py:210 msgid "Copy _up" msgstr "Skopiuj w gó_rę" -#: ../meld/gutterrendererchunk.py:189 +#: ../meld/gutterrendererchunk.py:211 msgid "Copy _down" msgstr "Skopiuj w _dół" @@ -2319,7 +2325,7 @@ msgstr "" "instalacja" #. no common path. empty names get changed to "[None]" -#: ../meld/misc.py:263 +#: ../meld/misc.py:265 msgid "[None]" msgstr "[Brak]" From e01b554246090722489d99cea95250584410d1f3 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Thu, 26 Jan 2017 06:54:14 +1000 Subject: [PATCH 0121/1316] help: Add keyboard shortcut doc for folder expansion --- help/C/keyboard-shortcuts.page | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/help/C/keyboard-shortcuts.page b/help/C/keyboard-shortcuts.page index be43613f..7b2dc5e6 100644 --- a/help/C/keyboard-shortcuts.page +++ b/help/C/keyboard-shortcuts.page @@ -101,6 +101,28 @@ + + Shortcuts for folder comparison + + + + + + + + + + + + + + + + + +

Shortcut

Description

+

Expand the current folder.

-

Collapse the current folder.

+ + Shortcuts for view settings From 44d14deb014a71bb4bd77cc8b03473c39f6248f6 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Thu, 26 Jan 2017 08:53:43 +1000 Subject: [PATCH 0122/1316] gutterrendererchunk: Translate buffer coords for alignment (bgo#777553) When we changed the gutter renderers to handle non-CELL alignment, we incorrectly used the locations returned from get_iter_location() for painting, which is incorrect; these are buffer coordinates not window coordinates. --- meld/gutterrendererchunk.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/meld/gutterrendererchunk.py b/meld/gutterrendererchunk.py index de95821c..4d64d2f6 100644 --- a/meld/gutterrendererchunk.py +++ b/meld/gutterrendererchunk.py @@ -260,9 +260,12 @@ def do_draw(self, context, background_area, cell_area, start, end, state): icon_y = y + (height - pix_height) // 2 else: line_iter = start if align_mode == ALIGN_MODE_FIRST else end - loc = self.get_view().get_iter_location(line_iter) + textview = self.get_view() + loc = textview.get_iter_location(line_iter) + line_x, line_y = textview.buffer_to_window_coords( + self.get_window_type(), loc.x, loc.y) icon_x = cell_area.x + (cell_area.width - pix_width) * xalign - icon_y = loc.y + (loc.height - pix_height) * yalign + icon_y = line_y + (loc.height - pix_height) * yalign Gtk.render_icon(style_context, context, pixbuf, icon_x, icon_y) From 6d6a6270c0cd013e3b22bd67b9577d331a7c7df7 Mon Sep 17 00:00:00 2001 From: Rafael Fontenelle Date: Mon, 6 Feb 2017 10:47:55 +0000 Subject: [PATCH 0123/1316] Update Brazilian Portuguese translation --- po/pt_BR.po | 276 ++++++++++++++++++++++++++-------------------------- 1 file changed, 139 insertions(+), 137 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index a2f839c4..17dab777 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1,5 +1,5 @@ # Brazilian Portuguese translation of meld. -# Copyright (C) 2016 Free Software Foundation, Inc. +# Copyright (C) 2017 Free Software Foundation, Inc. # This file is distributed under the same license as the meld package. # Raphael Higino , 2004. # Djavan Fagundes , 2008, 2009. @@ -9,14 +9,14 @@ # Gabriel Speckhahn , 2011. # Florêncio Neves , 2012. # Enrico Nicoletto , 2013. -# Rafael Fontenelle , 2013, 2014, 2015, 2016. +# Rafael Fontenelle , 2013, 2014, 2015, 2016, 2017. msgid "" msgstr "" "Project-Id-Version: meld\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=meld&ke" "ywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-09-30 23:28+0000\n" -"PO-Revision-Date: 2016-10-04 18:28-0200\n" +"POT-Creation-Date: 2017-01-21 23:12+0000\n" +"PO-Revision-Date: 2017-02-06 08:46-0200\n" "Last-Translator: Rafael Fontenelle \n" "Language-Team: Brazilian Portuguese \n" "Language: pt_BR\n" @@ -24,19 +24,19 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Virtaal 0.7.1\n" +"X-Generator: Virtaal 1.0.0-beta1\n" "X-Project-Style: gnome\n" -#: ../bin/meld:142 +#: ../bin/meld:179 msgid "Cannot import: " msgstr "Não foi possível importar: " -#: ../bin/meld:145 +#: ../bin/meld:182 #, c-format msgid "Meld requires %s or higher." msgstr "Meld requer %s ou superior." -#: ../bin/meld:191 +#: ../bin/meld:227 #, c-format msgid "" "Couldn't load Meld-specific CSS (%s)\n" @@ -97,22 +97,18 @@ msgid "Meld comparison description" msgstr "Descrição da comparação do Meld" #: ../data/org.gnome.meld.gschema.xml.h:1 -#| msgid "Default window size" msgid "Default window width" msgstr "Largura padrão da janela" #: ../data/org.gnome.meld.gschema.xml.h:2 -#| msgid "Default window size" msgid "Default window height" msgstr "Altura padrão da janela" #: ../data/org.gnome.meld.gschema.xml.h:3 -#| msgid "Default window state" msgid "Default window maximised state" msgstr "Estado maximizado padrão da janela" #: ../data/org.gnome.meld.gschema.xml.h:4 -#| msgid "Default window state" msgid "Default window fullscreen state" msgstr "Estado tela cheia padrão da janela" @@ -305,7 +301,7 @@ msgstr "" "Lista de nomes de colunas na comparação de diretórios e se eles deveriam ser " "exibidos." -#: ../data/org.gnome.meld.gschema.xml.h:39 ../data/ui/preferences.ui.h:32 +#: ../data/org.gnome.meld.gschema.xml.h:39 ../data/ui/preferences.ui.h:25 msgid "Ignore symbolic links" msgstr "Ignorar ligações simbólicas" @@ -347,7 +343,7 @@ msgstr "" "mtimes diferentes. Isso é útil quando se está comparando arquivos entre " "sistemas de arquivos com diferentes resolução de marca de tempo." -#: ../data/org.gnome.meld.gschema.xml.h:45 ../data/ui/preferences.ui.h:30 +#: ../data/org.gnome.meld.gschema.xml.h:45 ../data/ui/preferences.ui.h:22 msgid "Apply text filters during folder comparisons" msgstr "Aplicar filtros de texto durante comparação de pastas" @@ -592,7 +588,7 @@ msgstr "Copia para a direita" msgid "Delete selected" msgstr "Exclui os selecionados" -#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:858 ../meld/filediff.py:1382 +#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:858 ../meld/filediff.py:1336 msgid "Hide" msgstr "Ocultar" @@ -882,8 +878,8 @@ msgstr "Se você não salvar, as mudanças serão perdidas permanentemente." msgid "Close _without Saving" msgstr "_Fechar sem salvar" -#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:940 ../meld/filediff.py:1448 -#: ../meld/filediff.py:1520 +#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:940 ../meld/filediff.py:1402 +#: ../meld/filediff.py:1474 msgid "_Cancel" msgstr "_Cancelar" @@ -921,7 +917,7 @@ msgid "Changes made to the following documents will be permanently lost:\n" msgstr "" "Mudanças feitas nos seguintes documentos serão perdidas permanentemente:\n" -#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:941 ../meld/filediff.py:1449 +#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:941 ../meld/filediff.py:1403 msgid "_Replace" msgstr "_Substituir" @@ -969,7 +965,7 @@ msgstr "Formatar como patch" msgid "Copy to Clipboard" msgstr "Copiar para a área de transferência" -#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:155 +#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:154 msgid "Save Patch" msgstr "Salvar patch" @@ -990,166 +986,140 @@ msgid "_Reverse patch direction" msgstr "_Reverter direção do patch" #: ../data/ui/preferences.ui.h:1 -msgid "Left is remote, right is local" -msgstr "Esquerda é remoto, direita é local" - -#: ../data/ui/preferences.ui.h:2 -msgid "Left is local, right is remote" -msgstr "Esquerda é local, direita é remoto" - -#: ../data/ui/preferences.ui.h:3 -msgid "Remote, merge, local" -msgstr "Remoto, mesclagem, local" - -#: ../data/ui/preferences.ui.h:4 -msgid "Local, merge, remote" -msgstr "Local, mesclagem, remoto" - -#: ../data/ui/preferences.ui.h:5 -msgid "1ns (ext4)" -msgstr "1ns (ext4)" - -#: ../data/ui/preferences.ui.h:6 -msgid "100ns (NTFS)" -msgstr "100ns (NTFS)" - -#: ../data/ui/preferences.ui.h:7 -msgid "1s (ext2/ext3)" -msgstr "1s (ext2/ext3)" - -#: ../data/ui/preferences.ui.h:8 -msgid "2s (VFAT)" -msgstr "2s (VFAT)" - -#: ../data/ui/preferences.ui.h:9 msgid "Meld Preferences" msgstr "Preferências do Meld" -#: ../data/ui/preferences.ui.h:10 +#: ../data/ui/preferences.ui.h:2 msgid "Font" msgstr "Fonte" -#: ../data/ui/preferences.ui.h:11 +#: ../data/ui/preferences.ui.h:3 msgid "_Use the system fixed width font" msgstr "_Usar a fonte de largura fixa do sistema" -#: ../data/ui/preferences.ui.h:12 +#: ../data/ui/preferences.ui.h:4 msgid "_Editor font:" msgstr "_Fonte do editor:" -#: ../data/ui/preferences.ui.h:13 +#: ../data/ui/preferences.ui.h:5 msgid "Display" msgstr "Exibição" -#: ../data/ui/preferences.ui.h:14 +#: ../data/ui/preferences.ui.h:6 msgid "_Tab width:" msgstr "_Largura da tabulação:" -#: ../data/ui/preferences.ui.h:15 +#: ../data/ui/preferences.ui.h:7 msgid "_Insert spaces instead of tabs" msgstr "_Inserir espaços em vez de tabulações" -#: ../data/ui/preferences.ui.h:16 +#: ../data/ui/preferences.ui.h:8 msgid "Enable text _wrapping" msgstr "Habilitar _quebra de texto" -#: ../data/ui/preferences.ui.h:17 +#: ../data/ui/preferences.ui.h:9 msgid "Do not _split words over two lines" msgstr "Não _dividir uma palavra em duas linhas" -#: ../data/ui/preferences.ui.h:18 +#: ../data/ui/preferences.ui.h:10 msgid "Highlight _current line" msgstr "Desta_car a linha atual" -#: ../data/ui/preferences.ui.h:19 +#: ../data/ui/preferences.ui.h:11 msgid "Show _line numbers" msgstr "Mostrar números de _linhas" -#: ../data/ui/preferences.ui.h:20 +#: ../data/ui/preferences.ui.h:12 msgid "Show w_hitespace" msgstr "Mostrar _espaço em branco" -#: ../data/ui/preferences.ui.h:21 +#: ../data/ui/preferences.ui.h:13 msgid "Use s_yntax highlighting" msgstr "Usar de_staque de sintaxe" -#: ../data/ui/preferences.ui.h:22 +#: ../data/ui/preferences.ui.h:14 msgid "Syntax highlighting color scheme:" msgstr "Esquema de cores de realce de sintaxe:" -#: ../data/ui/preferences.ui.h:23 +#: ../data/ui/preferences.ui.h:15 msgid "External Editor" msgstr "Editor externo" -#: ../data/ui/preferences.ui.h:24 +#: ../data/ui/preferences.ui.h:16 msgid "Use _default system editor" msgstr "Usar o e_ditor padrão do sistema" -#: ../data/ui/preferences.ui.h:25 +#: ../data/ui/preferences.ui.h:17 msgid "Edito_r command:" msgstr "Comando do edito_r:" -#: ../data/ui/preferences.ui.h:26 +#: ../data/ui/preferences.ui.h:18 msgid "Editor" msgstr "Editor" -#: ../data/ui/preferences.ui.h:27 +#: ../data/ui/preferences.ui.h:19 msgid "Shallow Comparison" msgstr "Comparação superficial" -#: ../data/ui/preferences.ui.h:28 +#: ../data/ui/preferences.ui.h:20 msgid "C_ompare files based only on size and timestamp" msgstr "C_omparar arquivos baseando-se apenas no tamanho e marca de tempo" -#: ../data/ui/preferences.ui.h:29 +#: ../data/ui/preferences.ui.h:21 msgid "_Timestamp resolution:" msgstr "Resolução da marca de _tempo:" -#: ../data/ui/preferences.ui.h:31 +#: ../data/ui/preferences.ui.h:23 +msgid "Note: enabling text filters may make comparing large files much slower" +msgstr "" +"Nota: habilitar filtros de texto pode atrasar em muito a comparação entre " +"arquivos grandes" + +#: ../data/ui/preferences.ui.h:24 msgid "Symbolic Links" msgstr "Ligações simbólicas" -#: ../data/ui/preferences.ui.h:33 +#: ../data/ui/preferences.ui.h:26 msgid "Visible Columns" msgstr "Colunas visíveis" -#: ../data/ui/preferences.ui.h:34 +#: ../data/ui/preferences.ui.h:27 msgid "Folder Comparisons" msgstr "Comparação de pastas" -#: ../data/ui/preferences.ui.h:35 +#: ../data/ui/preferences.ui.h:28 msgid "Version Comparisons" msgstr "Comparação de versão" -#: ../data/ui/preferences.ui.h:36 +#: ../data/ui/preferences.ui.h:29 msgid "_Order when comparing file revisions:" msgstr "_Ordenar ao comparar revisões de arquivo:" -#: ../data/ui/preferences.ui.h:37 +#: ../data/ui/preferences.ui.h:30 msgid "Order when _merging files:" msgstr "Ordenar ao _mesclar arquivos:" -#: ../data/ui/preferences.ui.h:38 +#: ../data/ui/preferences.ui.h:31 msgid "Commit Messages" msgstr "Mensagens de commit" -#: ../data/ui/preferences.ui.h:39 +#: ../data/ui/preferences.ui.h:32 msgid "Show _right margin at:" msgstr "Mostrar ma_rgem esquerda em:" -#: ../data/ui/preferences.ui.h:40 +#: ../data/ui/preferences.ui.h:33 msgid "Automatically _break lines at right margin on commit" msgstr "Que_brar linhas automaticamente na margem esquerda no commit" -#: ../data/ui/preferences.ui.h:41 +#: ../data/ui/preferences.ui.h:34 msgid "Version Control" msgstr "Controle de versão" -#: ../data/ui/preferences.ui.h:42 +#: ../data/ui/preferences.ui.h:35 msgid "Filename filters" msgstr "Filtros de nome de arquivo" -#: ../data/ui/preferences.ui.h:43 +#: ../data/ui/preferences.ui.h:36 msgid "" "When performing directory comparisons, you may filter out files and " "directories by name. Each pattern is a list of shell style wildcards " @@ -1159,23 +1129,23 @@ msgstr "" "arquivos e diretórios por nome. Cada padrão é um lista com caracteres " "curingas (* ou ?) separados por espaços." -#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:104 +#: ../data/ui/preferences.ui.h:37 ../meld/meldwindow.py:104 msgid "File Filters" msgstr "Filtros de arquivos" -#: ../data/ui/preferences.ui.h:45 +#: ../data/ui/preferences.ui.h:38 msgid "Change trimming" msgstr "Aparar alterações" -#: ../data/ui/preferences.ui.h:46 +#: ../data/ui/preferences.ui.h:39 msgid "Trim blank line differences from the start and end of changes" msgstr "Aparar diferenças de linhas vazias do início e fim de alterações" -#: ../data/ui/preferences.ui.h:47 +#: ../data/ui/preferences.ui.h:40 msgid "Text filters" msgstr "Filtros de texto" -#: ../data/ui/preferences.ui.h:48 +#: ../data/ui/preferences.ui.h:41 msgid "" "When performing file comparisons, you may ignore certain types of changes. " "Each pattern here is a python regular expression which replaces matching " @@ -1189,10 +1159,42 @@ msgstr "" "da comparação. Se a expressão contém grupos, somente os grupos são " "substituídos. Veja o manual do usuário para maiores detalhes." -#: ../data/ui/preferences.ui.h:49 +#: ../data/ui/preferences.ui.h:42 msgid "Text Filters" msgstr "Filtros de texto" +#: ../data/ui/preferences.ui.h:43 +msgid "Left is remote, right is local" +msgstr "Esquerda é remoto, direita é local" + +#: ../data/ui/preferences.ui.h:44 +msgid "Left is local, right is remote" +msgstr "Esquerda é local, direita é remoto" + +#: ../data/ui/preferences.ui.h:45 +msgid "Remote, merge, local" +msgstr "Remoto, mesclagem, local" + +#: ../data/ui/preferences.ui.h:46 +msgid "Local, merge, remote" +msgstr "Local, mesclagem, remoto" + +#: ../data/ui/preferences.ui.h:47 +msgid "1ns (ext4)" +msgstr "1ns (ext4)" + +#: ../data/ui/preferences.ui.h:48 +msgid "100ns (NTFS)" +msgstr "100ns (NTFS)" + +#: ../data/ui/preferences.ui.h:49 +msgid "1s (ext2/ext3)" +msgstr "1s (ext2/ext3)" + +#: ../data/ui/preferences.ui.h:50 +msgid "2s (VFAT)" +msgstr "2s (VFAT)" + #: ../data/ui/shortcuts.ui.h:1 msgctxt "shortcut window" msgid "General" @@ -1715,8 +1717,8 @@ msgstr "" "Filtros de texto estão sendo usados e podem estar escondendo diferenças no " "conteúdo." -#: ../meld/dirdiff.py:860 ../meld/filediff.py:1384 ../meld/filediff.py:1414 -#: ../meld/filediff.py:1416 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 +#: ../meld/dirdiff.py:860 ../meld/filediff.py:1338 ../meld/filediff.py:1368 +#: ../meld/filediff.py:1370 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 msgid "Hi_de" msgstr "Ocu_ltar" @@ -1790,30 +1792,30 @@ msgstr "" msgid "Error deleting %s" msgstr "Erro ao excluir %s" -#: ../meld/dirdiff.py:1488 +#: ../meld/dirdiff.py:1494 msgid "No folder" msgstr "Nenhum pasta" #. Abbreviations for insert and overwrite that fit in the status bar -#: ../meld/filediff.py:355 +#: ../meld/filediff.py:311 msgid "INS" msgstr "INS" -#: ../meld/filediff.py:355 +#: ../meld/filediff.py:311 msgid "OVR" msgstr "SBR" #. Abbreviation for line, column so that it will fit in the status bar -#: ../meld/filediff.py:357 +#: ../meld/filediff.py:313 #, python-format msgid "Ln %i, Col %i" msgstr "Lin %i, Col %i" -#: ../meld/filediff.py:782 +#: ../meld/filediff.py:738 msgid "Comparison results will be inaccurate" msgstr "Resultados da comparação será imprecisa" -#: ../meld/filediff.py:784 +#: ../meld/filediff.py:740 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1821,66 +1823,66 @@ 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:840 +#: ../meld/filediff.py:796 msgid "Mark conflict as resolved?" msgstr "Marcar como resolvido?" -#: ../meld/filediff.py:842 +#: ../meld/filediff.py:798 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:844 +#: ../meld/filediff.py:800 msgid "Cancel" msgstr "Cancelar" -#: ../meld/filediff.py:845 +#: ../meld/filediff.py:801 msgid "Mark _Resolved" msgstr "Marcar como _resolvido" -#: ../meld/filediff.py:1093 +#: ../meld/filediff.py:1049 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Ocorreu um problema ao abrir o arquivo \"%s\"." -#: ../meld/filediff.py:1101 +#: ../meld/filediff.py:1057 #, python-format msgid "File %s appears to be a binary file." msgstr "O arquivo %s parece ser um arquivo binário." -#: ../meld/filediff.py:1103 +#: ../meld/filediff.py:1059 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:1105 +#: ../meld/filediff.py:1061 msgid "Open" msgstr "Abrir" -#: ../meld/filediff.py:1121 +#: ../meld/filediff.py:1077 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Analisando diferenças" -#: ../meld/filediff.py:1186 +#: ../meld/filediff.py:1142 #, python-format msgid "File %s has changed on disk" msgstr "O arquivo %s foi alterado em disco" -#: ../meld/filediff.py:1187 +#: ../meld/filediff.py:1143 msgid "Do you want to reload the file?" msgstr "Deseja recarregar o arquivo?" -#: ../meld/filediff.py:1189 +#: ../meld/filediff.py:1145 msgid "_Reload" msgstr "_Recarregar" -#: ../meld/filediff.py:1347 +#: ../meld/filediff.py:1301 msgid "Files are identical" msgstr "Os arquivos são idênticos" -#: ../meld/filediff.py:1360 +#: ../meld/filediff.py:1314 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1888,11 +1890,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:1365 +#: ../meld/filediff.py:1319 msgid "Files differ in line endings only" msgstr "Arquivos se diferenciam nos fins de linha apenas" -#: ../meld/filediff.py:1367 +#: ../meld/filediff.py:1321 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1901,15 +1903,15 @@ msgstr "" "Arquivos são idênticos, exceto pela diferença entre fins de linha:\n" "%s" -#: ../meld/filediff.py:1387 +#: ../meld/filediff.py:1341 msgid "Show without filters" msgstr "Mostrar sem filtros" -#: ../meld/filediff.py:1409 +#: ../meld/filediff.py:1363 msgid "Change highlighting incomplete" msgstr "Alteração de destaque incompleta" -#: ../meld/filediff.py:1410 +#: ../meld/filediff.py:1364 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." @@ -1918,20 +1920,20 @@ 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:1418 +#: ../meld/filediff.py:1372 msgid "Keep highlighting" msgstr "Manter destaque" -#: ../meld/filediff.py:1420 +#: ../meld/filediff.py:1374 msgid "_Keep highlighting" msgstr "_Manter destaque" -#: ../meld/filediff.py:1452 +#: ../meld/filediff.py:1406 #, python-format msgid "Replace file “%s”?" msgstr "Substituir arquivo \"%s\"?" -#: ../meld/filediff.py:1454 +#: ../meld/filediff.py:1408 #, python-format msgid "" "A file with this name already exists in “%s”.\n" @@ -1940,45 +1942,45 @@ msgstr "" "Um arquivo com esse nome já existe em \"%s\".\n" "Se você substituir o arquivo existente, seu conteúdo será perdido." -#: ../meld/filediff.py:1471 +#: ../meld/filediff.py:1425 msgid "Save Left Pane As" msgstr "Salvar o painel esquerdo como" -#: ../meld/filediff.py:1473 +#: ../meld/filediff.py:1427 msgid "Save Middle Pane As" msgstr "Salvar o painel do meio como" -#: ../meld/filediff.py:1475 +#: ../meld/filediff.py:1429 msgid "Save Right Pane As" msgstr "Salvar o painel direito como" -#: ../meld/filediff.py:1489 +#: ../meld/filediff.py:1443 #, 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:1491 +#: ../meld/filediff.py:1445 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:1494 +#: ../meld/filediff.py:1448 msgid "Save Anyway" msgstr "Salvar mesmo assim" -#: ../meld/filediff.py:1495 +#: ../meld/filediff.py:1449 msgid "Don't Save" msgstr "Não salvar" -#: ../meld/filediff.py:1521 +#: ../meld/filediff.py:1475 msgid "_Save as UTF-8" msgstr "_Salvar como UTF-8" -#: ../meld/filediff.py:1524 +#: ../meld/filediff.py:1478 #, python-format msgid "Couldn't encode text as “%s”" msgstr "Não foi possível codificar o texto como \"%s\"" -#: ../meld/filediff.py:1526 +#: ../meld/filediff.py:1480 #, python-format msgid "" "File “%s” contains characters that can't be encoded using encoding “%s”.\n" @@ -1988,12 +1990,12 @@ msgstr "" "codificação \"%s\"\n" "Você gostaria de salvar como UTF-8?" -#: ../meld/filediff.py:1566 ../meld/patchdialog.py:131 +#: ../meld/filediff.py:1520 ../meld/patchdialog.py:130 #, python-format msgid "Could not save file %s." msgstr "Não foi possível salvar o arquivo %s." -#: ../meld/filediff.py:1567 ../meld/patchdialog.py:132 +#: ../meld/filediff.py:1521 ../meld/patchdialog.py:131 #, python-format msgid "" "Couldn't save file due to:\n" @@ -2002,11 +2004,11 @@ msgstr "" "Não foi possível salvar o arquivo pois:\n" "%s" -#: ../meld/filediff.py:1913 +#: ../meld/filediff.py:1867 msgid "Live comparison updating disabled" msgstr "Atualização em tempo real de comparação desabilitada" -#: ../meld/filediff.py:1914 +#: ../meld/filediff.py:1868 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -2022,11 +2024,11 @@ msgstr "" msgid "[%s] Merging files" msgstr "[%s] Mesclando arquivos" -#: ../meld/gutterrendererchunk.py:159 +#: ../meld/gutterrendererchunk.py:210 msgid "Copy _up" msgstr "Copiar para ci_ma" -#: ../meld/gutterrendererchunk.py:160 +#: ../meld/gutterrendererchunk.py:211 msgid "Copy _down" msgstr "Copiar para bai_xo" @@ -2333,7 +2335,7 @@ msgstr "" "uma instalação ruim" #. no common path. empty names get changed to "[None]" -#: ../meld/misc.py:263 +#: ../meld/misc.py:265 msgid "[None]" msgstr "[Nenhum]" From 6937a1e25c8e2d238a3d04c506d2ad5b90b929e0 Mon Sep 17 00:00:00 2001 From: Marek Cernocky Date: Sat, 11 Feb 2017 09:47:15 +0100 Subject: [PATCH 0124/1316] Updated Czech translation --- help/cs/cs.po | 45 ++++++++++++++++++++++++++++++++++++--------- 1 file changed, 36 insertions(+), 9 deletions(-) diff --git a/help/cs/cs.po b/help/cs/cs.po index 8064c792..03471232 100644 --- a/help/cs/cs.po +++ b/help/cs/cs.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: meld master\n" -"POT-Creation-Date: 2016-12-30 21:36+0000\n" -"PO-Revision-Date: 2016-12-31 13:21+0100\n" +"POT-Creation-Date: 2017-01-25 20:54+0000\n" +"PO-Revision-Date: 2017-02-11 09:46+0100\n" "Last-Translator: Marek Černocký \n" "Language-Team: čeština \n" "Language: cs\n" @@ -1275,12 +1275,14 @@ msgstr "Klávesové zkratky pro práci se soubory a pro porovnávání" #. (itstool) path: td/p #: C/keyboard-shortcuts.page:22 C/keyboard-shortcuts.page:56 #: C/keyboard-shortcuts.page:109 C/keyboard-shortcuts.page:131 +#: C/keyboard-shortcuts.page:153 msgid "Shortcut" msgstr "klávesová zkratka" #. (itstool) path: td/p #: C/keyboard-shortcuts.page:22 C/keyboard-shortcuts.page:56 #: C/keyboard-shortcuts.page:109 C/keyboard-shortcuts.page:131 +#: C/keyboard-shortcuts.page:153 msgid "Description" msgstr "popis" @@ -1439,41 +1441,66 @@ msgstr "" #. (itstool) path: table/title #: C/keyboard-shortcuts.page:105 +msgid "Shortcuts for folder comparison" +msgstr "Klávesové zkratky pro porovnávání složek" + +#. (itstool) path: td/p +#: C/keyboard-shortcuts.page:115 +msgid "+" +msgstr "+" + +#. (itstool) path: td/p +#: C/keyboard-shortcuts.page:116 +msgid "Expand the current folder." +msgstr "Rozbalit aktuální složku" + +#. (itstool) path: td/p +#: C/keyboard-shortcuts.page:119 +msgid "-" +msgstr "-" + +#. (itstool) path: td/p +#: C/keyboard-shortcuts.page:120 +msgid "Collapse the current folder." +msgstr "Sbalit aktuální složku" + +#. (itstool) path: table/title +#: C/keyboard-shortcuts.page:127 msgid "Shortcuts for view settings" msgstr "Klávesové zkratky pro zobrazení nastavení" #. (itstool) path: td/p -#: C/keyboard-shortcuts.page:115 +#: C/keyboard-shortcuts.page:137 msgid "Escape" msgstr "Esc" #. (itstool) path: td/p -#: C/keyboard-shortcuts.page:116 +#: C/keyboard-shortcuts.page:138 msgid "Stop the current comparison." msgstr "Zastavit aktuální porovnávání" #. (itstool) path: td/p -#: C/keyboard-shortcuts.page:119 +#: C/keyboard-shortcuts.page:141 msgid "CtrlR" msgstr "CtrlR" #. (itstool) path: td/p -#: C/keyboard-shortcuts.page:120 +#: C/keyboard-shortcuts.page:142 msgid "Refresh the current comparison." msgstr "Aktualizovat aktuální porovnávání" #. (itstool) path: table/title -#: C/keyboard-shortcuts.page:127 +#: C/keyboard-shortcuts.page:149 msgid "Shortcuts for help" msgstr "Klávesové zkratky pro nápovědu" #. (itstool) path: td/p -#: C/keyboard-shortcuts.page:137 +#: C/keyboard-shortcuts.page:159 msgid "F1" msgstr "F1" #. (itstool) path: td/p -#: C/keyboard-shortcuts.page:138 +#: C/keyboard-shortcuts.page:160 msgid "Open Meld's user manual." msgstr "Otevřít uživatelskou příručku Meld" From 2ff3083dbae3604a299a97814bb12499657bf549 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20=C4=8Cernock=C3=BD?= Date: Sat, 11 Feb 2017 10:23:13 +0100 Subject: [PATCH 0125/1316] Updated Czech translation --- po/cs.po | 269 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 137 insertions(+), 132 deletions(-) diff --git a/po/cs.po b/po/cs.po index 67033bd0..d701984f 100644 --- a/po/cs.po +++ b/po/cs.po @@ -4,15 +4,15 @@ # # Miloslav Trmac , 2003, 2004, 2005. # Petr Kovar , 2008, 2009, 2010, 2011. -# Marek Černocký , 2011, 2012, 2013, 2014, 2015, 2016. +# Marek Černocký , 2011, 2012, 2013, 2014, 2015, 2016, 2017. # msgid "" msgstr "" "Project-Id-Version: meld\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=meld&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-09-30 23:28+0000\n" -"PO-Revision-Date: 2016-10-01 12:39+0200\n" +"POT-Creation-Date: 2017-01-21 23:12+0000\n" +"PO-Revision-Date: 2017-02-11 10:22+0100\n" "Last-Translator: Marek Černocký \n" "Language-Team: čeština \n" "Language: cs\n" @@ -22,16 +22,16 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Gtranslator 2.91.7\n" -#: ../bin/meld:142 +#: ../bin/meld:179 msgid "Cannot import: " msgstr "Nelze importovat: " -#: ../bin/meld:145 +#: ../bin/meld:182 #, c-format msgid "Meld requires %s or higher." msgstr "Meld vyžaduje %s nebo vyšší." -#: ../bin/meld:191 +#: ../bin/meld:227 #, c-format msgid "" "Couldn't load Meld-specific CSS (%s)\n" @@ -295,7 +295,7 @@ msgid "" "displayed." msgstr "Seznam názvů sloupců v porovnávání složek a zda by měly být zobrazeny." -#: ../data/org.gnome.meld.gschema.xml.h:39 ../data/ui/preferences.ui.h:32 +#: ../data/org.gnome.meld.gschema.xml.h:39 ../data/ui/preferences.ui.h:25 msgid "Ignore symbolic links" msgstr "Ignorovat symbolické odkazy" @@ -337,7 +337,7 @@ msgstr "" "jejich časy považovány za rozdílné. To je užitečné při porovnávání souborů " "mezi souborovými systémy, které mají různou přesnost časových razítek." -#: ../data/org.gnome.meld.gschema.xml.h:45 ../data/ui/preferences.ui.h:30 +#: ../data/org.gnome.meld.gschema.xml.h:45 ../data/ui/preferences.ui.h:22 msgid "Apply text filters during folder comparisons" msgstr "Použít textové filtry při porovnávání složek" @@ -575,7 +575,7 @@ msgstr "Kopírovat doprava" msgid "Delete selected" msgstr "Odstranit vybrané" -#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:858 ../meld/filediff.py:1382 +#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:858 ../meld/filediff.py:1336 msgid "Hide" msgstr "Skrýt" @@ -866,8 +866,8 @@ msgstr "Pokud se změny neuloží, budou trvale ztraceny." msgid "Close _without Saving" msgstr "Zavřít _bez uložení" -#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:940 ../meld/filediff.py:1448 -#: ../meld/filediff.py:1520 +#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:940 ../meld/filediff.py:1402 +#: ../meld/filediff.py:1474 msgid "_Cancel" msgstr "_Zrušit" @@ -904,7 +904,7 @@ msgstr "Vrátit stav před neuložené změny v dokumentu?" msgid "Changes made to the following documents will be permanently lost:\n" msgstr "Změny provedené v následujících dokumentech budou trvale ztraceny:\n" -#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:941 ../meld/filediff.py:1449 +#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:941 ../meld/filediff.py:1403 msgid "_Replace" msgstr "Nahradi_t" @@ -952,7 +952,7 @@ msgstr "Formátovat jako záplatu" msgid "Copy to Clipboard" msgstr "Kopírovat do schránky" -#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:155 +#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:154 msgid "Save Patch" msgstr "Uložení záplaty" @@ -973,166 +973,140 @@ msgid "_Reverse patch direction" msgstr "_Obrátit směr záplaty" #: ../data/ui/preferences.ui.h:1 -msgid "Left is remote, right is local" -msgstr "Levý je vzdálený, pravý je místní" - -#: ../data/ui/preferences.ui.h:2 -msgid "Left is local, right is remote" -msgstr "Levý je místní, pravý je vzdálený" - -#: ../data/ui/preferences.ui.h:3 -msgid "Remote, merge, local" -msgstr "Vzdálený, sloučený, místní" - -#: ../data/ui/preferences.ui.h:4 -msgid "Local, merge, remote" -msgstr "Místní, sloučený, vzdálený" - -#: ../data/ui/preferences.ui.h:5 -msgid "1ns (ext4)" -msgstr "1 ns (ext4)" - -#: ../data/ui/preferences.ui.h:6 -msgid "100ns (NTFS)" -msgstr "100 ns (NTFS)" - -#: ../data/ui/preferences.ui.h:7 -msgid "1s (ext2/ext3)" -msgstr "1 s (ext2/ext3)" - -#: ../data/ui/preferences.ui.h:8 -msgid "2s (VFAT)" -msgstr "2 s (VFAT)" - -#: ../data/ui/preferences.ui.h:9 msgid "Meld Preferences" msgstr "Předvolby aplikace Meld" -#: ../data/ui/preferences.ui.h:10 +#: ../data/ui/preferences.ui.h:2 msgid "Font" msgstr "Písmo" -#: ../data/ui/preferences.ui.h:11 +#: ../data/ui/preferences.ui.h:3 msgid "_Use the system fixed width font" msgstr "Po_užívat systémové písmo s pevnou šířkou" -#: ../data/ui/preferences.ui.h:12 +#: ../data/ui/preferences.ui.h:4 msgid "_Editor font:" msgstr "Písmo _editoru:" -#: ../data/ui/preferences.ui.h:13 +#: ../data/ui/preferences.ui.h:5 msgid "Display" msgstr "Zobrazení" -#: ../data/ui/preferences.ui.h:14 +#: ../data/ui/preferences.ui.h:6 msgid "_Tab width:" msgstr "Šířka _tabulátoru:" -#: ../data/ui/preferences.ui.h:15 +#: ../data/ui/preferences.ui.h:7 msgid "_Insert spaces instead of tabs" msgstr "V_kládat mezery namísto tabulátorů" -#: ../data/ui/preferences.ui.h:16 +#: ../data/ui/preferences.ui.h:8 msgid "Enable text _wrapping" msgstr "Povolit zalamování _textu" -#: ../data/ui/preferences.ui.h:17 +#: ../data/ui/preferences.ui.h:9 msgid "Do not _split words over two lines" msgstr "Nerozdělovat _slova na dva řádky" -#: ../data/ui/preferences.ui.h:18 +#: ../data/ui/preferences.ui.h:10 msgid "Highlight _current line" msgstr "Zvýrazňovat _aktuální řádek" -#: ../data/ui/preferences.ui.h:19 +#: ../data/ui/preferences.ui.h:11 msgid "Show _line numbers" msgstr "Zobrazovat čís_la řádků" -#: ../data/ui/preferences.ui.h:20 +#: ../data/ui/preferences.ui.h:12 msgid "Show w_hitespace" msgstr "Zobrazovat _mezery" -#: ../data/ui/preferences.ui.h:21 +#: ../data/ui/preferences.ui.h:13 msgid "Use s_yntax highlighting" msgstr "Používat zvýrazňování s_yntaxe" -#: ../data/ui/preferences.ui.h:22 +#: ../data/ui/preferences.ui.h:14 msgid "Syntax highlighting color scheme:" msgstr "Schéma barev pro zvýraznění syntaxe:" -#: ../data/ui/preferences.ui.h:23 +#: ../data/ui/preferences.ui.h:15 msgid "External Editor" msgstr "Externí editor" -#: ../data/ui/preferences.ui.h:24 +#: ../data/ui/preferences.ui.h:16 msgid "Use _default system editor" msgstr "Používat výchozí e_ditor systému" -#: ../data/ui/preferences.ui.h:25 +#: ../data/ui/preferences.ui.h:17 msgid "Edito_r command:" msgstr "Příkaz edito_ru:" -#: ../data/ui/preferences.ui.h:26 +#: ../data/ui/preferences.ui.h:18 msgid "Editor" msgstr "Editor" -#: ../data/ui/preferences.ui.h:27 +#: ../data/ui/preferences.ui.h:19 msgid "Shallow Comparison" msgstr "Povrchní porovnání" -#: ../data/ui/preferences.ui.h:28 +#: ../data/ui/preferences.ui.h:20 msgid "C_ompare files based only on size and timestamp" msgstr "P_orovnávat soubory jen na základě velikosti a časového razítka" -#: ../data/ui/preferences.ui.h:29 +#: ../data/ui/preferences.ui.h:21 msgid "_Timestamp resolution:" msgstr "Přesnos_t časového razítka:" -#: ../data/ui/preferences.ui.h:31 +#: ../data/ui/preferences.ui.h:23 +msgid "Note: enabling text filters may make comparing large files much slower" +msgstr "" +"Poznámka: zapnutí textových filtrů může výrazně zpomalit porovnávání velkých " +"souborů" + +#: ../data/ui/preferences.ui.h:24 msgid "Symbolic Links" msgstr "Symbolické odkazy" -#: ../data/ui/preferences.ui.h:33 +#: ../data/ui/preferences.ui.h:26 msgid "Visible Columns" msgstr "Viditelné sloupce" -#: ../data/ui/preferences.ui.h:34 +#: ../data/ui/preferences.ui.h:27 msgid "Folder Comparisons" msgstr "Porovnávání složek" -#: ../data/ui/preferences.ui.h:35 +#: ../data/ui/preferences.ui.h:28 msgid "Version Comparisons" msgstr "Porovnávání verzí" -#: ../data/ui/preferences.ui.h:36 +#: ../data/ui/preferences.ui.h:29 msgid "_Order when comparing file revisions:" msgstr "P_ořadí při porovnávání revizí souborů:" -#: ../data/ui/preferences.ui.h:37 +#: ../data/ui/preferences.ui.h:30 msgid "Order when _merging files:" msgstr "Pořadí při slučová_ní souborů:" -#: ../data/ui/preferences.ui.h:38 +#: ../data/ui/preferences.ui.h:31 msgid "Commit Messages" msgstr "Zprávy o zařazování" -#: ../data/ui/preferences.ui.h:39 +#: ../data/ui/preferences.ui.h:32 msgid "Show _right margin at:" msgstr "Zobrazit p_ravý okraj na:" -#: ../data/ui/preferences.ui.h:40 +#: ../data/ui/preferences.ui.h:33 msgid "Automatically _break lines at right margin on commit" msgstr "Při zařazování automaticky za_lamovat řádky na pravém okraji" -#: ../data/ui/preferences.ui.h:41 +#: ../data/ui/preferences.ui.h:34 msgid "Version Control" msgstr "Správa verzí" -#: ../data/ui/preferences.ui.h:42 +#: ../data/ui/preferences.ui.h:35 msgid "Filename filters" msgstr "Filtry názvů souborů" -#: ../data/ui/preferences.ui.h:43 +#: ../data/ui/preferences.ui.h:36 msgid "" "When performing directory comparisons, you may filter out files and " "directories by name. Each pattern is a list of shell style wildcards " @@ -1142,24 +1116,24 @@ msgstr "" "Každý vzorek je seznamem zástupných znaků ve stylu shellu oddělovaný " "mezerami." -#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:104 +#: ../data/ui/preferences.ui.h:37 ../meld/meldwindow.py:104 msgid "File Filters" msgstr "Filtry souborů" -#: ../data/ui/preferences.ui.h:45 +#: ../data/ui/preferences.ui.h:38 msgid "Change trimming" msgstr "Vynechávání změn" -#: ../data/ui/preferences.ui.h:46 +#: ../data/ui/preferences.ui.h:39 msgid "Trim blank line differences from the start and end of changes" msgstr "" "Vynechat od začátku do konce změn rozdíly spočívající v prázdných řádcích" -#: ../data/ui/preferences.ui.h:47 +#: ../data/ui/preferences.ui.h:40 msgid "Text filters" msgstr "Filtry textu" -#: ../data/ui/preferences.ui.h:48 +#: ../data/ui/preferences.ui.h:41 msgid "" "When performing file comparisons, you may ignore certain types of changes. " "Each pattern here is a python regular expression which replaces matching " @@ -1172,10 +1146,42 @@ msgstr "" "řetězcem před provedením porovnání. Pokud výraz obsahuje skupiny, jsou " "nahrazeny jen skupiny. Více podrobností viz příručka uživatele." -#: ../data/ui/preferences.ui.h:49 +#: ../data/ui/preferences.ui.h:42 msgid "Text Filters" msgstr "Filtry textu" +#: ../data/ui/preferences.ui.h:43 +msgid "Left is remote, right is local" +msgstr "Levý je vzdálený, pravý je místní" + +#: ../data/ui/preferences.ui.h:44 +msgid "Left is local, right is remote" +msgstr "Levý je místní, pravý je vzdálený" + +#: ../data/ui/preferences.ui.h:45 +msgid "Remote, merge, local" +msgstr "Vzdálený, sloučený, místní" + +#: ../data/ui/preferences.ui.h:46 +msgid "Local, merge, remote" +msgstr "Místní, sloučený, vzdálený" + +#: ../data/ui/preferences.ui.h:47 +msgid "1ns (ext4)" +msgstr "1 ns (ext4)" + +#: ../data/ui/preferences.ui.h:48 +msgid "100ns (NTFS)" +msgstr "100 ns (NTFS)" + +#: ../data/ui/preferences.ui.h:49 +msgid "1s (ext2/ext3)" +msgstr "1 s (ext2/ext3)" + +#: ../data/ui/preferences.ui.h:50 +msgid "2s (VFAT)" +msgstr "2 s (VFAT)" + #: ../data/ui/shortcuts.ui.h:1 msgctxt "shortcut window" msgid "General" @@ -1696,8 +1702,8 @@ msgstr "" "Jsou používány textové filtry a může dojít k zamaskování rozdílů mezi " "soubory." -#: ../meld/dirdiff.py:860 ../meld/filediff.py:1384 ../meld/filediff.py:1414 -#: ../meld/filediff.py:1416 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 +#: ../meld/dirdiff.py:860 ../meld/filediff.py:1338 ../meld/filediff.py:1368 +#: ../meld/filediff.py:1370 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 msgid "Hi_de" msgstr "_Skrýt" @@ -1769,30 +1775,30 @@ msgstr "" msgid "Error deleting %s" msgstr "Chyba při mazání %s" -#: ../meld/dirdiff.py:1488 +#: ../meld/dirdiff.py:1494 msgid "No folder" msgstr "Žádná složka" #. Abbreviations for insert and overwrite that fit in the status bar -#: ../meld/filediff.py:355 +#: ../meld/filediff.py:311 msgid "INS" msgstr "VKL" -#: ../meld/filediff.py:355 +#: ../meld/filediff.py:311 msgid "OVR" msgstr "PŘE" #. Abbreviation for line, column so that it will fit in the status bar -#: ../meld/filediff.py:357 +#: ../meld/filediff.py:313 #, python-format msgid "Ln %i, Col %i" msgstr "Řád %i, sl %i" -#: ../meld/filediff.py:782 +#: ../meld/filediff.py:738 msgid "Comparison results will be inaccurate" msgstr "Výsledky porovnávání budou nepřesné" -#: ../meld/filediff.py:784 +#: ../meld/filediff.py:740 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1800,64 +1806,64 @@ msgstr "" "Filtr změnil počet řádků v souboru, což není podporováno. Porovnání nebude " "správné." -#: ../meld/filediff.py:840 +#: ../meld/filediff.py:796 msgid "Mark conflict as resolved?" msgstr "Označit konflikt jako vyřešený?" -#: ../meld/filediff.py:842 +#: ../meld/filediff.py:798 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:844 +#: ../meld/filediff.py:800 msgid "Cancel" msgstr "Zrušit" -#: ../meld/filediff.py:845 +#: ../meld/filediff.py:801 msgid "Mark _Resolved" msgstr "Označi_t za vyřešené" -#: ../meld/filediff.py:1093 +#: ../meld/filediff.py:1049 #, 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:1101 +#: ../meld/filediff.py:1057 #, python-format msgid "File %s appears to be a binary file." msgstr "Soubor %s je zřejmě binární." -#: ../meld/filediff.py:1103 +#: ../meld/filediff.py:1059 msgid "Do you want to open the file using the default application?" msgstr "Chcete soubor otevřít pomocí výchozí aplikace?" -#: ../meld/filediff.py:1105 +#: ../meld/filediff.py:1061 msgid "Open" msgstr "Otevřít" -#: ../meld/filediff.py:1121 +#: ../meld/filediff.py:1077 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Počítají se rozdíly" -#: ../meld/filediff.py:1186 +#: ../meld/filediff.py:1142 #, python-format msgid "File %s has changed on disk" msgstr "Soubor „%s“ byl změněn na disku." -#: ../meld/filediff.py:1187 +#: ../meld/filediff.py:1143 msgid "Do you want to reload the file?" msgstr "Chcete soubor znovu načíst?" -#: ../meld/filediff.py:1189 +#: ../meld/filediff.py:1145 msgid "_Reload" msgstr "Zno_vu načíst" -#: ../meld/filediff.py:1347 +#: ../meld/filediff.py:1301 msgid "Files are identical" msgstr "Soubory jsou stejné" -#: ../meld/filediff.py:1360 +#: ../meld/filediff.py:1314 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1865,11 +1871,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:1365 +#: ../meld/filediff.py:1319 msgid "Files differ in line endings only" msgstr "Soubory se liší pouze zakončením řádků" -#: ../meld/filediff.py:1367 +#: ../meld/filediff.py:1321 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1878,15 +1884,15 @@ msgstr "" "Soubory jsou shodné, vyjma rozdílného zakončení řádků:\n" "%s" -#: ../meld/filediff.py:1387 +#: ../meld/filediff.py:1341 msgid "Show without filters" msgstr "Zobrazit bez filtrů" -#: ../meld/filediff.py:1409 +#: ../meld/filediff.py:1363 msgid "Change highlighting incomplete" msgstr "Změnit zvýraznění neúplných" -#: ../meld/filediff.py:1410 +#: ../meld/filediff.py:1364 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." @@ -1895,20 +1901,20 @@ 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:1418 +#: ../meld/filediff.py:1372 msgid "Keep highlighting" msgstr "Zachovat zvýrazňování" -#: ../meld/filediff.py:1420 +#: ../meld/filediff.py:1374 msgid "_Keep highlighting" msgstr "Z_achovat zvýrazňování" -#: ../meld/filediff.py:1452 +#: ../meld/filediff.py:1406 #, python-format msgid "Replace file “%s”?" msgstr "Nahradit soubor „%s“?" -#: ../meld/filediff.py:1454 +#: ../meld/filediff.py:1408 #, python-format msgid "" "A file with this name already exists in “%s”.\n" @@ -1917,45 +1923,45 @@ msgstr "" "V „%s“ již existuje soubor se stejným názvem.\n" "Pokud stávající soubor nahradíte, jeho obsah bude ztracen." -#: ../meld/filediff.py:1471 +#: ../meld/filediff.py:1425 msgid "Save Left Pane As" msgstr "Uložení levého panelu jako" -#: ../meld/filediff.py:1473 +#: ../meld/filediff.py:1427 msgid "Save Middle Pane As" msgstr "Uložení prostředního panelu jako" -#: ../meld/filediff.py:1475 +#: ../meld/filediff.py:1429 msgid "Save Right Pane As" msgstr "Uložení pravého panelu jako" -#: ../meld/filediff.py:1489 +#: ../meld/filediff.py:1443 #, 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:1491 +#: ../meld/filediff.py:1445 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:1494 +#: ../meld/filediff.py:1448 msgid "Save Anyway" msgstr "Přesto uložit" -#: ../meld/filediff.py:1495 +#: ../meld/filediff.py:1449 msgid "Don't Save" msgstr "Neukládat" -#: ../meld/filediff.py:1521 +#: ../meld/filediff.py:1475 msgid "_Save as UTF-8" msgstr "_Uložit v UTF-8" -#: ../meld/filediff.py:1524 +#: ../meld/filediff.py:1478 #, python-format msgid "Couldn't encode text as “%s”" msgstr "Text nelze zakódovat jako „%s“" -#: ../meld/filediff.py:1526 +#: ../meld/filediff.py:1480 #, python-format msgid "" "File “%s” contains characters that can't be encoded using encoding “%s”.\n" @@ -1964,12 +1970,12 @@ msgstr "" "Soubor „%s“ obsahuje znaky, které nelze zakódovat pomocí kódování „%s“\n" "Chcete jej uložit v UTF-8?" -#: ../meld/filediff.py:1566 ../meld/patchdialog.py:131 +#: ../meld/filediff.py:1520 ../meld/patchdialog.py:130 #, python-format msgid "Could not save file %s." msgstr "Nelze uložit soubor %s." -#: ../meld/filediff.py:1567 ../meld/patchdialog.py:132 +#: ../meld/filediff.py:1521 ../meld/patchdialog.py:131 #, python-format msgid "" "Couldn't save file due to:\n" @@ -1978,11 +1984,11 @@ msgstr "" "Nelze uložit soubor z důvodu:\n" "%s" -#: ../meld/filediff.py:1913 +#: ../meld/filediff.py:1867 msgid "Live comparison updating disabled" msgstr "Živá aktualizace porovnání zakázána" -#: ../meld/filediff.py:1914 +#: ../meld/filediff.py:1868 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -1997,11 +2003,11 @@ msgstr "" msgid "[%s] Merging files" msgstr "[%s] Slučují se soubory" -#: ../meld/gutterrendererchunk.py:159 +#: ../meld/gutterrendererchunk.py:210 msgid "Copy _up" msgstr "Kopírovat nahor_u" -#: ../meld/gutterrendererchunk.py:160 +#: ../meld/gutterrendererchunk.py:211 msgid "Copy _down" msgstr "Kopírovat _dolů" @@ -2305,7 +2311,7 @@ msgstr "" "Ve schématu barev nelze najít údaj pro %s-%s. Jedná se o chybnou instalaci" #. no common path. empty names get changed to "[None]" -#: ../meld/misc.py:263 +#: ../meld/misc.py:265 msgid "[None]" msgstr "[Žádný]" @@ -2522,4 +2528,3 @@ msgstr "Chyba při odstraňování %s" #: ../meld/vcview.py:745 msgid "Clear" msgstr "Vymazat" - From 6fe612cd0e60950a88b4575d25dc370bcf78210b Mon Sep 17 00:00:00 2001 From: Alan Mortensen Date: Sat, 11 Feb 2017 19:16:09 +0100 Subject: [PATCH 0126/1316] Updated Danish translation --- po/da.po | 642 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 346 insertions(+), 296 deletions(-) diff --git a/po/da.po b/po/da.po index c6440c2c..0df6424d 100644 --- a/po/da.po +++ b/po/da.po @@ -18,8 +18,8 @@ msgstr "" "Project-Id-Version: meld master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=meld&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-09-30 23:28+0000\n" -"PO-Revision-Date: 2016-12-20 18:52+0100\n" +"POT-Creation-Date: 2017-01-21 23:12+0000\n" +"PO-Revision-Date: 2017-02-11 15:59+0100\n" "Last-Translator: Alan Mortensen \n" "Language-Team: Danish \n" "Language: da\n" @@ -29,16 +29,16 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 1.8.7.1\n" -#: ../bin/meld:142 +#: ../bin/meld:179 msgid "Cannot import: " msgstr "Kan ikke importere: " -#: ../bin/meld:145 +#: ../bin/meld:182 #, c-format msgid "Meld requires %s or higher." msgstr "Meld kræver %s eller højere." -#: ../bin/meld:191 +#: ../bin/meld:227 #, c-format msgid "" "Couldn't load Meld-specific CSS (%s)\n" @@ -72,24 +72,24 @@ msgstr "diff;flet;" #: ../data/meld.appdata.xml.in.h:3 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." +"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 "" -"Meld er et visuelt værktøj til diff og flet, som er rettet mod udviklere. Meld " -"hjælper dig med at sammenligne filer, mapper og versionsstyrede projekter. Der er " -"to- og trevejssammenligning af både filer og mapper, og mange " -"versionsstyringssystemer, bl.a. Git, Mercurial, Bazaar og Subversion, er " -"understøttede." +"Meld er et visuelt værktøj til diff og flet, som er rettet mod udviklere. " +"Meld hjælper dig med at sammenligne filer, mapper og versionsstyrede " +"projekter. Der er to- og trevejssammenligning af både filer og mapper, og " +"mange versionsstyringssystemer, bl.a. Git, Mercurial, Bazaar og Subversion, " +"er understøttede." #: ../data/meld.appdata.xml.in.h:4 msgid "" -"Meld helps you review code changes, understand patches, and makes enormous merge " -"conflicts slightly less painful." +"Meld helps you review code changes, understand patches, and makes enormous " +"merge conflicts slightly less painful." msgstr "" -"Meld hjælper dig med at gennemgå kodeændringer, forstå rettelser (patches) og gør " -"enorme flettekonflikter mindre besværlige." +"Meld hjælper dig med at gennemgå kodeændringer, forstå rettelser (patches) " +"og gør enorme flettekonflikter mindre besværlige." #: ../data/meld.appdata.xml.in.h:5 msgid "The GNOME Project" @@ -137,15 +137,15 @@ msgstr "Yderligere automatisk fundne tekstkodninger" #: ../data/org.gnome.meld.gschema.xml.h:10 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." +"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 bruger disse tekstkodninger til at prøve at afkode indlæste tekstfiler, før " -"andre kodninger prøves. Ud over kodningerne på denne liste vil UTF-8 og de aktuelle " -"standardkodninger for regionen altid blive brugt; afhængig af brugerens region vil " -"andre kodninger også blive prøvet." +"Meld bruger disse tekstkodninger til at prøve at afkode indlæste tekstfiler, " +"før andre kodninger prøves. Ud over kodningerne på denne liste vil UTF-8 og " +"de aktuelle standardkodninger for regionen altid blive brugt; afhængig af " +"brugerens region vil andre kodninger også blive prøvet." #: ../data/org.gnome.meld.gschema.xml.h:11 msgid "Width of an indentation step" @@ -161,7 +161,8 @@ msgstr "Om indrykning sker med mellemrum eller tabulator" #: ../data/org.gnome.meld.gschema.xml.h:14 msgid "If true, any new indentation will use spaces instead of tabs." -msgstr "Hvis sand vil nye indrykninger bruge mellemrum i stedet for tabulatorer." +msgstr "" +"Hvis sand vil nye indrykninger bruge mellemrum i stedet for tabulatorer." #: ../data/org.gnome.meld.gschema.xml.h:15 msgid "Show line numbers" @@ -169,7 +170,9 @@ msgstr "Vis linjenumre" #: ../data/org.gnome.meld.gschema.xml.h:16 msgid "If true, line numbers will be shown in the gutter of file comparisons." -msgstr "Hvis sand vil linjenumre blive vist i filsammenligningers indvendige margener." +msgstr "" +"Hvis sand vil linjenumre blive vist i filsammenligningers indvendige " +"margener." #: ../data/org.gnome.meld.gschema.xml.h:17 msgid "Highlight syntax" @@ -180,8 +183,8 @@ msgid "" "Whether to highlight syntax in comparisons. Because of Meld's own color " "highlighting, this is off by default." msgstr "" -"Om syntaks skal fremhæves i sammenligninger. Pga. Melds egen farvefremhævning er " -"dette som standard slået fra." +"Om syntaks skal fremhæves i sammenligninger. Pga. Melds egen " +"farvefremhævning er dette som standard slået fra." #: ../data/org.gnome.meld.gschema.xml.h:19 msgid "Color scheme to use for syntax highlighting" @@ -189,7 +192,8 @@ msgstr "Farveskema til brug for syntaksfremhævning" #: ../data/org.gnome.meld.gschema.xml.h:20 msgid "Used by GtkSourceView to determine colors for syntax highlighting" -msgstr "Bruges af GtkSourceView til at bestemme farver til fremhævning af syntaks" +msgstr "" +"Bruges af GtkSourceView til at bestemme farver til fremhævning af syntaks" #: ../data/org.gnome.meld.gschema.xml.h:21 msgid "Displayed whitespace" @@ -197,11 +201,11 @@ msgstr "Viste blanktegn" #: ../data/org.gnome.meld.gschema.xml.h:22 msgid "" -"Selector for individual whitespace character types to be shown. Possible values are " -"'space', 'tab', 'newline' and 'nbsp'." +"Selector for individual whitespace character types to be shown. Possible " +"values are 'space', 'tab', 'newline' and 'nbsp'." msgstr "" -"Hvilken type blanktegn skal vises. Mulige værdier er: \"space\", \"tab\", \"newline" -"\" og \"nbsp\"." +"Hvilken type blanktegn skal vises. Mulige værdier er: \"space\", \"tab\", " +"\"newline\" og \"nbsp\"." #: ../data/org.gnome.meld.gschema.xml.h:23 msgid "Wrap mode" @@ -209,12 +213,13 @@ msgstr "Ombrydningstilstand" #: ../data/org.gnome.meld.gschema.xml.h:24 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')." +"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 "" -"Linjer i filsammenligninger vil blive ombrudt i henhold til denne indstilling: " -"overhovedet ikke (\"none\"), ved ethvert tegn (\"char\") eller kun efter et ord " -"(\"word\")." +"Linjer i filsammenligninger vil blive ombrudt i henhold til denne " +"indstilling: overhovedet ikke (\"none\"), ved ethvert tegn (\"char\") eller " +"kun efter et ord (\"word\")." #: ../data/org.gnome.meld.gschema.xml.h:25 msgid "Highlight current line" @@ -222,15 +227,18 @@ msgstr "Fremhæv den aktuelle linje" #: ../data/org.gnome.meld.gschema.xml.h:26 msgid "" -"If true, the line containing the cursor will be highlighted in file comparisons." -msgstr "Hvis sand vil linjen med markøren blive fremhævet i filsammenligninger." +"If true, the line containing the cursor will be highlighted in file " +"comparisons." +msgstr "" +"Hvis sand vil linjen med markøren blive fremhævet i filsammenligninger." #: ../data/org.gnome.meld.gschema.xml.h:27 msgid "Use the system default monospace font" msgstr "Brug systemets standardskrifttype med fast bredde" #: ../data/org.gnome.meld.gschema.xml.h:28 -msgid "If false, custom-font will be used instead of the system monospace font." +msgid "" +"If false, custom-font will be used instead of the system monospace font." msgstr "" "Hvis falsk vil en tilpasset skrifttype blive brugt i stedet for systemets " "standardskrifttype med fast bredde." @@ -241,19 +249,22 @@ msgstr "Tilpasset skrifttype" #: ../data/org.gnome.meld.gschema.xml.h:30 msgid "" -"The custom font to use, stored as a string and parsed as a Pango font description." +"The custom font to use, stored as a string and parsed as a Pango font " +"description." msgstr "" -"Den tilpassede skrifttype som skal bruges. Gemmes som en streng og fortolkes som en " -"Pango-skrifttypebeskrivelse." +"Den tilpassede skrifttype som skal bruges. Gemmes som en streng og fortolkes " +"som en Pango-skrifttypebeskrivelse." #: ../data/org.gnome.meld.gschema.xml.h:31 msgid "Ignore blank lines when comparing files" msgstr "Ignorér tomme linjer, når filer sammenlignes" #: ../data/org.gnome.meld.gschema.xml.h:32 -msgid "If true, blank lines will be trimmed when highlighting changes between files." +msgid "" +"If true, blank lines will be trimmed when highlighting changes between files." msgstr "" -"Hvis sand vil tomme linjer blive beskåret, når ændringer mellem filer fremhæves." +"Hvis sand vil tomme linjer blive beskåret, når ændringer mellem filer " +"fremhæves." # Brug det _normale systemredigeringsprogram # Brug systemets _standardredigeringsprogram @@ -263,8 +274,8 @@ msgstr "Brug systemets standardredigeringsprogram" #: ../data/org.gnome.meld.gschema.xml.h:34 msgid "" -"If false, custom-editor-command will be used instead of the system editor when " -"opening files externally." +"If false, custom-editor-command will be used instead of the system editor " +"when opening files externally." msgstr "" "Hvis falsk vil \"custom-editor-command\" blive brugt i stedet for systemets " "redigeringsprogram, når filer åbnes eksternt." @@ -275,31 +286,34 @@ msgstr "Kommando til at starte brugerdefineret redigeringsprogram" #: ../data/org.gnome.meld.gschema.xml.h:36 msgid "" -"The command used to launch a custom editor. Some limited templating is supported " -"here; at the moment '{file}' and '{line}' are recognised tokens." +"The command used to launch a custom editor. Some limited templating is " +"supported here; at the moment '{file}' and '{line}' are recognised tokens." msgstr "" -"Kommandoen til at starte et brugerdefineret redigeringsprogram. Begrænset brug af " -"skabeloner understøttes; for øjeblikket kan \"{file}\" og \"{line}\" bruges." +"Kommandoen til at starte et brugerdefineret redigeringsprogram. Begrænset " +"brug af skabeloner understøttes; for øjeblikket kan \"{file}\" og \"{line}\" " +"bruges." #: ../data/org.gnome.meld.gschema.xml.h:37 msgid "Columns to display" msgstr "Kolonner der skal vises" #: ../data/org.gnome.meld.gschema.xml.h:38 -msgid "List of column names in folder comparison and whether they should be displayed." +msgid "" +"List of column names in folder comparison and whether they should be " +"displayed." msgstr "Liste over kolonnenavne i mappesammenligning og om de skal vises." -#: ../data/org.gnome.meld.gschema.xml.h:39 ../data/ui/preferences.ui.h:32 +#: ../data/org.gnome.meld.gschema.xml.h:39 ../data/ui/preferences.ui.h:25 msgid "Ignore symbolic links" msgstr "Ignorér symbolske henvisninger" #: ../data/org.gnome.meld.gschema.xml.h:40 msgid "" -"If true, folder comparisons do not follow symbolic links when traversing the folder " -"tree." +"If true, folder comparisons do not follow symbolic links when traversing the " +"folder tree." msgstr "" -"Hvis sand vil mappesammenligninger ikke følge symbolske henvisninger, når mappetræet " -"gennemkrydses." +"Hvis sand vil mappesammenligninger ikke følge symbolske henvisninger, når " +"mappetræet gennemkrydses." #: ../data/org.gnome.meld.gschema.xml.h:41 msgid "Use shallow comparison" @@ -308,12 +322,12 @@ msgstr "Brug overfladisk sammenligningen" #: ../data/org.gnome.meld.gschema.xml.h:42 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." +"considering files to be identical if their size and mtime match, and " +"different otherwise." msgstr "" -"Hvis sand vil mappesammenligninger kun sammenligne filer baseret på størrelse og " -"mtime. Filer anses for at være identiske, hvis deres størrelse og mtime matcher og " -"ellers forskellige." +"Hvis sand vil mappesammenligninger kun sammenligne filer baseret på " +"størrelse og mtime. Filer anses for at være identiske, hvis deres størrelse " +"og mtime matcher og ellers forskellige." #: ../data/org.gnome.meld.gschema.xml.h:43 msgid "File timestamp resolution" @@ -321,25 +335,29 @@ msgstr "Filers tidsstempelopløsning" #: ../data/org.gnome.meld.gschema.xml.h:44 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." +"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 "" -"Når sammenligninger er baseret på mtime, er dette den mindste forskel i nanosekunder " -"mellem to filer, før de anses for at have forskellige mtimes. Dette er nyttigt, når " -"der sammenlignes filer på tværs af filsystemer med forskellig tidsstempelopløsning." +"Når sammenligninger er baseret på mtime, er dette den mindste forskel i " +"nanosekunder mellem to filer, før de anses for at have forskellige mtimes. " +"Dette er nyttigt, når der sammenlignes filer på tværs af filsystemer med " +"forskellig tidsstempelopløsning." -#: ../data/org.gnome.meld.gschema.xml.h:45 ../data/ui/preferences.ui.h:30 +#: ../data/org.gnome.meld.gschema.xml.h:45 ../data/ui/preferences.ui.h:22 msgid "Apply text filters during folder comparisons" msgstr "Anvend tekstfiltre under mappesammenligninger" #: ../data/org.gnome.meld.gschema.xml.h:46 msgid "" -"If true, folder comparisons that compare file contents also apply active text " -"filters and the blank line trimming option, and ignore newline differences." +"If true, folder comparisons that compare file contents also apply active " +"text filters and the blank line trimming option, and ignore newline " +"differences." msgstr "" -"Hvis sand vil mappesammenligninger, som sammenligner filindhold, også anvende aktive " -"tekstfiltre og beskære tomme linjer samt ignorere newline-forskelle." +"Hvis sand vil mappesammenligninger, som sammenligner filindhold, også " +"anvende aktive tekstfiltre og beskære tomme linjer samt ignorere newline-" +"forskelle." #: ../data/org.gnome.meld.gschema.xml.h:47 msgid "File status filters" @@ -348,7 +366,8 @@ msgstr "Filtre for filstatus" #: ../data/org.gnome.meld.gschema.xml.h:48 msgid "List of statuses used to filter visible files in folder comparison." msgstr "" -"Oversigt over statusser brugt til at filtrere synlige filer i mappesammenligninger." +"Oversigt over statusser brugt til at filtrere synlige filer i " +"mappesammenligninger." #: ../data/org.gnome.meld.gschema.xml.h:49 msgid "Show the version control console output" @@ -356,11 +375,12 @@ msgstr "Vis konsoloutputtet for versionsstyring" #: ../data/org.gnome.meld.gschema.xml.h:50 msgid "" -"If true, a console output section will be shown in version control views, showing " -"the commands run for version control operations." +"If true, a console output section will be shown in version control views, " +"showing the commands run for version control operations." msgstr "" -"Hvis sand vil et konsoloutputafsnit blive vist i visninger af versionsstyring, som " -"viser de kommandoer, der køres for versionsstyringshandlinger." +"Hvis sand vil et konsoloutputafsnit blive vist i visninger af " +"versionsstyring, som viser de kommandoer, der køres for " +"versionsstyringshandlinger." #: ../data/org.gnome.meld.gschema.xml.h:51 msgid "Version control pane position" @@ -368,7 +388,8 @@ msgstr "Rudeplacering af versionsstyring" #: ../data/org.gnome.meld.gschema.xml.h:52 msgid "" -"This is the height of the main version control tree when the console pane is shown." +"This is the height of the main version control tree when the console pane is " +"shown." msgstr "Dette er højden på versionsstyringens hovedtræ, når konsolruden vises." #: ../data/org.gnome.meld.gschema.xml.h:53 @@ -377,13 +398,13 @@ msgstr "Nuværende versionssammenligninger som venstre-lokal/højre-fjern" #: ../data/org.gnome.meld.gschema.xml.h:54 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." +"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 "" -"Hvis sand vil sammenligning af versionsstyringer bruge et venstre-er-lokal/højre-er-" -"fjern-skema til at bestemme, i hvilken rækkefølge filer vises i ruder. Ellers vil et " -"venstre-er-deres/højre-er-min-skema blive anvendt." +"Hvis sand vil sammenligning af versionsstyringer bruge et venstre-er-lokal/" +"højre-er-fjern-skema til at bestemme, i hvilken rækkefølge filer vises i " +"ruder. Ellers vil et venstre-er-deres/højre-er-min-skema blive anvendt." #: ../data/org.gnome.meld.gschema.xml.h:55 msgid "Order for files in three-way version control merge comparisons" @@ -392,13 +413,13 @@ msgstr "Filrækkefølge i fletssammenligninger i trevejsversionsstyring" #: ../data/org.gnome.meld.gschema.xml.h:56 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." +"preference only affects three-way comparisons launched from the version " +"control view, so is used solely for merges/conflict resolution within Meld." msgstr "" -"Muligheder for filrækkefølge er fjern/flettet/lokal og lokal/flettet/fjern. Denne " -"indstilling påvirker kun trevejssammenligninger, der startes fra " -"versionsstyringsvisningen, så den bruges kun til at løse sammenfletninger/konflikter " -"i Meld." +"Muligheder for filrækkefølge er fjern/flettet/lokal og lokal/flettet/fjern. " +"Denne indstilling påvirker kun trevejssammenligninger, der startes fra " +"versionsstyringsvisningen, så den bruges kun til at løse sammenfletninger/" +"konflikter i Meld." #: ../data/org.gnome.meld.gschema.xml.h:57 msgid "Show margin in commit message editor" @@ -406,11 +427,11 @@ msgstr "Vis margen i redigeringsprogram til commit-beskeder" #: ../data/org.gnome.meld.gschema.xml.h:58 msgid "" -"If true, a guide will be displayed to show what column the margin is at in the " -"version control commit message editor." +"If true, a guide will be displayed to show what column the margin is at in " +"the version control commit message editor." msgstr "" -"Hvis sand vil en hjælpelinje blive vist, som viser, hvilken kolonne margenen er ved " -"i redigeringsprogrammet til versionsstyringens commit-beskeder." +"Hvis sand vil en hjælpelinje blive vist, som viser, hvilken kolonne margenen " +"er ved i redigeringsprogrammet til versionsstyringens commit-beskeder." #: ../data/org.gnome.meld.gschema.xml.h:59 msgid "Margin column in commit message editor" @@ -418,10 +439,11 @@ msgstr "Margenkolonne i redigeringsprogram til commit-beskeder" #: ../data/org.gnome.meld.gschema.xml.h:60 msgid "" -"The column at which to show the margin in the version control commit message editor." +"The column at which to show the margin in the version control commit message " +"editor." msgstr "" -"Den kolonne hvor margenen skal vises i redigeringsprogrammet til versionsstyring af " -"commit-beskeder." +"Den kolonne hvor margenen skal vises i redigeringsprogrammet til " +"versionsstyring af commit-beskeder." #: ../data/org.gnome.meld.gschema.xml.h:61 msgid "Automatically hard-wrap commit messages" @@ -429,18 +451,19 @@ msgstr "Automatisk tvungen linjeskift i commit-beskeder" #: ../data/org.gnome.meld.gschema.xml.h:62 msgid "" -"If true, the version control commit message editor will hard-wrap (i.e., insert line " -"breaks) at the commit margin before commit." +"If true, the version control commit message editor will hard-wrap (i.e., " +"insert line breaks) at the commit margin before commit." msgstr "" -"Hvis sand vil redigeringsprogrammet til versionsstyring af commit-beskeder indføre " -"tvungen linjeskift ved commit-margen før commit." +"Hvis sand vil redigeringsprogrammet til versionsstyring af commit-beskeder " +"indføre tvungen linjeskift ved commit-margen før commit." #: ../data/org.gnome.meld.gschema.xml.h:63 msgid "Version control status filters" msgstr "Statusfiltre til versionsstyring" #: ../data/org.gnome.meld.gschema.xml.h:64 -msgid "List of statuses used to filter visible files in version control comparison." +msgid "" +"List of statuses used to filter visible files in version control comparison." msgstr "" "Oversigt over statusser anvendt til at filtrere synlige filer i " "versionsstyringssammenligninger." @@ -451,11 +474,11 @@ msgstr "Filnavne-baserede filtre" #: ../data/org.gnome.meld.gschema.xml.h:66 msgid "" -"List of predefined filename-based filters that, if active, will remove matching " -"files from a folder comparison." +"List of predefined filename-based filters that, if active, will remove " +"matching files from a folder comparison." msgstr "" -"Oversigt over foruddefinerede filnavne-baserede filtre, som, hvis aktive, vil fjerne " -"matchende filer i en mappesammenligning." +"Oversigt over foruddefinerede filnavne-baserede filtre, som, hvis aktive, " +"vil fjerne matchende filer i en mappesammenligning." #: ../data/org.gnome.meld.gschema.xml.h:67 msgid "Text-based filters" @@ -463,13 +486,13 @@ msgstr "Tekst-baserede filtre" #: ../data/org.gnome.meld.gschema.xml.h:68 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." +"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 "" -"Oversigt over foruddefinerede tekst-baserede regex-filtre, som, hvis aktive, vil " -"forhindre at tekst bruges i en filsammenligning. Teksten vil stadig blive vist, men " -"vil ikke bidrage til selve sammenligningen." +"Oversigt over foruddefinerede tekst-baserede regex-filtre, som, hvis aktive, " +"vil forhindre at tekst bruges i en filsammenligning. Teksten vil stadig " +"blive vist, men vil ikke bidrage til selve sammenligningen." #: ../data/styles/meld-base.xml.h:1 msgid "Meld base scheme" @@ -560,7 +583,7 @@ msgstr "Kopiér til højre" msgid "Delete selected" msgstr "Slet det valgte" -#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:858 ../meld/filediff.py:1382 +#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:858 ../meld/filediff.py:1336 msgid "Hide" msgstr "Skjul" @@ -574,10 +597,11 @@ msgstr "Ignorér store/små bogstaver i filnavne" #: ../data/ui/dirdiff.ui.h:11 msgid "" -"Consider differently-cased filenames that are otherwise-identical to be the same" +"Consider differently-cased filenames that are otherwise-identical to be the " +"same" msgstr "" -"Anse filnavne med forskelle i store/små bogstaver, men ellers er identiske, som " -"værende ens" +"Anse filnavne med forskelle i store/små bogstaver, men ellers er identiske, " +"som værende ens" #: ../data/ui/dirdiff.ui.h:12 msgid "Same" @@ -627,7 +651,8 @@ msgstr "Kolonnenavn" msgid "_Add" msgstr "_Tilføj" -#: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11 ../meld/vcview.py:644 +#: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11 +#: ../meld/vcview.py:644 msgid "_Remove" msgstr "_Fjern" @@ -648,7 +673,8 @@ msgid "Move _Down" msgstr "Flyt _ned" #. Create icon and filename CellRenderer -#: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35 ../meld/dirdiff.py:373 +#: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35 +#: ../meld/dirdiff.py:373 msgid "Name" msgstr "Navn" @@ -810,7 +836,8 @@ msgstr "Flet alle" #: ../data/ui/filediff.ui.h:37 msgid "Merge all non-conflicting changes from left and right panes" -msgstr "Flet alle ændringer, der ikke er i konflikt, fra venstre og højre ruder" +msgstr "" +"Flet alle ændringer, der ikke er i konflikt, fra venstre og højre ruder" #: ../data/ui/filediff.ui.h:38 msgid "Previous Pane" @@ -848,8 +875,8 @@ msgstr "Ændringerne vil gå tabt, hvis ikke du gemmer." msgid "Close _without Saving" msgstr "Luk _uden at gemme" -#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:940 ../meld/filediff.py:1448 -#: ../meld/filediff.py:1520 +#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:940 ../meld/filediff.py:1402 +#: ../meld/filediff.py:1474 msgid "_Cancel" msgstr "_Annullér" @@ -859,11 +886,11 @@ msgstr "_Gem" #: ../data/ui/filediff.ui.h:49 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." +"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 "" -"Der kan ikke skrives til denne fil. Du kan klikke her for at låse filen op og " -"alligevel foretage ændringer, men ændringerne skal gemmes til en ny fil." +"Der kan ikke skrives til denne fil. Du kan klikke her for at låse filen op " +"og alligevel foretage ændringer, men ændringerne skal gemmes til en ny fil." #: ../data/ui/filediff.ui.h:50 msgid "File 3" @@ -885,7 +912,7 @@ msgstr "Forkast ikke gemte ændringer i dokumentet?" msgid "Changes made to the following documents will be permanently lost:\n" msgstr "Ændringer foretaget i følgende dokumenter vil gå tabt for altid:\n" -#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:941 ../meld/filediff.py:1449 +#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:941 ../meld/filediff.py:1403 msgid "_Replace" msgstr "_Erstat" @@ -933,7 +960,7 @@ msgstr "Formatér som rettelse (patch)" msgid "Copy to Clipboard" msgstr "Kopiér til udklipsholderen" -#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:155 +#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:154 msgid "Save Patch" msgstr "Gem rettelse (patch)" @@ -954,210 +981,221 @@ msgid "_Reverse patch direction" msgstr "_Modsat rettelsesretning" #: ../data/ui/preferences.ui.h:1 -msgid "Left is remote, right is local" -msgstr "Venstre er fjern, højre er lokal" - -#: ../data/ui/preferences.ui.h:2 -msgid "Left is local, right is remote" -msgstr "Venstre er lokal, højre er fjern" - -#: ../data/ui/preferences.ui.h:3 -msgid "Remote, merge, local" -msgstr "Fjern, flet, lokal" - -#: ../data/ui/preferences.ui.h:4 -msgid "Local, merge, remote" -msgstr "Lokal, flet, fjern" - -#: ../data/ui/preferences.ui.h:5 -msgid "1ns (ext4)" -msgstr "1ns (ext4)" - -#: ../data/ui/preferences.ui.h:6 -msgid "100ns (NTFS)" -msgstr "100ns (NTFS)" - -#: ../data/ui/preferences.ui.h:7 -msgid "1s (ext2/ext3)" -msgstr "1s (ext2/ext3)" - -#: ../data/ui/preferences.ui.h:8 -msgid "2s (VFAT)" -msgstr "2s (VFAT)" - -#: ../data/ui/preferences.ui.h:9 msgid "Meld Preferences" msgstr "Indstillinger for Meld" -#: ../data/ui/preferences.ui.h:10 +#: ../data/ui/preferences.ui.h:2 msgid "Font" msgstr "Skrifttype" -#: ../data/ui/preferences.ui.h:11 +#: ../data/ui/preferences.ui.h:3 msgid "_Use the system fixed width font" msgstr "_Brug systemets standardskrifttype med fast bredde" # Det er ikke det eksterne redigeringsprogram, men internt i Meld. -#: ../data/ui/preferences.ui.h:12 +#: ../data/ui/preferences.ui.h:4 msgid "_Editor font:" msgstr "_Skrifttype for redigering:" -#: ../data/ui/preferences.ui.h:13 +#: ../data/ui/preferences.ui.h:5 msgid "Display" msgstr "Skærm" -#: ../data/ui/preferences.ui.h:14 +#: ../data/ui/preferences.ui.h:6 msgid "_Tab width:" msgstr "_Bredde på tabulator:" -#: ../data/ui/preferences.ui.h:15 +#: ../data/ui/preferences.ui.h:7 msgid "_Insert spaces instead of tabs" msgstr "_Indsæt mellemrum i stedet for tabulator" -#: ../data/ui/preferences.ui.h:16 +#: ../data/ui/preferences.ui.h:8 msgid "Enable text _wrapping" msgstr "Aktivér _tekstombrydning" -#: ../data/ui/preferences.ui.h:17 +#: ../data/ui/preferences.ui.h:9 msgid "Do not _split words over two lines" msgstr "_Opdel ikke ord over to linjer" -#: ../data/ui/preferences.ui.h:18 +#: ../data/ui/preferences.ui.h:10 msgid "Highlight _current line" msgstr "Fremhæv _aktuelle linje" -#: ../data/ui/preferences.ui.h:19 +#: ../data/ui/preferences.ui.h:11 msgid "Show _line numbers" msgstr "Vis _linjenumre" -#: ../data/ui/preferences.ui.h:20 +#: ../data/ui/preferences.ui.h:12 msgid "Show w_hitespace" msgstr "Vis _blanktegn" -#: ../data/ui/preferences.ui.h:21 +#: ../data/ui/preferences.ui.h:13 msgid "Use s_yntax highlighting" msgstr "Brug _syntaksfremhævning" -#: ../data/ui/preferences.ui.h:22 +#: ../data/ui/preferences.ui.h:14 msgid "Syntax highlighting color scheme:" msgstr "Farveskema for syntaksfremhævning:" -#: ../data/ui/preferences.ui.h:23 +#: ../data/ui/preferences.ui.h:15 msgid "External Editor" msgstr "Eksternt redigeringsprogram" # Brug det _normale systemredigeringsprogram # Brug systemets _standardredigeringsprogram -#: ../data/ui/preferences.ui.h:24 +#: ../data/ui/preferences.ui.h:16 msgid "Use _default system editor" msgstr "Brug det _normale systemredigeringsprogram" -#: ../data/ui/preferences.ui.h:25 +#: ../data/ui/preferences.ui.h:17 msgid "Edito_r command:" msgstr "_Kommando for redigeringsprogram:" -#: ../data/ui/preferences.ui.h:26 +#: ../data/ui/preferences.ui.h:18 msgid "Editor" msgstr "Redigeringsprogram" -#: ../data/ui/preferences.ui.h:27 +#: ../data/ui/preferences.ui.h:19 msgid "Shallow Comparison" msgstr "Overfladisk sammenligning" -#: ../data/ui/preferences.ui.h:28 +#: ../data/ui/preferences.ui.h:20 msgid "C_ompare files based only on size and timestamp" msgstr "_Sammenlign kun filer baseret på størrelse og tidsstempel" -#: ../data/ui/preferences.ui.h:29 +#: ../data/ui/preferences.ui.h:21 msgid "_Timestamp resolution:" msgstr "_Tidsstempelopløsning:" -#: ../data/ui/preferences.ui.h:31 +#: ../data/ui/preferences.ui.h:23 +msgid "Note: enabling text filters may make comparing large files much slower" +msgstr "" +"Bemærk: aktivering af tekstfiltre kan gøre sammenligning af store filer " +"meget langsommere" + +#: ../data/ui/preferences.ui.h:24 msgid "Symbolic Links" msgstr "Symbolske henvisninger" -#: ../data/ui/preferences.ui.h:33 +#: ../data/ui/preferences.ui.h:26 msgid "Visible Columns" msgstr "Synlige kolonner" -#: ../data/ui/preferences.ui.h:34 +#: ../data/ui/preferences.ui.h:27 msgid "Folder Comparisons" msgstr "Mappesammenligninger" -#: ../data/ui/preferences.ui.h:35 +#: ../data/ui/preferences.ui.h:28 msgid "Version Comparisons" msgstr "Versionssammenligninger" -#: ../data/ui/preferences.ui.h:36 +#: ../data/ui/preferences.ui.h:29 msgid "_Order when comparing file revisions:" msgstr "_Rækkefølge ved sammenligning af filrevisioner:" -#: ../data/ui/preferences.ui.h:37 +#: ../data/ui/preferences.ui.h:30 msgid "Order when _merging files:" msgstr "R_ækkefølge når filer flettes:" -#: ../data/ui/preferences.ui.h:38 +#: ../data/ui/preferences.ui.h:31 msgid "Commit Messages" msgstr "Commit-beskeder" -#: ../data/ui/preferences.ui.h:39 +#: ../data/ui/preferences.ui.h:32 msgid "Show _right margin at:" msgstr "Vis _højre margen ved:" -#: ../data/ui/preferences.ui.h:40 +#: ../data/ui/preferences.ui.h:33 msgid "Automatically _break lines at right margin on commit" msgstr "Bryd automatisk linjer ved højre margen ved commit" -#: ../data/ui/preferences.ui.h:41 +#: ../data/ui/preferences.ui.h:34 msgid "Version Control" msgstr "Versionsstyring" -#: ../data/ui/preferences.ui.h:42 +#: ../data/ui/preferences.ui.h:35 msgid "Filename filters" msgstr "Filnavnefiltre" -#: ../data/ui/preferences.ui.h:43 +#: ../data/ui/preferences.ui.h:36 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." +"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 "" -"Når der udføres mappesammenligninger, kan du filtrere filer og mapper fra efter " -"navn. Hvert mønster er en liste af skallignende jokertegn adskilt af mellemrum." +"Når der udføres mappesammenligninger, kan du filtrere filer og mapper fra " +"efter navn. Hvert mønster er en liste af skallignende jokertegn adskilt af " +"mellemrum." -#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:104 +#: ../data/ui/preferences.ui.h:37 ../meld/meldwindow.py:104 msgid "File Filters" msgstr "Filfiltre" -#: ../data/ui/preferences.ui.h:45 +#: ../data/ui/preferences.ui.h:38 msgid "Change trimming" msgstr "Ændr beskæring" -#: ../data/ui/preferences.ui.h:46 +#: ../data/ui/preferences.ui.h:39 msgid "Trim blank line differences from the start and end of changes" -msgstr "Beskær tomme linjer-forskelle fra begyndelsen og slutningen af ændringer" +msgstr "" +"Beskær tomme linjer-forskelle fra begyndelsen og slutningen af ændringer" -#: ../data/ui/preferences.ui.h:47 +#: ../data/ui/preferences.ui.h:40 msgid "Text filters" msgstr "Tekstfiltre" # vert mønster er et regulært udtryk i python, der erstatter # tilsvarende tekst med den tomme streng før sammenligningen udføres. -#: ../data/ui/preferences.ui.h:48 +#: ../data/ui/preferences.ui.h:41 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." +"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 "" -"Når der udføres filsammenligninger, kan du ignorere visse ændringer. Hvert mønster " -"her er et regulært udtryk i python, som erstatter tilsvarende tekst med den tomme " -"streng før sammenligning udføres. Hvis udtrykket indeholder grupper, bliver kun " -"grupperne erstattet. Se brugermanualen for yderligere detaljer." +"Når der udføres filsammenligninger, kan du ignorere visse ændringer. Hvert " +"mønster her er et regulært udtryk i python, som erstatter tilsvarende tekst " +"med den tomme streng før sammenligning udføres. Hvis udtrykket indeholder " +"grupper, bliver kun grupperne erstattet. Se brugermanualen for yderligere " +"detaljer." -#: ../data/ui/preferences.ui.h:49 +#: ../data/ui/preferences.ui.h:42 msgid "Text Filters" msgstr "Tekstfiltre" +#: ../data/ui/preferences.ui.h:43 +msgid "Left is remote, right is local" +msgstr "Venstre er fjern, højre er lokal" + +#: ../data/ui/preferences.ui.h:44 +msgid "Left is local, right is remote" +msgstr "Venstre er lokal, højre er fjern" + +#: ../data/ui/preferences.ui.h:45 +msgid "Remote, merge, local" +msgstr "Fjern, flet, lokal" + +#: ../data/ui/preferences.ui.h:46 +msgid "Local, merge, remote" +msgstr "Lokal, flet, fjern" + +#: ../data/ui/preferences.ui.h:47 +msgid "1ns (ext4)" +msgstr "1ns (ext4)" + +#: ../data/ui/preferences.ui.h:48 +msgid "100ns (NTFS)" +msgstr "100ns (NTFS)" + +#: ../data/ui/preferences.ui.h:49 +msgid "1s (ext2/ext3)" +msgstr "1s (ext2/ext3)" + +#: ../data/ui/preferences.ui.h:50 +msgid "2s (VFAT)" +msgstr "2s (VFAT)" + #: ../data/ui/shortcuts.ui.h:1 msgctxt "shortcut window" msgid "General" @@ -1403,7 +1441,8 @@ msgctxt "shortcut window" msgid "Show/hide console output" msgstr "Vis/skjul konsoloutput" -#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:559 ../meld/newdifftab.py:38 +#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:559 +#: ../meld/newdifftab.py:38 msgid "New comparison" msgstr "Ny sammenligning" @@ -1607,7 +1646,8 @@ msgstr "Skub lokale commit'er til fjern?" #: ../data/ui/vcview.ui.h:41 msgid "The commits to be pushed are determined by your version control system." -msgstr "Hvilke commit'er, der skubbes, bestemmes af dit versionsstyringssystem." +msgstr "" +"Hvilke commit'er, der skubbes, bestemmes af dit versionsstyringssystem." #: ../data/ui/vcview.ui.h:42 msgid "_Push commits" @@ -1664,10 +1704,12 @@ msgid "Contents of scanned files in folders are identical." msgstr "Indholdet af de skannede filer i mapperne er ens." #: ../meld/dirdiff.py:837 -msgid "Scanned files in folders appear identical, but contents have not been scanned." +msgid "" +"Scanned files in folders appear identical, but contents have not been " +"scanned." msgstr "" -"De skannede filer i mapperne ser ud til at være ens, men indholdet er ikke blevet " -"skannet." +"De skannede filer i mapperne ser ud til at være ens, men indholdet er ikke " +"blevet skannet." #: ../meld/dirdiff.py:840 msgid "File filters are in use, so not all files have been scanned." @@ -1677,8 +1719,8 @@ msgstr "Ikke alle filer er blevet skannet, da filfiltre er i brug." msgid "Text filters are in use and may be masking content differences." msgstr "Tekstfiltre er i brug og kan maskere forskelle i indhold." -#: ../meld/dirdiff.py:860 ../meld/filediff.py:1384 ../meld/filediff.py:1414 -#: ../meld/filediff.py:1416 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 +#: ../meld/dirdiff.py:860 ../meld/filediff.py:1338 ../meld/filediff.py:1368 +#: ../meld/filediff.py:1370 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 msgid "Hi_de" msgstr "_Skjul" @@ -1704,12 +1746,12 @@ msgstr "Filer skjult af søgning, som ikke tager højde for store/små bogstaver #. TRANSLATORS: This is followed by a list of files #: ../meld/dirdiff.py:877 msgid "" -"You are running a case insensitive comparison on a case sensitive filesystem. The " -"following files in this folder are hidden:" +"You are running a case insensitive comparison on a case sensitive " +"filesystem. The following files in this folder are hidden:" msgstr "" -"Du udfører en sammenligning, der ikke tager højde for store/små bogstaver, på et " -"filsystem, som tager højde for store/små bogstaver. Følgende filer i denne mappe er " -"skjulte:" +"Du udfører en sammenligning, der ikke tager højde for store/små bogstaver, " +"på et filsystem, som tager højde for store/små bogstaver. Følgende filer i " +"denne mappe er skjulte:" #: ../meld/dirdiff.py:888 #, python-format @@ -1752,30 +1794,30 @@ msgstr "" msgid "Error deleting %s" msgstr "Fejl ved sletning af %s" -#: ../meld/dirdiff.py:1488 +#: ../meld/dirdiff.py:1494 msgid "No folder" msgstr "Ingen mappe" #. Abbreviations for insert and overwrite that fit in the status bar -#: ../meld/filediff.py:355 +#: ../meld/filediff.py:311 msgid "INS" msgstr "INDS" -#: ../meld/filediff.py:355 +#: ../meld/filediff.py:311 msgid "OVR" msgstr "OVS." #. Abbreviation for line, column so that it will fit in the status bar -#: ../meld/filediff.py:357 +#: ../meld/filediff.py:313 #, python-format msgid "Ln %i, Col %i" msgstr "Lin. %i, kol. %i" -#: ../meld/filediff.py:782 +#: ../meld/filediff.py:738 msgid "Comparison results will be inaccurate" msgstr "Resultatet af sammenligningen vil være unøjagtigt" -#: ../meld/filediff.py:784 +#: ../meld/filediff.py:740 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1783,75 +1825,76 @@ msgstr "" "Et filter ændrede antallet af linjer i filen, hvilket ikke understøttes. " "Sammenligningen vil ikke være nøjagtig." -#: ../meld/filediff.py:840 +#: ../meld/filediff.py:796 msgid "Mark conflict as resolved?" msgstr "Markér konflikt som løst?" -#: ../meld/filediff.py:842 -msgid "If the conflict was resolved successfully, you may mark it as resolved now." +#: ../meld/filediff.py:798 +msgid "" +"If the conflict was resolved successfully, you may mark it as resolved now." msgstr "Hvis konflikten blev løst, kan du nu markere den som løst." -#: ../meld/filediff.py:844 +#: ../meld/filediff.py:800 msgid "Cancel" msgstr "Annullér" -#: ../meld/filediff.py:845 +#: ../meld/filediff.py:801 msgid "Mark _Resolved" msgstr "Markér som _løst" -#: ../meld/filediff.py:1093 +#: ../meld/filediff.py:1049 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Der var et problem med at åbne filen \"%s\"." -#: ../meld/filediff.py:1101 +#: ../meld/filediff.py:1057 #, python-format msgid "File %s appears to be a binary file." msgstr "Filen %s ser ud til at være en binær fil." -#: ../meld/filediff.py:1103 +#: ../meld/filediff.py:1059 msgid "Do you want to open the file using the default application?" msgstr "Vil du åbne filen med standardprogrammet?" -#: ../meld/filediff.py:1105 +#: ../meld/filediff.py:1061 msgid "Open" msgstr "Åbn" -#: ../meld/filediff.py:1121 +#: ../meld/filediff.py:1077 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Beregner forskelle" -#: ../meld/filediff.py:1186 +#: ../meld/filediff.py:1142 #, python-format msgid "File %s has changed on disk" msgstr "Filen %s er blevet ændret på disken" -#: ../meld/filediff.py:1187 +#: ../meld/filediff.py:1143 msgid "Do you want to reload the file?" msgstr "Vil du genindlæse filen?" -#: ../meld/filediff.py:1189 +#: ../meld/filediff.py:1145 msgid "_Reload" msgstr "_Genindlæs" -#: ../meld/filediff.py:1347 +#: ../meld/filediff.py:1301 msgid "Files are identical" msgstr "Filer er identiske" -#: ../meld/filediff.py:1360 +#: ../meld/filediff.py:1314 msgid "" -"Text filters are being used, and may be masking differences between files. Would you " -"like to compare the unfiltered files?" +"Text filters are being used, and may be masking differences between files. " +"Would you like to compare the unfiltered files?" msgstr "" -"Tekstfiltre er i brug og kan maskere forskelle mellem filer. Vil du sammenligne de " -"ikke-filtrerede filer?" +"Tekstfiltre er i brug og kan maskere forskelle mellem filer. Vil du " +"sammenligne de ikke-filtrerede filer?" -#: ../meld/filediff.py:1365 +#: ../meld/filediff.py:1319 msgid "Files differ in line endings only" msgstr "Filer er kun forskellige i slutningen af linjerne" -#: ../meld/filediff.py:1367 +#: ../meld/filediff.py:1321 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1860,36 +1903,37 @@ msgstr "" "Filerne er ens bortset fra forskelle i slutningen af linjerne:\n" "%s" -#: ../meld/filediff.py:1387 +#: ../meld/filediff.py:1341 msgid "Show without filters" msgstr "Vis uden filtre" -#: ../meld/filediff.py:1409 +#: ../meld/filediff.py:1363 msgid "Change highlighting incomplete" msgstr "Fremhævning af ændringer ufuldstændig" -#: ../meld/filediff.py:1410 +#: ../meld/filediff.py:1364 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." +"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 "" -"Nogle ændringer blev ikke fremhævet, fordi de var for store. Du kan tvinge Meld til " -"at bruge længere tid på at fremhæve større ændringer, selvom det kan være langsomt." +"Nogle ændringer blev ikke fremhævet, fordi de var for store. Du kan tvinge " +"Meld til at bruge længere tid på at fremhæve større ændringer, selvom det " +"kan være langsomt." -#: ../meld/filediff.py:1418 +#: ../meld/filediff.py:1372 msgid "Keep highlighting" msgstr "Bliv ved med at fremhæve" -#: ../meld/filediff.py:1420 +#: ../meld/filediff.py:1374 msgid "_Keep highlighting" msgstr "_Bliv ved med at fremhæve" -#: ../meld/filediff.py:1452 +#: ../meld/filediff.py:1406 #, python-format msgid "Replace file “%s”?" msgstr "Erstat filen \"%s\"?" -#: ../meld/filediff.py:1454 +#: ../meld/filediff.py:1408 #, python-format msgid "" "A file with this name already exists in “%s”.\n" @@ -1898,45 +1942,46 @@ msgstr "" "Der er allerede en fil med dette navn i \"%s\".\n" "Hvis du erstatter den eksisterende fil, vil dens indhold gå tabt." -#: ../meld/filediff.py:1471 +#: ../meld/filediff.py:1425 msgid "Save Left Pane As" msgstr "Gem venstre rude som" -#: ../meld/filediff.py:1473 +#: ../meld/filediff.py:1427 msgid "Save Middle Pane As" msgstr "Gem midterste rude som" -#: ../meld/filediff.py:1475 +#: ../meld/filediff.py:1429 msgid "Save Right Pane As" msgstr "Gem højre rude som" -#: ../meld/filediff.py:1489 +#: ../meld/filediff.py:1443 #, python-format msgid "File %s has changed on disk since it was opened" msgstr "Filen %s er blevet ændret på disken, siden den blev åbnet" -#: ../meld/filediff.py:1491 +#: ../meld/filediff.py:1445 msgid "If you save it, any external changes will be lost." -msgstr "Hvis du gemmer den, vil alle ændringer, som er foretaget eksternt, gå tabt." +msgstr "" +"Hvis du gemmer den, vil alle ændringer, som er foretaget eksternt, gå tabt." -#: ../meld/filediff.py:1494 +#: ../meld/filediff.py:1448 msgid "Save Anyway" msgstr "Gem alligevel" -#: ../meld/filediff.py:1495 +#: ../meld/filediff.py:1449 msgid "Don't Save" msgstr "Gem ikke" -#: ../meld/filediff.py:1521 +#: ../meld/filediff.py:1475 msgid "_Save as UTF-8" msgstr "_Gem som UTF-8" -#: ../meld/filediff.py:1524 +#: ../meld/filediff.py:1478 #, python-format msgid "Couldn't encode text as “%s”" msgstr "Kunne ikke kode teksten som \"%s\"" -#: ../meld/filediff.py:1526 +#: ../meld/filediff.py:1480 #, python-format msgid "" "File “%s” contains characters that can't be encoded using encoding “%s”.\n" @@ -1945,12 +1990,12 @@ msgstr "" "Filen \"%s\" indeholder tegn, som ikke kan kodes med kodningen \"%s\".\n" "Ønsker du at gemme som UTF-8?" -#: ../meld/filediff.py:1566 ../meld/patchdialog.py:131 +#: ../meld/filediff.py:1520 ../meld/patchdialog.py:130 #, python-format msgid "Could not save file %s." msgstr "Kunne ikke gemme filen %s." -#: ../meld/filediff.py:1567 ../meld/patchdialog.py:132 +#: ../meld/filediff.py:1521 ../meld/patchdialog.py:131 #, python-format msgid "" "Couldn't save file due to:\n" @@ -1959,30 +2004,30 @@ msgstr "" "Kunne ikke gemme filen pga.:\n" "%s" -#: ../meld/filediff.py:1913 +#: ../meld/filediff.py:1867 msgid "Live comparison updating disabled" msgstr "Liveopdatering af sammenligninger deaktiveret" -#: ../meld/filediff.py:1914 +#: ../meld/filediff.py:1868 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." +"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 "" -"Liveopdatering af sammenligninger er deaktiveret, når synkroniseringspunkter er " -"aktive. Du kan stadig opdatere sammenligningen manuelt, og liveopdatering vil " -"fortsætte, når synkroniseringspunkterne er blevet ryddet." +"Liveopdatering af sammenligninger er deaktiveret, når synkroniseringspunkter " +"er aktive. Du kan stadig opdatere sammenligningen manuelt, og liveopdatering " +"vil fortsætte, når synkroniseringspunkterne er blevet ryddet." #: ../meld/filemerge.py:37 #, python-format msgid "[%s] Merging files" msgstr "[%s] Fletter filer" -#: ../meld/gutterrendererchunk.py:159 +#: ../meld/gutterrendererchunk.py:210 msgid "Copy _up" msgstr "Kopiér _op" -#: ../meld/gutterrendererchunk.py:160 +#: ../meld/gutterrendererchunk.py:211 msgid "Copy _down" msgstr "Kopiér _ned" @@ -2286,10 +2331,12 @@ msgstr "Kan ikke sammenligne en blanding af filer og mapper" #: ../meld/misc.py:203 #, python-format msgid "Couldn't find colour scheme details for %s-%s; this is a bad install" -msgstr "Kunne ikke finde farveskemadetaljer for %s-%s; dette er en dårlig installation" +msgstr "" +"Kunne ikke finde farveskemadetaljer for %s-%s; dette er en dårlig " +"installation" #. no common path. empty names get changed to "[None]" -#: ../meld/misc.py:263 +#: ../meld/misc.py:265 msgid "[None]" msgstr "[Ingen]" @@ -2493,11 +2540,11 @@ msgstr "Fjern mappen og alle dens filer?" #: ../meld/vcview.py:640 msgid "" -"This will remove all selected files and folders, and all files within any selected " -"folders, from version control." +"This will remove all selected files and folders, and all files within any " +"selected folders, from version control." msgstr "" -"Dette vil fjerne alle valgte filer og mapper, samt alle filer i de valgte mapper, " -"fra versionsstyring." +"Dette vil fjerne alle valgte filer og mapper, samt alle filer i de valgte " +"mapper, fra versionsstyring." #: ../meld/vcview.py:665 #, python-format @@ -2564,7 +2611,8 @@ msgstr "Ryd" #~ msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)" #~ msgstr "" -#~ "Når der indlæses, så prøv disse codec i rækkefølge. (for eksempel utf8, iso8859)" +#~ "Når der indlæses, så prøv disse codec i rækkefølge. (for eksempel utf8, " +#~ "iso8859)" #~ msgid "Compare Options" #~ msgstr "Sammenlign indstillinger" @@ -2862,8 +2910,10 @@ msgstr "Ryd" #~ msgstr "Vis en filvælger, så en fil kan vælges" # "Uden_version" -> "Uversioneret" / "Versionsløs" -#~ msgid "Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:Missing" -#~ msgstr "Ignoreret:Versionsløs:::Fejl::Seneste:Ændret:Konflikt:Fjernet:Mangler" +#~ msgid "" +#~ "Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:Missing" +#~ msgstr "" +#~ "Ignoreret:Versionsløs:::Fejl::Seneste:Ændret:Konflikt:Fjernet:Mangler" # evt. "Mønstret var" #~ msgid "" From 353a0f90e1d4183aa16d1a1dacd9f361cf957995 Mon Sep 17 00:00:00 2001 From: Alan Mortensen Date: Sat, 11 Feb 2017 19:39:30 +0100 Subject: [PATCH 0127/1316] Updated Danish translation --- po/da.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/da.po b/po/da.po index 0df6424d..98dd6dd3 100644 --- a/po/da.po +++ b/po/da.po @@ -19,7 +19,7 @@ msgstr "" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=meld&keywords=I18N+L10N&component=general\n" "POT-Creation-Date: 2017-01-21 23:12+0000\n" -"PO-Revision-Date: 2017-02-11 15:59+0100\n" +"PO-Revision-Date: 2017-02-11 19:39+0100\n" "Last-Translator: Alan Mortensen \n" "Language-Team: Danish \n" "Language: da\n" @@ -1069,9 +1069,7 @@ msgstr "_Tidsstempelopløsning:" #: ../data/ui/preferences.ui.h:23 msgid "Note: enabling text filters may make comparing large files much slower" -msgstr "" -"Bemærk: aktivering af tekstfiltre kan gøre sammenligning af store filer " -"meget langsommere" +msgstr "Bemærk: Aktivering af tekstfiltre kan gøre sammenligning af store filer meget langsommere" #: ../data/ui/preferences.ui.h:24 msgid "Symbolic Links" From 9b7a80eec6a67f2257b21154f88a3399f98dd377 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sat, 11 Feb 2017 06:35:25 +1000 Subject: [PATCH 0128/1316] misc: Remove some dead code --- meld/misc.py | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/meld/misc.py b/meld/misc.py index 60ef8a21..ef329cb3 100644 --- a/meld/misc.py +++ b/meld/misc.py @@ -228,10 +228,6 @@ def get_common_theme(): return fill_colours, line_colours -def gdk_to_cairo_color(color): - return (color.red / 65535., color.green / 65535., color.blue / 65535.) - - def all_same(lst): """Return True if all elements of the list are equal""" return not lst or lst.count(lst[0]) == len(lst) @@ -386,12 +382,6 @@ def copytree(src, dst): raise -def shell_escape(glob_pat): - # TODO: handle all cases - assert not re.compile(r"[][*?]").findall(glob_pat) - return glob_pat.replace('{', '[{]').replace('}', '[}]') - - def shell_to_regex(pat): """Translate a shell PATTERN to a regular expression. From 83022aeb170aff16acf503bbcb1438581638a5b8 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 19 Feb 2017 09:04:22 +1000 Subject: [PATCH 0129/1316] filediff: Fix chunk deletion for CRLF endings (bgo#778856) The problem here was that we were always only going backwards by a single character for the last line in a file, even when file endings were CRLF. The line ending behaviour here is weird, because of how Gtk.TextBuffer handles the last line in a file, but it appears to be correct. Also added a test for this case. --- meld/filediff.py | 5 ++++ test/test_chunk_actions.py | 57 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 test/test_chunk_actions.py diff --git a/meld/filediff.py b/meld/filediff.py index ff0ab463..8b05609c 100644 --- a/meld/filediff.py +++ b/meld/filediff.py @@ -1816,7 +1816,12 @@ def delete_chunk(self, src, chunk): b0 = self.textbuffer[src] it = b0.get_iter_at_line_or_eof(chunk[1]) if chunk[2] >= b0.get_line_count(): + # If this is the end of the buffer, we need to remove the + # previous newline, because the current line has none. it.backward_char() + newline_type = b0.data.sourcefile.get_newline_type() + if newline_type == GtkSource.NewlineType.CR_LF: + it.backward_char() b0.delete(it, b0.get_iter_at_line_or_eof(chunk[2])) mark0 = b0.create_mark(None, it, True) mark1 = b0.create_mark(None, it, True) diff --git a/test/test_chunk_actions.py b/test/test_chunk_actions.py new file mode 100644 index 00000000..b2333033 --- /dev/null +++ b/test/test_chunk_actions.py @@ -0,0 +1,57 @@ + +from unittest import mock + +import pytest +from gi.repository import GtkSource + +import meld.meldbuffer +from meld.filediff import FileDiff +from meld.matchers.myers import DiffChunk + + +@pytest.mark.parametrize("text, newline, expected_text", [ + # For the following tests, newlines and text match + # Basic CRLF tests + ("ree\r\neee", GtkSource.NewlineType.CR_LF, 'ree'), + ("ree\r\neee\r\n", GtkSource.NewlineType.CR_LF, 'ree\r\neee'), + # Basic CR tests + ("ree\neee", GtkSource.NewlineType.CR, 'ree'), + ("ree\neee\n", GtkSource.NewlineType.CR, 'ree\neee'), + # Basic LF tests + ("ree\reee", GtkSource.NewlineType.LF, 'ree'), + ("ree\reee\r", GtkSource.NewlineType.LF, 'ree\reee'), + + # This case is intentionally incorrect; the newline information is + # wrong for the text, and the result is also incorrect. + ("ree\r\neee", GtkSource.NewlineType.CR, 'ree\r'), +]) +def test_delete_last_line_crlf(text, newline, expected_text): + filediff = mock.Mock(FileDiff) + + with mock.patch.multiple( + 'meld.meldbuffer', + bind_settings=mock.DEFAULT, meldsettings=mock.DEFAULT): + with mock.patch('meld.meldbuffer.MeldBuffer.set_style_scheme'): + meldbuffer = meld.meldbuffer.MeldBuffer() + meldbuffer.set_text(text) + + def make_last_line_chunk(buf): + end = buf.get_line_count() + last = end - 1 + return DiffChunk('delete', last, end, last, end) + + start, end = meldbuffer.get_bounds() + buf_text = meldbuffer.get_text(start, end, False) + print(repr(buf_text)) + + with mock.patch.object( + meldbuffer.data.sourcefile, + 'get_newline_type', return_value=newline): + filediff.textbuffer = [meldbuffer] + filediff.textview = [mock.Mock()] + FileDiff.delete_chunk(filediff, 0, make_last_line_chunk(meldbuffer)) + + start, end = meldbuffer.get_bounds() + buf_text = meldbuffer.get_text(start, end, False) + print(repr(buf_text)) + assert buf_text == expected_text From 00bfc6d4fa852d57d5bcf7d000c3284800a16236 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 19 Feb 2017 09:09:07 +1000 Subject: [PATCH 0130/1316] Update test imports for Python 3 --- test/test_filediff.py | 4 ++-- test/test_gutterrendererchunk.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/test/test_filediff.py b/test/test_filediff.py index b998ff3b..b0e5501e 100644 --- a/test/test_filediff.py +++ b/test/test_filediff.py @@ -1,7 +1,7 @@ -import pytest +from unittest import mock -import mock +import pytest from gi.repository import Gtk from meld.filediff import FileDiff diff --git a/test/test_gutterrendererchunk.py b/test/test_gutterrendererchunk.py index e101ee46..d0c05054 100644 --- a/test/test_gutterrendererchunk.py +++ b/test/test_gutterrendererchunk.py @@ -1,5 +1,6 @@ -import mock +from unittest import mock + import pytest import meld.gutterrendererchunk From 18b6e4bda5578e711d33efa7fed7583dc956c9aa Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Mon, 20 Feb 2017 06:14:43 +1000 Subject: [PATCH 0131/1316] filediff: Use cursor position for EOF chunk deletion (bgo#778856 take 2) A problem with the previous approach, demonstrated by the test cases added, is that GtkTextView inexplicably doesn't bother to add newlines that match the existing ones while editing a file. The new approach is to avoid doing this calculation manually ourselves, and instead rely on cursor position manipulation, since that will/should always result in us ending up on the last non-linebreak character of the previous line. --- meld/filediff.py | 5 +---- test/test_chunk_actions.py | 10 +++++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/meld/filediff.py b/meld/filediff.py index 8b05609c..81a96ce6 100644 --- a/meld/filediff.py +++ b/meld/filediff.py @@ -1818,10 +1818,7 @@ def delete_chunk(self, src, chunk): if chunk[2] >= b0.get_line_count(): # If this is the end of the buffer, we need to remove the # previous newline, because the current line has none. - it.backward_char() - newline_type = b0.data.sourcefile.get_newline_type() - if newline_type == GtkSource.NewlineType.CR_LF: - it.backward_char() + it.backward_cursor_position() b0.delete(it, b0.get_iter_at_line_or_eof(chunk[2])) mark0 = b0.create_mark(None, it, True) mark1 = b0.create_mark(None, it, True) diff --git a/test/test_chunk_actions.py b/test/test_chunk_actions.py index b2333033..b2c2c108 100644 --- a/test/test_chunk_actions.py +++ b/test/test_chunk_actions.py @@ -21,9 +21,13 @@ ("ree\reee", GtkSource.NewlineType.LF, 'ree'), ("ree\reee\r", GtkSource.NewlineType.LF, 'ree\reee'), - # This case is intentionally incorrect; the newline information is - # wrong for the text, and the result is also incorrect. - ("ree\r\neee", GtkSource.NewlineType.CR, 'ree\r'), + # Mismatched newline and text + ("ree\r\neee", GtkSource.NewlineType.CR, 'ree'), + + # Mismatched newline types within text + ("ree\r\neee\n", GtkSource.NewlineType.CR_LF, 'ree\r\neee'), + ("ree\r\neee\nqqq", GtkSource.NewlineType.CR_LF, 'ree\r\neee'), + ("ree\r\neee\nqqq\r\n", GtkSource.NewlineType.CR_LF, 'ree\r\neee\nqqq'), ]) def test_delete_last_line_crlf(text, newline, expected_text): filediff = mock.Mock(FileDiff) From 66da7361092fa47b808f9d42e30fb22630553dc1 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Fri, 24 Feb 2017 06:44:23 +1000 Subject: [PATCH 0132/1316] bin/meld: Redirect glib's new structured logging (bgo#779008) We already tried to redirect logging, but in 2.50 glib added support for structured logging that inexplicably bypassed all of the API that was already being used by applications to do logging redirection. --- bin/meld | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/bin/meld b/bin/meld index 21c47d46..92e04c37 100755 --- a/bin/meld +++ b/bin/meld @@ -273,6 +273,9 @@ def setup_logging(): def setup_glib_logging(): from gi.repository import GLib levels = { + GLib.LogLevelFlags.LEVEL_DEBUG: logging.DEBUG, + GLib.LogLevelFlags.LEVEL_INFO: logging.INFO, + GLib.LogLevelFlags.LEVEL_MESSAGE: logging.INFO, GLib.LogLevelFlags.LEVEL_WARNING: logging.WARNING, GLib.LogLevelFlags.LEVEL_ERROR: logging.ERROR, GLib.LogLevelFlags.LEVEL_CRITICAL: logging.CRITICAL, @@ -286,8 +289,10 @@ def setup_glib_logging(): log_domain = "Gtk" log = logging.getLogger(log_domain) + # This logging handler is for "old" glib logging using a simple + # syslog-style API. def log_adapter(domain, level, message, user_data): - log.log(levels[level], message) + log.log(levels.get(level, logging.WARNING), message) try: GLib.log_set_handler(log_domain, level_flag, log_adapter, None) @@ -295,6 +300,21 @@ def setup_glib_logging(): # Only present in glib 2.46+ pass + # This logging handler is for new glib logging using a structured + # API. Unfortunately, it was added in such a way that the old + # redirection API became a no-op, so we need to hack both of these + # handlers to get it to work. + def structured_log_adapter(level, fields, field_count, user_data): + message = GLib.log_writer_format_fields(level, fields, True) + log.log(levels.get(level, logging.WARNING), message) + return GLib.LogWriterOutput.HANDLED + + try: + GLib.log_set_writer_func(structured_log_adapter, None) + except AttributeError: + # Only present in glib 2.50+ + pass + def environment_hacks(): # We manage cwd ourselves for git operations, and GIT_DIR in particular From 269fb5eba811f36ac0d44e4fce6866cbfb96851d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B8=D1=80=D0=BE=D1=81=D0=BB=D0=B0=D0=B2=20=D0=9D?= =?UTF-8?q?=D0=B8=D0=BA=D0=BE=D0=BB=D0=B8=D1=9B?= Date: Sun, 26 Feb 2017 09:27:30 +0100 Subject: [PATCH 0133/1316] Updated Serbian translation --- po/sr.po | 548 +++++++++++++++++++++++++------------------------ po/sr@latin.po | 548 +++++++++++++++++++++++++------------------------ 2 files changed, 566 insertions(+), 530 deletions(-) diff --git a/po/sr.po b/po/sr.po index f4acd2c1..85fb572a 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,18 +1,18 @@ # Serbian translation of meld -# Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2016. +# Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2017. # This file is distributed under the same license as the meld package. # Translators: # Данило Шеган -# Мирослав Николић , 2011—2016. +# Мирослав Николић , 2011—2017. msgid "" msgstr "" "Project-Id-Version: meld\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=meld&ke" "ywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-08-20 21:39+0000\n" -"PO-Revision-Date: 2016-08-21 14:01+0200\n" +"POT-Creation-Date: 2017-01-21 23:12+0000\n" +"PO-Revision-Date: 2017-02-25 20:12+0200\n" "Last-Translator: Мирослав Николић \n" -"Language-Team: Serbian \n" +"Language-Team: Serbian <(nothing)>\n" "Language: sr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,16 +21,16 @@ msgstr "" "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Project-Style: gnome\n" -#: ../bin/meld:142 +#: ../bin/meld:179 msgid "Cannot import: " msgstr "Не могу да увезем: " -#: ../bin/meld:145 +#: ../bin/meld:182 #, c-format msgid "Meld requires %s or higher." msgstr "Мелд захтева %s или новији." -#: ../bin/meld:194 +#: ../bin/meld:227 #, c-format msgid "" "Couldn't load Meld-specific CSS (%s)\n" @@ -91,34 +91,46 @@ msgid "Meld comparison description" msgstr "Опис Мелдовог поређења" #: ../data/org.gnome.meld.gschema.xml.h:1 -msgid "Default window size" -msgstr "Основна величина прозора" +#| msgid "Default window size" +msgid "Default window width" +msgstr "Основна ширина прозора" #: ../data/org.gnome.meld.gschema.xml.h:2 -msgid "Default window state" -msgstr "Основно стање прозора" +#| msgid "Default window size" +msgid "Default window height" +msgstr "Основна висина прозора" #: ../data/org.gnome.meld.gschema.xml.h:3 +#| msgid "Default window state" +msgid "Default window maximised state" +msgstr "Основно стање увеличаног прозора" + +#: ../data/org.gnome.meld.gschema.xml.h:4 +#| msgid "Default window state" +msgid "Default window fullscreen state" +msgstr "Основно стање прозора преко целог екрана" + +#: ../data/org.gnome.meld.gschema.xml.h:5 msgid "Show toolbar" msgstr "Приказује траку алата" -#: ../data/org.gnome.meld.gschema.xml.h:4 +#: ../data/org.gnome.meld.gschema.xml.h:6 msgid "If true, the window toolbar is visible." msgstr "Ако је изабрано, трака алата је видљива." -#: ../data/org.gnome.meld.gschema.xml.h:5 +#: ../data/org.gnome.meld.gschema.xml.h:7 msgid "Show statusbar" msgstr "Приказује траку стања" -#: ../data/org.gnome.meld.gschema.xml.h:6 +#: ../data/org.gnome.meld.gschema.xml.h:8 msgid "If true, the window statusbar is visible." msgstr "Ако је изабрано, трака стања је видљива." -#: ../data/org.gnome.meld.gschema.xml.h:7 +#: ../data/org.gnome.meld.gschema.xml.h:9 msgid "Additional automatically detected text encodings" msgstr "Додатно самостално откривање кодних распореда" -#: ../data/org.gnome.meld.gschema.xml.h:8 +#: ../data/org.gnome.meld.gschema.xml.h:10 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 " @@ -131,37 +143,37 @@ msgstr "" "коришћени; остала кодирања могу такође бити испробана, у зависности од " "корисниковог језика." -#: ../data/org.gnome.meld.gschema.xml.h:9 +#: ../data/org.gnome.meld.gschema.xml.h:11 msgid "Width of an indentation step" msgstr "Ширина корака увлачења" -#: ../data/org.gnome.meld.gschema.xml.h:10 +#: ../data/org.gnome.meld.gschema.xml.h:12 msgid "The number of spaces to use for a single indent step" msgstr "Број размака за један корак увлачења" -#: ../data/org.gnome.meld.gschema.xml.h:11 +#: ../data/org.gnome.meld.gschema.xml.h:13 msgid "Whether to indent using spaces or tabs" msgstr "Да ли да увлачи користећи размаке или табулаторе" -#: ../data/org.gnome.meld.gschema.xml.h:12 +#: ../data/org.gnome.meld.gschema.xml.h:14 msgid "If true, any new indentation will use spaces instead of tabs." msgstr "" "Ако је изабрано, свако ново увлачење ће користити размаке уместо табулатора." -#: ../data/org.gnome.meld.gschema.xml.h:13 +#: ../data/org.gnome.meld.gschema.xml.h:15 msgid "Show line numbers" msgstr "Приказује бројеве редова" -#: ../data/org.gnome.meld.gschema.xml.h:14 +#: ../data/org.gnome.meld.gschema.xml.h:16 msgid "If true, line numbers will be shown in the gutter of file comparisons." msgstr "" "Ако је изабрано, бројеви редова ће бити приказани у жлебу поређења датотека." -#: ../data/org.gnome.meld.gschema.xml.h:15 +#: ../data/org.gnome.meld.gschema.xml.h:17 msgid "Highlight syntax" msgstr "Истиче појаву" -#: ../data/org.gnome.meld.gschema.xml.h:16 +#: ../data/org.gnome.meld.gschema.xml.h:18 msgid "" "Whether to highlight syntax in comparisons. Because of Meld's own color " "highlighting, this is off by default." @@ -169,19 +181,19 @@ msgstr "" "Да ли да истиче појаву у поређењу. Због самог Мелдовог истицања бојом, ово " "је унапред искључено." -#: ../data/org.gnome.meld.gschema.xml.h:17 +#: ../data/org.gnome.meld.gschema.xml.h:19 msgid "Color scheme to use for syntax highlighting" msgstr "Шема боје за истицање синтаксе" -#: ../data/org.gnome.meld.gschema.xml.h:18 +#: ../data/org.gnome.meld.gschema.xml.h:20 msgid "Used by GtkSourceView to determine colors for syntax highlighting" msgstr "Користи је преглед Гтк извора да одреди боје за истицање синтаксе" -#: ../data/org.gnome.meld.gschema.xml.h:19 +#: ../data/org.gnome.meld.gschema.xml.h:21 msgid "Displayed whitespace" msgstr "Приказане празнине" -#: ../data/org.gnome.meld.gschema.xml.h:20 +#: ../data/org.gnome.meld.gschema.xml.h:22 msgid "" "Selector for individual whitespace character types to be shown. Possible " "values are 'space', 'tab', 'newline' and 'nbsp'." @@ -190,11 +202,11 @@ msgstr "" "вредности су: „space“ (размак), „tab“ (табулатор), „newline“ (нови ред) и " "„nbsp“ (нбсп)." -#: ../data/org.gnome.meld.gschema.xml.h:21 +#: ../data/org.gnome.meld.gschema.xml.h:23 msgid "Wrap mode" msgstr "Режим преламања" -#: ../data/org.gnome.meld.gschema.xml.h:22 +#: ../data/org.gnome.meld.gschema.xml.h:24 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 " @@ -204,11 +216,11 @@ msgstr "" "подешавањем, без преламања — „none“, на било ком знаку — „char“, или само на " "крају речи — „word“." -#: ../data/org.gnome.meld.gschema.xml.h:23 +#: ../data/org.gnome.meld.gschema.xml.h:25 msgid "Highlight current line" msgstr "Истиче текући ред" -#: ../data/org.gnome.meld.gschema.xml.h:24 +#: ../data/org.gnome.meld.gschema.xml.h:26 msgid "" "If true, the line containing the cursor will be highlighted in file " "comparisons." @@ -216,22 +228,22 @@ msgstr "" "Ако је изабрано, ред који садржи курзор ће бити истакнут при поређењу " "датотека." -#: ../data/org.gnome.meld.gschema.xml.h:25 +#: ../data/org.gnome.meld.gschema.xml.h:27 msgid "Use the system default monospace font" msgstr "Користи системски словни лик сталне ширине" -#: ../data/org.gnome.meld.gschema.xml.h:26 +#: ../data/org.gnome.meld.gschema.xml.h:28 msgid "" "If false, custom-font will be used instead of the system monospace font." msgstr "" "Ако није изабрано, произвољни словни лик ће бити коришћен уместо системског " "словног лика сталне ширине." -#: ../data/org.gnome.meld.gschema.xml.h:27 +#: ../data/org.gnome.meld.gschema.xml.h:29 msgid "Custom font" msgstr "Произвољни словни лик" -#: ../data/org.gnome.meld.gschema.xml.h:28 +#: ../data/org.gnome.meld.gschema.xml.h:30 msgid "" "The custom font to use, stored as a string and parsed as a Pango font " "description." @@ -239,22 +251,22 @@ msgstr "" "Произвољни словни лик за коришћење, смештен као ниска и обрађен као опис " "Панго словног лика." -#: ../data/org.gnome.meld.gschema.xml.h:29 +#: ../data/org.gnome.meld.gschema.xml.h:31 msgid "Ignore blank lines when comparing files" msgstr "Занемарује празне редове при поређењу датотека" -#: ../data/org.gnome.meld.gschema.xml.h:30 +#: ../data/org.gnome.meld.gschema.xml.h:32 msgid "" "If true, blank lines will be trimmed when highlighting changes between files." msgstr "" "Ако је изабрано, празни редови ће бити скраћени када се истицање промени " "међу датотекама." -#: ../data/org.gnome.meld.gschema.xml.h:31 +#: ../data/org.gnome.meld.gschema.xml.h:33 msgid "Use the system default editor" msgstr "Користи основни уређивач система" -#: ../data/org.gnome.meld.gschema.xml.h:32 +#: ../data/org.gnome.meld.gschema.xml.h:34 msgid "" "If false, custom-editor-command will be used instead of the system editor " "when opening files externally." @@ -262,11 +274,11 @@ msgstr "" "Ако није изабрано, произвољни уређивач наредбе ће бити коришћен уместо " "системског уређивача приликом отварања датотека споља." -#: ../data/org.gnome.meld.gschema.xml.h:33 +#: ../data/org.gnome.meld.gschema.xml.h:35 msgid "The custom editor launch command" msgstr "Наредба покретања произвољног уређивача" -#: ../data/org.gnome.meld.gschema.xml.h:34 +#: ../data/org.gnome.meld.gschema.xml.h:36 msgid "" "The command used to launch a custom editor. Some limited templating is " "supported here; at the moment '{file}' and '{line}' are recognised tokens." @@ -274,21 +286,21 @@ msgstr "" "Наредба за покретање произвољног уређивача. Овде је подржано неко ограничено " "шаблонирање; за сада „{file}“ и „{line}“ су препознате опције." -#: ../data/org.gnome.meld.gschema.xml.h:35 +#: ../data/org.gnome.meld.gschema.xml.h:37 msgid "Columns to display" msgstr "Ступци за приказивање" -#: ../data/org.gnome.meld.gschema.xml.h:36 +#: ../data/org.gnome.meld.gschema.xml.h:38 msgid "" "List of column names in folder comparison and whether they should be " "displayed." msgstr "Списак назива стубаца при поређењу фасцикли и да ли ће бити приказани." -#: ../data/org.gnome.meld.gschema.xml.h:37 ../data/ui/preferences.ui.h:32 +#: ../data/org.gnome.meld.gschema.xml.h:39 ../data/ui/preferences.ui.h:25 msgid "Ignore symbolic links" msgstr "Занемари симболичке везе" -#: ../data/org.gnome.meld.gschema.xml.h:38 +#: ../data/org.gnome.meld.gschema.xml.h:40 msgid "" "If true, folder comparisons do not follow symbolic links when traversing the " "folder tree." @@ -296,11 +308,11 @@ msgstr "" "Ако је изабрано, поређења фасцикли не прате симболичке везе приликом " "проласка кроз стабло фасцикле." -#: ../data/org.gnome.meld.gschema.xml.h:39 +#: ../data/org.gnome.meld.gschema.xml.h:41 msgid "Use shallow comparison" msgstr "Користи површно поређење" -#: ../data/org.gnome.meld.gschema.xml.h:40 +#: ../data/org.gnome.meld.gschema.xml.h:42 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 +322,11 @@ msgstr "" "м_времена, сматрајући да су датотеке истоветне ако се њихове величине и " "м_време поклапају, а различите у супротном." -#: ../data/org.gnome.meld.gschema.xml.h:41 +#: ../data/org.gnome.meld.gschema.xml.h:43 msgid "File timestamp resolution" msgstr "Резолуција временске ознаке датотеке" -#: ../data/org.gnome.meld.gschema.xml.h:42 +#: ../data/org.gnome.meld.gschema.xml.h:44 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,11 +338,11 @@ msgstr "" "м_времена. Ово је корисно приликом поређења датотека између система датотека " "са различитом резолцијом временске ознаке." -#: ../data/org.gnome.meld.gschema.xml.h:43 ../data/ui/preferences.ui.h:30 +#: ../data/org.gnome.meld.gschema.xml.h:45 ../data/ui/preferences.ui.h:22 msgid "Apply text filters during folder comparisons" msgstr "Примени издвајаче текста за време поређење фасцикли" -#: ../data/org.gnome.meld.gschema.xml.h:44 +#: ../data/org.gnome.meld.gschema.xml.h:46 msgid "" "If true, folder comparisons that compare file contents also apply active " "text filters and the blank line trimming option, and ignore newline " @@ -340,20 +352,20 @@ msgstr "" "примењују радне издвајаче текста и опције скраћивања празног реда, и " "занемарују разлике нових редова." -#: ../data/org.gnome.meld.gschema.xml.h:45 +#: ../data/org.gnome.meld.gschema.xml.h:47 msgid "File status filters" msgstr "Пропусници стања датотека" -#: ../data/org.gnome.meld.gschema.xml.h:46 +#: ../data/org.gnome.meld.gschema.xml.h:48 msgid "List of statuses used to filter visible files in folder comparison." msgstr "" "Списак стања коришћених за издвајање видљивих датотека при поређењу фасцикли." -#: ../data/org.gnome.meld.gschema.xml.h:47 +#: ../data/org.gnome.meld.gschema.xml.h:49 msgid "Show the version control console output" msgstr "Приказује излаз конзоле управљања издањем" -#: ../data/org.gnome.meld.gschema.xml.h:48 +#: ../data/org.gnome.meld.gschema.xml.h:50 msgid "" "If true, a console output section will be shown in version control views, " "showing the commands run for version control operations." @@ -361,11 +373,11 @@ msgstr "" "Ако је изабрано, одељак излаза конзоле ће бити приказан у прегледима " "управљања издањем, приказујући покренуте наредбе за радње управљања издањем." -#: ../data/org.gnome.meld.gschema.xml.h:49 +#: ../data/org.gnome.meld.gschema.xml.h:51 msgid "Version control pane position" msgstr "Положај површи управљања издањима" -#: ../data/org.gnome.meld.gschema.xml.h:50 +#: ../data/org.gnome.meld.gschema.xml.h:52 msgid "" "This is the height of the main version control tree when the console pane is " "shown." @@ -373,11 +385,11 @@ msgstr "" "Ово је висина главног стабла управљања издањем када је приказана површ " "конзоле." -#: ../data/org.gnome.meld.gschema.xml.h:51 +#: ../data/org.gnome.meld.gschema.xml.h:53 msgid "Present version comparisons as left-local/right-remote" msgstr "Представља поређења издања као месно-лево/удаљено-десно" -#: ../data/org.gnome.meld.gschema.xml.h:52 +#: ../data/org.gnome.meld.gschema.xml.h:54 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, " @@ -387,12 +399,12 @@ msgstr "" "месно, десно-је-удаљено“ да одреде којим редом ће представити датотеке у " "окнима. У супротном, користи се шема „лево-је-њихово, десно-је-моје“." -#: ../data/org.gnome.meld.gschema.xml.h:53 +#: ../data/org.gnome.meld.gschema.xml.h:55 msgid "Order for files in three-way version control merge comparisons" msgstr "" "Редослед датотека за поређење стапања управљања издањем за три елемента" -#: ../data/org.gnome.meld.gschema.xml.h:54 +#: ../data/org.gnome.meld.gschema.xml.h:56 msgid "" "Choices for file order are remote/merged/local and local/merged/remote. This " "preference only affects three-way comparisons launched from the version " @@ -403,11 +415,11 @@ msgstr "" "прегледа управљања издањем, стога се користи једино за решавање спајања/" "сукоба у Мелду." -#: ../data/org.gnome.meld.gschema.xml.h:55 +#: ../data/org.gnome.meld.gschema.xml.h:57 msgid "Show margin in commit message editor" msgstr "Приказује ивицу у уређивачу поруке предаје" -#: ../data/org.gnome.meld.gschema.xml.h:56 +#: ../data/org.gnome.meld.gschema.xml.h:58 msgid "" "If true, a guide will be displayed to show what column the margin is at in " "the version control commit message editor." @@ -415,22 +427,22 @@ msgstr "" "Ако је изабрано, биће приказана вођица да покаже од ког ступца се ивица " "налази у уређивачу поруке предаје управљања издањем." -#: ../data/org.gnome.meld.gschema.xml.h:57 +#: ../data/org.gnome.meld.gschema.xml.h:59 msgid "Margin column in commit message editor" msgstr "Стубац ивице у уређивачу поруке предаје" -#: ../data/org.gnome.meld.gschema.xml.h:58 +#: ../data/org.gnome.meld.gschema.xml.h:60 msgid "" "The column at which to show the margin in the version control commit message " "editor." msgstr "" "Стубац на коме приказати ивицу у уређивачу поруке предаје управљања издањем." -#: ../data/org.gnome.meld.gschema.xml.h:59 +#: ../data/org.gnome.meld.gschema.xml.h:61 msgid "Automatically hard-wrap commit messages" msgstr "Самостално силно-прелама поруке предаје" -#: ../data/org.gnome.meld.gschema.xml.h:60 +#: ../data/org.gnome.meld.gschema.xml.h:62 msgid "" "If true, the version control commit message editor will hard-wrap (i.e., " "insert line breaks) at the commit margin before commit." @@ -438,22 +450,22 @@ msgstr "" "Ако је изабрано, уређивач поруке предаје управљања издањем ће силно-" "преломити (тј. уметнути преломе редова) на ивици предаје пре предаје." -#: ../data/org.gnome.meld.gschema.xml.h:61 +#: ../data/org.gnome.meld.gschema.xml.h:63 msgid "Version control status filters" msgstr "Пропусници стања управљања издањем" -#: ../data/org.gnome.meld.gschema.xml.h:62 +#: ../data/org.gnome.meld.gschema.xml.h:64 msgid "" "List of statuses used to filter visible files in version control comparison." msgstr "" "Списак стања коришћених за издвајање видљивих датотека при поређењу " "управљања издањем." -#: ../data/org.gnome.meld.gschema.xml.h:63 +#: ../data/org.gnome.meld.gschema.xml.h:65 msgid "Filename-based filters" msgstr "Пропусници засновани на називу датотеке" -#: ../data/org.gnome.meld.gschema.xml.h:64 +#: ../data/org.gnome.meld.gschema.xml.h:66 msgid "" "List of predefined filename-based filters that, if active, will remove " "matching files from a folder comparison." @@ -461,11 +473,11 @@ msgstr "" "Списак унапред одређених филтера заснованих на називу датотеке који ће, ако " "је радно, уклонити поклопљене датотеке из поређења фасцикли." -#: ../data/org.gnome.meld.gschema.xml.h:65 +#: ../data/org.gnome.meld.gschema.xml.h:67 msgid "Text-based filters" msgstr "Пропусници засновани на тексту" -#: ../data/org.gnome.meld.gschema.xml.h:66 +#: ../data/org.gnome.meld.gschema.xml.h:68 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, " @@ -525,7 +537,7 @@ msgstr "По_моћ" #: ../data/ui/application.ui.h:8 msgid "Keyboard Shortcuts" -msgstr "Пречице _тастатуре" +msgstr "Пречице тастатуре" #: ../data/ui/application.ui.h:9 msgid "_About" @@ -563,7 +575,7 @@ msgstr "Умножите десно" msgid "Delete selected" msgstr "Обриши изабрано" -#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:859 ../meld/filediff.py:1384 +#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:858 ../meld/filediff.py:1336 msgid "Hide" msgstr "Сакриј" @@ -854,8 +866,8 @@ msgstr "Ако не сачувате, измене ће бити трајно и msgid "Close _without Saving" msgstr "Затвори _без чувања" -#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:941 ../meld/filediff.py:1450 -#: ../meld/filediff.py:1518 +#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:940 ../meld/filediff.py:1402 +#: ../meld/filediff.py:1474 msgid "_Cancel" msgstr "_Откажи" @@ -892,7 +904,7 @@ msgstr "Да повратим несачуване измене у докуме msgid "Changes made to the following documents will be permanently lost:\n" msgstr "Измене начињене над следећим документима ће бити трајно изгубљене:\n" -#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:942 ../meld/filediff.py:1451 +#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:941 ../meld/filediff.py:1403 msgid "_Replace" msgstr "_Замени" @@ -940,7 +952,7 @@ msgstr "Обликуј као исправку" msgid "Copy to Clipboard" msgstr "Умножи у оставу" -#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:144 +#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:154 msgid "Save Patch" msgstr "Сачувај исправку" @@ -961,166 +973,140 @@ msgid "_Reverse patch direction" msgstr "Преокрени смер _исправке" #: ../data/ui/preferences.ui.h:1 -msgid "Left is remote, right is local" -msgstr "Лева је удаљена, десна је месна" - -#: ../data/ui/preferences.ui.h:2 -msgid "Left is local, right is remote" -msgstr "Лева је месна, десна је удаљена" - -#: ../data/ui/preferences.ui.h:3 -msgid "Remote, merge, local" -msgstr "Удаљена, спојена, месна" - -#: ../data/ui/preferences.ui.h:4 -msgid "Local, merge, remote" -msgstr "Месна, спојена, удаљена" - -#: ../data/ui/preferences.ui.h:5 -msgid "1ns (ext4)" -msgstr "1ns (екст4)" - -#: ../data/ui/preferences.ui.h:6 -msgid "100ns (NTFS)" -msgstr "100ns (НТФС)" - -#: ../data/ui/preferences.ui.h:7 -msgid "1s (ext2/ext3)" -msgstr "1s (екст2/екст3)" - -#: ../data/ui/preferences.ui.h:8 -msgid "2s (VFAT)" -msgstr "2s (ВФАТ)" - -#: ../data/ui/preferences.ui.h:9 msgid "Meld Preferences" msgstr "Поставке Мелда" -#: ../data/ui/preferences.ui.h:10 +#: ../data/ui/preferences.ui.h:2 msgid "Font" msgstr "Словни лик" -#: ../data/ui/preferences.ui.h:11 +#: ../data/ui/preferences.ui.h:3 msgid "_Use the system fixed width font" msgstr "_Користи системски словни лик сталне ширине" -#: ../data/ui/preferences.ui.h:12 +#: ../data/ui/preferences.ui.h:4 msgid "_Editor font:" msgstr "_Словни лик уређивача:" -#: ../data/ui/preferences.ui.h:13 +#: ../data/ui/preferences.ui.h:5 msgid "Display" msgstr "Приказ" -#: ../data/ui/preferences.ui.h:14 +#: ../data/ui/preferences.ui.h:6 msgid "_Tab width:" msgstr "Ширина _табулатора:" -#: ../data/ui/preferences.ui.h:15 +#: ../data/ui/preferences.ui.h:7 msgid "_Insert spaces instead of tabs" msgstr "_Убаци размаке уместо табулатора" -#: ../data/ui/preferences.ui.h:16 +#: ../data/ui/preferences.ui.h:8 msgid "Enable text _wrapping" msgstr "Укључи _преламање текста" -#: ../data/ui/preferences.ui.h:17 +#: ../data/ui/preferences.ui.h:9 msgid "Do not _split words over two lines" msgstr "Немој _делити речи у два реда" -#: ../data/ui/preferences.ui.h:18 +#: ../data/ui/preferences.ui.h:10 msgid "Highlight _current line" msgstr "Истакни _текући ред" -#: ../data/ui/preferences.ui.h:19 +#: ../data/ui/preferences.ui.h:11 msgid "Show _line numbers" msgstr "Прикажи _бројеве редова" -#: ../data/ui/preferences.ui.h:20 +#: ../data/ui/preferences.ui.h:12 msgid "Show w_hitespace" msgstr "Прикажи _размаке" -#: ../data/ui/preferences.ui.h:21 +#: ../data/ui/preferences.ui.h:13 msgid "Use s_yntax highlighting" msgstr "Користи истицање _синтаксе" -#: ../data/ui/preferences.ui.h:22 +#: ../data/ui/preferences.ui.h:14 msgid "Syntax highlighting color scheme:" msgstr "Шема боје истицања синтаксе:" -#: ../data/ui/preferences.ui.h:23 +#: ../data/ui/preferences.ui.h:15 msgid "External Editor" msgstr "Спољни уређивач" -#: ../data/ui/preferences.ui.h:24 +#: ../data/ui/preferences.ui.h:16 msgid "Use _default system editor" msgstr "Користи _основни уређивач система" -#: ../data/ui/preferences.ui.h:25 +#: ../data/ui/preferences.ui.h:17 msgid "Edito_r command:" msgstr "Наредба _уређивача:" -#: ../data/ui/preferences.ui.h:26 +#: ../data/ui/preferences.ui.h:18 msgid "Editor" msgstr "Уређивач" -#: ../data/ui/preferences.ui.h:27 +#: ../data/ui/preferences.ui.h:19 msgid "Shallow Comparison" msgstr "Површно поређење" -#: ../data/ui/preferences.ui.h:28 +#: ../data/ui/preferences.ui.h:20 msgid "C_ompare files based only on size and timestamp" msgstr "Уп_ореди датотеке само на основу величине и временске ознаке" -#: ../data/ui/preferences.ui.h:29 +#: ../data/ui/preferences.ui.h:21 msgid "_Timestamp resolution:" msgstr "_Резолуција временске ознаке:" -#: ../data/ui/preferences.ui.h:31 +#: ../data/ui/preferences.ui.h:23 +msgid "Note: enabling text filters may make comparing large files much slower" +msgstr "" +"Напомена: укључивање филтера текста може учинити да поређење великих " +"датотека буде много спорије" + +#: ../data/ui/preferences.ui.h:24 msgid "Symbolic Links" msgstr "Симболичке везе" -#: ../data/ui/preferences.ui.h:33 +#: ../data/ui/preferences.ui.h:26 msgid "Visible Columns" msgstr "Приказане колоне" -#: ../data/ui/preferences.ui.h:34 +#: ../data/ui/preferences.ui.h:27 msgid "Folder Comparisons" msgstr "Поређење фасцикли" -#: ../data/ui/preferences.ui.h:35 +#: ../data/ui/preferences.ui.h:28 msgid "Version Comparisons" msgstr "Поређење издања" -#: ../data/ui/preferences.ui.h:36 +#: ../data/ui/preferences.ui.h:29 msgid "_Order when comparing file revisions:" msgstr "_Редослед при поређењу прегледа датотеке:" -#: ../data/ui/preferences.ui.h:37 +#: ../data/ui/preferences.ui.h:30 msgid "Order when _merging files:" msgstr "Редослед при _спајању датотека:" -#: ../data/ui/preferences.ui.h:38 +#: ../data/ui/preferences.ui.h:31 msgid "Commit Messages" msgstr "Поруке предаје" -#: ../data/ui/preferences.ui.h:39 +#: ../data/ui/preferences.ui.h:32 msgid "Show _right margin at:" msgstr "Прикажи _десну маргину на:" -#: ../data/ui/preferences.ui.h:40 +#: ../data/ui/preferences.ui.h:33 msgid "Automatically _break lines at right margin on commit" msgstr "Сам _преламај редове на десној маргини при предаји" -#: ../data/ui/preferences.ui.h:41 +#: ../data/ui/preferences.ui.h:34 msgid "Version Control" msgstr "Управљање издањем" -#: ../data/ui/preferences.ui.h:42 +#: ../data/ui/preferences.ui.h:35 msgid "Filename filters" msgstr "Филтери назива датотека" -#: ../data/ui/preferences.ui.h:43 +#: ../data/ui/preferences.ui.h:36 msgid "" "When performing directory comparisons, you may filter out files and " "directories by name. Each pattern is a list of shell style wildcards " @@ -1130,23 +1116,23 @@ msgstr "" "према називу. Сваки образац је списак џокера у стилу конзоле раздвојених " "размаком." -#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:103 +#: ../data/ui/preferences.ui.h:37 ../meld/meldwindow.py:104 msgid "File Filters" msgstr "Пропусници датотека" -#: ../data/ui/preferences.ui.h:45 +#: ../data/ui/preferences.ui.h:38 msgid "Change trimming" msgstr "Скраћивање измене" -#: ../data/ui/preferences.ui.h:46 +#: ../data/ui/preferences.ui.h:39 msgid "Trim blank line differences from the start and end of changes" msgstr "Скраћује разлике празних редова од почетка и краја измена" -#: ../data/ui/preferences.ui.h:47 +#: ../data/ui/preferences.ui.h:40 msgid "Text filters" msgstr "Филтери текста" -#: ../data/ui/preferences.ui.h:48 +#: ../data/ui/preferences.ui.h:41 msgid "" "When performing file comparisons, you may ignore certain types of changes. " "Each pattern here is a python regular expression which replaces matching " @@ -1159,10 +1145,42 @@ msgstr "" "празним нискама пре извршавања поређења. Ако израз садржи групе, само групе " "бивају замењене. За више детаља погледајте упутство за кориснике." -#: ../data/ui/preferences.ui.h:49 +#: ../data/ui/preferences.ui.h:42 msgid "Text Filters" msgstr "Пропусници текста" +#: ../data/ui/preferences.ui.h:43 +msgid "Left is remote, right is local" +msgstr "Лева је удаљена, десна је месна" + +#: ../data/ui/preferences.ui.h:44 +msgid "Left is local, right is remote" +msgstr "Лева је месна, десна је удаљена" + +#: ../data/ui/preferences.ui.h:45 +msgid "Remote, merge, local" +msgstr "Удаљена, спојена, месна" + +#: ../data/ui/preferences.ui.h:46 +msgid "Local, merge, remote" +msgstr "Месна, спојена, удаљена" + +#: ../data/ui/preferences.ui.h:47 +msgid "1ns (ext4)" +msgstr "1ns (екст4)" + +#: ../data/ui/preferences.ui.h:48 +msgid "100ns (NTFS)" +msgstr "100ns (НТФС)" + +#: ../data/ui/preferences.ui.h:49 +msgid "1s (ext2/ext3)" +msgstr "1s (екст2/екст3)" + +#: ../data/ui/preferences.ui.h:50 +msgid "2s (VFAT)" +msgstr "2s (ВФАТ)" + #: ../data/ui/shortcuts.ui.h:1 msgctxt "shortcut window" msgid "General" @@ -1408,7 +1426,7 @@ msgctxt "shortcut window" msgid "Show/hide console output" msgstr "Приказује/скрива излаз конзоле" -#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:570 +#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:559 #: ../meld/newdifftab.py:38 msgid "New comparison" msgstr "Ново поређење" @@ -1651,20 +1669,20 @@ msgstr "Сакриј „%s“" msgid "[%s] Scanning %s" msgstr "[%s] прегледам „%s“" -#: ../meld/dirdiff.py:826 +#: ../meld/dirdiff.py:825 #, python-format msgid "[%s] Done" msgstr "[%s] Готово" -#: ../meld/dirdiff.py:834 +#: ../meld/dirdiff.py:833 msgid "Folders have no differences" msgstr "Фасцикле се не разликују" -#: ../meld/dirdiff.py:836 +#: ../meld/dirdiff.py:835 msgid "Contents of scanned files in folders are identical." msgstr "Садржаји прегледаних датотека у фасциклама су исти." -#: ../meld/dirdiff.py:838 +#: ../meld/dirdiff.py:837 msgid "" "Scanned files in folders appear identical, but contents have not been " "scanned." @@ -1672,38 +1690,38 @@ msgstr "" "Прегледане датотеке у фасциклама изгледа да су исте, али садржај није " "прегледан." -#: ../meld/dirdiff.py:841 +#: ../meld/dirdiff.py:840 msgid "File filters are in use, so not all files have been scanned." msgstr "Филтери датотека су у употреби, тако да нису све датотеке прегледане." -#: ../meld/dirdiff.py:843 +#: ../meld/dirdiff.py:842 msgid "Text filters are in use and may be masking content differences." msgstr "Филтери текста су у употреби и можда су замаскирали разлике садржаја." -#: ../meld/dirdiff.py:861 ../meld/filediff.py:1386 ../meld/filediff.py:1416 -#: ../meld/filediff.py:1418 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 +#: ../meld/dirdiff.py:860 ../meld/filediff.py:1338 ../meld/filediff.py:1368 +#: ../meld/filediff.py:1370 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 msgid "Hi_de" msgstr "_Сакриј" -#: ../meld/dirdiff.py:871 +#: ../meld/dirdiff.py:870 msgid "Multiple errors occurred while scanning this folder" msgstr "Дошло је до више грешака за време претраживања ове фасцикле" -#: ../meld/dirdiff.py:872 +#: ../meld/dirdiff.py:871 msgid "Files with invalid encodings found" msgstr "Пронађене су датотеке са неисправним кодирањем" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:874 +#: ../meld/dirdiff.py:873 msgid "Some files were in an incorrect encoding. The names are something like:" msgstr "Неке датотеке бејаху у неисправном кодирању. Називи су нешто као:" -#: ../meld/dirdiff.py:876 +#: ../meld/dirdiff.py:875 msgid "Files hidden by case insensitive comparison" msgstr "Датотеке скривене поређењем неосетљивим на величину слова" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:878 +#: ../meld/dirdiff.py:877 msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. The following files in this folder are hidden:" @@ -1711,17 +1729,17 @@ msgstr "" "Покренули сте поређење независно од величине слова на систему датотека где " "је она битна. Неке датотеке нису видљиве:" -#: ../meld/dirdiff.py:889 +#: ../meld/dirdiff.py:888 #, python-format msgid "'%s' hidden by '%s'" msgstr "„%s“ сакривено од стране „%s“" -#: ../meld/dirdiff.py:945 +#: ../meld/dirdiff.py:944 #, python-format msgid "Replace folder “%s”?" msgstr "Да заменим фасциклу „%s“?" -#: ../meld/dirdiff.py:947 +#: ../meld/dirdiff.py:946 #, python-format msgid "" "Another folder with the same name already exists in “%s”.\n" @@ -1730,11 +1748,11 @@ msgstr "" "Фасцикла са истим називом већ постоји у „%s“.\n" "Ако замените постојећу фасциклу, све датотеке у њој биће изгубљене." -#: ../meld/dirdiff.py:960 +#: ../meld/dirdiff.py:959 msgid "Error copying file" msgstr "Грешка умножавања датотеке" -#: ../meld/dirdiff.py:961 +#: ../meld/dirdiff.py:960 #, python-format msgid "" "Couldn't copy %s\n" @@ -1747,35 +1765,35 @@ msgstr "" "\n" "%s" -#: ../meld/dirdiff.py:984 +#: ../meld/dirdiff.py:983 #, python-format msgid "Error deleting %s" msgstr "Грешка брисања „%s“" -#: ../meld/dirdiff.py:1489 +#: ../meld/dirdiff.py:1494 msgid "No folder" msgstr "Нема фасцикле" #. Abbreviations for insert and overwrite that fit in the status bar -#: ../meld/filediff.py:354 +#: ../meld/filediff.py:311 msgid "INS" msgstr "УМЕТ" -#: ../meld/filediff.py:354 +#: ../meld/filediff.py:311 msgid "OVR" msgstr "ПРЕП" #. Abbreviation for line, column so that it will fit in the status bar -#: ../meld/filediff.py:356 +#: ../meld/filediff.py:313 #, python-format msgid "Ln %i, Col %i" msgstr "Ред %i, место %i" -#: ../meld/filediff.py:781 +#: ../meld/filediff.py:738 msgid "Comparison results will be inaccurate" msgstr "Резултати поређења биће нетачни" -#: ../meld/filediff.py:783 +#: ../meld/filediff.py:740 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1783,64 +1801,64 @@ msgstr "" "Филтер је изменио број редова у датотеци, а то није подржано. Поређење неће " "бити тачно." -#: ../meld/filediff.py:841 +#: ../meld/filediff.py:796 msgid "Mark conflict as resolved?" msgstr "Да означим сукоб решеним?" -#: ../meld/filediff.py:843 +#: ../meld/filediff.py:798 msgid "" "If the conflict was resolved successfully, you may mark it as resolved now." msgstr "Ако је сукоб успешно решен, сада га можете означити решеним." -#: ../meld/filediff.py:845 +#: ../meld/filediff.py:800 msgid "Cancel" msgstr "Откажи" -#: ../meld/filediff.py:846 +#: ../meld/filediff.py:801 msgid "Mark _Resolved" msgstr "Означи _решеним" -#: ../meld/filediff.py:1095 +#: ../meld/filediff.py:1049 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Дошло је до проблема отварања датотеке „%s“." -#: ../meld/filediff.py:1103 +#: ../meld/filediff.py:1057 #, python-format msgid "File %s appears to be a binary file." msgstr "Изгледа да је „%s“ извршна датотека." -#: ../meld/filediff.py:1105 +#: ../meld/filediff.py:1059 msgid "Do you want to open the file using the default application?" msgstr "Да ли желите да отворите датотеку користећи основни програм?" -#: ../meld/filediff.py:1107 +#: ../meld/filediff.py:1061 msgid "Open" msgstr "Отвори" -#: ../meld/filediff.py:1123 +#: ../meld/filediff.py:1077 #, python-format msgid "[%s] Computing differences" msgstr "Срачунавам разлике [%s]" -#: ../meld/filediff.py:1188 +#: ../meld/filediff.py:1142 #, python-format msgid "File %s has changed on disk" msgstr "Датотека „%s“ је измењена на диску" -#: ../meld/filediff.py:1189 +#: ../meld/filediff.py:1143 msgid "Do you want to reload the file?" msgstr "Да ли желите поново да учитате датотеку?" -#: ../meld/filediff.py:1191 +#: ../meld/filediff.py:1145 msgid "_Reload" msgstr "_Учитај поново" -#: ../meld/filediff.py:1349 +#: ../meld/filediff.py:1301 msgid "Files are identical" msgstr "Датотеке су истоветне" -#: ../meld/filediff.py:1362 +#: ../meld/filediff.py:1314 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1848,11 +1866,11 @@ msgstr "" "Коришћени су филтери текста, а могу постојати и замаскиране разлике између " "датотека. Да ли желите да поредите неиздвојене датотеке?" -#: ../meld/filediff.py:1367 +#: ../meld/filediff.py:1319 msgid "Files differ in line endings only" msgstr "Датотеке се разликују само по завршецима редова" -#: ../meld/filediff.py:1369 +#: ../meld/filediff.py:1321 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1861,15 +1879,15 @@ msgstr "" "Датотеке су истоветне али се разликују само по завршецима редова:\n" "%s" -#: ../meld/filediff.py:1389 +#: ../meld/filediff.py:1341 msgid "Show without filters" msgstr "Приказује без филтера" -#: ../meld/filediff.py:1411 +#: ../meld/filediff.py:1363 msgid "Change highlighting incomplete" msgstr "Истицање измена није довршено" -#: ../meld/filediff.py:1412 +#: ../meld/filediff.py:1364 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." @@ -1877,20 +1895,20 @@ msgstr "" "Неке измене нису истакнуте зато што су превелике. Можете да приморате Мелд " "да продужи са истицањем већих измена, иако то може бити споро." -#: ../meld/filediff.py:1420 +#: ../meld/filediff.py:1372 msgid "Keep highlighting" msgstr "Задржите истицање" -#: ../meld/filediff.py:1422 +#: ../meld/filediff.py:1374 msgid "_Keep highlighting" msgstr "_Задржи истицање" -#: ../meld/filediff.py:1454 +#: ../meld/filediff.py:1406 #, python-format msgid "Replace file “%s”?" msgstr "Да заменим датотеку „%s“?" -#: ../meld/filediff.py:1456 +#: ../meld/filediff.py:1408 #, python-format msgid "" "A file with this name already exists in “%s”.\n" @@ -1899,45 +1917,45 @@ msgstr "" "Датотека са овим називом већ постоји у „%s“.\n" "Ако замените постојећу датотеку, њен садржај биће изгубљен." -#: ../meld/filediff.py:1473 +#: ../meld/filediff.py:1425 msgid "Save Left Pane As" msgstr "Сачувај леву површ као" -#: ../meld/filediff.py:1475 +#: ../meld/filediff.py:1427 msgid "Save Middle Pane As" msgstr "Сачувај средњу површ као" -#: ../meld/filediff.py:1477 +#: ../meld/filediff.py:1429 msgid "Save Right Pane As" msgstr "Сачувај десну површ као" -#: ../meld/filediff.py:1491 +#: ../meld/filediff.py:1443 #, python-format msgid "File %s has changed on disk since it was opened" msgstr "Датотека „%s“ је измењена на диску након отварања" -#: ../meld/filediff.py:1493 +#: ../meld/filediff.py:1445 msgid "If you save it, any external changes will be lost." msgstr "Ако је сачувате, све спољне измене ће бити изгубљене." -#: ../meld/filediff.py:1496 +#: ../meld/filediff.py:1448 msgid "Save Anyway" msgstr "Ипак сачувај" -#: ../meld/filediff.py:1497 +#: ../meld/filediff.py:1449 msgid "Don't Save" msgstr "Немој чувати" -#: ../meld/filediff.py:1519 +#: ../meld/filediff.py:1475 msgid "_Save as UTF-8" msgstr "_Сачувај као УТФ-8" -#: ../meld/filediff.py:1522 +#: ../meld/filediff.py:1478 #, python-format msgid "Couldn't encode text as “%s”" msgstr "Не могу да кодирам текст као „%s“" -#: ../meld/filediff.py:1524 +#: ../meld/filediff.py:1480 #, python-format msgid "" "File “%s” contains characters that can't be encoded using encoding “%s”.\n" @@ -1946,12 +1964,12 @@ msgstr "" "„%s“ садржи знакове који се не могу кодирати употребом кодирања „%s“\n" "Да ли желите да сачувате као УТФ-8?" -#: ../meld/filediff.py:1564 ../meld/patchdialog.py:120 +#: ../meld/filediff.py:1520 ../meld/patchdialog.py:130 #, python-format msgid "Could not save file %s." msgstr "Не могу да сачувам датотеку „%s“." -#: ../meld/filediff.py:1565 ../meld/patchdialog.py:121 +#: ../meld/filediff.py:1521 ../meld/patchdialog.py:131 #, python-format msgid "" "Couldn't save file due to:\n" @@ -1960,11 +1978,11 @@ msgstr "" "Не могу да сачувам датотеку због следећег:\n" "%s" -#: ../meld/filediff.py:1910 +#: ../meld/filediff.py:1867 msgid "Live comparison updating disabled" msgstr "Искључено је живо ажурирање поређења" -#: ../meld/filediff.py:1911 +#: ../meld/filediff.py:1868 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -1979,11 +1997,11 @@ msgstr "" msgid "[%s] Merging files" msgstr "Обједињујем датотеке [%s]" -#: ../meld/gutterrendererchunk.py:159 +#: ../meld/gutterrendererchunk.py:210 msgid "Copy _up" msgstr "Умножи _горе" -#: ../meld/gutterrendererchunk.py:160 +#: ../meld/gutterrendererchunk.py:211 msgid "Copy _down" msgstr "Умножи _доле" @@ -2088,196 +2106,196 @@ msgstr "<неименован>" msgid "untitled" msgstr "безимени" -#: ../meld/meldwindow.py:48 +#: ../meld/meldwindow.py:49 msgid "_File" msgstr "_Датотека" -#: ../meld/meldwindow.py:49 +#: ../meld/meldwindow.py:50 msgid "_New Comparison..." msgstr "_Ново поређење..." -#: ../meld/meldwindow.py:50 +#: ../meld/meldwindow.py:51 msgid "Start a new comparison" msgstr "Започните ново поређење" -#: ../meld/meldwindow.py:53 +#: ../meld/meldwindow.py:54 msgid "Save the current file" msgstr "Сачувајте тренутну датотеку" -#: ../meld/meldwindow.py:55 +#: ../meld/meldwindow.py:56 msgid "Save As..." msgstr "Сачувај као..." -#: ../meld/meldwindow.py:56 +#: ../meld/meldwindow.py:57 msgid "Save the current file with a different name" msgstr "Сачувајте текућу датотеку под другим називом" -#: ../meld/meldwindow.py:59 +#: ../meld/meldwindow.py:60 msgid "Close the current file" msgstr "Затворите тренутну датотеку" -#: ../meld/meldwindow.py:62 +#: ../meld/meldwindow.py:63 msgid "_Edit" msgstr "_Уређивање" -#: ../meld/meldwindow.py:64 +#: ../meld/meldwindow.py:65 msgid "Undo the last action" msgstr "Опозовите последњу радњу" -#: ../meld/meldwindow.py:67 +#: ../meld/meldwindow.py:68 msgid "Redo the last undone action" msgstr "Поновите последњу опозвану радњу" -#: ../meld/meldwindow.py:69 +#: ../meld/meldwindow.py:70 msgid "Cut the selection" msgstr "Исеците избор" -#: ../meld/meldwindow.py:71 +#: ../meld/meldwindow.py:72 msgid "Copy the selection" msgstr "Умножите избор" -#: ../meld/meldwindow.py:73 +#: ../meld/meldwindow.py:74 msgid "Paste the clipboard" msgstr "Убаците оставу" -#: ../meld/meldwindow.py:75 +#: ../meld/meldwindow.py:76 msgid "Find..." msgstr "Пронађи..." -#: ../meld/meldwindow.py:75 +#: ../meld/meldwindow.py:76 msgid "Search for text" msgstr "Тражите текст" -#: ../meld/meldwindow.py:77 +#: ../meld/meldwindow.py:78 msgid "Find Ne_xt" msgstr "Нађи с_ледеће" -#: ../meld/meldwindow.py:78 +#: ../meld/meldwindow.py:79 msgid "Search forwards for the same text" msgstr "Тражите унапред исти текст" -#: ../meld/meldwindow.py:80 +#: ../meld/meldwindow.py:81 msgid "Find _Previous" msgstr "Нађи пре_тходно" -#: ../meld/meldwindow.py:81 +#: ../meld/meldwindow.py:82 msgid "Search backwards for the same text" msgstr "Тражите уназад исти текст" -#: ../meld/meldwindow.py:84 +#: ../meld/meldwindow.py:85 msgid "_Replace..." msgstr "_Замени..." -#: ../meld/meldwindow.py:85 +#: ../meld/meldwindow.py:86 msgid "Find and replace text" msgstr "Пронађите и замените текст" -#: ../meld/meldwindow.py:88 +#: ../meld/meldwindow.py:89 msgid "_Changes" msgstr "_Измене" -#: ../meld/meldwindow.py:89 +#: ../meld/meldwindow.py:90 msgid "Next Change" msgstr "Следећа измена" -#: ../meld/meldwindow.py:90 +#: ../meld/meldwindow.py:91 msgid "Go to the next change" msgstr "Идите на следећу измену" -#: ../meld/meldwindow.py:92 +#: ../meld/meldwindow.py:93 msgid "Previous Change" msgstr "Претходна измена" -#: ../meld/meldwindow.py:93 +#: ../meld/meldwindow.py:94 msgid "Go to the previous change" msgstr "Идите на претходну измену" -#: ../meld/meldwindow.py:95 +#: ../meld/meldwindow.py:96 msgid "Open Externally" msgstr "Отвори спољним" -#: ../meld/meldwindow.py:96 +#: ../meld/meldwindow.py:97 msgid "Open selected file or directory in the default external application" msgstr "Отворите изабрану датотеку или фасциклу у основном спољном програму" -#: ../meld/meldwindow.py:100 +#: ../meld/meldwindow.py:101 msgid "_View" msgstr "П_реглед" -#: ../meld/meldwindow.py:101 +#: ../meld/meldwindow.py:102 msgid "File Status" msgstr "Стање датотеке" -#: ../meld/meldwindow.py:102 +#: ../meld/meldwindow.py:103 msgid "Version Status" msgstr "Стање издања" -#: ../meld/meldwindow.py:105 +#: ../meld/meldwindow.py:106 msgid "Stop the current action" msgstr "Зауставите тренутну радњу" -#: ../meld/meldwindow.py:108 +#: ../meld/meldwindow.py:109 msgid "Refresh the view" msgstr "Освежите преглед" -#: ../meld/meldwindow.py:112 +#: ../meld/meldwindow.py:113 msgid "Fullscreen" msgstr "Преко целог екрана" -#: ../meld/meldwindow.py:113 +#: ../meld/meldwindow.py:114 msgid "View the comparison in fullscreen" msgstr "Прегледајте поређење преко целог екрана" -#: ../meld/meldwindow.py:115 +#: ../meld/meldwindow.py:116 msgid "_Toolbar" msgstr "_Трака алата" -#: ../meld/meldwindow.py:116 +#: ../meld/meldwindow.py:117 msgid "Show or hide the toolbar" msgstr "Прикажите или сакријте траку алата" -#: ../meld/meldwindow.py:126 +#: ../meld/meldwindow.py:127 msgid "Open Recent" msgstr "Отвори скорашње" -#: ../meld/meldwindow.py:127 +#: ../meld/meldwindow.py:128 msgid "Open recent files" msgstr "Отворите скорашње датотеке" -#: ../meld/meldwindow.py:149 +#: ../meld/meldwindow.py:150 msgid "_Meld" msgstr "_Мелд" -#: ../meld/meldwindow.py:150 +#: ../meld/meldwindow.py:151 msgid "Quit the program" msgstr "Затворите програм" -#: ../meld/meldwindow.py:152 +#: ../meld/meldwindow.py:153 msgid "Prefere_nces" msgstr "_Поставке" -#: ../meld/meldwindow.py:153 +#: ../meld/meldwindow.py:154 msgid "Configure the application" msgstr "Подесите програм" -#: ../meld/meldwindow.py:155 +#: ../meld/meldwindow.py:156 msgid "_Contents" msgstr "_Садржај" -#: ../meld/meldwindow.py:156 +#: ../meld/meldwindow.py:157 msgid "Open the Meld manual" msgstr "Отворите упутство Мелда" -#: ../meld/meldwindow.py:158 +#: ../meld/meldwindow.py:159 msgid "About this application" msgstr "О овом програму" -#: ../meld/meldwindow.py:604 +#: ../meld/meldwindow.py:593 #, python-format msgid "Need three files to auto-merge, got: %r" msgstr "Потребне су три датотеке за само-спајање, добих: %r" -#: ../meld/meldwindow.py:618 +#: ../meld/meldwindow.py:607 msgid "Cannot compare a mixture of files and directories" msgstr "Не могу да поредим мешавину датотека и фасцикли" @@ -2288,7 +2306,7 @@ msgstr "" "Не могу да нађем појединости шеме боје за „%s-%s“; јер је лоше инсталирана" #. no common path. empty names get changed to "[None]" -#: ../meld/misc.py:263 +#: ../meld/misc.py:265 msgid "[None]" msgstr "[ништа]" diff --git a/po/sr@latin.po b/po/sr@latin.po index fb916c88..38431ce0 100644 --- a/po/sr@latin.po +++ b/po/sr@latin.po @@ -1,18 +1,18 @@ # Serbian translation of meld -# Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2016. +# Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2017. # This file is distributed under the same license as the meld package. # Translators: # Danilo Šegan -# Miroslav Nikolić , 2011—2016. +# Miroslav Nikolić , 2011—2017. msgid "" msgstr "" "Project-Id-Version: meld\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=meld&ke" "ywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-08-20 21:39+0000\n" -"PO-Revision-Date: 2016-08-21 14:01+0200\n" +"POT-Creation-Date: 2017-01-21 23:12+0000\n" +"PO-Revision-Date: 2017-02-25 20:12+0200\n" "Last-Translator: Miroslav Nikolić \n" -"Language-Team: Serbian \n" +"Language-Team: Serbian <(nothing)>\n" "Language: sr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,16 +21,16 @@ msgstr "" "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Project-Style: gnome\n" -#: ../bin/meld:142 +#: ../bin/meld:179 msgid "Cannot import: " msgstr "Ne mogu da uvezem: " -#: ../bin/meld:145 +#: ../bin/meld:182 #, c-format msgid "Meld requires %s or higher." msgstr "Meld zahteva %s ili noviji." -#: ../bin/meld:194 +#: ../bin/meld:227 #, c-format msgid "" "Couldn't load Meld-specific CSS (%s)\n" @@ -91,34 +91,46 @@ msgid "Meld comparison description" msgstr "Opis Meldovog poređenja" #: ../data/org.gnome.meld.gschema.xml.h:1 -msgid "Default window size" -msgstr "Osnovna veličina prozora" +#| msgid "Default window size" +msgid "Default window width" +msgstr "Osnovna širina prozora" #: ../data/org.gnome.meld.gschema.xml.h:2 -msgid "Default window state" -msgstr "Osnovno stanje prozora" +#| msgid "Default window size" +msgid "Default window height" +msgstr "Osnovna visina prozora" #: ../data/org.gnome.meld.gschema.xml.h:3 +#| msgid "Default window state" +msgid "Default window maximised state" +msgstr "Osnovno stanje uveličanog prozora" + +#: ../data/org.gnome.meld.gschema.xml.h:4 +#| msgid "Default window state" +msgid "Default window fullscreen state" +msgstr "Osnovno stanje prozora preko celog ekrana" + +#: ../data/org.gnome.meld.gschema.xml.h:5 msgid "Show toolbar" msgstr "Prikazuje traku alata" -#: ../data/org.gnome.meld.gschema.xml.h:4 +#: ../data/org.gnome.meld.gschema.xml.h:6 msgid "If true, the window toolbar is visible." msgstr "Ako je izabrano, traka alata je vidljiva." -#: ../data/org.gnome.meld.gschema.xml.h:5 +#: ../data/org.gnome.meld.gschema.xml.h:7 msgid "Show statusbar" msgstr "Prikazuje traku stanja" -#: ../data/org.gnome.meld.gschema.xml.h:6 +#: ../data/org.gnome.meld.gschema.xml.h:8 msgid "If true, the window statusbar is visible." msgstr "Ako je izabrano, traka stanja je vidljiva." -#: ../data/org.gnome.meld.gschema.xml.h:7 +#: ../data/org.gnome.meld.gschema.xml.h:9 msgid "Additional automatically detected text encodings" msgstr "Dodatno samostalno otkrivanje kodnih rasporeda" -#: ../data/org.gnome.meld.gschema.xml.h:8 +#: ../data/org.gnome.meld.gschema.xml.h:10 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 " @@ -131,37 +143,37 @@ msgstr "" "korišćeni; ostala kodiranja mogu takođe biti isprobana, u zavisnosti od " "korisnikovog jezika." -#: ../data/org.gnome.meld.gschema.xml.h:9 +#: ../data/org.gnome.meld.gschema.xml.h:11 msgid "Width of an indentation step" msgstr "Širina koraka uvlačenja" -#: ../data/org.gnome.meld.gschema.xml.h:10 +#: ../data/org.gnome.meld.gschema.xml.h:12 msgid "The number of spaces to use for a single indent step" msgstr "Broj razmaka za jedan korak uvlačenja" -#: ../data/org.gnome.meld.gschema.xml.h:11 +#: ../data/org.gnome.meld.gschema.xml.h:13 msgid "Whether to indent using spaces or tabs" msgstr "Da li da uvlači koristeći razmake ili tabulatore" -#: ../data/org.gnome.meld.gschema.xml.h:12 +#: ../data/org.gnome.meld.gschema.xml.h:14 msgid "If true, any new indentation will use spaces instead of tabs." msgstr "" "Ako je izabrano, svako novo uvlačenje će koristiti razmake umesto tabulatora." -#: ../data/org.gnome.meld.gschema.xml.h:13 +#: ../data/org.gnome.meld.gschema.xml.h:15 msgid "Show line numbers" msgstr "Prikazuje brojeve redova" -#: ../data/org.gnome.meld.gschema.xml.h:14 +#: ../data/org.gnome.meld.gschema.xml.h:16 msgid "If true, line numbers will be shown in the gutter of file comparisons." msgstr "" "Ako je izabrano, brojevi redova će biti prikazani u žlebu poređenja datoteka." -#: ../data/org.gnome.meld.gschema.xml.h:15 +#: ../data/org.gnome.meld.gschema.xml.h:17 msgid "Highlight syntax" msgstr "Ističe pojavu" -#: ../data/org.gnome.meld.gschema.xml.h:16 +#: ../data/org.gnome.meld.gschema.xml.h:18 msgid "" "Whether to highlight syntax in comparisons. Because of Meld's own color " "highlighting, this is off by default." @@ -169,19 +181,19 @@ msgstr "" "Da li da ističe pojavu u poređenju. Zbog samog Meldovog isticanja bojom, ovo " "je unapred isključeno." -#: ../data/org.gnome.meld.gschema.xml.h:17 +#: ../data/org.gnome.meld.gschema.xml.h:19 msgid "Color scheme to use for syntax highlighting" msgstr "Šema boje za isticanje sintakse" -#: ../data/org.gnome.meld.gschema.xml.h:18 +#: ../data/org.gnome.meld.gschema.xml.h:20 msgid "Used by GtkSourceView to determine colors for syntax highlighting" msgstr "Koristi je pregled Gtk izvora da odredi boje za isticanje sintakse" -#: ../data/org.gnome.meld.gschema.xml.h:19 +#: ../data/org.gnome.meld.gschema.xml.h:21 msgid "Displayed whitespace" msgstr "Prikazane praznine" -#: ../data/org.gnome.meld.gschema.xml.h:20 +#: ../data/org.gnome.meld.gschema.xml.h:22 msgid "" "Selector for individual whitespace character types to be shown. Possible " "values are 'space', 'tab', 'newline' and 'nbsp'." @@ -190,11 +202,11 @@ msgstr "" "vrednosti su: „space“ (razmak), „tab“ (tabulator), „newline“ (novi red) i " "„nbsp“ (nbsp)." -#: ../data/org.gnome.meld.gschema.xml.h:21 +#: ../data/org.gnome.meld.gschema.xml.h:23 msgid "Wrap mode" msgstr "Režim prelamanja" -#: ../data/org.gnome.meld.gschema.xml.h:22 +#: ../data/org.gnome.meld.gschema.xml.h:24 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 " @@ -204,11 +216,11 @@ msgstr "" "podešavanjem, bez prelamanja — „none“, na bilo kom znaku — „char“, ili samo na " "kraju reči — „word“." -#: ../data/org.gnome.meld.gschema.xml.h:23 +#: ../data/org.gnome.meld.gschema.xml.h:25 msgid "Highlight current line" msgstr "Ističe tekući red" -#: ../data/org.gnome.meld.gschema.xml.h:24 +#: ../data/org.gnome.meld.gschema.xml.h:26 msgid "" "If true, the line containing the cursor will be highlighted in file " "comparisons." @@ -216,22 +228,22 @@ msgstr "" "Ako je izabrano, red koji sadrži kurzor će biti istaknut pri poređenju " "datoteka." -#: ../data/org.gnome.meld.gschema.xml.h:25 +#: ../data/org.gnome.meld.gschema.xml.h:27 msgid "Use the system default monospace font" msgstr "Koristi sistemski slovni lik stalne širine" -#: ../data/org.gnome.meld.gschema.xml.h:26 +#: ../data/org.gnome.meld.gschema.xml.h:28 msgid "" "If false, custom-font will be used instead of the system monospace font." msgstr "" "Ako nije izabrano, proizvoljni slovni lik će biti korišćen umesto sistemskog " "slovnog lika stalne širine." -#: ../data/org.gnome.meld.gschema.xml.h:27 +#: ../data/org.gnome.meld.gschema.xml.h:29 msgid "Custom font" msgstr "Proizvoljni slovni lik" -#: ../data/org.gnome.meld.gschema.xml.h:28 +#: ../data/org.gnome.meld.gschema.xml.h:30 msgid "" "The custom font to use, stored as a string and parsed as a Pango font " "description." @@ -239,22 +251,22 @@ msgstr "" "Proizvoljni slovni lik za korišćenje, smešten kao niska i obrađen kao opis " "Pango slovnog lika." -#: ../data/org.gnome.meld.gschema.xml.h:29 +#: ../data/org.gnome.meld.gschema.xml.h:31 msgid "Ignore blank lines when comparing files" msgstr "Zanemaruje prazne redove pri poređenju datoteka" -#: ../data/org.gnome.meld.gschema.xml.h:30 +#: ../data/org.gnome.meld.gschema.xml.h:32 msgid "" "If true, blank lines will be trimmed when highlighting changes between files." msgstr "" "Ako je izabrano, prazni redovi će biti skraćeni kada se isticanje promeni " "među datotekama." -#: ../data/org.gnome.meld.gschema.xml.h:31 +#: ../data/org.gnome.meld.gschema.xml.h:33 msgid "Use the system default editor" msgstr "Koristi osnovni uređivač sistema" -#: ../data/org.gnome.meld.gschema.xml.h:32 +#: ../data/org.gnome.meld.gschema.xml.h:34 msgid "" "If false, custom-editor-command will be used instead of the system editor " "when opening files externally." @@ -262,11 +274,11 @@ msgstr "" "Ako nije izabrano, proizvoljni uređivač naredbe će biti korišćen umesto " "sistemskog uređivača prilikom otvaranja datoteka spolja." -#: ../data/org.gnome.meld.gschema.xml.h:33 +#: ../data/org.gnome.meld.gschema.xml.h:35 msgid "The custom editor launch command" msgstr "Naredba pokretanja proizvoljnog uređivača" -#: ../data/org.gnome.meld.gschema.xml.h:34 +#: ../data/org.gnome.meld.gschema.xml.h:36 msgid "" "The command used to launch a custom editor. Some limited templating is " "supported here; at the moment '{file}' and '{line}' are recognised tokens." @@ -274,21 +286,21 @@ msgstr "" "Naredba za pokretanje proizvoljnog uređivača. Ovde je podržano neko ograničeno " "šabloniranje; za sada „{file}“ i „{line}“ su prepoznate opcije." -#: ../data/org.gnome.meld.gschema.xml.h:35 +#: ../data/org.gnome.meld.gschema.xml.h:37 msgid "Columns to display" msgstr "Stupci za prikazivanje" -#: ../data/org.gnome.meld.gschema.xml.h:36 +#: ../data/org.gnome.meld.gschema.xml.h:38 msgid "" "List of column names in folder comparison and whether they should be " "displayed." msgstr "Spisak naziva stubaca pri poređenju fascikli i da li će biti prikazani." -#: ../data/org.gnome.meld.gschema.xml.h:37 ../data/ui/preferences.ui.h:32 +#: ../data/org.gnome.meld.gschema.xml.h:39 ../data/ui/preferences.ui.h:25 msgid "Ignore symbolic links" msgstr "Zanemari simboličke veze" -#: ../data/org.gnome.meld.gschema.xml.h:38 +#: ../data/org.gnome.meld.gschema.xml.h:40 msgid "" "If true, folder comparisons do not follow symbolic links when traversing the " "folder tree." @@ -296,11 +308,11 @@ msgstr "" "Ako je izabrano, poređenja fascikli ne prate simboličke veze prilikom " "prolaska kroz stablo fascikle." -#: ../data/org.gnome.meld.gschema.xml.h:39 +#: ../data/org.gnome.meld.gschema.xml.h:41 msgid "Use shallow comparison" msgstr "Koristi površno poređenje" -#: ../data/org.gnome.meld.gschema.xml.h:40 +#: ../data/org.gnome.meld.gschema.xml.h:42 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 +322,11 @@ msgstr "" "m_vremena, smatrajući da su datoteke istovetne ako se njihove veličine i " "m_vreme poklapaju, a različite u suprotnom." -#: ../data/org.gnome.meld.gschema.xml.h:41 +#: ../data/org.gnome.meld.gschema.xml.h:43 msgid "File timestamp resolution" msgstr "Rezolucija vremenske oznake datoteke" -#: ../data/org.gnome.meld.gschema.xml.h:42 +#: ../data/org.gnome.meld.gschema.xml.h:44 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,11 +338,11 @@ msgstr "" "m_vremena. Ovo je korisno prilikom poređenja datoteka između sistema datoteka " "sa različitom rezolcijom vremenske oznake." -#: ../data/org.gnome.meld.gschema.xml.h:43 ../data/ui/preferences.ui.h:30 +#: ../data/org.gnome.meld.gschema.xml.h:45 ../data/ui/preferences.ui.h:22 msgid "Apply text filters during folder comparisons" msgstr "Primeni izdvajače teksta za vreme poređenje fascikli" -#: ../data/org.gnome.meld.gschema.xml.h:44 +#: ../data/org.gnome.meld.gschema.xml.h:46 msgid "" "If true, folder comparisons that compare file contents also apply active " "text filters and the blank line trimming option, and ignore newline " @@ -340,20 +352,20 @@ msgstr "" "primenjuju radne izdvajače teksta i opcije skraćivanja praznog reda, i " "zanemaruju razlike novih redova." -#: ../data/org.gnome.meld.gschema.xml.h:45 +#: ../data/org.gnome.meld.gschema.xml.h:47 msgid "File status filters" msgstr "Propusnici stanja datoteka" -#: ../data/org.gnome.meld.gschema.xml.h:46 +#: ../data/org.gnome.meld.gschema.xml.h:48 msgid "List of statuses used to filter visible files in folder comparison." msgstr "" "Spisak stanja korišćenih za izdvajanje vidljivih datoteka pri poređenju fascikli." -#: ../data/org.gnome.meld.gschema.xml.h:47 +#: ../data/org.gnome.meld.gschema.xml.h:49 msgid "Show the version control console output" msgstr "Prikazuje izlaz konzole upravljanja izdanjem" -#: ../data/org.gnome.meld.gschema.xml.h:48 +#: ../data/org.gnome.meld.gschema.xml.h:50 msgid "" "If true, a console output section will be shown in version control views, " "showing the commands run for version control operations." @@ -361,11 +373,11 @@ msgstr "" "Ako je izabrano, odeljak izlaza konzole će biti prikazan u pregledima " "upravljanja izdanjem, prikazujući pokrenute naredbe za radnje upravljanja izdanjem." -#: ../data/org.gnome.meld.gschema.xml.h:49 +#: ../data/org.gnome.meld.gschema.xml.h:51 msgid "Version control pane position" msgstr "Položaj površi upravljanja izdanjima" -#: ../data/org.gnome.meld.gschema.xml.h:50 +#: ../data/org.gnome.meld.gschema.xml.h:52 msgid "" "This is the height of the main version control tree when the console pane is " "shown." @@ -373,11 +385,11 @@ msgstr "" "Ovo je visina glavnog stabla upravljanja izdanjem kada je prikazana površ " "konzole." -#: ../data/org.gnome.meld.gschema.xml.h:51 +#: ../data/org.gnome.meld.gschema.xml.h:53 msgid "Present version comparisons as left-local/right-remote" msgstr "Predstavlja poređenja izdanja kao mesno-levo/udaljeno-desno" -#: ../data/org.gnome.meld.gschema.xml.h:52 +#: ../data/org.gnome.meld.gschema.xml.h:54 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, " @@ -387,12 +399,12 @@ msgstr "" "mesno, desno-je-udaljeno“ da odrede kojim redom će predstaviti datoteke u " "oknima. U suprotnom, koristi se šema „levo-je-njihovo, desno-je-moje“." -#: ../data/org.gnome.meld.gschema.xml.h:53 +#: ../data/org.gnome.meld.gschema.xml.h:55 msgid "Order for files in three-way version control merge comparisons" msgstr "" "Redosled datoteka za poređenje stapanja upravljanja izdanjem za tri elementa" -#: ../data/org.gnome.meld.gschema.xml.h:54 +#: ../data/org.gnome.meld.gschema.xml.h:56 msgid "" "Choices for file order are remote/merged/local and local/merged/remote. This " "preference only affects three-way comparisons launched from the version " @@ -403,11 +415,11 @@ msgstr "" "pregleda upravljanja izdanjem, stoga se koristi jedino za rešavanje spajanja/" "sukoba u Meldu." -#: ../data/org.gnome.meld.gschema.xml.h:55 +#: ../data/org.gnome.meld.gschema.xml.h:57 msgid "Show margin in commit message editor" msgstr "Prikazuje ivicu u uređivaču poruke predaje" -#: ../data/org.gnome.meld.gschema.xml.h:56 +#: ../data/org.gnome.meld.gschema.xml.h:58 msgid "" "If true, a guide will be displayed to show what column the margin is at in " "the version control commit message editor." @@ -415,22 +427,22 @@ msgstr "" "Ako je izabrano, biće prikazana vođica da pokaže od kog stupca se ivica " "nalazi u uređivaču poruke predaje upravljanja izdanjem." -#: ../data/org.gnome.meld.gschema.xml.h:57 +#: ../data/org.gnome.meld.gschema.xml.h:59 msgid "Margin column in commit message editor" msgstr "Stubac ivice u uređivaču poruke predaje" -#: ../data/org.gnome.meld.gschema.xml.h:58 +#: ../data/org.gnome.meld.gschema.xml.h:60 msgid "" "The column at which to show the margin in the version control commit message " "editor." msgstr "" "Stubac na kome prikazati ivicu u uređivaču poruke predaje upravljanja izdanjem." -#: ../data/org.gnome.meld.gschema.xml.h:59 +#: ../data/org.gnome.meld.gschema.xml.h:61 msgid "Automatically hard-wrap commit messages" msgstr "Samostalno silno-prelama poruke predaje" -#: ../data/org.gnome.meld.gschema.xml.h:60 +#: ../data/org.gnome.meld.gschema.xml.h:62 msgid "" "If true, the version control commit message editor will hard-wrap (i.e., " "insert line breaks) at the commit margin before commit." @@ -438,22 +450,22 @@ msgstr "" "Ako je izabrano, uređivač poruke predaje upravljanja izdanjem će silno-" "prelomiti (tj. umetnuti prelome redova) na ivici predaje pre predaje." -#: ../data/org.gnome.meld.gschema.xml.h:61 +#: ../data/org.gnome.meld.gschema.xml.h:63 msgid "Version control status filters" msgstr "Propusnici stanja upravljanja izdanjem" -#: ../data/org.gnome.meld.gschema.xml.h:62 +#: ../data/org.gnome.meld.gschema.xml.h:64 msgid "" "List of statuses used to filter visible files in version control comparison." msgstr "" "Spisak stanja korišćenih za izdvajanje vidljivih datoteka pri poređenju " "upravljanja izdanjem." -#: ../data/org.gnome.meld.gschema.xml.h:63 +#: ../data/org.gnome.meld.gschema.xml.h:65 msgid "Filename-based filters" msgstr "Propusnici zasnovani na nazivu datoteke" -#: ../data/org.gnome.meld.gschema.xml.h:64 +#: ../data/org.gnome.meld.gschema.xml.h:66 msgid "" "List of predefined filename-based filters that, if active, will remove " "matching files from a folder comparison." @@ -461,11 +473,11 @@ msgstr "" "Spisak unapred određenih filtera zasnovanih na nazivu datoteke koji će, ako " "je radno, ukloniti poklopljene datoteke iz poređenja fascikli." -#: ../data/org.gnome.meld.gschema.xml.h:65 +#: ../data/org.gnome.meld.gschema.xml.h:67 msgid "Text-based filters" msgstr "Propusnici zasnovani na tekstu" -#: ../data/org.gnome.meld.gschema.xml.h:66 +#: ../data/org.gnome.meld.gschema.xml.h:68 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, " @@ -525,7 +537,7 @@ msgstr "Po_moć" #: ../data/ui/application.ui.h:8 msgid "Keyboard Shortcuts" -msgstr "Prečice _tastature" +msgstr "Prečice tastature" #: ../data/ui/application.ui.h:9 msgid "_About" @@ -563,7 +575,7 @@ msgstr "Umnožite desno" msgid "Delete selected" msgstr "Obriši izabrano" -#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:859 ../meld/filediff.py:1384 +#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:858 ../meld/filediff.py:1336 msgid "Hide" msgstr "Sakrij" @@ -854,8 +866,8 @@ msgstr "Ako ne sačuvate, izmene će biti trajno izgubljene." msgid "Close _without Saving" msgstr "Zatvori _bez čuvanja" -#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:941 ../meld/filediff.py:1450 -#: ../meld/filediff.py:1518 +#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:940 ../meld/filediff.py:1402 +#: ../meld/filediff.py:1474 msgid "_Cancel" msgstr "_Otkaži" @@ -892,7 +904,7 @@ msgstr "Da povratim nesačuvane izmene u dokumentima?" msgid "Changes made to the following documents will be permanently lost:\n" msgstr "Izmene načinjene nad sledećim dokumentima će biti trajno izgubljene:\n" -#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:942 ../meld/filediff.py:1451 +#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:941 ../meld/filediff.py:1403 msgid "_Replace" msgstr "_Zameni" @@ -940,7 +952,7 @@ msgstr "Oblikuj kao ispravku" msgid "Copy to Clipboard" msgstr "Umnoži u ostavu" -#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:144 +#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:154 msgid "Save Patch" msgstr "Sačuvaj ispravku" @@ -961,166 +973,140 @@ msgid "_Reverse patch direction" msgstr "Preokreni smer _ispravke" #: ../data/ui/preferences.ui.h:1 -msgid "Left is remote, right is local" -msgstr "Leva je udaljena, desna je mesna" - -#: ../data/ui/preferences.ui.h:2 -msgid "Left is local, right is remote" -msgstr "Leva je mesna, desna je udaljena" - -#: ../data/ui/preferences.ui.h:3 -msgid "Remote, merge, local" -msgstr "Udaljena, spojena, mesna" - -#: ../data/ui/preferences.ui.h:4 -msgid "Local, merge, remote" -msgstr "Mesna, spojena, udaljena" - -#: ../data/ui/preferences.ui.h:5 -msgid "1ns (ext4)" -msgstr "1ns (ekst4)" - -#: ../data/ui/preferences.ui.h:6 -msgid "100ns (NTFS)" -msgstr "100ns (NTFS)" - -#: ../data/ui/preferences.ui.h:7 -msgid "1s (ext2/ext3)" -msgstr "1s (ekst2/ekst3)" - -#: ../data/ui/preferences.ui.h:8 -msgid "2s (VFAT)" -msgstr "2s (VFAT)" - -#: ../data/ui/preferences.ui.h:9 msgid "Meld Preferences" msgstr "Postavke Melda" -#: ../data/ui/preferences.ui.h:10 +#: ../data/ui/preferences.ui.h:2 msgid "Font" msgstr "Slovni lik" -#: ../data/ui/preferences.ui.h:11 +#: ../data/ui/preferences.ui.h:3 msgid "_Use the system fixed width font" msgstr "_Koristi sistemski slovni lik stalne širine" -#: ../data/ui/preferences.ui.h:12 +#: ../data/ui/preferences.ui.h:4 msgid "_Editor font:" msgstr "_Slovni lik uređivača:" -#: ../data/ui/preferences.ui.h:13 +#: ../data/ui/preferences.ui.h:5 msgid "Display" msgstr "Prikaz" -#: ../data/ui/preferences.ui.h:14 +#: ../data/ui/preferences.ui.h:6 msgid "_Tab width:" msgstr "Širina _tabulatora:" -#: ../data/ui/preferences.ui.h:15 +#: ../data/ui/preferences.ui.h:7 msgid "_Insert spaces instead of tabs" msgstr "_Ubaci razmake umesto tabulatora" -#: ../data/ui/preferences.ui.h:16 +#: ../data/ui/preferences.ui.h:8 msgid "Enable text _wrapping" msgstr "Uključi _prelamanje teksta" -#: ../data/ui/preferences.ui.h:17 +#: ../data/ui/preferences.ui.h:9 msgid "Do not _split words over two lines" msgstr "Nemoj _deliti reči u dva reda" -#: ../data/ui/preferences.ui.h:18 +#: ../data/ui/preferences.ui.h:10 msgid "Highlight _current line" msgstr "Istakni _tekući red" -#: ../data/ui/preferences.ui.h:19 +#: ../data/ui/preferences.ui.h:11 msgid "Show _line numbers" msgstr "Prikaži _brojeve redova" -#: ../data/ui/preferences.ui.h:20 +#: ../data/ui/preferences.ui.h:12 msgid "Show w_hitespace" msgstr "Prikaži _razmake" -#: ../data/ui/preferences.ui.h:21 +#: ../data/ui/preferences.ui.h:13 msgid "Use s_yntax highlighting" msgstr "Koristi isticanje _sintakse" -#: ../data/ui/preferences.ui.h:22 +#: ../data/ui/preferences.ui.h:14 msgid "Syntax highlighting color scheme:" msgstr "Šema boje isticanja sintakse:" -#: ../data/ui/preferences.ui.h:23 +#: ../data/ui/preferences.ui.h:15 msgid "External Editor" msgstr "Spoljni uređivač" -#: ../data/ui/preferences.ui.h:24 +#: ../data/ui/preferences.ui.h:16 msgid "Use _default system editor" msgstr "Koristi _osnovni uređivač sistema" -#: ../data/ui/preferences.ui.h:25 +#: ../data/ui/preferences.ui.h:17 msgid "Edito_r command:" msgstr "Naredba _uređivača:" -#: ../data/ui/preferences.ui.h:26 +#: ../data/ui/preferences.ui.h:18 msgid "Editor" msgstr "Uređivač" -#: ../data/ui/preferences.ui.h:27 +#: ../data/ui/preferences.ui.h:19 msgid "Shallow Comparison" msgstr "Površno poređenje" -#: ../data/ui/preferences.ui.h:28 +#: ../data/ui/preferences.ui.h:20 msgid "C_ompare files based only on size and timestamp" msgstr "Up_oredi datoteke samo na osnovu veličine i vremenske oznake" -#: ../data/ui/preferences.ui.h:29 +#: ../data/ui/preferences.ui.h:21 msgid "_Timestamp resolution:" msgstr "_Rezolucija vremenske oznake:" -#: ../data/ui/preferences.ui.h:31 +#: ../data/ui/preferences.ui.h:23 +msgid "Note: enabling text filters may make comparing large files much slower" +msgstr "" +"Napomena: uključivanje filtera teksta može učiniti da poređenje velikih " +"datoteka bude mnogo sporije" + +#: ../data/ui/preferences.ui.h:24 msgid "Symbolic Links" msgstr "Simboličke veze" -#: ../data/ui/preferences.ui.h:33 +#: ../data/ui/preferences.ui.h:26 msgid "Visible Columns" msgstr "Prikazane kolone" -#: ../data/ui/preferences.ui.h:34 +#: ../data/ui/preferences.ui.h:27 msgid "Folder Comparisons" msgstr "Poređenje fascikli" -#: ../data/ui/preferences.ui.h:35 +#: ../data/ui/preferences.ui.h:28 msgid "Version Comparisons" msgstr "Poređenje izdanja" -#: ../data/ui/preferences.ui.h:36 +#: ../data/ui/preferences.ui.h:29 msgid "_Order when comparing file revisions:" msgstr "_Redosled pri poređenju pregleda datoteke:" -#: ../data/ui/preferences.ui.h:37 +#: ../data/ui/preferences.ui.h:30 msgid "Order when _merging files:" msgstr "Redosled pri _spajanju datoteka:" -#: ../data/ui/preferences.ui.h:38 +#: ../data/ui/preferences.ui.h:31 msgid "Commit Messages" msgstr "Poruke predaje" -#: ../data/ui/preferences.ui.h:39 +#: ../data/ui/preferences.ui.h:32 msgid "Show _right margin at:" msgstr "Prikaži _desnu marginu na:" -#: ../data/ui/preferences.ui.h:40 +#: ../data/ui/preferences.ui.h:33 msgid "Automatically _break lines at right margin on commit" msgstr "Sam _prelamaj redove na desnoj margini pri predaji" -#: ../data/ui/preferences.ui.h:41 +#: ../data/ui/preferences.ui.h:34 msgid "Version Control" msgstr "Upravljanje izdanjem" -#: ../data/ui/preferences.ui.h:42 +#: ../data/ui/preferences.ui.h:35 msgid "Filename filters" msgstr "Filteri naziva datoteka" -#: ../data/ui/preferences.ui.h:43 +#: ../data/ui/preferences.ui.h:36 msgid "" "When performing directory comparisons, you may filter out files and " "directories by name. Each pattern is a list of shell style wildcards " @@ -1130,23 +1116,23 @@ msgstr "" "prema nazivu. Svaki obrazac je spisak džokera u stilu konzole razdvojenih " "razmakom." -#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:103 +#: ../data/ui/preferences.ui.h:37 ../meld/meldwindow.py:104 msgid "File Filters" msgstr "Propusnici datoteka" -#: ../data/ui/preferences.ui.h:45 +#: ../data/ui/preferences.ui.h:38 msgid "Change trimming" msgstr "Skraćivanje izmene" -#: ../data/ui/preferences.ui.h:46 +#: ../data/ui/preferences.ui.h:39 msgid "Trim blank line differences from the start and end of changes" msgstr "Skraćuje razlike praznih redova od početka i kraja izmena" -#: ../data/ui/preferences.ui.h:47 +#: ../data/ui/preferences.ui.h:40 msgid "Text filters" msgstr "Filteri teksta" -#: ../data/ui/preferences.ui.h:48 +#: ../data/ui/preferences.ui.h:41 msgid "" "When performing file comparisons, you may ignore certain types of changes. " "Each pattern here is a python regular expression which replaces matching " @@ -1159,10 +1145,42 @@ msgstr "" "praznim niskama pre izvršavanja poređenja. Ako izraz sadrži grupe, samo grupe " "bivaju zamenjene. Za više detalja pogledajte uputstvo za korisnike." -#: ../data/ui/preferences.ui.h:49 +#: ../data/ui/preferences.ui.h:42 msgid "Text Filters" msgstr "Propusnici teksta" +#: ../data/ui/preferences.ui.h:43 +msgid "Left is remote, right is local" +msgstr "Leva je udaljena, desna je mesna" + +#: ../data/ui/preferences.ui.h:44 +msgid "Left is local, right is remote" +msgstr "Leva je mesna, desna je udaljena" + +#: ../data/ui/preferences.ui.h:45 +msgid "Remote, merge, local" +msgstr "Udaljena, spojena, mesna" + +#: ../data/ui/preferences.ui.h:46 +msgid "Local, merge, remote" +msgstr "Mesna, spojena, udaljena" + +#: ../data/ui/preferences.ui.h:47 +msgid "1ns (ext4)" +msgstr "1ns (ekst4)" + +#: ../data/ui/preferences.ui.h:48 +msgid "100ns (NTFS)" +msgstr "100ns (NTFS)" + +#: ../data/ui/preferences.ui.h:49 +msgid "1s (ext2/ext3)" +msgstr "1s (ekst2/ekst3)" + +#: ../data/ui/preferences.ui.h:50 +msgid "2s (VFAT)" +msgstr "2s (VFAT)" + #: ../data/ui/shortcuts.ui.h:1 msgctxt "shortcut window" msgid "General" @@ -1408,7 +1426,7 @@ msgctxt "shortcut window" msgid "Show/hide console output" msgstr "Prikazuje/skriva izlaz konzole" -#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:570 +#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:559 #: ../meld/newdifftab.py:38 msgid "New comparison" msgstr "Novo poređenje" @@ -1651,20 +1669,20 @@ msgstr "Sakrij „%s“" msgid "[%s] Scanning %s" msgstr "[%s] pregledam „%s“" -#: ../meld/dirdiff.py:826 +#: ../meld/dirdiff.py:825 #, python-format msgid "[%s] Done" msgstr "[%s] Gotovo" -#: ../meld/dirdiff.py:834 +#: ../meld/dirdiff.py:833 msgid "Folders have no differences" msgstr "Fascikle se ne razlikuju" -#: ../meld/dirdiff.py:836 +#: ../meld/dirdiff.py:835 msgid "Contents of scanned files in folders are identical." msgstr "Sadržaji pregledanih datoteka u fasciklama su isti." -#: ../meld/dirdiff.py:838 +#: ../meld/dirdiff.py:837 msgid "" "Scanned files in folders appear identical, but contents have not been " "scanned." @@ -1672,38 +1690,38 @@ msgstr "" "Pregledane datoteke u fasciklama izgleda da su iste, ali sadržaj nije " "pregledan." -#: ../meld/dirdiff.py:841 +#: ../meld/dirdiff.py:840 msgid "File filters are in use, so not all files have been scanned." msgstr "Filteri datoteka su u upotrebi, tako da nisu sve datoteke pregledane." -#: ../meld/dirdiff.py:843 +#: ../meld/dirdiff.py:842 msgid "Text filters are in use and may be masking content differences." msgstr "Filteri teksta su u upotrebi i možda su zamaskirali razlike sadržaja." -#: ../meld/dirdiff.py:861 ../meld/filediff.py:1386 ../meld/filediff.py:1416 -#: ../meld/filediff.py:1418 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 +#: ../meld/dirdiff.py:860 ../meld/filediff.py:1338 ../meld/filediff.py:1368 +#: ../meld/filediff.py:1370 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 msgid "Hi_de" msgstr "_Sakrij" -#: ../meld/dirdiff.py:871 +#: ../meld/dirdiff.py:870 msgid "Multiple errors occurred while scanning this folder" msgstr "Došlo je do više grešaka za vreme pretraživanja ove fascikle" -#: ../meld/dirdiff.py:872 +#: ../meld/dirdiff.py:871 msgid "Files with invalid encodings found" msgstr "Pronađene su datoteke sa neispravnim kodiranjem" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:874 +#: ../meld/dirdiff.py:873 msgid "Some files were in an incorrect encoding. The names are something like:" msgstr "Neke datoteke bejahu u neispravnom kodiranju. Nazivi su nešto kao:" -#: ../meld/dirdiff.py:876 +#: ../meld/dirdiff.py:875 msgid "Files hidden by case insensitive comparison" msgstr "Datoteke skrivene poređenjem neosetljivim na veličinu slova" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:878 +#: ../meld/dirdiff.py:877 msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. The following files in this folder are hidden:" @@ -1711,17 +1729,17 @@ msgstr "" "Pokrenuli ste poređenje nezavisno od veličine slova na sistemu datoteka gde " "je ona bitna. Neke datoteke nisu vidljive:" -#: ../meld/dirdiff.py:889 +#: ../meld/dirdiff.py:888 #, python-format msgid "'%s' hidden by '%s'" msgstr "„%s“ sakriveno od strane „%s“" -#: ../meld/dirdiff.py:945 +#: ../meld/dirdiff.py:944 #, python-format msgid "Replace folder “%s”?" msgstr "Da zamenim fasciklu „%s“?" -#: ../meld/dirdiff.py:947 +#: ../meld/dirdiff.py:946 #, python-format msgid "" "Another folder with the same name already exists in “%s”.\n" @@ -1730,11 +1748,11 @@ msgstr "" "Fascikla sa istim nazivom već postoji u „%s“.\n" "Ako zamenite postojeću fasciklu, sve datoteke u njoj biće izgubljene." -#: ../meld/dirdiff.py:960 +#: ../meld/dirdiff.py:959 msgid "Error copying file" msgstr "Greška umnožavanja datoteke" -#: ../meld/dirdiff.py:961 +#: ../meld/dirdiff.py:960 #, python-format msgid "" "Couldn't copy %s\n" @@ -1747,35 +1765,35 @@ msgstr "" "\n" "%s" -#: ../meld/dirdiff.py:984 +#: ../meld/dirdiff.py:983 #, python-format msgid "Error deleting %s" msgstr "Greška brisanja „%s“" -#: ../meld/dirdiff.py:1489 +#: ../meld/dirdiff.py:1494 msgid "No folder" msgstr "Nema fascikle" #. Abbreviations for insert and overwrite that fit in the status bar -#: ../meld/filediff.py:354 +#: ../meld/filediff.py:311 msgid "INS" msgstr "UMET" -#: ../meld/filediff.py:354 +#: ../meld/filediff.py:311 msgid "OVR" msgstr "PREP" #. Abbreviation for line, column so that it will fit in the status bar -#: ../meld/filediff.py:356 +#: ../meld/filediff.py:313 #, python-format msgid "Ln %i, Col %i" msgstr "Red %i, mesto %i" -#: ../meld/filediff.py:781 +#: ../meld/filediff.py:738 msgid "Comparison results will be inaccurate" msgstr "Rezultati poređenja biće netačni" -#: ../meld/filediff.py:783 +#: ../meld/filediff.py:740 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1783,64 +1801,64 @@ msgstr "" "Filter je izmenio broj redova u datoteci, a to nije podržano. Poređenje neće " "biti tačno." -#: ../meld/filediff.py:841 +#: ../meld/filediff.py:796 msgid "Mark conflict as resolved?" msgstr "Da označim sukob rešenim?" -#: ../meld/filediff.py:843 +#: ../meld/filediff.py:798 msgid "" "If the conflict was resolved successfully, you may mark it as resolved now." msgstr "Ako je sukob uspešno rešen, sada ga možete označiti rešenim." -#: ../meld/filediff.py:845 +#: ../meld/filediff.py:800 msgid "Cancel" msgstr "Otkaži" -#: ../meld/filediff.py:846 +#: ../meld/filediff.py:801 msgid "Mark _Resolved" msgstr "Označi _rešenim" -#: ../meld/filediff.py:1095 +#: ../meld/filediff.py:1049 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Došlo je do problema otvaranja datoteke „%s“." -#: ../meld/filediff.py:1103 +#: ../meld/filediff.py:1057 #, python-format msgid "File %s appears to be a binary file." msgstr "Izgleda da je „%s“ izvršna datoteka." -#: ../meld/filediff.py:1105 +#: ../meld/filediff.py:1059 msgid "Do you want to open the file using the default application?" msgstr "Da li želite da otvorite datoteku koristeći osnovni program?" -#: ../meld/filediff.py:1107 +#: ../meld/filediff.py:1061 msgid "Open" msgstr "Otvori" -#: ../meld/filediff.py:1123 +#: ../meld/filediff.py:1077 #, python-format msgid "[%s] Computing differences" msgstr "Sračunavam razlike [%s]" -#: ../meld/filediff.py:1188 +#: ../meld/filediff.py:1142 #, python-format msgid "File %s has changed on disk" msgstr "Datoteka „%s“ je izmenjena na disku" -#: ../meld/filediff.py:1189 +#: ../meld/filediff.py:1143 msgid "Do you want to reload the file?" msgstr "Da li želite ponovo da učitate datoteku?" -#: ../meld/filediff.py:1191 +#: ../meld/filediff.py:1145 msgid "_Reload" msgstr "_Učitaj ponovo" -#: ../meld/filediff.py:1349 +#: ../meld/filediff.py:1301 msgid "Files are identical" msgstr "Datoteke su istovetne" -#: ../meld/filediff.py:1362 +#: ../meld/filediff.py:1314 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1848,11 +1866,11 @@ msgstr "" "Korišćeni su filteri teksta, a mogu postojati i zamaskirane razlike između " "datoteka. Da li želite da poredite neizdvojene datoteke?" -#: ../meld/filediff.py:1367 +#: ../meld/filediff.py:1319 msgid "Files differ in line endings only" msgstr "Datoteke se razlikuju samo po završecima redova" -#: ../meld/filediff.py:1369 +#: ../meld/filediff.py:1321 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1861,15 +1879,15 @@ msgstr "" "Datoteke su istovetne ali se razlikuju samo po završecima redova:\n" "%s" -#: ../meld/filediff.py:1389 +#: ../meld/filediff.py:1341 msgid "Show without filters" msgstr "Prikazuje bez filtera" -#: ../meld/filediff.py:1411 +#: ../meld/filediff.py:1363 msgid "Change highlighting incomplete" msgstr "Isticanje izmena nije dovršeno" -#: ../meld/filediff.py:1412 +#: ../meld/filediff.py:1364 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." @@ -1877,20 +1895,20 @@ msgstr "" "Neke izmene nisu istaknute zato što su prevelike. Možete da primorate Meld " "da produži sa isticanjem većih izmena, iako to može biti sporo." -#: ../meld/filediff.py:1420 +#: ../meld/filediff.py:1372 msgid "Keep highlighting" msgstr "Zadržite isticanje" -#: ../meld/filediff.py:1422 +#: ../meld/filediff.py:1374 msgid "_Keep highlighting" msgstr "_Zadrži isticanje" -#: ../meld/filediff.py:1454 +#: ../meld/filediff.py:1406 #, python-format msgid "Replace file “%s”?" msgstr "Da zamenim datoteku „%s“?" -#: ../meld/filediff.py:1456 +#: ../meld/filediff.py:1408 #, python-format msgid "" "A file with this name already exists in “%s”.\n" @@ -1899,45 +1917,45 @@ msgstr "" "Datoteka sa ovim nazivom već postoji u „%s“.\n" "Ako zamenite postojeću datoteku, njen sadržaj biće izgubljen." -#: ../meld/filediff.py:1473 +#: ../meld/filediff.py:1425 msgid "Save Left Pane As" msgstr "Sačuvaj levu površ kao" -#: ../meld/filediff.py:1475 +#: ../meld/filediff.py:1427 msgid "Save Middle Pane As" msgstr "Sačuvaj srednju površ kao" -#: ../meld/filediff.py:1477 +#: ../meld/filediff.py:1429 msgid "Save Right Pane As" msgstr "Sačuvaj desnu površ kao" -#: ../meld/filediff.py:1491 +#: ../meld/filediff.py:1443 #, python-format msgid "File %s has changed on disk since it was opened" msgstr "Datoteka „%s“ je izmenjena na disku nakon otvaranja" -#: ../meld/filediff.py:1493 +#: ../meld/filediff.py:1445 msgid "If you save it, any external changes will be lost." msgstr "Ako je sačuvate, sve spoljne izmene će biti izgubljene." -#: ../meld/filediff.py:1496 +#: ../meld/filediff.py:1448 msgid "Save Anyway" msgstr "Ipak sačuvaj" -#: ../meld/filediff.py:1497 +#: ../meld/filediff.py:1449 msgid "Don't Save" msgstr "Nemoj čuvati" -#: ../meld/filediff.py:1519 +#: ../meld/filediff.py:1475 msgid "_Save as UTF-8" msgstr "_Sačuvaj kao UTF-8" -#: ../meld/filediff.py:1522 +#: ../meld/filediff.py:1478 #, python-format msgid "Couldn't encode text as “%s”" msgstr "Ne mogu da kodiram tekst kao „%s“" -#: ../meld/filediff.py:1524 +#: ../meld/filediff.py:1480 #, python-format msgid "" "File “%s” contains characters that can't be encoded using encoding “%s”.\n" @@ -1946,12 +1964,12 @@ msgstr "" "„%s“ sadrži znakove koji se ne mogu kodirati upotrebom kodiranja „%s“\n" "Da li želite da sačuvate kao UTF-8?" -#: ../meld/filediff.py:1564 ../meld/patchdialog.py:120 +#: ../meld/filediff.py:1520 ../meld/patchdialog.py:130 #, python-format msgid "Could not save file %s." msgstr "Ne mogu da sačuvam datoteku „%s“." -#: ../meld/filediff.py:1565 ../meld/patchdialog.py:121 +#: ../meld/filediff.py:1521 ../meld/patchdialog.py:131 #, python-format msgid "" "Couldn't save file due to:\n" @@ -1960,11 +1978,11 @@ msgstr "" "Ne mogu da sačuvam datoteku zbog sledećeg:\n" "%s" -#: ../meld/filediff.py:1910 +#: ../meld/filediff.py:1867 msgid "Live comparison updating disabled" msgstr "Isključeno je živo ažuriranje poređenja" -#: ../meld/filediff.py:1911 +#: ../meld/filediff.py:1868 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -1979,11 +1997,11 @@ msgstr "" msgid "[%s] Merging files" msgstr "Objedinjujem datoteke [%s]" -#: ../meld/gutterrendererchunk.py:159 +#: ../meld/gutterrendererchunk.py:210 msgid "Copy _up" msgstr "Umnoži _gore" -#: ../meld/gutterrendererchunk.py:160 +#: ../meld/gutterrendererchunk.py:211 msgid "Copy _down" msgstr "Umnoži _dole" @@ -2088,196 +2106,196 @@ msgstr "" msgid "untitled" msgstr "bezimeni" -#: ../meld/meldwindow.py:48 +#: ../meld/meldwindow.py:49 msgid "_File" msgstr "_Datoteka" -#: ../meld/meldwindow.py:49 +#: ../meld/meldwindow.py:50 msgid "_New Comparison..." msgstr "_Novo poređenje..." -#: ../meld/meldwindow.py:50 +#: ../meld/meldwindow.py:51 msgid "Start a new comparison" msgstr "Započnite novo poređenje" -#: ../meld/meldwindow.py:53 +#: ../meld/meldwindow.py:54 msgid "Save the current file" msgstr "Sačuvajte trenutnu datoteku" -#: ../meld/meldwindow.py:55 +#: ../meld/meldwindow.py:56 msgid "Save As..." msgstr "Sačuvaj kao..." -#: ../meld/meldwindow.py:56 +#: ../meld/meldwindow.py:57 msgid "Save the current file with a different name" msgstr "Sačuvajte tekuću datoteku pod drugim nazivom" -#: ../meld/meldwindow.py:59 +#: ../meld/meldwindow.py:60 msgid "Close the current file" msgstr "Zatvorite trenutnu datoteku" -#: ../meld/meldwindow.py:62 +#: ../meld/meldwindow.py:63 msgid "_Edit" msgstr "_Uređivanje" -#: ../meld/meldwindow.py:64 +#: ../meld/meldwindow.py:65 msgid "Undo the last action" msgstr "Opozovite poslednju radnju" -#: ../meld/meldwindow.py:67 +#: ../meld/meldwindow.py:68 msgid "Redo the last undone action" msgstr "Ponovite poslednju opozvanu radnju" -#: ../meld/meldwindow.py:69 +#: ../meld/meldwindow.py:70 msgid "Cut the selection" msgstr "Isecite izbor" -#: ../meld/meldwindow.py:71 +#: ../meld/meldwindow.py:72 msgid "Copy the selection" msgstr "Umnožite izbor" -#: ../meld/meldwindow.py:73 +#: ../meld/meldwindow.py:74 msgid "Paste the clipboard" msgstr "Ubacite ostavu" -#: ../meld/meldwindow.py:75 +#: ../meld/meldwindow.py:76 msgid "Find..." msgstr "Pronađi..." -#: ../meld/meldwindow.py:75 +#: ../meld/meldwindow.py:76 msgid "Search for text" msgstr "Tražite tekst" -#: ../meld/meldwindow.py:77 +#: ../meld/meldwindow.py:78 msgid "Find Ne_xt" msgstr "Nađi s_ledeće" -#: ../meld/meldwindow.py:78 +#: ../meld/meldwindow.py:79 msgid "Search forwards for the same text" msgstr "Tražite unapred isti tekst" -#: ../meld/meldwindow.py:80 +#: ../meld/meldwindow.py:81 msgid "Find _Previous" msgstr "Nađi pre_thodno" -#: ../meld/meldwindow.py:81 +#: ../meld/meldwindow.py:82 msgid "Search backwards for the same text" msgstr "Tražite unazad isti tekst" -#: ../meld/meldwindow.py:84 +#: ../meld/meldwindow.py:85 msgid "_Replace..." msgstr "_Zameni..." -#: ../meld/meldwindow.py:85 +#: ../meld/meldwindow.py:86 msgid "Find and replace text" msgstr "Pronađite i zamenite tekst" -#: ../meld/meldwindow.py:88 +#: ../meld/meldwindow.py:89 msgid "_Changes" msgstr "_Izmene" -#: ../meld/meldwindow.py:89 +#: ../meld/meldwindow.py:90 msgid "Next Change" msgstr "Sledeća izmena" -#: ../meld/meldwindow.py:90 +#: ../meld/meldwindow.py:91 msgid "Go to the next change" msgstr "Idite na sledeću izmenu" -#: ../meld/meldwindow.py:92 +#: ../meld/meldwindow.py:93 msgid "Previous Change" msgstr "Prethodna izmena" -#: ../meld/meldwindow.py:93 +#: ../meld/meldwindow.py:94 msgid "Go to the previous change" msgstr "Idite na prethodnu izmenu" -#: ../meld/meldwindow.py:95 +#: ../meld/meldwindow.py:96 msgid "Open Externally" msgstr "Otvori spoljnim" -#: ../meld/meldwindow.py:96 +#: ../meld/meldwindow.py:97 msgid "Open selected file or directory in the default external application" msgstr "Otvorite izabranu datoteku ili fasciklu u osnovnom spoljnom programu" -#: ../meld/meldwindow.py:100 +#: ../meld/meldwindow.py:101 msgid "_View" msgstr "P_regled" -#: ../meld/meldwindow.py:101 +#: ../meld/meldwindow.py:102 msgid "File Status" msgstr "Stanje datoteke" -#: ../meld/meldwindow.py:102 +#: ../meld/meldwindow.py:103 msgid "Version Status" msgstr "Stanje izdanja" -#: ../meld/meldwindow.py:105 +#: ../meld/meldwindow.py:106 msgid "Stop the current action" msgstr "Zaustavite trenutnu radnju" -#: ../meld/meldwindow.py:108 +#: ../meld/meldwindow.py:109 msgid "Refresh the view" msgstr "Osvežite pregled" -#: ../meld/meldwindow.py:112 +#: ../meld/meldwindow.py:113 msgid "Fullscreen" msgstr "Preko celog ekrana" -#: ../meld/meldwindow.py:113 +#: ../meld/meldwindow.py:114 msgid "View the comparison in fullscreen" msgstr "Pregledajte poređenje preko celog ekrana" -#: ../meld/meldwindow.py:115 +#: ../meld/meldwindow.py:116 msgid "_Toolbar" msgstr "_Traka alata" -#: ../meld/meldwindow.py:116 +#: ../meld/meldwindow.py:117 msgid "Show or hide the toolbar" msgstr "Prikažite ili sakrijte traku alata" -#: ../meld/meldwindow.py:126 +#: ../meld/meldwindow.py:127 msgid "Open Recent" msgstr "Otvori skorašnje" -#: ../meld/meldwindow.py:127 +#: ../meld/meldwindow.py:128 msgid "Open recent files" msgstr "Otvorite skorašnje datoteke" -#: ../meld/meldwindow.py:149 +#: ../meld/meldwindow.py:150 msgid "_Meld" msgstr "_Meld" -#: ../meld/meldwindow.py:150 +#: ../meld/meldwindow.py:151 msgid "Quit the program" msgstr "Zatvorite program" -#: ../meld/meldwindow.py:152 +#: ../meld/meldwindow.py:153 msgid "Prefere_nces" msgstr "_Postavke" -#: ../meld/meldwindow.py:153 +#: ../meld/meldwindow.py:154 msgid "Configure the application" msgstr "Podesite program" -#: ../meld/meldwindow.py:155 +#: ../meld/meldwindow.py:156 msgid "_Contents" msgstr "_Sadržaj" -#: ../meld/meldwindow.py:156 +#: ../meld/meldwindow.py:157 msgid "Open the Meld manual" msgstr "Otvorite uputstvo Melda" -#: ../meld/meldwindow.py:158 +#: ../meld/meldwindow.py:159 msgid "About this application" msgstr "O ovom programu" -#: ../meld/meldwindow.py:604 +#: ../meld/meldwindow.py:593 #, python-format msgid "Need three files to auto-merge, got: %r" msgstr "Potrebne su tri datoteke za samo-spajanje, dobih: %r" -#: ../meld/meldwindow.py:618 +#: ../meld/meldwindow.py:607 msgid "Cannot compare a mixture of files and directories" msgstr "Ne mogu da poredim mešavinu datoteka i fascikli" @@ -2288,7 +2306,7 @@ msgstr "" "Ne mogu da nađem pojedinosti šeme boje za „%s-%s“; jer je loše instalirana" #. no common path. empty names get changed to "[None]" -#: ../meld/misc.py:263 +#: ../meld/misc.py:265 msgid "[None]" msgstr "[ništa]" From b2ec209144705b183b80ff94b0292370abb3a06a Mon Sep 17 00:00:00 2001 From: Paul Seyfert Date: Tue, 28 Feb 2017 20:08:20 +0000 Subject: [PATCH 0134/1316] Update German translation --- po/de.po | 276 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 142 insertions(+), 134 deletions(-) diff --git a/po/de.po b/po/de.po index 4720d592..425370cd 100644 --- a/po/de.po +++ b/po/de.po @@ -8,34 +8,35 @@ # Holger Wansing , 2010. # Benjamin Steinwender , 2014. # Bernd Homuth , 2015. +# Paul Seyfert , 2017. # msgid "" msgstr "" "Project-Id-Version: meld master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" "product=meld&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-09-30 23:28+0000\n" -"PO-Revision-Date: 2016-10-01 21:16+0200\n" -"Last-Translator: Mario Blättermann \n" +"POT-Creation-Date: 2017-02-23 20:47+0000\n" +"PO-Revision-Date: 2017-02-28 21:01+0100\n" +"Last-Translator: Paul Seyfert \n" "Language-Team: Deutsch \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 1.8.9\n" +"X-Generator: Poedit 1.6.10\n" "X-Poedit-Bookmarks: -1,351,-1,-1,-1,-1,-1,-1,-1,-1\n" -#: ../bin/meld:142 +#: ../bin/meld:179 msgid "Cannot import: " msgstr "Import nicht möglich: " -#: ../bin/meld:145 +#: ../bin/meld:182 #, c-format msgid "Meld requires %s or higher." msgstr "Meld benötigt %s oder aktueller." -#: ../bin/meld:191 +#: ../bin/meld:227 #, c-format msgid "" "Couldn't load Meld-specific CSS (%s)\n" @@ -311,7 +312,7 @@ msgid "" msgstr "" "Liste der Spaltennamen im Ordnervergleich und ob sie angezeigt werden sollen." -#: ../data/org.gnome.meld.gschema.xml.h:39 ../data/ui/preferences.ui.h:32 +#: ../data/org.gnome.meld.gschema.xml.h:39 ../data/ui/preferences.ui.h:25 msgid "Ignore symbolic links" msgstr "Symbolische Verknüpfungen ignorieren" @@ -354,7 +355,7 @@ msgstr "" "verschieden gelten. Diese Funktion ist nützlich beim Vergleichen von Dateien " "auf unterschiedlichen Dateisystemen mit verschiedenen Zeitauflösungen." -#: ../data/org.gnome.meld.gschema.xml.h:45 ../data/ui/preferences.ui.h:30 +#: ../data/org.gnome.meld.gschema.xml.h:45 ../data/ui/preferences.ui.h:22 msgid "Apply text filters during folder comparisons" msgstr "Textfilter während eines Ordnervergleichs anwenden" @@ -547,7 +548,8 @@ msgstr "" "Holger Wansing \n" "Benjamin Steinwender \n" "Christian Kirbach \n" -"Bernd Homuth " +"Bernd Homuth \n" +"Paul Seyfert " #: ../data/ui/application.ui.h:6 msgid "_Preferences" @@ -597,7 +599,7 @@ msgstr "Nach rechts kopieren" msgid "Delete selected" msgstr "Markierte löschen" -#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:858 ../meld/filediff.py:1382 +#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:858 ../meld/filediff.py:1336 msgid "Hide" msgstr "Verbergen" @@ -889,8 +891,8 @@ msgstr "Wenn Sie nicht speichern, gehen die Änderungen verloren." msgid "Close _without Saving" msgstr "Schließen _ohne zu Speichern" -#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:940 ../meld/filediff.py:1448 -#: ../meld/filediff.py:1520 +#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:940 ../meld/filediff.py:1402 +#: ../meld/filediff.py:1474 msgid "_Cancel" msgstr "A_bbrechen" @@ -927,7 +929,7 @@ msgstr "Nicht gespeicherte Dokumentenänderungen zurücknehmen?" msgid "Changes made to the following documents will be permanently lost:\n" msgstr "Änderungen der folgenden Dokumente werden verloren gehen:\n" -#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:941 ../meld/filediff.py:1449 +#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:941 ../meld/filediff.py:1403 msgid "_Replace" msgstr "E_rsetzen" @@ -975,7 +977,7 @@ msgstr "Als Patch formatieren" msgid "Copy to Clipboard" msgstr "In die Zwischenablage kopieren" -#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:155 +#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:154 msgid "Save Patch" msgstr "Patch speichern" @@ -996,166 +998,139 @@ msgid "_Reverse patch direction" msgstr "Patch-_Richtung umkehren" #: ../data/ui/preferences.ui.h:1 -msgid "Left is remote, right is local" -msgstr "Links ist die entfernte Datei, rechts die lokale" - -#: ../data/ui/preferences.ui.h:2 -msgid "Left is local, right is remote" -msgstr "Links is die lokale Datei, rechts die entfernte" - -#: ../data/ui/preferences.ui.h:3 -msgid "Remote, merge, local" -msgstr "Entfernt, zusammengeführt, lokal" - -#: ../data/ui/preferences.ui.h:4 -msgid "Local, merge, remote" -msgstr "Lokal, zusammengeführt, entfernt" - -#: ../data/ui/preferences.ui.h:5 -msgid "1ns (ext4)" -msgstr "1ns (ext4)" - -#: ../data/ui/preferences.ui.h:6 -msgid "100ns (NTFS)" -msgstr "100ns (NTFS)" - -#: ../data/ui/preferences.ui.h:7 -msgid "1s (ext2/ext3)" -msgstr "1s (ext2/ext3)" - -#: ../data/ui/preferences.ui.h:8 -msgid "2s (VFAT)" -msgstr "2s (VFAT)" - -#: ../data/ui/preferences.ui.h:9 msgid "Meld Preferences" msgstr "Meld - Einstellungen" -#: ../data/ui/preferences.ui.h:10 +#: ../data/ui/preferences.ui.h:2 msgid "Font" msgstr "Schrift" -#: ../data/ui/preferences.ui.h:11 +#: ../data/ui/preferences.ui.h:3 msgid "_Use the system fixed width font" msgstr "Die dicktengleiche S_ystemschrift verwenden" -#: ../data/ui/preferences.ui.h:12 +#: ../data/ui/preferences.ui.h:4 msgid "_Editor font:" msgstr "Editor-_Schrift:" -#: ../data/ui/preferences.ui.h:13 +#: ../data/ui/preferences.ui.h:5 msgid "Display" msgstr "Darstellung" -#: ../data/ui/preferences.ui.h:14 +#: ../data/ui/preferences.ui.h:6 msgid "_Tab width:" msgstr "_Tabulatorbreite:" -#: ../data/ui/preferences.ui.h:15 +#: ../data/ui/preferences.ui.h:7 msgid "_Insert spaces instead of tabs" msgstr "Leerze_ichen anstelle von Tabulatoren verwenden" -#: ../data/ui/preferences.ui.h:16 +#: ../data/ui/preferences.ui.h:8 msgid "Enable text _wrapping" msgstr "Zeilen_umbruch aktivieren" -#: ../data/ui/preferences.ui.h:17 +#: ../data/ui/preferences.ui.h:9 msgid "Do not _split words over two lines" msgstr "Nur am _Wortende umbrechen" -#: ../data/ui/preferences.ui.h:18 +#: ../data/ui/preferences.ui.h:10 msgid "Highlight _current line" msgstr "Aktuelle Zeile _hervorheben" -#: ../data/ui/preferences.ui.h:19 +#: ../data/ui/preferences.ui.h:11 msgid "Show _line numbers" msgstr "Zei_lennummern anzeigen" -#: ../data/ui/preferences.ui.h:20 +#: ../data/ui/preferences.ui.h:12 msgid "Show w_hitespace" msgstr "Leerzeic_hen anzeigen" -#: ../data/ui/preferences.ui.h:21 +#: ../data/ui/preferences.ui.h:13 msgid "Use s_yntax highlighting" msgstr "S_yntaxhervorhebung verwenden" -#: ../data/ui/preferences.ui.h:22 +#: ../data/ui/preferences.ui.h:14 msgid "Syntax highlighting color scheme:" msgstr "Farbschema der Syntaxhervorhebung:" -#: ../data/ui/preferences.ui.h:23 +#: ../data/ui/preferences.ui.h:15 msgid "External Editor" msgstr "Externes Bearbeitungsprogramm" -#: ../data/ui/preferences.ui.h:24 +#: ../data/ui/preferences.ui.h:16 msgid "Use _default system editor" msgstr "_Den vom System vorgegebenen Editor verwenden" -#: ../data/ui/preferences.ui.h:25 +#: ../data/ui/preferences.ui.h:17 msgid "Edito_r command:" msgstr "Edito_r-Befehl:" -#: ../data/ui/preferences.ui.h:26 +#: ../data/ui/preferences.ui.h:18 msgid "Editor" msgstr "Editor" -#: ../data/ui/preferences.ui.h:27 +#: ../data/ui/preferences.ui.h:19 msgid "Shallow Comparison" msgstr "Oberflächlicher Vergleich" -#: ../data/ui/preferences.ui.h:28 +#: ../data/ui/preferences.ui.h:20 msgid "C_ompare files based only on size and timestamp" msgstr "Dateien nur anhand _Größe und Änderungszeit vergleichen" -#: ../data/ui/preferences.ui.h:29 +#: ../data/ui/preferences.ui.h:21 msgid "_Timestamp resolution:" msgstr "Genauigkeit des Zeitstempels:" -#: ../data/ui/preferences.ui.h:31 +#: ../data/ui/preferences.ui.h:23 +msgid "Note: enabling text filters may make comparing large files much slower" +msgstr "" +"Beachten Sie: Textfilter können Vergleiche großer Dateien sehr verlangsamen" + +#: ../data/ui/preferences.ui.h:24 msgid "Symbolic Links" msgstr "Symbolische Verknüpfungen" -#: ../data/ui/preferences.ui.h:33 +#: ../data/ui/preferences.ui.h:26 msgid "Visible Columns" msgstr "Sichtbare Spalten" -#: ../data/ui/preferences.ui.h:34 +#: ../data/ui/preferences.ui.h:27 msgid "Folder Comparisons" msgstr "Ordnervergleiche" -#: ../data/ui/preferences.ui.h:35 +#: ../data/ui/preferences.ui.h:28 msgid "Version Comparisons" msgstr "Versionsvergleiche" -#: ../data/ui/preferences.ui.h:36 +#: ../data/ui/preferences.ui.h:29 msgid "_Order when comparing file revisions:" msgstr "_Reihenfolge beim Vergleichen von Dateiversionen:" -#: ../data/ui/preferences.ui.h:37 +#: ../data/ui/preferences.ui.h:30 msgid "Order when _merging files:" msgstr "Reihenfolge beim _Zusammenführen von Dateien:" -#: ../data/ui/preferences.ui.h:38 +#: ../data/ui/preferences.ui.h:31 msgid "Commit Messages" msgstr "Änderungsmitteilungen" -#: ../data/ui/preferences.ui.h:39 +#: ../data/ui/preferences.ui.h:32 msgid "Show _right margin at:" msgstr "_Rechten Rand anzeigen bei:" -#: ../data/ui/preferences.ui.h:40 +#: ../data/ui/preferences.ui.h:33 msgid "Automatically _break lines at right margin on commit" msgstr "Beim Einspielen die Zeilen am rechten Rand automatisch um_brechen" -#: ../data/ui/preferences.ui.h:41 +#: ../data/ui/preferences.ui.h:34 msgid "Version Control" msgstr "Versionskontrolle" -#: ../data/ui/preferences.ui.h:42 +#: ../data/ui/preferences.ui.h:35 msgid "Filename filters" msgstr "Dateinamenfilter" -#: ../data/ui/preferences.ui.h:43 +#: ../data/ui/preferences.ui.h:36 msgid "" "When performing directory comparisons, you may filter out files and " "directories by name. Each pattern is a list of shell style wildcards " @@ -1165,23 +1140,23 @@ msgstr "" "Dateien und Ordner nach Namen herauszufiltern. Jedes Muster ist dabei eine " "durch Leerzeichen getrennte Liste von Befehlszeilenplatzhaltern." -#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:104 +#: ../data/ui/preferences.ui.h:37 ../meld/meldwindow.py:104 msgid "File Filters" msgstr "Dateifilter" -#: ../data/ui/preferences.ui.h:45 +#: ../data/ui/preferences.ui.h:38 msgid "Change trimming" msgstr "Abschneiden ändern" -#: ../data/ui/preferences.ui.h:46 +#: ../data/ui/preferences.ui.h:39 msgid "Trim blank line differences from the start and end of changes" msgstr "Unterschiede in Leerzeilen vor und nach Änderungen abschneiden" -#: ../data/ui/preferences.ui.h:47 +#: ../data/ui/preferences.ui.h:40 msgid "Text filters" msgstr "Textfilter" -#: ../data/ui/preferences.ui.h:48 +#: ../data/ui/preferences.ui.h:41 msgid "" "When performing file comparisons, you may ignore certain types of changes. " "Each pattern here is a python regular expression which replaces matching " @@ -1196,10 +1171,42 @@ msgstr "" "wird. Falls der Ausdruck Gruppen enthält, werden nur die Gruppen ersetzt. " "Weitere Informationen sind im Benutzerhandbuch zu finden." -#: ../data/ui/preferences.ui.h:49 +#: ../data/ui/preferences.ui.h:42 msgid "Text Filters" msgstr "Textfilter" +#: ../data/ui/preferences.ui.h:43 +msgid "Left is remote, right is local" +msgstr "Links ist die entfernte Datei, rechts die lokale" + +#: ../data/ui/preferences.ui.h:44 +msgid "Left is local, right is remote" +msgstr "Links is die lokale Datei, rechts die entfernte" + +#: ../data/ui/preferences.ui.h:45 +msgid "Remote, merge, local" +msgstr "Entfernt, zusammengeführt, lokal" + +#: ../data/ui/preferences.ui.h:46 +msgid "Local, merge, remote" +msgstr "Lokal, zusammengeführt, entfernt" + +#: ../data/ui/preferences.ui.h:47 +msgid "1ns (ext4)" +msgstr "1ns (ext4)" + +#: ../data/ui/preferences.ui.h:48 +msgid "100ns (NTFS)" +msgstr "100ns (NTFS)" + +#: ../data/ui/preferences.ui.h:49 +msgid "1s (ext2/ext3)" +msgstr "1s (ext2/ext3)" + +#: ../data/ui/preferences.ui.h:50 +msgid "2s (VFAT)" +msgstr "2s (VFAT)" + #: ../data/ui/shortcuts.ui.h:1 msgctxt "shortcut window" msgid "General" @@ -1721,8 +1728,9 @@ msgstr "" "Textfilter werden verwendet, welche Unterschiede zwischen Dateien maskieren " "könnten." -#: ../meld/dirdiff.py:860 ../meld/filediff.py:1384 ../meld/filediff.py:1414 -#: ../meld/filediff.py:1416 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 +#: ../meld/dirdiff.py:860 ../meld/filediff.py:1338 ../meld/filediff.py:1368 +#: ../meld/filediff.py:1370 ../meld/ui/msgarea.py:109 +#: ../meld/ui/msgarea.py:122 msgid "Hi_de" msgstr "Ver_bergen" @@ -1796,30 +1804,30 @@ msgstr "" msgid "Error deleting %s" msgstr "Fehler beim Löschen von »%s«" -#: ../meld/dirdiff.py:1488 +#: ../meld/dirdiff.py:1494 msgid "No folder" msgstr "Kein Ordner" #. Abbreviations for insert and overwrite that fit in the status bar -#: ../meld/filediff.py:355 +#: ../meld/filediff.py:311 msgid "INS" msgstr "EINF" -#: ../meld/filediff.py:355 +#: ../meld/filediff.py:311 msgid "OVR" msgstr "ÜBR" #. Abbreviation for line, column so that it will fit in the status bar -#: ../meld/filediff.py:357 +#: ../meld/filediff.py:313 #, python-format msgid "Ln %i, Col %i" msgstr "Zeile %i, Spalte %i" -#: ../meld/filediff.py:782 +#: ../meld/filediff.py:738 msgid "Comparison results will be inaccurate" msgstr "Ergebnisse werden ungenau sein" -#: ../meld/filediff.py:784 +#: ../meld/filediff.py:740 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1828,66 +1836,66 @@ msgstr "" "nicht unterstützt, deshalb wird ein Vergleich keine korrekten Ergebnisse " "liefern." -#: ../meld/filediff.py:840 +#: ../meld/filediff.py:796 msgid "Mark conflict as resolved?" msgstr "Konflikt als _gelöst markieren?" -#: ../meld/filediff.py:842 +#: ../meld/filediff.py:798 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:844 +#: ../meld/filediff.py:800 msgid "Cancel" msgstr "Abbrechen" -#: ../meld/filediff.py:845 +#: ../meld/filediff.py:801 msgid "Mark _Resolved" msgstr "Als _gelöst markieren" -#: ../meld/filediff.py:1093 +#: ../meld/filediff.py:1049 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Beim Öffnen der Datei »%s« ist ein Fehler aufgetreten." -#: ../meld/filediff.py:1101 +#: ../meld/filediff.py:1057 #, python-format msgid "File %s appears to be a binary file." msgstr "Datei %s scheint eine Binärdatei zu sein." -#: ../meld/filediff.py:1103 +#: ../meld/filediff.py:1059 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:1105 +#: ../meld/filediff.py:1061 msgid "Open" msgstr "Öffnen" -#: ../meld/filediff.py:1121 +#: ../meld/filediff.py:1077 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Unterschiede werden berechnet" -#: ../meld/filediff.py:1186 +#: ../meld/filediff.py:1142 #, python-format msgid "File %s has changed on disk" msgstr "Die Datei %s wurde auf dem Datenträger geändert" -#: ../meld/filediff.py:1187 +#: ../meld/filediff.py:1143 msgid "Do you want to reload the file?" msgstr "Möchten Sie die Datei neu laden?" -#: ../meld/filediff.py:1189 +#: ../meld/filediff.py:1145 msgid "_Reload" msgstr "_Neu laden" -#: ../meld/filediff.py:1347 +#: ../meld/filediff.py:1301 msgid "Files are identical" msgstr "Dateien sind identisch" -#: ../meld/filediff.py:1360 +#: ../meld/filediff.py:1314 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1895,11 +1903,11 @@ msgstr "" "Textfilter werden verwendet, welche Unterschiede zwischen Dateien maskieren " "könnten. Wollen Sie die ungefilterten Dateien vergleichen?" -#: ../meld/filediff.py:1365 +#: ../meld/filediff.py:1319 msgid "Files differ in line endings only" msgstr "Dateien unterscheiden sich nur in den Zeilenendungen" -#: ../meld/filediff.py:1367 +#: ../meld/filediff.py:1321 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1908,15 +1916,15 @@ msgstr "" "Dateien sind identisch, abgesehen von unterschiedlichen Zeilenenden:\n" "%s" -#: ../meld/filediff.py:1387 +#: ../meld/filediff.py:1341 msgid "Show without filters" msgstr "Ungefiltert anzeigen" -#: ../meld/filediff.py:1409 +#: ../meld/filediff.py:1363 msgid "Change highlighting incomplete" msgstr "Änderungsmarkierung unvollständig" -#: ../meld/filediff.py:1410 +#: ../meld/filediff.py:1364 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." @@ -1925,20 +1933,20 @@ msgstr "" "Sie können Meld zur Hervorhebung längerer Änderungen zwingen, was jedoch " "langsam sein könnte." -#: ../meld/filediff.py:1418 +#: ../meld/filediff.py:1372 msgid "Keep highlighting" msgstr "Hervorhebung fortführen" -#: ../meld/filediff.py:1420 +#: ../meld/filediff.py:1374 msgid "_Keep highlighting" msgstr "Hervorhebung _fortführen" -#: ../meld/filediff.py:1452 +#: ../meld/filediff.py:1406 #, python-format msgid "Replace file “%s”?" msgstr "Datei »%s« ersetzen?" -#: ../meld/filediff.py:1454 +#: ../meld/filediff.py:1408 #, python-format msgid "" "A file with this name already exists in “%s”.\n" @@ -1947,46 +1955,46 @@ msgstr "" "Eine Datei mit diesem Namen existiert bereits in »%s«.\n" "Wenn Sie die vorhandene Datei ersetzen, geht dessen Inhalt verloren." -#: ../meld/filediff.py:1471 +#: ../meld/filediff.py:1425 msgid "Save Left Pane As" msgstr "Linke Ansicht speichern unter" -#: ../meld/filediff.py:1473 +#: ../meld/filediff.py:1427 msgid "Save Middle Pane As" msgstr "Mittlere Ansicht speichern unter" -#: ../meld/filediff.py:1475 +#: ../meld/filediff.py:1429 msgid "Save Right Pane As" msgstr "Rechte Ansicht speichern unter" -#: ../meld/filediff.py:1489 +#: ../meld/filediff.py:1443 #, 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:1491 +#: ../meld/filediff.py:1445 msgid "If you save it, any external changes will be lost." msgstr "Wenn Sie speichern, gehen externe Änderungen verloren." -#: ../meld/filediff.py:1494 +#: ../meld/filediff.py:1448 msgid "Save Anyway" msgstr "Dennoch speichern" -#: ../meld/filediff.py:1495 +#: ../meld/filediff.py:1449 msgid "Don't Save" msgstr "Nicht Speichern" -#: ../meld/filediff.py:1521 +#: ../meld/filediff.py:1475 msgid "_Save as UTF-8" msgstr "Als UTF-8 _speichern" -#: ../meld/filediff.py:1524 +#: ../meld/filediff.py:1478 #, python-format msgid "Couldn't encode text as “%s”" msgstr "Text konnte nicht als »%s« kodiert werden." -#: ../meld/filediff.py:1526 +#: ../meld/filediff.py:1480 #, python-format msgid "" "File “%s” contains characters that can't be encoded using encoding “%s”.\n" @@ -1995,12 +2003,12 @@ msgstr "" "Die Datei »%s« enthält Zeichen, die mit »%s« nicht kodierbar sind.\n" "Möchten Sie im UTF-8-Format speichern?" -#: ../meld/filediff.py:1566 ../meld/patchdialog.py:131 +#: ../meld/filediff.py:1520 ../meld/patchdialog.py:130 #, python-format msgid "Could not save file %s." msgstr "Datei %s konnte nicht gespeichert werden." -#: ../meld/filediff.py:1567 ../meld/patchdialog.py:132 +#: ../meld/filediff.py:1521 ../meld/patchdialog.py:131 #, python-format msgid "" "Couldn't save file due to:\n" @@ -2009,11 +2017,11 @@ msgstr "" "Datei konnte nicht gespeichert werden:\n" "%s" -#: ../meld/filediff.py:1913 +#: ../meld/filediff.py:1869 msgid "Live comparison updating disabled" msgstr "Direkte Vergleichsaktualisierung deaktiviert" -#: ../meld/filediff.py:1914 +#: ../meld/filediff.py:1870 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -2029,11 +2037,11 @@ msgstr "" msgid "[%s] Merging files" msgstr "[%s] Dateien werden zusammengeführt" -#: ../meld/gutterrendererchunk.py:159 +#: ../meld/gutterrendererchunk.py:210 msgid "Copy _up" msgstr "Nach _oben kopieren" -#: ../meld/gutterrendererchunk.py:160 +#: ../meld/gutterrendererchunk.py:211 msgid "Copy _down" msgstr "Nach _unten kopieren" @@ -2341,7 +2349,7 @@ msgstr "" "ist fehlerhaft." #. no common path. empty names get changed to "[None]" -#: ../meld/misc.py:263 +#: ../meld/misc.py:261 msgid "[None]" msgstr "[Nichts]" From ce7274cea3768002d65814198e8d7d48bb842823 Mon Sep 17 00:00:00 2001 From: Josef Andersson Date: Tue, 7 Mar 2017 13:15:59 +0000 Subject: [PATCH 0135/1316] Update Swedish translation --- po/sv.po | 544 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 279 insertions(+), 265 deletions(-) diff --git a/po/sv.po b/po/sv.po index 6f1af32d..b79ef69b 100644 --- a/po/sv.po +++ b/po/sv.po @@ -3,36 +3,36 @@ # Christian Rose , 2005. # Daniel Nylander , 2006, 2007, 2008, 2009, 2011. # Sebastian Rasmussen , 2015. -# Josef Andersson , 2014, 2015, 2016. # Anders Jonsson , 2016. +# Josef Andersson , 2014, 2015, 2016, 2017. # msgid "" msgstr "" "Project-Id-Version: meld\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" "product=meld&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-08-20 21:39+0000\n" -"PO-Revision-Date: 2016-08-21 22:37+0200\n" -"Last-Translator: Anders Jonsson \n" +"POT-Creation-Date: 2017-02-23 20:47+0000\n" +"PO-Revision-Date: 2017-03-07 12:32+0100\n" +"Last-Translator: Josef Andersson \n" "Language-Team: Swedish \n" "Language: sv\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 1.8.8\n" +"X-Generator: Poedit 1.8.11\n" "X-Project-Style: gnome\n" -#: ../bin/meld:142 +#: ../bin/meld:179 msgid "Cannot import: " msgstr "Kan inte importera: " -#: ../bin/meld:145 +#: ../bin/meld:182 #, c-format msgid "Meld requires %s or higher." msgstr "Meld kräver %s eller högre." -#: ../bin/meld:194 +#: ../bin/meld:227 #, c-format msgid "" "Couldn't load Meld-specific CSS (%s)\n" @@ -93,34 +93,42 @@ msgid "Meld comparison description" msgstr "Meld jämförelsebeskrivning" #: ../data/org.gnome.meld.gschema.xml.h:1 -msgid "Default window size" -msgstr "Standardstorlek för fönster" +msgid "Default window width" +msgstr "Standardbredd för fönster" #: ../data/org.gnome.meld.gschema.xml.h:2 -msgid "Default window state" -msgstr "Standardtillstånd för fönster" +msgid "Default window height" +msgstr "Standardhöjd för fönster" #: ../data/org.gnome.meld.gschema.xml.h:3 +msgid "Default window maximised state" +msgstr "Maximeringstillstånd för standardfönster" + +#: ../data/org.gnome.meld.gschema.xml.h:4 +msgid "Default window fullscreen state" +msgstr "Helskärmstillstånd för standardfönster" + +#: ../data/org.gnome.meld.gschema.xml.h:5 msgid "Show toolbar" msgstr "Visa verktygsfältet" -#: ../data/org.gnome.meld.gschema.xml.h:4 +#: ../data/org.gnome.meld.gschema.xml.h:6 msgid "If true, the window toolbar is visible." msgstr "Om true så är fönsterverktygsfältet synlig." -#: ../data/org.gnome.meld.gschema.xml.h:5 +#: ../data/org.gnome.meld.gschema.xml.h:7 msgid "Show statusbar" msgstr "Visa statusraden" -#: ../data/org.gnome.meld.gschema.xml.h:6 +#: ../data/org.gnome.meld.gschema.xml.h:8 msgid "If true, the window statusbar is visible." msgstr "Om true så är fönsterstatusraden synlig." -#: ../data/org.gnome.meld.gschema.xml.h:7 +#: ../data/org.gnome.meld.gschema.xml.h:9 msgid "Additional automatically detected text encodings" msgstr "Ytterligare automatiskt upptäckta textkodningar" -#: ../data/org.gnome.meld.gschema.xml.h:8 +#: ../data/org.gnome.meld.gschema.xml.h:10 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 " @@ -132,36 +140,36 @@ msgstr "" "kommer UTF-8 och standardkodningen för aktuell lokal alltid att användas. " "Andra kodningar kan också provas beroende på användarens lokal." -#: ../data/org.gnome.meld.gschema.xml.h:9 +#: ../data/org.gnome.meld.gschema.xml.h:11 msgid "Width of an indentation step" msgstr "Bredden på ett indenteringssteg" -#: ../data/org.gnome.meld.gschema.xml.h:10 +#: ../data/org.gnome.meld.gschema.xml.h:12 msgid "The number of spaces to use for a single indent step" msgstr "Antalet blanksteg att använda för ett ensamt indenteringssteg" -#: ../data/org.gnome.meld.gschema.xml.h:11 +#: ../data/org.gnome.meld.gschema.xml.h:13 msgid "Whether to indent using spaces or tabs" msgstr "Huruvida indentering sker med blanksteg eller tabb" -#: ../data/org.gnome.meld.gschema.xml.h:12 +#: ../data/org.gnome.meld.gschema.xml.h:14 msgid "If true, any new indentation will use spaces instead of tabs." msgstr "" "Om true kommer nya indenteringar att använda blanksteg istället för tabbar." -#: ../data/org.gnome.meld.gschema.xml.h:13 +#: ../data/org.gnome.meld.gschema.xml.h:15 msgid "Show line numbers" msgstr "Visa radnummer" -#: ../data/org.gnome.meld.gschema.xml.h:14 +#: ../data/org.gnome.meld.gschema.xml.h:16 msgid "If true, line numbers will be shown in the gutter of file comparisons." msgstr "Om true visas radnummer i marginalen på filjämförelserna." -#: ../data/org.gnome.meld.gschema.xml.h:15 +#: ../data/org.gnome.meld.gschema.xml.h:17 msgid "Highlight syntax" msgstr "Markera syntax" -#: ../data/org.gnome.meld.gschema.xml.h:16 +#: ../data/org.gnome.meld.gschema.xml.h:18 msgid "" "Whether to highlight syntax in comparisons. Because of Meld's own color " "highlighting, this is off by default." @@ -169,23 +177,23 @@ msgstr "" "Huruvida syntax ska markeras i jämförelser. På grund av Melds egna " "markeringar är detta som standard av." -#: ../data/org.gnome.meld.gschema.xml.h:17 +#: ../data/org.gnome.meld.gschema.xml.h:19 msgid "Color scheme to use for syntax highlighting" msgstr "Färgschema att använda för syntaxmarkering" -#: ../data/org.gnome.meld.gschema.xml.h:18 +#: ../data/org.gnome.meld.gschema.xml.h:20 msgid "Used by GtkSourceView to determine colors for syntax highlighting" msgstr "" "Används av GtkSourceView för att bestämma färger för färgmarkering av syntax" -#: ../data/org.gnome.meld.gschema.xml.h:19 +#: ../data/org.gnome.meld.gschema.xml.h:21 msgid "Displayed whitespace" msgstr "Visade tomrum" # # Detta är värden för gschema-nycklar, använd \" runt dem # http://listor.tp-sv.se/pipermail/tp-sv/2014-July/000779.html -#: ../data/org.gnome.meld.gschema.xml.h:20 +#: ../data/org.gnome.meld.gschema.xml.h:22 msgid "" "Selector for individual whitespace character types to be shown. Possible " "values are 'space', 'tab', 'newline' and 'nbsp'." @@ -193,11 +201,11 @@ msgstr "" "Väljare för individuella tomrumsteckentyper att visa. Möjliga värden är " "\"space\", \"tab\", \"newline\" och \"nbsp\"." -#: ../data/org.gnome.meld.gschema.xml.h:21 +#: ../data/org.gnome.meld.gschema.xml.h:23 msgid "Wrap mode" msgstr "Radbrytningsläge" -#: ../data/org.gnome.meld.gschema.xml.h:22 +#: ../data/org.gnome.meld.gschema.xml.h:24 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 " @@ -207,32 +215,32 @@ msgstr "" "antingen inte alls (\"none\"), vid vilket tecken som helst (\"char\") eller " "bara vid slutet av ord (\"word\")." -#: ../data/org.gnome.meld.gschema.xml.h:23 +#: ../data/org.gnome.meld.gschema.xml.h:25 msgid "Highlight current line" msgstr "Markera aktuell rad" -#: ../data/org.gnome.meld.gschema.xml.h:24 +#: ../data/org.gnome.meld.gschema.xml.h:26 msgid "" "If true, the line containing the cursor will be highlighted in file " "comparisons." msgstr "Om true kommer raden med markören att bli markerad i filjämförelser." -#: ../data/org.gnome.meld.gschema.xml.h:25 +#: ../data/org.gnome.meld.gschema.xml.h:27 msgid "Use the system default monospace font" msgstr "Använd systemets standard typsnitt med fast breddsteg" -#: ../data/org.gnome.meld.gschema.xml.h:26 +#: ../data/org.gnome.meld.gschema.xml.h:28 msgid "" "If false, custom-font will be used instead of the system monospace font." msgstr "" "Om false kommer det anpassade typsnittet att användas istället för systemets " "monospace-typsnitt." -#: ../data/org.gnome.meld.gschema.xml.h:27 +#: ../data/org.gnome.meld.gschema.xml.h:29 msgid "Custom font" msgstr "Anpassat typsnitt" -#: ../data/org.gnome.meld.gschema.xml.h:28 +#: ../data/org.gnome.meld.gschema.xml.h:30 msgid "" "The custom font to use, stored as a string and parsed as a Pango font " "description." @@ -240,21 +248,21 @@ msgstr "" "Det anpassade typsnittet att använda, lagrat som en sträng och tolkat som en " "som en Pango typsnittsbeskrivning." -#: ../data/org.gnome.meld.gschema.xml.h:29 +#: ../data/org.gnome.meld.gschema.xml.h:31 msgid "Ignore blank lines when comparing files" msgstr "Ignorera tomma rader vid filjämförelser" -#: ../data/org.gnome.meld.gschema.xml.h:30 +#: ../data/org.gnome.meld.gschema.xml.h:32 msgid "" "If true, blank lines will be trimmed when highlighting changes between files." msgstr "" "Om true kommer tomma rader att tas bort när ändringar markeras mellan filer." -#: ../data/org.gnome.meld.gschema.xml.h:31 +#: ../data/org.gnome.meld.gschema.xml.h:33 msgid "Use the system default editor" msgstr "Använd systemets standardredigerare" -#: ../data/org.gnome.meld.gschema.xml.h:32 +#: ../data/org.gnome.meld.gschema.xml.h:34 msgid "" "If false, custom-editor-command will be used instead of the system editor " "when opening files externally." @@ -262,11 +270,11 @@ msgstr "" "Om false kommer den anpassade redigeraren att användas istället för " "systemredigeraren när filer öppnas externt." -#: ../data/org.gnome.meld.gschema.xml.h:33 +#: ../data/org.gnome.meld.gschema.xml.h:35 msgid "The custom editor launch command" msgstr "Kommandot för att starta anpassad redigerare" -#: ../data/org.gnome.meld.gschema.xml.h:34 +#: ../data/org.gnome.meld.gschema.xml.h:36 msgid "" "The command used to launch a custom editor. Some limited templating is " "supported here; at the moment '{file}' and '{line}' are recognised tokens." @@ -274,21 +282,21 @@ msgstr "" "Kommandot för att starta en anpassad redigerare. Begränsat mallstöd här; för " "tillfället är ”{file}” och ”{line}” igenkända informationsbärare." -#: ../data/org.gnome.meld.gschema.xml.h:35 +#: ../data/org.gnome.meld.gschema.xml.h:37 msgid "Columns to display" msgstr "Kolumner att visa" -#: ../data/org.gnome.meld.gschema.xml.h:36 +#: ../data/org.gnome.meld.gschema.xml.h:38 msgid "" "List of column names in folder comparison and whether they should be " "displayed." msgstr "Lista av kolumnnamn vid mappjämförelse och huruvida de ska visas." -#: ../data/org.gnome.meld.gschema.xml.h:37 ../data/ui/preferences.ui.h:32 +#: ../data/org.gnome.meld.gschema.xml.h:39 ../data/ui/preferences.ui.h:25 msgid "Ignore symbolic links" msgstr "Ignorera symboliska länkar" -#: ../data/org.gnome.meld.gschema.xml.h:38 +#: ../data/org.gnome.meld.gschema.xml.h:40 msgid "" "If true, folder comparisons do not follow symbolic links when traversing the " "folder tree." @@ -296,11 +304,11 @@ msgstr "" "Om true följer inte mappjämförelser symboliska länkar när mappträdet " "genomsöks." -#: ../data/org.gnome.meld.gschema.xml.h:39 +#: ../data/org.gnome.meld.gschema.xml.h:41 msgid "Use shallow comparison" msgstr "Använd ytlig jämförelse" -#: ../data/org.gnome.meld.gschema.xml.h:40 +#: ../data/org.gnome.meld.gschema.xml.h:42 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 " @@ -309,11 +317,11 @@ msgstr "" "Om true sker mappjämförelser endast baserat på storlek och mtime och bedömer " "filerna identiska om deras storlek och mtime matchar, annars inte." -#: ../data/org.gnome.meld.gschema.xml.h:41 +#: ../data/org.gnome.meld.gschema.xml.h:43 msgid "File timestamp resolution" msgstr "Tidsstämpelupplösning på filen" -#: ../data/org.gnome.meld.gschema.xml.h:42 +#: ../data/org.gnome.meld.gschema.xml.h:44 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 " @@ -325,11 +333,11 @@ msgstr "" "användbart när filer jämförs på olika filsystem med olika " "tidsstämpelupplösningar." -#: ../data/org.gnome.meld.gschema.xml.h:43 ../data/ui/preferences.ui.h:30 +#: ../data/org.gnome.meld.gschema.xml.h:45 ../data/ui/preferences.ui.h:22 msgid "Apply text filters during folder comparisons" msgstr "Verkställ textfilter vid mappjämförelser" -#: ../data/org.gnome.meld.gschema.xml.h:44 +#: ../data/org.gnome.meld.gschema.xml.h:46 msgid "" "If true, folder comparisons that compare file contents also apply active " "text filters and the blank line trimming option, and ignore newline " @@ -339,21 +347,21 @@ msgstr "" "aktiva textfilter och alternativet att trimma tomma rader samt ignorera " "nyradsskillnader." -#: ../data/org.gnome.meld.gschema.xml.h:45 +#: ../data/org.gnome.meld.gschema.xml.h:47 msgid "File status filters" msgstr "Filstatusfilter" -#: ../data/org.gnome.meld.gschema.xml.h:46 +#: ../data/org.gnome.meld.gschema.xml.h:48 msgid "List of statuses used to filter visible files in folder comparison." msgstr "" "Lista över statusar använda till att filtrera synliga filer vid " "mappjämförelse." -#: ../data/org.gnome.meld.gschema.xml.h:47 +#: ../data/org.gnome.meld.gschema.xml.h:49 msgid "Show the version control console output" msgstr "Visa versionshanterarens konsolutmatning" -#: ../data/org.gnome.meld.gschema.xml.h:48 +#: ../data/org.gnome.meld.gschema.xml.h:50 msgid "" "If true, a console output section will be shown in version control views, " "showing the commands run for version control operations." @@ -361,11 +369,11 @@ msgstr "" "Om true kommer en konsolutmatning att visas i versionshanteringsvyer, " "visandes de kommandon som körs vid versionshanteringsåtgärder." -#: ../data/org.gnome.meld.gschema.xml.h:49 +#: ../data/org.gnome.meld.gschema.xml.h:51 msgid "Version control pane position" msgstr "Position för versionshanteringspanelen" -#: ../data/org.gnome.meld.gschema.xml.h:50 +#: ../data/org.gnome.meld.gschema.xml.h:52 msgid "" "This is the height of the main version control tree when the console pane is " "shown." @@ -373,11 +381,11 @@ msgstr "" "Detta är höjden på huvudträdet för versionshanteringen när konsolpanelen " "visas." -#: ../data/org.gnome.meld.gschema.xml.h:51 +#: ../data/org.gnome.meld.gschema.xml.h:53 msgid "Present version comparisons as left-local/right-remote" msgstr "Visa versionsjämförelser som vänster-lokal/höger-fjärr" -#: ../data/org.gnome.meld.gschema.xml.h:52 +#: ../data/org.gnome.meld.gschema.xml.h:54 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, " @@ -388,11 +396,11 @@ msgstr "" "presenteras i paneler. Annars används ett vänster-är-deras-, höger-är-mitt-" "schema." -#: ../data/org.gnome.meld.gschema.xml.h:53 +#: ../data/org.gnome.meld.gschema.xml.h:55 msgid "Order for files in three-way version control merge comparisons" msgstr "Sortering för filer i trevägsjämförelser med versionshantering" -#: ../data/org.gnome.meld.gschema.xml.h:54 +#: ../data/org.gnome.meld.gschema.xml.h:56 msgid "" "Choices for file order are remote/merged/local and local/merged/remote. This " "preference only affects three-way comparisons launched from the version " @@ -403,11 +411,11 @@ msgstr "" "versionshanteringsvyn, och används endast för sammanfogning/konfliktlösning " "i Meld." -#: ../data/org.gnome.meld.gschema.xml.h:55 +#: ../data/org.gnome.meld.gschema.xml.h:57 msgid "Show margin in commit message editor" msgstr "Visa marginal i redigeraren för incheckningsmeddelanden" -#: ../data/org.gnome.meld.gschema.xml.h:56 +#: ../data/org.gnome.meld.gschema.xml.h:58 msgid "" "If true, a guide will be displayed to show what column the margin is at in " "the version control commit message editor." @@ -415,11 +423,11 @@ msgstr "" "Om true så visas en guide för marginalens kolumn i " "versionshanteringsredigeraren för incheckningsmeddelanden." -#: ../data/org.gnome.meld.gschema.xml.h:57 +#: ../data/org.gnome.meld.gschema.xml.h:59 msgid "Margin column in commit message editor" msgstr "Marginalkolumn i redigeraren för incheckningsmeddelanden" -#: ../data/org.gnome.meld.gschema.xml.h:58 +#: ../data/org.gnome.meld.gschema.xml.h:60 msgid "" "The column at which to show the margin in the version control commit message " "editor." @@ -427,11 +435,11 @@ msgstr "" "Kolumnen i vilken marginalen ska visas i versionshanteringsredigeraren för " "incheckningsmeddelanden." -#: ../data/org.gnome.meld.gschema.xml.h:59 +#: ../data/org.gnome.meld.gschema.xml.h:61 msgid "Automatically hard-wrap commit messages" msgstr "Automatisk radbrytning av incheckningsmeddelanden" -#: ../data/org.gnome.meld.gschema.xml.h:60 +#: ../data/org.gnome.meld.gschema.xml.h:62 msgid "" "If true, the version control commit message editor will hard-wrap (i.e., " "insert line breaks) at the commit margin before commit." @@ -440,22 +448,22 @@ msgstr "" "radbrytas (d.v.s. infoga radbrytning) vid incheckningsmarginalen före " "incheckning." -#: ../data/org.gnome.meld.gschema.xml.h:61 +#: ../data/org.gnome.meld.gschema.xml.h:63 msgid "Version control status filters" msgstr "Statusfilter för versionshantering" -#: ../data/org.gnome.meld.gschema.xml.h:62 +#: ../data/org.gnome.meld.gschema.xml.h:64 msgid "" "List of statuses used to filter visible files in version control comparison." msgstr "" "Statuslista använd för att filtrera synliga filer vid " "versionshanteringsjämförelse." -#: ../data/org.gnome.meld.gschema.xml.h:63 +#: ../data/org.gnome.meld.gschema.xml.h:65 msgid "Filename-based filters" msgstr "Filnamnsbaserade filter" -#: ../data/org.gnome.meld.gschema.xml.h:64 +#: ../data/org.gnome.meld.gschema.xml.h:66 msgid "" "List of predefined filename-based filters that, if active, will remove " "matching files from a folder comparison." @@ -463,11 +471,11 @@ msgstr "" "Lista över fördefinierade filnamnsbaserade filter som, om aktiva, kommer att " "ta bort matchande filer vid en mappjämförelse." -#: ../data/org.gnome.meld.gschema.xml.h:65 +#: ../data/org.gnome.meld.gschema.xml.h:67 msgid "Text-based filters" msgstr "Textbaserade filter" -#: ../data/org.gnome.meld.gschema.xml.h:66 +#: ../data/org.gnome.meld.gschema.xml.h:68 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, " @@ -567,7 +575,7 @@ msgstr "Kopiera till höger" msgid "Delete selected" msgstr "Ta bort markerade" -#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:859 ../meld/filediff.py:1384 +#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:858 ../meld/filediff.py:1336 msgid "Hide" msgstr "Dölj" @@ -858,8 +866,8 @@ msgstr "Sparar du inte kommer ändringar att gå förlorade för alltid." msgid "Close _without Saving" msgstr "Stäng _utan att spara" -#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:941 ../meld/filediff.py:1450 -#: ../meld/filediff.py:1518 +#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:940 ../meld/filediff.py:1402 +#: ../meld/filediff.py:1474 msgid "_Cancel" msgstr "_Avbryt" @@ -896,7 +904,7 @@ msgid "Changes made to the following documents will be permanently lost:\n" msgstr "" "Ändringar utförda i följande dokument kommer att gå förlorade för alltid:\n" -#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:942 ../meld/filediff.py:1451 +#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:941 ../meld/filediff.py:1403 msgid "_Replace" msgstr "_Ersätt" @@ -944,7 +952,7 @@ msgstr "Formatera som programfix" msgid "Copy to Clipboard" msgstr "Kopiera till Urklipp" -#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:144 +#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:154 msgid "Save Patch" msgstr "Spara programfix" @@ -965,166 +973,140 @@ msgid "_Reverse patch direction" msgstr "_Omvänd programfixriktning" #: ../data/ui/preferences.ui.h:1 -msgid "Left is remote, right is local" -msgstr "Vänster är fjärr, höger är lokal" - -#: ../data/ui/preferences.ui.h:2 -msgid "Left is local, right is remote" -msgstr "Vänster är lokal, höger är fjärr" - -#: ../data/ui/preferences.ui.h:3 -msgid "Remote, merge, local" -msgstr "Fjärr, sammanfoga, lokal" - -#: ../data/ui/preferences.ui.h:4 -msgid "Local, merge, remote" -msgstr "Lokal, sammanfoga, fjärr" - -#: ../data/ui/preferences.ui.h:5 -msgid "1ns (ext4)" -msgstr "1ns (ext4)" - -#: ../data/ui/preferences.ui.h:6 -msgid "100ns (NTFS)" -msgstr "100ns (NTFS)" - -#: ../data/ui/preferences.ui.h:7 -msgid "1s (ext2/ext3)" -msgstr "1s (ext2/ext3)" - -#: ../data/ui/preferences.ui.h:8 -msgid "2s (VFAT)" -msgstr "2s (VFAT)" - -#: ../data/ui/preferences.ui.h:9 msgid "Meld Preferences" msgstr "Inställningar för Meld" -#: ../data/ui/preferences.ui.h:10 +#: ../data/ui/preferences.ui.h:2 msgid "Font" msgstr "Typsnitt" -#: ../data/ui/preferences.ui.h:11 +#: ../data/ui/preferences.ui.h:3 msgid "_Use the system fixed width font" msgstr "_Använd systemets typsnitt med fast bredd" -#: ../data/ui/preferences.ui.h:12 +#: ../data/ui/preferences.ui.h:4 msgid "_Editor font:" msgstr "_Typsnitt för redigerare:" -#: ../data/ui/preferences.ui.h:13 +#: ../data/ui/preferences.ui.h:5 msgid "Display" msgstr "Visa" -#: ../data/ui/preferences.ui.h:14 +#: ../data/ui/preferences.ui.h:6 msgid "_Tab width:" msgstr "_Tabulatorbredd:" -#: ../data/ui/preferences.ui.h:15 +#: ../data/ui/preferences.ui.h:7 msgid "_Insert spaces instead of tabs" msgstr "_Infoga blanksteg istället för tabbar" -#: ../data/ui/preferences.ui.h:16 +#: ../data/ui/preferences.ui.h:8 msgid "Enable text _wrapping" msgstr "Aktivera text_radbrytning" -#: ../data/ui/preferences.ui.h:17 +#: ../data/ui/preferences.ui.h:9 msgid "Do not _split words over two lines" msgstr "Dela inte _ord över två rader" -#: ../data/ui/preferences.ui.h:18 +#: ../data/ui/preferences.ui.h:10 msgid "Highlight _current line" msgstr "Markera _aktuell rad" -#: ../data/ui/preferences.ui.h:19 +#: ../data/ui/preferences.ui.h:11 msgid "Show _line numbers" msgstr "Visa _radnummer" -#: ../data/ui/preferences.ui.h:20 +#: ../data/ui/preferences.ui.h:12 msgid "Show w_hitespace" msgstr "Visa tom_rum" -#: ../data/ui/preferences.ui.h:21 +#: ../data/ui/preferences.ui.h:13 msgid "Use s_yntax highlighting" msgstr "Använd _syntaxmarkering" -#: ../data/ui/preferences.ui.h:22 +#: ../data/ui/preferences.ui.h:14 msgid "Syntax highlighting color scheme:" msgstr "Färgschema för syntaxmarkering:" -#: ../data/ui/preferences.ui.h:23 +#: ../data/ui/preferences.ui.h:15 msgid "External Editor" msgstr "Extern redigerare" -#: ../data/ui/preferences.ui.h:24 +#: ../data/ui/preferences.ui.h:16 msgid "Use _default system editor" msgstr "Använd systemets standardred_igerare" -#: ../data/ui/preferences.ui.h:25 +#: ../data/ui/preferences.ui.h:17 msgid "Edito_r command:" msgstr "Kommando för re_digerare:" -#: ../data/ui/preferences.ui.h:26 +#: ../data/ui/preferences.ui.h:18 msgid "Editor" msgstr "Redigerare" -#: ../data/ui/preferences.ui.h:27 +#: ../data/ui/preferences.ui.h:19 msgid "Shallow Comparison" msgstr "Ytlig jämförelse" -#: ../data/ui/preferences.ui.h:28 +#: ../data/ui/preferences.ui.h:20 msgid "C_ompare files based only on size and timestamp" msgstr "J_ämför filer enbart baserat på storlek och tidsstämpel" -#: ../data/ui/preferences.ui.h:29 +#: ../data/ui/preferences.ui.h:21 msgid "_Timestamp resolution:" msgstr "_Tidsstämpelupplösning:" -#: ../data/ui/preferences.ui.h:31 +#: ../data/ui/preferences.ui.h:23 +msgid "Note: enabling text filters may make comparing large files much slower" +msgstr "" +"Observera: att aktivera textfilter kan göra att jämförelse av stora filer " +"blir mycket långsammare" + +#: ../data/ui/preferences.ui.h:24 msgid "Symbolic Links" msgstr "Symboliska länkar" -#: ../data/ui/preferences.ui.h:33 +#: ../data/ui/preferences.ui.h:26 msgid "Visible Columns" msgstr "Synliga kolumner" -#: ../data/ui/preferences.ui.h:34 +#: ../data/ui/preferences.ui.h:27 msgid "Folder Comparisons" msgstr "Mappjämförelser" -#: ../data/ui/preferences.ui.h:35 +#: ../data/ui/preferences.ui.h:28 msgid "Version Comparisons" msgstr "Versionsjämförelser" -#: ../data/ui/preferences.ui.h:36 +#: ../data/ui/preferences.ui.h:29 msgid "_Order when comparing file revisions:" msgstr "_Sortering vid jämförelse av filrevisioner:" -#: ../data/ui/preferences.ui.h:37 +#: ../data/ui/preferences.ui.h:30 msgid "Order when _merging files:" msgstr "Sortering när filer _sammanfogas:" -#: ../data/ui/preferences.ui.h:38 +#: ../data/ui/preferences.ui.h:31 msgid "Commit Messages" msgstr "Incheckningsmeddelanden" -#: ../data/ui/preferences.ui.h:39 +#: ../data/ui/preferences.ui.h:32 msgid "Show _right margin at:" msgstr "Visa _högermarginal vid:" -#: ../data/ui/preferences.ui.h:40 +#: ../data/ui/preferences.ui.h:33 msgid "Automatically _break lines at right margin on commit" msgstr "_Radbryt automatiskt vid högermarginal under incheckning" -#: ../data/ui/preferences.ui.h:41 +#: ../data/ui/preferences.ui.h:34 msgid "Version Control" msgstr "Versionshantering" -#: ../data/ui/preferences.ui.h:42 +#: ../data/ui/preferences.ui.h:35 msgid "Filename filters" msgstr "Filnamnsfilter" -#: ../data/ui/preferences.ui.h:43 +#: ../data/ui/preferences.ui.h:36 msgid "" "When performing directory comparisons, you may filter out files and " "directories by name. Each pattern is a list of shell style wildcards " @@ -1134,23 +1116,23 @@ msgstr "" "deras namn. Varje mönster är en lista med jokertecken i skalstil, åtskilda " "med blanksteg." -#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:103 +#: ../data/ui/preferences.ui.h:37 ../meld/meldwindow.py:104 msgid "File Filters" msgstr "Filfilter" -#: ../data/ui/preferences.ui.h:45 +#: ../data/ui/preferences.ui.h:38 msgid "Change trimming" msgstr "Ändra borttagning av blanksteg" -#: ../data/ui/preferences.ui.h:46 +#: ../data/ui/preferences.ui.h:39 msgid "Trim blank line differences from the start and end of changes" msgstr "Ta bort tomma radskillnader från början och slutet av ändringar" -#: ../data/ui/preferences.ui.h:47 +#: ../data/ui/preferences.ui.h:40 msgid "Text filters" msgstr "Textfilter" -#: ../data/ui/preferences.ui.h:48 +#: ../data/ui/preferences.ui.h:41 msgid "" "When performing file comparisons, you may ignore certain types of changes. " "Each pattern here is a python regular expression which replaces matching " @@ -1164,10 +1146,42 @@ msgstr "" "grupper kommer endast grupperna att ersättas. Se användarhandboken för mer " "information." -#: ../data/ui/preferences.ui.h:49 +#: ../data/ui/preferences.ui.h:42 msgid "Text Filters" msgstr "Textfilter" +#: ../data/ui/preferences.ui.h:43 +msgid "Left is remote, right is local" +msgstr "Vänster är fjärr, höger är lokal" + +#: ../data/ui/preferences.ui.h:44 +msgid "Left is local, right is remote" +msgstr "Vänster är lokal, höger är fjärr" + +#: ../data/ui/preferences.ui.h:45 +msgid "Remote, merge, local" +msgstr "Fjärr, sammanfoga, lokal" + +#: ../data/ui/preferences.ui.h:46 +msgid "Local, merge, remote" +msgstr "Lokal, sammanfoga, fjärr" + +#: ../data/ui/preferences.ui.h:47 +msgid "1ns (ext4)" +msgstr "1ns (ext4)" + +#: ../data/ui/preferences.ui.h:48 +msgid "100ns (NTFS)" +msgstr "100ns (NTFS)" + +#: ../data/ui/preferences.ui.h:49 +msgid "1s (ext2/ext3)" +msgstr "1s (ext2/ext3)" + +#: ../data/ui/preferences.ui.h:50 +msgid "2s (VFAT)" +msgstr "2s (VFAT)" + #: ../data/ui/shortcuts.ui.h:1 msgctxt "shortcut window" msgid "General" @@ -1413,7 +1427,7 @@ msgctxt "shortcut window" msgid "Show/hide console output" msgstr "Visa/dölj konsolutskrift" -#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:570 +#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:559 #: ../meld/newdifftab.py:38 msgid "New comparison" msgstr "Ny jämförelse" @@ -1655,58 +1669,58 @@ msgstr "Dölj %s" msgid "[%s] Scanning %s" msgstr "[%s] Söker igenom %s" -#: ../meld/dirdiff.py:826 +#: ../meld/dirdiff.py:825 #, python-format msgid "[%s] Done" msgstr "[%s] Klar" -#: ../meld/dirdiff.py:834 +#: ../meld/dirdiff.py:833 msgid "Folders have no differences" msgstr "Mapparna skiljer sig inte åt" -#: ../meld/dirdiff.py:836 +#: ../meld/dirdiff.py:835 msgid "Contents of scanned files in folders are identical." msgstr "Innehållet i mapparnas avsökta filer är identiskt." -#: ../meld/dirdiff.py:838 +#: ../meld/dirdiff.py:837 msgid "" "Scanned files in folders appear identical, but contents have not been " "scanned." msgstr "" "Mapparnas avsökta filer verkar identiska, men innehållet har inte genomsökts." -#: ../meld/dirdiff.py:841 +#: ../meld/dirdiff.py:840 msgid "File filters are in use, so not all files have been scanned." msgstr "Filfilter används, och därför har inte alla filer genomsökts." -#: ../meld/dirdiff.py:843 +#: ../meld/dirdiff.py:842 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:861 ../meld/filediff.py:1386 ../meld/filediff.py:1416 -#: ../meld/filediff.py:1418 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 +#: ../meld/dirdiff.py:860 ../meld/filediff.py:1338 ../meld/filediff.py:1368 +#: ../meld/filediff.py:1370 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 msgid "Hi_de" msgstr "_Dölj" -#: ../meld/dirdiff.py:871 +#: ../meld/dirdiff.py:870 msgid "Multiple errors occurred while scanning this folder" msgstr "Flera fel inträffade vid avsökning av denna mapp" -#: ../meld/dirdiff.py:872 +#: ../meld/dirdiff.py:871 msgid "Files with invalid encodings found" msgstr "Filer med ogiltiga teckenkodningar hittades" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:874 +#: ../meld/dirdiff.py:873 msgid "Some files were in an incorrect encoding. The names are something like:" msgstr "En del filer hade en felaktig kodning. Namnen är ungefär:" -#: ../meld/dirdiff.py:876 +#: ../meld/dirdiff.py:875 msgid "Files hidden by case insensitive comparison" msgstr "Filer dolda av skiftlägeskänslig jämförelse" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:878 +#: ../meld/dirdiff.py:877 msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. The following files in this folder are hidden:" @@ -1714,17 +1728,17 @@ msgstr "" "Du gör en skiftlägesokänslig jämförelse på ett skiftlägeskänsligt filsystem. " "En del filer syns inte:" -#: ../meld/dirdiff.py:889 +#: ../meld/dirdiff.py:888 #, python-format msgid "'%s' hidden by '%s'" msgstr "”%s” dolda av ”%s”" -#: ../meld/dirdiff.py:945 +#: ../meld/dirdiff.py:944 #, python-format msgid "Replace folder “%s”?" msgstr "Ersätt mappen ”%s”?" -#: ../meld/dirdiff.py:947 +#: ../meld/dirdiff.py:946 #, python-format msgid "" "Another folder with the same name already exists in “%s”.\n" @@ -1733,11 +1747,11 @@ msgstr "" "En annan mapp med samma namn existerar redan i ”%s”.\n" "Om du ersätter befintlig mapp kommer alla filer att förloras." -#: ../meld/dirdiff.py:960 +#: ../meld/dirdiff.py:959 msgid "Error copying file" msgstr "Fel vid filkopiering" -#: ../meld/dirdiff.py:961 +#: ../meld/dirdiff.py:960 #, python-format msgid "" "Couldn't copy %s\n" @@ -1750,35 +1764,35 @@ msgstr "" "\n" "%s" -#: ../meld/dirdiff.py:984 +#: ../meld/dirdiff.py:983 #, python-format msgid "Error deleting %s" msgstr "Fel vid borttagning av %s" -#: ../meld/dirdiff.py:1489 +#: ../meld/dirdiff.py:1494 msgid "No folder" msgstr "Ingen mapp" #. Abbreviations for insert and overwrite that fit in the status bar -#: ../meld/filediff.py:354 +#: ../meld/filediff.py:311 msgid "INS" msgstr "INF" -#: ../meld/filediff.py:354 +#: ../meld/filediff.py:311 msgid "OVR" msgstr "ÖVR" #. Abbreviation for line, column so that it will fit in the status bar -#: ../meld/filediff.py:356 +#: ../meld/filediff.py:313 #, python-format msgid "Ln %i, Col %i" msgstr "Rad %i, kolumn %i" -#: ../meld/filediff.py:781 +#: ../meld/filediff.py:738 msgid "Comparison results will be inaccurate" msgstr "Jämförelseresultat kommer att bli osäkra" -#: ../meld/filediff.py:783 +#: ../meld/filediff.py:740 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1786,64 +1800,64 @@ msgstr "" "Ett filter ändrade antalet rader i filen vilket inte stöds. Jämförelsen " "kommer att vara osäker." -#: ../meld/filediff.py:841 +#: ../meld/filediff.py:796 msgid "Mark conflict as resolved?" msgstr "Markera konflikten som löst?" -#: ../meld/filediff.py:843 +#: ../meld/filediff.py:798 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:845 +#: ../meld/filediff.py:800 msgid "Cancel" msgstr "Avbryt" -#: ../meld/filediff.py:846 +#: ../meld/filediff.py:801 msgid "Mark _Resolved" msgstr "Markera som _löst" -#: ../meld/filediff.py:1095 +#: ../meld/filediff.py:1049 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Det uppstod ett problem vid öppnandet av filen ”%s”." -#: ../meld/filediff.py:1103 +#: ../meld/filediff.py:1057 #, python-format msgid "File %s appears to be a binary file." msgstr "Filen %s verkar vara en binärfil." -#: ../meld/filediff.py:1105 +#: ../meld/filediff.py:1059 msgid "Do you want to open the file using the default application?" msgstr "Vill du öppna filen med standardprogrammet?" -#: ../meld/filediff.py:1107 +#: ../meld/filediff.py:1061 msgid "Open" msgstr "Öppna" -#: ../meld/filediff.py:1123 +#: ../meld/filediff.py:1077 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Beräknar skillnader" -#: ../meld/filediff.py:1188 +#: ../meld/filediff.py:1142 #, python-format msgid "File %s has changed on disk" msgstr "Filen %s har ändrats på disk" -#: ../meld/filediff.py:1189 +#: ../meld/filediff.py:1143 msgid "Do you want to reload the file?" msgstr "Vill du läsa om filen?" -#: ../meld/filediff.py:1191 +#: ../meld/filediff.py:1145 msgid "_Reload" msgstr "_Läs om" -#: ../meld/filediff.py:1349 +#: ../meld/filediff.py:1301 msgid "Files are identical" msgstr "Filerna är identiska" -#: ../meld/filediff.py:1362 +#: ../meld/filediff.py:1314 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1851,11 +1865,11 @@ msgstr "" "Textfilter används och kan dölja skillnader mellan filer. Vill du jämföra de " "ofiltrerade filerna?" -#: ../meld/filediff.py:1367 +#: ../meld/filediff.py:1319 msgid "Files differ in line endings only" msgstr "Filer skiljer sig endast vad gäller radslut" -#: ../meld/filediff.py:1369 +#: ../meld/filediff.py:1321 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1864,15 +1878,15 @@ msgstr "" "Filerna är identiska förutom radavsluten:\n" "%s" -#: ../meld/filediff.py:1389 +#: ../meld/filediff.py:1341 msgid "Show without filters" msgstr "Visa utan filer" -#: ../meld/filediff.py:1411 +#: ../meld/filediff.py:1363 msgid "Change highlighting incomplete" msgstr "Ändra markering av ofärdiga" -#: ../meld/filediff.py:1412 +#: ../meld/filediff.py:1364 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." @@ -1881,20 +1895,20 @@ msgstr "" "Meld till att längre tid på sig att markera större ändringar, men det kan " "bli långsamt." -#: ../meld/filediff.py:1420 +#: ../meld/filediff.py:1372 msgid "Keep highlighting" msgstr "Använd markering" -#: ../meld/filediff.py:1422 +#: ../meld/filediff.py:1374 msgid "_Keep highlighting" msgstr "_Använd markering" -#: ../meld/filediff.py:1454 +#: ../meld/filediff.py:1406 #, python-format msgid "Replace file “%s”?" msgstr "Ersätt filen ”%s”?" -#: ../meld/filediff.py:1456 +#: ../meld/filediff.py:1408 #, python-format msgid "" "A file with this name already exists in “%s”.\n" @@ -1903,45 +1917,45 @@ msgstr "" "En fil med detta namn existerar redan i ”%s”.\n" "Om du ersätter befintlig fil kommer dess innehåll att gå förlorat." -#: ../meld/filediff.py:1473 +#: ../meld/filediff.py:1425 msgid "Save Left Pane As" msgstr "Spara vänsterpanel som" -#: ../meld/filediff.py:1475 +#: ../meld/filediff.py:1427 msgid "Save Middle Pane As" msgstr "Spara mittenpanel som" -#: ../meld/filediff.py:1477 +#: ../meld/filediff.py:1429 msgid "Save Right Pane As" msgstr "Spara högerpanel som" -#: ../meld/filediff.py:1491 +#: ../meld/filediff.py:1443 #, 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:1493 +#: ../meld/filediff.py:1445 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:1496 +#: ../meld/filediff.py:1448 msgid "Save Anyway" msgstr "Spara ändå" -#: ../meld/filediff.py:1497 +#: ../meld/filediff.py:1449 msgid "Don't Save" msgstr "Spara inte" -#: ../meld/filediff.py:1519 +#: ../meld/filediff.py:1475 msgid "_Save as UTF-8" msgstr "_Spara som UTF-8" -#: ../meld/filediff.py:1522 +#: ../meld/filediff.py:1478 #, python-format msgid "Couldn't encode text as “%s”" msgstr "Kunde inte koda text som ”%s”" -#: ../meld/filediff.py:1524 +#: ../meld/filediff.py:1480 #, python-format msgid "" "File “%s” contains characters that can't be encoded using encoding “%s”.\n" @@ -1950,12 +1964,12 @@ msgstr "" "Filen ”%s” innehåller tecken som inte kan kodas med kodningen ”%s”\n" "Vill du spara som UTF-8?" -#: ../meld/filediff.py:1564 ../meld/patchdialog.py:120 +#: ../meld/filediff.py:1520 ../meld/patchdialog.py:130 #, python-format msgid "Could not save file %s." msgstr "Kunde inte spara filen %s." -#: ../meld/filediff.py:1565 ../meld/patchdialog.py:121 +#: ../meld/filediff.py:1521 ../meld/patchdialog.py:131 #, python-format msgid "" "Couldn't save file due to:\n" @@ -1964,11 +1978,11 @@ msgstr "" "Kunde in spara fil beroende på:\n" "%s" -#: ../meld/filediff.py:1910 +#: ../meld/filediff.py:1869 msgid "Live comparison updating disabled" msgstr "Inaktivera realtidsuppdateringar av jämförelser" -#: ../meld/filediff.py:1911 +#: ../meld/filediff.py:1870 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -1984,11 +1998,11 @@ msgstr "" msgid "[%s] Merging files" msgstr "[%s] Sammanfogar filer" -#: ../meld/gutterrendererchunk.py:159 +#: ../meld/gutterrendererchunk.py:210 msgid "Copy _up" msgstr "Kopiera _upp" -#: ../meld/gutterrendererchunk.py:160 +#: ../meld/gutterrendererchunk.py:211 msgid "Copy _down" msgstr "Kopiera _ned" @@ -2092,196 +2106,196 @@ msgstr "" msgid "untitled" msgstr "namnlös" -#: ../meld/meldwindow.py:48 +#: ../meld/meldwindow.py:49 msgid "_File" msgstr "_Arkiv" -#: ../meld/meldwindow.py:49 +#: ../meld/meldwindow.py:50 msgid "_New Comparison..." msgstr "_Ny jämförelse…" -#: ../meld/meldwindow.py:50 +#: ../meld/meldwindow.py:51 msgid "Start a new comparison" msgstr "Starta en ny jämförelse" -#: ../meld/meldwindow.py:53 +#: ../meld/meldwindow.py:54 msgid "Save the current file" msgstr "Spara den aktuella filen" -#: ../meld/meldwindow.py:55 +#: ../meld/meldwindow.py:56 msgid "Save As..." msgstr "Spara som…" -#: ../meld/meldwindow.py:56 +#: ../meld/meldwindow.py:57 msgid "Save the current file with a different name" msgstr "Spara den aktuella filen med ett annat namn" -#: ../meld/meldwindow.py:59 +#: ../meld/meldwindow.py:60 msgid "Close the current file" msgstr "Stäng den aktuella filen" -#: ../meld/meldwindow.py:62 +#: ../meld/meldwindow.py:63 msgid "_Edit" msgstr "_Redigera" -#: ../meld/meldwindow.py:64 +#: ../meld/meldwindow.py:65 msgid "Undo the last action" msgstr "Ångra den senaste åtgärden" -#: ../meld/meldwindow.py:67 +#: ../meld/meldwindow.py:68 msgid "Redo the last undone action" msgstr "Gör om den senaste ångrade åtgärden" -#: ../meld/meldwindow.py:69 +#: ../meld/meldwindow.py:70 msgid "Cut the selection" msgstr "Klipp ut markering" -#: ../meld/meldwindow.py:71 +#: ../meld/meldwindow.py:72 msgid "Copy the selection" msgstr "Kopiera markering" -#: ../meld/meldwindow.py:73 +#: ../meld/meldwindow.py:74 msgid "Paste the clipboard" msgstr "Klistra in Urklipp" -#: ../meld/meldwindow.py:75 +#: ../meld/meldwindow.py:76 msgid "Find..." msgstr "Sök…" -#: ../meld/meldwindow.py:75 +#: ../meld/meldwindow.py:76 msgid "Search for text" msgstr "Sök efter text" -#: ../meld/meldwindow.py:77 +#: ../meld/meldwindow.py:78 msgid "Find Ne_xt" msgstr "Sök _nästa" -#: ../meld/meldwindow.py:78 +#: ../meld/meldwindow.py:79 msgid "Search forwards for the same text" msgstr "Sök framåt efter samma text" -#: ../meld/meldwindow.py:80 +#: ../meld/meldwindow.py:81 msgid "Find _Previous" msgstr "Sök _Föregående" -#: ../meld/meldwindow.py:81 +#: ../meld/meldwindow.py:82 msgid "Search backwards for the same text" msgstr "Sök bakåt efter samma text" -#: ../meld/meldwindow.py:84 +#: ../meld/meldwindow.py:85 msgid "_Replace..." msgstr "_Ersätt…" -#: ../meld/meldwindow.py:85 +#: ../meld/meldwindow.py:86 msgid "Find and replace text" msgstr "Sök och ersätt text" -#: ../meld/meldwindow.py:88 +#: ../meld/meldwindow.py:89 msgid "_Changes" msgstr "Än_dringar" -#: ../meld/meldwindow.py:89 +#: ../meld/meldwindow.py:90 msgid "Next Change" msgstr "Nästa ändring" -#: ../meld/meldwindow.py:90 +#: ../meld/meldwindow.py:91 msgid "Go to the next change" msgstr "Gå till nästa ändring" -#: ../meld/meldwindow.py:92 +#: ../meld/meldwindow.py:93 msgid "Previous Change" msgstr "Föregående ändring" -#: ../meld/meldwindow.py:93 +#: ../meld/meldwindow.py:94 msgid "Go to the previous change" msgstr "Gå till föregående ändring" -#: ../meld/meldwindow.py:95 +#: ../meld/meldwindow.py:96 msgid "Open Externally" msgstr "Öppna externt" -#: ../meld/meldwindow.py:96 +#: ../meld/meldwindow.py:97 msgid "Open selected file or directory in the default external application" msgstr "Öppna markerad fil eller katalog i det externa standardprogrammet" -#: ../meld/meldwindow.py:100 +#: ../meld/meldwindow.py:101 msgid "_View" msgstr "_Visa" -#: ../meld/meldwindow.py:101 +#: ../meld/meldwindow.py:102 msgid "File Status" msgstr "Filstatus" -#: ../meld/meldwindow.py:102 +#: ../meld/meldwindow.py:103 msgid "Version Status" msgstr "Versionsstatus" -#: ../meld/meldwindow.py:105 +#: ../meld/meldwindow.py:106 msgid "Stop the current action" msgstr "Stoppa den aktuella åtgärden" -#: ../meld/meldwindow.py:108 +#: ../meld/meldwindow.py:109 msgid "Refresh the view" msgstr "Uppdatera vyn" -#: ../meld/meldwindow.py:112 +#: ../meld/meldwindow.py:113 msgid "Fullscreen" msgstr "Helskärm" -#: ../meld/meldwindow.py:113 +#: ../meld/meldwindow.py:114 msgid "View the comparison in fullscreen" msgstr "Visa jämförelsen i helskärmsläge" -#: ../meld/meldwindow.py:115 +#: ../meld/meldwindow.py:116 msgid "_Toolbar" msgstr "Ver_ktygsfält" -#: ../meld/meldwindow.py:116 +#: ../meld/meldwindow.py:117 msgid "Show or hide the toolbar" msgstr "Visa eller dölj verktygsfältet" -#: ../meld/meldwindow.py:126 +#: ../meld/meldwindow.py:127 msgid "Open Recent" msgstr "Öppna senaste" -#: ../meld/meldwindow.py:127 +#: ../meld/meldwindow.py:128 msgid "Open recent files" msgstr "Öppna senaste filer" -#: ../meld/meldwindow.py:149 +#: ../meld/meldwindow.py:150 msgid "_Meld" msgstr "_Meld" -#: ../meld/meldwindow.py:150 +#: ../meld/meldwindow.py:151 msgid "Quit the program" msgstr "Avsluta programmet" -#: ../meld/meldwindow.py:152 +#: ../meld/meldwindow.py:153 msgid "Prefere_nces" msgstr "Inställ_ningar" -#: ../meld/meldwindow.py:153 +#: ../meld/meldwindow.py:154 msgid "Configure the application" msgstr "Konfigurera programmet" -#: ../meld/meldwindow.py:155 +#: ../meld/meldwindow.py:156 msgid "_Contents" msgstr "_Innehåll" -#: ../meld/meldwindow.py:156 +#: ../meld/meldwindow.py:157 msgid "Open the Meld manual" msgstr "Öppna handboken för Meld" -#: ../meld/meldwindow.py:158 +#: ../meld/meldwindow.py:159 msgid "About this application" msgstr "Om detta program" -#: ../meld/meldwindow.py:604 +#: ../meld/meldwindow.py:593 #, python-format msgid "Need three files to auto-merge, got: %r" msgstr "Behöver tre filer för att auto-sammanfoga, fick: %r" -#: ../meld/meldwindow.py:618 +#: ../meld/meldwindow.py:607 msgid "Cannot compare a mixture of files and directories" msgstr "Kan inte jämföra en blandning av filer och kataloger" @@ -2293,7 +2307,7 @@ msgstr "" "installation" #. no common path. empty names get changed to "[None]" -#: ../meld/misc.py:263 +#: ../meld/misc.py:261 msgid "[None]" msgstr "[Ingen]" From a5ba0683f8d5ab3292b6d616f619ea8a7913fa66 Mon Sep 17 00:00:00 2001 From: Anders Jonsson Date: Wed, 8 Mar 2017 10:40:16 +0000 Subject: [PATCH 0136/1316] Update Swedish translation --- help/sv/sv.po | 1929 +++++++++++++++++++++++++------------------------ 1 file changed, 981 insertions(+), 948 deletions(-) diff --git a/help/sv/sv.po b/help/sv/sv.po index 53937ff2..1e49b21a 100644 --- a/help/sv/sv.po +++ b/help/sv/sv.po @@ -1,12 +1,14 @@ # Swedish translation for meld help. -# Copyright © 2015 meld's COPYRIGHT HOLDER +# Copyright © 2015-2017 meld's COPYRIGHT HOLDER # This file is distributed under the same license as the meld package. # Josef Andersson , 2015. +# Anders Jonsson , 2017. +# msgid "" msgstr "" "Project-Id-Version: meld master\n" -"POT-Creation-Date: 2016-12-17 21:39+0000\n" -"PO-Revision-Date: 2016-12-27 00:13+0100\n" +"POT-Creation-Date: 2017-02-23 20:48+0000\n" +"PO-Revision-Date: 2017-03-08 10:47+0100\n" "Last-Translator: Anders Jonsson \n" "Language-Team: Swedish \n" "Language: sv\n" @@ -22,29 +24,67 @@ msgid "translator-credits" msgstr "Josef Andersson , 2015" #. (itstool) path: info/title -#: C/vc-supported.page:5 +#: C/introduction.page:5 C/file-mode.page:5 C/missing-functionality.page:5 +#: C/folder-mode.page:5 C/preferences.page:5 msgctxt "sort" -msgid "3" -msgstr "3" +msgid "1" +msgstr "1" #. (itstool) path: credit/name -#: C/vc-supported.page:10 C/file-filters.page:10 C/text-filters.page:11 -#: C/resolving-conflicts.page:10 C/preferences.page:10 C/file-changes.page:10 -#: C/file-mode.page:11 C/flattened-view.page:10 C/index.page:8 -#: C/vc-mode.page:10 C/keyboard-shortcuts.page:10 C/introduction.page:10 -#: C/folder-mode.page:10 C/missing-functionality.page:10 C/command-line.page:10 +#: C/introduction.page:10 C/vc-supported.page:10 C/file-mode.page:11 +#: C/file-filters.page:10 C/missing-functionality.page:10 C/index.page:8 +#: C/command-line.page:10 C/text-filters.page:11 C/flattened-view.page:10 +#: C/vc-mode.page:10 C/folder-mode.page:10 C/resolving-conflicts.page:10 +#: C/preferences.page:10 C/keyboard-shortcuts.page:10 C/file-changes.page:10 msgid "Kai Willadsen" msgstr "Kai Willadsen" #. (itstool) path: credit/years -#: C/vc-supported.page:12 C/file-filters.page:12 C/text-filters.page:13 -#: C/resolving-conflicts.page:12 C/file-changes.page:12 C/file-mode.page:13 -#: C/flattened-view.page:12 C/index.page:10 C/vc-mode.page:12 -#: C/keyboard-shortcuts.page:12 C/introduction.page:12 C/folder-mode.page:12 -#: C/missing-functionality.page:12 C/command-line.page:12 +#: C/introduction.page:12 C/vc-supported.page:12 C/file-mode.page:13 +#: C/file-filters.page:12 C/missing-functionality.page:12 C/index.page:10 +#: C/command-line.page:12 C/text-filters.page:13 C/flattened-view.page:12 +#: C/vc-mode.page:12 C/folder-mode.page:12 C/resolving-conflicts.page:12 +#: C/keyboard-shortcuts.page:12 C/file-changes.page:12 msgid "2012" msgstr "2012" +#. (itstool) path: page/title +#: C/introduction.page:15 +msgid "What is Meld?" +msgstr "Vad är Meld?" + +#. (itstool) path: page/p +#: C/introduction.page:16 +msgid "" +"Meld is a tool for comparing files and directories, and for " +"resolving differences between them. It is also useful for comparing changes " +"captured by version control systems." +msgstr "" +"Meld är ett verktyg för att jämföra filer och kataloger, och för " +"att lösa skillnader mellan dem. Den är också användbar för att jämföra " +"ändringar registrerade i versionshanteringssystem." + +#. (itstool) path: page/p +#: C/introduction.page:22 +msgid "" +"Meld shows differences between two or three files (or two or " +"three directories) and allows you to move content between them, or edit the " +"files manually. Meld's focus is on helping developers compare and " +"merge source files, and get a visual overview of changes in their favourite " +"version control system." +msgstr "" +"Meld visar skillnader mellan två eller tre filer (eller två eller " +"tre kataloger) och låter dig flytta innehåll mellan dem, eller redigera " +"filerna manuellt. Melds fokus ligger på att hjälpa utvecklare " +"jämföra och sammanfoga källfiler, och att ge en visuell överblick av " +"ändringar i deras favorit-versionshanteringssystem." + +#. (itstool) path: info/title +#: C/vc-supported.page:5 +msgctxt "sort" +msgid "3" +msgstr "3" + #. (itstool) path: page/title #: C/vc-supported.page:15 msgid "Supported version control systems" @@ -91,10 +131,142 @@ msgstr "" "inte lika vältestade; rapportera fel till GNOME bugzilla." +#. (itstool) path: page/title +#: C/file-mode.page:17 +msgid "Getting started comparing files" +msgstr "Att komma igång med att jämföra filer" + +#. (itstool) path: page/p +#: C/file-mode.page:19 +msgid "" +"Meld lets you compare two or three text files side-by-side. You " +"can start a new file comparison by selecting the FileNew... menu item." +msgstr "" +"Meld låter dig jämföra två eller tre textfiler sida-vid-sida. Du " +"kan starta en ny filjämförelse genom att välj menyobjektet ArkivNy...." + +#. (itstool) path: page/p +#: C/file-mode.page:26 +msgid "" +"Once you've selected your files, Meld will show them side-by-" +"side. Differences between the files will be highlighted to make individual " +"changes easier to see. Editing the files will cause the comparison to update " +"on-the-fly. For details on navigating between individual changes, and on how " +"to use change-based editing, see ." +msgstr "" +"När du väl har markerat dina filer kommer Meld att visa dem sida-" +"vid-sida. Skillnader mellan filerna kommer att markeras för att göra " +"individuella ändringar enklare att se. Att redigera filer kommer att få " +"jämförelsen att uppdatera direkt. För detaljer om navigering mellan " +"individuella ändringar och hur man använder ändrings-baserad redigering, se " +"." + +#. (itstool) path: section/title +#: C/file-mode.page:35 +msgid "Meld's file comparisons" +msgstr "Melds filjämförelser" + +#. (itstool) path: section/p +#: C/file-mode.page:37 +msgid "" +"There are several different parts to a file comparison. The most important " +"parts are the editors where your files appear. In addition to these editors, " +"the areas around and between your files give you a visual overview and " +"actions to help you handle changes between the files." +msgstr "" +"Det finns flera olika delar vid en filjämförelse. De viktigaste delarna är " +"redigerarna där dina filer visas. Förutom dessa redigerare ger områdena " +"kring och mellan dina filer en visuell överblick samt åtgärder för att " +"hjälpa dig att hantera ändringar mellan filerna." + +#. (itstool) path: section/p +#: C/file-mode.page:43 +msgid "" +"On the left and right-hand sides of the window, there are two small vertical " +"bars showing various coloured blocks. These bars are designed to give you an " +"overview of all of the differences between your two files. Each coloured " +"block represents a section that is inserted, deleted, changed or in conflict " +"between your files, depending on the block's colour used." +msgstr "" +"På den vänstra och den högra sidan av fönstret finns två vertikala rullister " +"som visar olika färgade block. Dessa rullister är designade för att ge dig " +"en överblick av alla skillnader mellan dina två filer. Varje färgat block " +"representerar ett avsnitt som är infogat, borttaget, ändrat eller i konflikt " +"mellan dina filer beroende på färgen blocket använder." + +#. (itstool) path: section/p +#: C/file-mode.page:50 +msgid "" +"In between each pair of files is a segment that shows how the changed " +"sections between your files correspond to each other. You can click on the " +"arrows in a segment to replace sections in one file with sections from the " +"other. You can also delete, copy or merge changes. For details on what you " +"can do with individual change segments, see ." +msgstr "" +"Mellan varje par av filer finns ett segment som visar hur de ändrade " +"avsnitten mellan dina filer motsvaras av varandra. Du kan klicka på pilarna " +"i ett avsnitt för att ersätta avsnitt i en fil med avsnitt från det andra. " +"Du kan också ta bort, kopiera eller sammanfoga ändringar. För detaljer om " +"vad du kan göra med individuella ändringssegment, se ." + +#. (itstool) path: section/title +#: C/file-mode.page:62 +msgid "Saving your changes" +msgstr "Spara dina ändringar" + +#. (itstool) path: section/p +#: C/file-mode.page:64 +msgid "" +"Once you've finished editing your files, you need to save each file you've " +"changed." +msgstr "" +"När du väl har slutat redigera dina filer behöver du spara varje fil du har " +"ändrat." + +#. (itstool) path: section/p +#: C/file-mode.page:68 +msgid "" +"You can tell whether your files have been saved since they last changed by " +"the save icon that appears next to the file name above each file. Also, the " +"notebook label will show an asterisk (*) after any file that " +"hasn't been saved." +msgstr "" +"Du kan avgöra huruvida dina filer har ändrats sedan senaste ändringen genom " +"spara-ikonen som visas intill filnamnet ovanför varje fil. Anteckningsfliken " +"kommer också att visa en asterisk (*) efter varje fil som inte " +"har sparats." + +#. (itstool) path: section/p +#: C/file-mode.page:74 +msgid "" +"You can save the current file by selecting the FileSave menu item, or using " +"the CtrlS keyboard shortcut." +msgstr "" +"Du kan spara aktuell fil genom att välja menyobjektet ArkivSpara eller genom " +"att använda tangentbordsgenvägen CtrlS." + +#. (itstool) path: note/p +#: C/file-mode.page:81 +msgid "" +"Saving only saves the currently focussed file, which is the file " +"containing the cursor. If you can't tell which file is focussed, you can " +"click on the file to focus it before saving." +msgstr "" +"Att spara sparar endast den fokuserade filen, vilket är filen som " +"innehåller markören. Om du inte kan avgöra vilken fil som är fokuserad så " +"kan du klicka på filen för att fokusera den innan du sparar." + #. (itstool) path: info/title -#: C/file-filters.page:5 C/text-filters.page:5 C/resolving-conflicts.page:5 -#: C/file-changes.page:5 C/flattened-view.page:5 C/keyboard-shortcuts.page:5 -#: C/command-line.page:5 +#: C/file-filters.page:5 C/command-line.page:5 C/text-filters.page:5 +#: C/flattened-view.page:5 C/resolving-conflicts.page:5 +#: C/keyboard-shortcuts.page:5 C/file-changes.page:5 msgctxt "sort" msgid "2" msgstr "2" @@ -399,70 +571,202 @@ msgstr "" "i menyerna." #. (itstool) path: page/title -#: C/text-filters.page:17 -msgid "Filtering out text" -msgstr "Filtrera ut text" +#: C/missing-functionality.page:15 +msgid "Things that Meld doesn't do" +msgstr "Saker Meld inte gör" #. (itstool) path: page/p -#: C/text-filters.page:19 +#: C/missing-functionality.page:17 msgid "" -"When comparing several files, you may have sections of text where " -"differences aren't really important. For example, you may want to focus on " -"changed sections of code, and ignore any changes in comment lines. With text " -"filters you can tell Meld to ignore text that matches a pattern " -"(i.e., a regular expression) when showing differences between files." +"Have you ever spent half an hour poking around an application trying to find " +"out how to do something, thinking that surely there must be an " +"option for this?" msgstr "" -"Vid jämförelse av flera filer kan du ha textavsnitt där skillnader inte är " -"viktiga. Till exempel kanske du vill fokusera på ändrade avsnitt i kod, och " -"ignorera ändringar i kommentarsrader. Med textfilter kan du säga åt " -"Meld att ignorera text som matchar ett visst mönster (d.v.s. ett " -"reguljärt uttryck) när skillnader mellan filer visas." +"Har du någonsin spenderat en halvtimme grävandes runt i ett program, " +"letandes efter hur du gör någonting, och tänkt att det säkerligen " +"måste finnas ett alternativ för det här?" -#. (itstool) path: note/p -#: C/text-filters.page:28 +#. (itstool) path: page/p +#: C/missing-functionality.page:23 msgid "" -"Text filters don't just affect file comparisons, but also folder " -"comparisons. Check the file filtering notes for more details." +"This section lists a few of the common things that Meld " +"doesn't do, either as a deliberate choice, or because we just " +"haven't had time." msgstr "" -"Textfilter påverkar inte bara filjämförelser, men också mappjämförelser. Se " -"anteckningar om filfiltrering för fler " -"detaljer." +"Det här avsnittet listar några saker som Meldinte gör, " +"antingen med avsikt, eller för att vi inte hade tid." #. (itstool) path: section/title -#: C/text-filters.page:37 -msgid "Adding and using text filters" -msgstr "Lägga till och använda textfilter" +#: C/missing-functionality.page:30 +msgid "Aligning changes by adding lines" +msgstr "Justera ändringar genom att lägga till rader" #. (itstool) path: section/p -#: C/text-filters.page:39 +#: C/missing-functionality.page:31 msgid "" -"You can turn text filters on or off from the the Text Filters tab " -"in Preferences dialog. Meld comes with a few simple " -"filters that you might find useful, but you can add your own as well." +"When Meld shows differences between files, it shows both files as " +"they would appear in a normal text editor. It does not insert " +"additional lines so that the left and right sides of a particular change are " +"the same size. There is no option to do this." msgstr "" -"Du kan slå på eller av textfilter från fliken Textfilter i " -"dialogen Inställningar. Meld kommer med några enkla " -"filter du kanske finner användbara, men du kan lägga till dina egna också." +"När Meld visar skillnader mellan filer visar det båda filer som " +"de normalt skulle visas i en textredigerare. Det infogar inte " +"ytterligare rader så att vänstra och högra sidan för en specifik ändring är " +"av samma storlek. Det finns inget alternativ för detta." -#. (itstool) path: section/p -#: C/text-filters.page:45 -msgid "" -"In Meld, text filters are regular expressions that are matched " -"against the text of files you're comparing. Any text that is matched is " -"ignored during the comparison; you'll still see this text in the comparison " -"view, but it won't be taken into account when finding differences. Text " -"filters are applied in order, so it's possible for the first filter to " -"remove text that now makes the second filter match, and so on." -msgstr "" -"I Meld är textfilter reguljära uttryck som matchas mot texten i " -"de filer du jämför. Matchad text ignoreras vid jämförelsen; du kommer " -"fortfarande att se texten i jämförelsevyn, men den kommer inte att tas med " -"när skillnader ska hittas. Textfilter verkställs i ordning, så det är " -"möjligt för det första filtret att ta bort text som gör att det andra " -"filtret nu matchar och så vidare." +#. (itstool) path: page/title +#: C/index.page:14 +msgid "Meld Help" +msgstr "Meld hjälp" -#. (itstool) path: note/p +#. (itstool) path: section/title +#: C/index.page:17 +msgid "Introduction" +msgstr "Introduktion" + +#. (itstool) path: section/title +#: C/index.page:21 +msgid "Comparing Files" +msgstr "Jämföra filer" + +#. (itstool) path: section/title +#: C/index.page:25 +msgid "Comparing Folders" +msgstr "Jämföra mappar" + +#. (itstool) path: section/title +#: C/index.page:29 +msgid "Using Meld with Version Control" +msgstr "Använda Meld med versionshantering" + +#. (itstool) path: section/title +#: C/index.page:33 +msgid "Advanced Usage" +msgstr "Avancerad användning" + +#. (itstool) path: page/title +#: C/command-line.page:15 +msgid "Command line usage" +msgstr "Kommandoradsanvändning" + +#. (itstool) path: page/p +#: C/command-line.page:17 +msgid "" +"If you start Meld from the command line, you can tell it what to " +"do when it starts." +msgstr "" +"Om du startar Meld från kommandoraden kan du berätta hur det ska " +"bete sig vid uppstart." + +#. (itstool) path: page/p +#: C/command-line.page:20 +msgid "" +"For a two- or three-way file comparison, " +"start Meld with meld file1 file2 " +"or meld file1 file2 file3 " +"respectively." +msgstr "" +"För en två- eller trevägsfiljämförelse, " +"starta Meld med meld fil1 fil2 " +"eller meld fil1 fil2 fil3." + +#. (itstool) path: page/p +#: C/command-line.page:26 +msgid "" +"For a two- or three-way directory comparison, start Meld with meld dir1 dir2 or meld dir1 dir2 dir3." +msgstr "" +"För en två- eller trevägs mappjämförelse, " +"starta Meld med meld kat1 kat2 " +"eller meld kat1 kat2 kat3." + +#. (itstool) path: page/p +#: C/command-line.page:31 +msgid "" +"You can start a version control comparison by " +"just giving a single argument; if that file or directory is managed by a " +"recognized version control system, it " +"will start a version control comparison on that argument. For example, " +"meld . would start a version control view of the current " +"directory." +msgstr "" +"Du kan starta en versionshanteringsjämförelse " +"genom att endast ange ett argument; om filen eller katalogen hanteras av ett " +"versionshanteringssystem, kommer det att " +"starta en versionshanteringsjämförelse med det argumentet. Till exempel, " +"meld . skulle starta en versionskontroll av aktuell katalog." + +#. (itstool) path: note/p +#: C/command-line.page:40 +msgid "Run meld --help for a list of all command line options." +msgstr "Kör meld --help för en lista över alla kommandoradsflaggor." + +#. (itstool) path: page/title +#: C/text-filters.page:17 +msgid "Filtering out text" +msgstr "Filtrera ut text" + +#. (itstool) path: page/p +#: C/text-filters.page:19 +msgid "" +"When comparing several files, you may have sections of text where " +"differences aren't really important. For example, you may want to focus on " +"changed sections of code, and ignore any changes in comment lines. With text " +"filters you can tell Meld to ignore text that matches a pattern " +"(i.e., a regular expression) when showing differences between files." +msgstr "" +"Vid jämförelse av flera filer kan du ha textavsnitt där skillnader inte är " +"viktiga. Till exempel kanske du vill fokusera på ändrade avsnitt i kod, och " +"ignorera ändringar i kommentarsrader. Med textfilter kan du säga åt " +"Meld att ignorera text som matchar ett visst mönster (d.v.s. ett " +"reguljärt uttryck) när skillnader mellan filer visas." + +#. (itstool) path: note/p +#: C/text-filters.page:28 +msgid "" +"Text filters don't just affect file comparisons, but also folder " +"comparisons. Check the file filtering notes for more details." +msgstr "" +"Textfilter påverkar inte bara filjämförelser, men också mappjämförelser. Se " +"anteckningar om filfiltrering för fler " +"detaljer." + +#. (itstool) path: section/title +#: C/text-filters.page:37 +msgid "Adding and using text filters" +msgstr "Lägga till och använda textfilter" + +#. (itstool) path: section/p +#: C/text-filters.page:39 +msgid "" +"You can turn text filters on or off from the the Text Filters tab " +"in Preferences dialog. Meld comes with a few simple " +"filters that you might find useful, but you can add your own as well." +msgstr "" +"Du kan slå på eller av textfilter från fliken Textfilter i " +"dialogen Inställningar. Meld kommer med några enkla " +"filter du kanske finner användbara, men du kan lägga till dina egna också." + +#. (itstool) path: section/p +#: C/text-filters.page:45 +msgid "" +"In Meld, text filters are regular expressions that are matched " +"against the text of files you're comparing. Any text that is matched is " +"ignored during the comparison; you'll still see this text in the comparison " +"view, but it won't be taken into account when finding differences. Text " +"filters are applied in order, so it's possible for the first filter to " +"remove text that now makes the second filter match, and so on." +msgstr "" +"I Meld är textfilter reguljära uttryck som matchas mot texten i " +"de filer du jämför. Matchad text ignoreras vid jämförelsen; du kommer " +"fortfarande att se texten i jämförelsevyn, men den kommer inte att tas med " +"när skillnader ska hittas. Textfilter verkställs i ordning, så det är " +"möjligt för det första filtret att ta bort text som gör att det andra " +"filtret nu matchar och så vidare." + +#. (itstool) path: note/p #: C/text-filters.page:55 msgid "" "If you're not familiar with regular expressions, you might want to check out " @@ -586,680 +890,626 @@ msgstr "" "sig självt." #. (itstool) path: page/title -#: C/resolving-conflicts.page:15 -msgid "Resolving merge conflicts" -msgstr "Att lösa konflikter vid sammanfogning" - -#. (itstool) path: page/p -#: C/resolving-conflicts.page:17 -msgid "" -"One of the best uses of Meld is to resolve conflicts that occur " -"while merging different branches." -msgstr "" -"Ett av det bästa användningsområdena för Meld är att lösa " -"konflikter som uppstår när olika grenar sammanfogas." +#: C/flattened-view.page:15 +msgid "Flattened view" +msgstr "Utplattad vy" #. (itstool) path: page/p -#: C/resolving-conflicts.page:22 -msgid "" -"For example, when using Git, git mergetool will start " -"a 'merge helper'; Meld is one such helper. If you want to make " -"git mergetool use Meld by default, you can add" -msgstr "" -"Till exempel, vid användning av Git kommer git mergetool att starta en ”merge helper”; Meld är en sådan hjälp. Om du " -"vill göra så att git mergetool använder Meld som " -"standard kan du lägga till" - -#. (itstool) path: page/code -#: C/resolving-conflicts.page:27 -#, no-wrap +#: C/flattened-view.page:17 msgid "" -"\n" -"[merge]\n" -" tool = meld\n" +"When viewing large folders, you may be interested in only a few files among " +"the thousands in the folder itself. For this reason, Meld " +"includes a flattened view of a folder; only files that have not " +"been filtered out (e.g., by ) are " +"shown, and the folder hierarchy is stripped away, with file paths shown in " +"the Location column." msgstr "" -"\n" -"[merge]\n" -" tool = meld\n" +"När du visar stora mappar kanske du bara är intresserad av ett fåtal filer " +"av tusentals i själva mappen. Därför innehåller Meld en platt " +"vy för en mapp; endast filer som inte har filtrerats bort (t.ex. av " +") visas, och mapphierarkin är " +"borttagen, med filsökvägar visade i kolumnen Plats." #. (itstool) path: page/p -#: C/resolving-conflicts.page:31 +#: C/flattened-view.page:27 msgid "" -"to .git/gitconfig. See the git mergetool manual for " -"details." +"You can turn this flattened view on or off by unchecking the ViewFlatten menu " +"item, or by clicking the corresponding Flatten " +"button on the toolbar." msgstr "" -"till .git/gitconfig. Se handboken git mergetool för " -"detaljer." +"Du kan aktivera och inaktivera den platta vyn genom att kryssa menyobjektet " +"VisaPlatta till eller genom att klicka i motsvarande knapp Platta till i verktygsfältet." #. (itstool) path: info/title -#: C/preferences.page:5 C/file-mode.page:5 C/introduction.page:5 -#: C/folder-mode.page:5 C/missing-functionality.page:5 +#: C/vc-mode.page:5 msgctxt "sort" -msgid "1" -msgstr "1" - -#. (itstool) path: credit/years -#: C/preferences.page:12 -msgid "2013" -msgstr "2013" +msgid "0" +msgstr "0" #. (itstool) path: page/title -#: C/preferences.page:15 -msgid "Meld's preferences" -msgstr "Melds inställningar" - -#. (itstool) path: terms/title -#: C/preferences.page:18 -msgid "Editor preferences" -msgstr "Redigerarinställningar" - -#. (itstool) path: item/title -#: C/preferences.page:20 -msgid "Editor command" -msgstr "Redigerarkommando" +#: C/vc-mode.page:16 +msgid "Viewing version-controlled files" +msgstr "Visa versionshanterade filer" -#. (itstool) path: item/p -#: C/preferences.page:21 +#. (itstool) path: page/p +#: C/vc-mode.page:18 msgid "" -"The name of the command to run to open text files in an external editor. " -"This may be just the command (e.g., gedit) in which case the file " -"to be opened will be passed as the last argument. Alternatively, you can add " -"{file} and {line} elements to the command, in " -"which case Meld will substitute the file path and current line " -"number respectively (e.g., gedit {file}:{line})." +"Meld integrates with many version " +"control systems to let you review local changes and perform simple " +"version control tasks. You can start a new version control comparison by " +"selecting the FileNew... menu item, and clicking on the Version Control tab." msgstr "" -"Namnet på kommandot att köra för att öppna textfiler i en extern redigerare. " -"Det kan vara bara kommandot (t.ex. gedit) i vilket fall filen att " -"öppna kommer att skickas som sista argumentet. Alternativt kan du lägga till " -"{file} och {line}-element till kommandot i vilket " -"fall Meld kommer att ersätta filsökvägen och aktuellt radnummer " -"(t.ex. gedit {file}:{line})." - -#. (itstool) path: terms/title -#: C/preferences.page:31 -msgid "Folder Comparison preferences" -msgstr "Inställningar för mappjämförelse" +"Meld integrerar med många " +"versionshanteringssystem för att kunna låta dig se över lokala " +"ändringar och utföra enkla versionshanteringsuppgifter. Du kan börja en ny " +"versionshanteringsjämförelse genom att välja menyobjektet ArkivNy... och klicka " +"på fliken Versionshantering tab." -#. (itstool) path: item/title -#: C/preferences.page:33 -msgid "Apply text filters during folder comparisons" -msgstr "Att verkställa textfilter vid mappjämförelser" +#. (itstool) path: section/title +#: C/vc-mode.page:30 +msgid "Version control comparisons" +msgstr "Versionshanteringsjämförelse" -#. (itstool) path: item/p -#: C/preferences.page:34 +#. (itstool) path: section/p +#: C/vc-mode.page:32 msgid "" -"When comparing files in folder comparison mode, text filters and other text " -"manipulation options can be applied to the contents of files. If this option " -"is enabled, all currently enabled text filters will be applied, the blank " -"line trimming option will be applied as appropriate, and differences in line " -"endings will be ignored." +"Version control comparisons show the differences between the contents of " +"your folder and the current repository version. Each file in your local copy " +"has a state that indicates how it differs " +"from the repository copy." msgstr "" -"Under jämförelse av filer i läget mappjämförelse kan textfilter och andra " -"textmanipulationsalternativ tillämpas på innehållet i filerna. Om detta " -"alternativ är aktiverat kommer alla aktiverade textfilter att tillämpas, " -"alternativet för trimning av tomma rader kommer att tillämpas som önskat och " -"skillnader i radslut kommer att ignoreras." +"Versionshanteringsjämförelse visar skillnaderna mellan innehållet i din mapp " +"och nuvarande förrådsstatus. Varje fil i din lokala kopia har ett tillstånd som indikerar hur den skiljer sig från " +"förrådskopian." -#. (itstool) path: item/p -#: C/preferences.page:40 +#. (itstool) path: section/p +#: C/vc-mode.page:46 msgid "" -"Enabling this option means that Meld must fully read all non-" -"binary files into memory during the folder comparison. With large text " -"files, this can be slow and may cause memory issues." +"If you want to look at a particular file's differences, you can select it " +"and press Enter, or double-click the file to start a file comparison. You can also interact with your " +"version control system using the Changes menu." msgstr "" -"Aktivering av detta alternativ innebär att Meld måste läsa in " -"alla icke-binära filer till minnet vid mappjämförelsen. Med större textfiler " -"kan detta gå långsamt och medföra minnesproblem." +"Om du vill se på en speciell fils skillnader kan du markera den och trycka " +"Retur eller dubbelklicka filen för att starta en filjämförelse. Du kan också interagera med ditt " +"versionshanteringssystem genom användarmenyn Ändringar." -#. (itstool) path: item/p -#: C/preferences.page:44 +#. (itstool) path: section/title +#. (itstool) path: table/title +#: C/vc-mode.page:56 C/vc-mode.page:81 +msgid "Version control states" +msgstr "Versionshanteringstillstånd" + +#. (itstool) path: section/p +#: C/vc-mode.page:58 msgid "" -"This option only has an effect if \"Compare files based only on size and " -"timestamp\" is not enabled." +"Each file or folder in a version control comparison has a state, " +"obtained from the version control system itself. Meld maps these " +"different states into a standard set of very similar concepts. As such, " +"Meld might use slightly different names for states than your " +"version control system does. The possible states are:" msgstr "" -"Detta alternativ har endast effekt om ”Jämför filer enbart baserat på " -"storlek och tidsstämpel” inte är aktiverad." +"Varje fil eller mapp i ett versionshanteringsjämförelse har ett " +"tillstånd hämtat från versionshanteringssystemet själv. Meld mappar dessa tillstånd till en standardsamling av liknande koncept. " +"Meld kan därför använda något annorlunda namn för tillstånd än " +"ditt versionshanteringssystem gör. Möjliga tillstånd är:" -#. (itstool) path: page/title -#: C/file-changes.page:16 -msgid "Dealing with changes" -msgstr "Hantera ändringar" +#. (itstool) path: td/p +#: C/vc-mode.page:85 C/folder-mode.page:110 +msgid "State" +msgstr "Tillstånd" -#. (itstool) path: page/p -#: C/file-changes.page:18 -msgid "" -"Meld deals with differences between files as a list of change " -"blocks or more simply changes. Each change is a group of lines " -"which correspond between files. Since these changes are what you're usually " -"interested in, Meld gives you specific tools to navigate between " -"these changes and to edit them. You can find these tools in the Changes menu." -msgstr "" -"Meld hanterar skillnader mellan filer som en lista av " -"ändringsblock eller enklare, ändringar. Varje ändring är " -"en grupp rader som motsvaras mellan filer. Eftersom dessa ändringar är vad " -"du vanligtvis är intresserad av, ger dig Meld specifika verktyg " -"för att navigera mellan ändringarna och redigera dem. Du kan hitta dessa " -"verktyg i menyn Ändringar." +#. (itstool) path: td/p +#: C/vc-mode.page:86 C/folder-mode.page:111 +msgid "Appearance" +msgstr "Utseende" -#. (itstool) path: section/title -#: C/file-changes.page:30 -msgid "Navigating between changes" -msgstr "Navigera mellan ändringar" +#. (itstool) path: td/p +#: C/vc-mode.page:87 C/folder-mode.page:112 +msgid "Meaning" +msgstr "Betyder" -#. (itstool) path: section/p -#: C/file-changes.page:32 -msgid "" -"You can navigate between changes with the ChangesPrevious change and " -"ChangesNext " -"change menu items. You can also use your mouse's scroll wheel " -"to move between changes, by scrolling on the central change bar." -msgstr "" -"Du kan navigera mellan ändringar med menyobjekten ÄndringarFöregående ändring " -"och ÄndringarNästa " -"ändring. Du kan också använda din mus rullhjul för flytta " -"mellan ändringar genom att rulla på ändringsraden i mitten." +#. (itstool) path: td/p +#: C/vc-mode.page:95 C/folder-mode.page:120 +msgid "Normal font" +msgstr "Normalt typsnitt" -#. (itstool) path: section/title -#: C/file-changes.page:46 -msgid "Changing changes" -msgstr "Ändra ändringar" +#. (itstool) path: td/p +#: C/vc-mode.page:101 +msgid "The file/folder is the same as the repository version." +msgstr "Filen/mappen är densamma som förrådsversionen." -#. (itstool) path: section/p -#: C/file-changes.page:48 -msgid "" -"In addition to directly editing text files, Meld gives you tools " -"to move, copy or delete individual differences between files. The bar " -"between two files not only shows you what parts of the two files correspond, " -"but also lets you selectively merge or delete differing changes by clicking " -"the arrow or cross icons next to the start of each change." -msgstr "" -"Förutom att direkt redigera textfiler ger dig Meld verktyg för " -"att flytta, kopiera eller ta bort individuella skillnader mellan filer. " -"Raden mellan två filer visar inte bara vilka delar av de två filerna som " -"motsvaras utan låter dig också selektivt välja att sammanfoga eller ta bort " -"olika ändringar genom att klicka på pilen eller kryssikonen intill början på " -"varje ändring." +#. (itstool) path: td/p +#: C/vc-mode.page:109 +msgid "Red and bold" +msgstr "Röd och fet" -#. (itstool) path: section/p -#: C/file-changes.page:52 -msgid "" -"The default action is replace. This action replaces the contents of " -"the corresponding change with the current change." -msgstr "" -"Standardåtgärden är ersätt. Denna åtgärd ersätter innehållet för " -"motsvarande ändring med den aktuella ändringen." +#. (itstool) path: td/p +#: C/vc-mode.page:115 +msgid "This file is different to the repository version." +msgstr "Filen skiljer sig mot förrådsversionen." -#. (itstool) path: section/p -#: C/file-changes.page:59 -msgid "" -"Hold down the Shift key to change the current action to " -"delete. This action deletes the current change." -msgstr "" -"Håll ner tangenten Skift för att ändra aktuell åtgärd till ta " -"bort. Denna åtgärd tar bort aktuell ändring." +#. (itstool) path: td/p +#: C/vc-mode.page:123 C/folder-mode.page:164 +msgid "Green and bold" +msgstr "Grön och fet" -#. (itstool) path: section/p -#: C/file-changes.page:62 +#. (itstool) path: td/p +#: C/vc-mode.page:129 msgid "" -"Hold down the Ctrl key to change the current action to " -"insert. This action inserts the current change above or below (as " -"selected) the corresponding change." -msgstr "" -"Håll ner tangenten Ctrl för att ändra den aktuella åtgärden till " -"infoga. Denna åtgärd infogar den aktuella ändringen ovan eller " -"under (beroende på val) motsvarande ändring." +"This file/folder is new, and is scheduled to be added to the repository." +msgstr "Filen/mappen är ny och är schemalagd att läggas till i förrådet." -#. (itstool) path: page/title -#: C/file-mode.page:17 -msgid "Getting started comparing files" -msgstr "Att komma igång med att jämföra filer" +#. (itstool) path: td/p +#: C/vc-mode.page:136 +msgid "Removed" +msgstr "Borttagen" -#. (itstool) path: page/p -#: C/file-mode.page:19 -msgid "" -"Meld lets you compare two or three text files side-by-side. You " -"can start a new file comparison by selecting the FileNew... menu item." -msgstr "" -"Meld låter dig jämföra två eller tre textfiler sida-vid-sida. Du " -"kan starta en ny filjämförelse genom att välj menyobjektet ArkivNy...." +#. (itstool) path: td/p +#: C/vc-mode.page:138 +msgid "Red bold text with a line through the middle" +msgstr "Röd fet genomstruken text" -#. (itstool) path: page/p -#: C/file-mode.page:26 +#. (itstool) path: td/p +#: C/vc-mode.page:144 msgid "" -"Once you've selected your files, Meld will show them side-by-" -"side. Differences between the files will be highlighted to make individual " -"changes easier to see. Editing the files will cause the comparison to update " -"on-the-fly. For details on navigating between individual changes, and on how " -"to use change-based editing, see ." +"This file/folder existed, but is scheduled to be removed from the repository." msgstr "" -"När du väl har markerat dina filer kommer Meld att visa dem sida-" -"vid-sida. Skillnader mellan filerna kommer att markeras för att göra " -"individuella ändringar enklare att se. Att redigera filer kommer att få " -"jämförelsen att uppdatera direkt. För detaljer om navigering mellan " -"individuella ändringar och hur man använder ändrings-baserad redigering, se " -"." +"Filen/mappen existerade, men är schemalagd till att tas bort från förrådet." -#. (itstool) path: section/title -#: C/file-mode.page:35 -msgid "Meld's file comparisons" -msgstr "Melds filjämförelser" +#. (itstool) path: td/p +#: C/vc-mode.page:151 +msgid "Conflict" +msgstr "Konflikt" -#. (itstool) path: section/p -#: C/file-mode.page:37 -msgid "" -"There are several different parts to a file comparison. The most important " -"parts are the editors where your files appear. In addition to these editors, " -"the areas around and between your files give you a visual overview and " -"actions to help you handle changes between the files." -msgstr "" -"Det finns flera olika delar vid en filjämförelse. De viktigaste delarna är " -"redigerarna där dina filer visas. Förutom dessa redigerare ger områdena " -"kring och mellan dina filer en visuell överblick samt åtgärder för att " -"hjälpa dig att hantera ändringar mellan filerna." +#. (itstool) path: td/p +#: C/vc-mode.page:153 +msgid "Bright red bold text" +msgstr "Ljust röd fet text" -#. (itstool) path: section/p -#: C/file-mode.page:43 +#. (itstool) path: td/p +#: C/vc-mode.page:159 msgid "" -"On the left and right-hand sides of the window, there are two small vertical " -"bars showing various coloured blocks. These bars are designed to give you an " -"overview of all of the differences between your two files. Each coloured " -"block represents a section that is inserted, deleted, changed or in conflict " -"between your files, depending on the block's colour used." +"When trying to merge with the repository, the differences between the local " +"file and the repository could not be resolved, and the file is now in " +"conflict with the repository contents" msgstr "" -"På den vänstra och den högra sidan av fönstret finns två vertikala rullister " -"som visar olika färgade block. Dessa rullister är designade för att ge dig " -"en överblick av alla skillnader mellan dina två filer. Varje färgat block " -"representerar ett avsnitt som är infogat, borttaget, ändrat eller i konflikt " -"mellan dina filer beroende på färgen blocket använder." +"Då sammanfogning med förrådet skulle ske kunde inte skillnaderna mellan den " +"lokala filen och förrådet lösas och filen är nu i konflikt med " +"förrådsinnehållet" -#. (itstool) path: section/p -#: C/file-mode.page:50 -msgid "" -"In between each pair of files is a segment that shows how the changed " -"sections between your files correspond to each other. You can click on the " -"arrows in a segment to replace sections in one file with sections from the " -"other. You can also delete, copy or merge changes. For details on what you " -"can do with individual change segments, see ." -msgstr "" -"Mellan varje par av filer finns ett segment som visar hur de ändrade " -"avsnitten mellan dina filer motsvaras av varandra. Du kan klicka på pilarna " -"i ett avsnitt för att ersätta avsnitt i en fil med avsnitt från det andra. " -"Du kan också ta bort, kopiera eller sammanfoga ändringar. För detaljer om " -"vad du kan göra med individuella ändringssegment, se ." +#. (itstool) path: td/p +#: C/vc-mode.page:167 C/folder-mode.page:176 +msgid "Missing" +msgstr "Saknad" -#. (itstool) path: section/title -#: C/file-mode.page:62 -msgid "Saving your changes" -msgstr "Spara dina ändringar" +#. (itstool) path: td/p +#: C/vc-mode.page:169 +msgid "Blue bold text with a line through the middle" +msgstr "Blå fet genomstruken text" -#. (itstool) path: section/p -#: C/file-mode.page:64 +#. (itstool) path: td/p +#: C/vc-mode.page:175 +msgid "This file/folder should be present, but isn't." +msgstr "Denna fil/mapp ska finnas, men finns inte." + +#. (itstool) path: td/p +#: C/vc-mode.page:181 +msgid "Ignored" +msgstr "Ignorerad" + +#. (itstool) path: td/p +#: C/vc-mode.page:183 C/vc-mode.page:199 +msgid "Greyed out text" +msgstr "Utgråad text" + +#. (itstool) path: td/p +#: C/vc-mode.page:189 msgid "" -"Once you've finished editing your files, you need to save each file you've " -"changed." +"This file/folder has been explicitly ignored (e.g., by an entry in ." +"gitignore) and is not being tracked by version control." msgstr "" -"När du väl har slutat redigera dina filer behöver du spara varje fil du har " -"ändrat." +"Denna fil/mapp har explicit ignorerats (t.ex. genom att finnas i ." +"gitignore) och spåras inte av versionshantering." -#. (itstool) path: section/p -#: C/file-mode.page:68 +#. (itstool) path: td/p +#: C/vc-mode.page:197 +msgid "Unversioned" +msgstr "Oversionerad" + +#. (itstool) path: td/p +#: C/vc-mode.page:205 msgid "" -"You can tell whether your files have been saved since they last changed by " -"the save icon that appears next to the file name above each file. Also, the " -"notebook label will show an asterisk (*) after any file that " -"hasn't been saved." +"This file is not in the version control system; it is only in the local copy." msgstr "" -"Du kan avgöra huruvida dina filer har ändrats sedan senaste ändringen genom " -"spara-ikonen som visas intill filnamnet ovanför varje fil. Anteckningsfliken " -"kommer också att visa en asterisk (*) efter varje fil som inte " -"har sparats." +"Denna fil finns inte i versionshanteringssystemet; den finns endast i den " +"lokala kopian." -#. (itstool) path: section/p -#: C/file-mode.page:74 -msgid "" -"You can save the current file by selecting the FileSave menu item, or using " -"the CtrlS keyboard shortcut." +#. (itstool) path: td/p +#: C/vc-mode.page:212 C/folder-mode.page:191 +msgid "Error" +msgstr "Fel" + +#. (itstool) path: td/p +#: C/vc-mode.page:214 C/folder-mode.page:193 +msgid "Bright red with a yellow background and bold" +msgstr "Ljust röd med en gul bakgrund och fet" + +#. (itstool) path: td/p +#: C/vc-mode.page:220 +msgid "The version control system has reported a problem with this file." msgstr "" -"Du kan spara aktuell fil genom att välja menyobjektet ArkivSpara eller genom " -"att använda tangentbordsgenvägen CtrlS." +"Versionshanteringssystemet har rapporterat att denna fil har ett problem." -#. (itstool) path: note/p -#: C/file-mode.page:81 +#. (itstool) path: section/title +#: C/vc-mode.page:230 +msgid "Version control state filtering" +msgstr "Filtrering av versionshanteringstillstånd" + +#. (itstool) path: section/p +#: C/vc-mode.page:232 msgid "" -"Saving only saves the currently focussed file, which is the file " -"containing the cursor. If you can't tell which file is focussed, you can " -"click on the file to focus it before saving." +"Most often, you will only want to see files that are identified as being in " +"some way different; this is the default setting in Meld. You can " +"change which file states you see by using the ViewVersion Status menu, or " +"by clicking the corresponding Modified, Normal, Unversioned and " +"Ignored buttons on the toolbar." msgstr "" -"Att spara sparar endast den fokuserade filen, vilket är filen som " -"innehåller markören. Om du inte kan avgöra vilken fil som är fokuserad så " -"kan du klicka på filen för att fokusera den innan du sparar." +"Oftast vill du endast se filer som identifieras som annorlunda på något " +"sätt; det är standardinställningen i Meld. Du kan ändra vilka " +"filtillstånd du er genom att använda menyn VyVersionstillstånd eller genom att " +"klicka motsvarande knapparna Ändrade, Normala, Oversionerad och Ignorerade i verktygsfältet." #. (itstool) path: page/title -#: C/flattened-view.page:15 -msgid "Flattened view" -msgstr "Utplattad vy" +#: C/folder-mode.page:16 +msgid "Getting started comparing folders" +msgstr "Kom igång med att jämföra mappar" #. (itstool) path: page/p -#: C/flattened-view.page:17 +#: C/folder-mode.page:18 msgid "" -"When viewing large folders, you may be interested in only a few files among " -"the thousands in the folder itself. For this reason, Meld " -"includes a flattened view of a folder; only files that have not " -"been filtered out (e.g., by ) are " -"shown, and the folder hierarchy is stripped away, with file paths shown in " -"the Location column." +"Meld lets you compare two or three folders side-by-side. You can " +"start a new folder comparison by selecting the FileNew... menu item, and " +"clicking on the Directory Comparison tab." msgstr "" -"När du visar stora mappar kanske du bara är intresserad av ett fåtal filer " -"av tusentals i själva mappen. Därför innehåller Meld en platt " -"vy för en mapp; endast filer som inte har filtrerats bort (t.ex. av " -") visas, och mapphierarkin är " -"borttagen, med filsökvägar visade i kolumnen Plats." +"Meld låter dig jämföra två eller tre mappar sida-vid-sida. Du kan " +"starta en ny mappjämförelse genom att markera menyobjektet ArkivNy... och " +"klicka på fliken Katalogjämförelse." #. (itstool) path: page/p -#: C/flattened-view.page:27 +#: C/folder-mode.page:26 msgid "" -"You can turn this flattened view on or off by unchecking the ViewFlatten menu " -"item, or by clicking the corresponding Flatten " -"button on the toolbar." +"Your selected folders will be shown as side-by-side trees, with differences " +"between files in each folder highlighted. You can copy or delete files from " +"either folder, or compare individual text files in more detail." msgstr "" -"Du kan aktivera och inaktivera den platta vyn genom att kryssa menyobjektet " -"VisaPlatta till eller genom att klicka i motsvarande knapp Platta till i verktygsfältet." - -#. (itstool) path: page/title -#: C/index.page:14 -msgid "Meld Help" -msgstr "Meld hjälp" - -#. (itstool) path: section/title -#: C/index.page:17 -msgid "Introduction" -msgstr "Introduktion" - -#. (itstool) path: section/title -#: C/index.page:21 -msgid "Comparing Files" -msgstr "Jämföra filer" - -#. (itstool) path: section/title -#: C/index.page:25 -msgid "Comparing Folders" -msgstr "Jämföra mappar" - -#. (itstool) path: section/title -#: C/index.page:29 -msgid "Using Meld with Version Control" -msgstr "Använda Meld med versionshantering" +"Dina valda mappar kommer att visas som sida-vid-sida-träd, med skillnader " +"mellan filer i olika mappar markerade. Du kan kopiera eller ta bort filer " +"antingen från var mapp, eller jämföra enskilda textfiler i mer detalj." #. (itstool) path: section/title -#: C/index.page:33 -msgid "Advanced Usage" -msgstr "Avancerad användning" - -#. (itstool) path: info/title -#: C/vc-mode.page:5 -msgctxt "sort" -msgid "0" -msgstr "0" +#: C/folder-mode.page:36 +msgid "The folder comparison view" +msgstr "Vyn för mappjämförelse" -#. (itstool) path: page/title -#: C/vc-mode.page:16 -msgid "Viewing version-controlled files" -msgstr "Visa versionshanterade filer" +#. (itstool) path: section/p +#: C/folder-mode.page:38 +msgid "" +"The main parts of a folder comparison are the trees showing the folders " +"you're comparing. You can easily move " +"around these comparisons to find changes that you're interested in. " +"When you select a file or folder, more detailed information is given in the " +"status bar at the bottom of the window. Pressing Enter on a " +"selected file, or double-clicking any file in the tree will open a side-by-" +"side file comparison of the files in a new " +"tab, but this will only work properly if they're text files!" +msgstr "" +"Huvuddelarna vid en mappjämförelse är träden som visar mapparna du jämför. " +"Du kan enkelt navigera runt i dessa " +"jämförelser för att hitta skillnader du är intresserad av. När du markerar " +"en fil eller mapp ges mer detaljerad information i statusraden i nedre delen " +"av fönstret. Att trycka Retur på en markerad fil eller att " +"dubbelklicka en fil i trädet öppnar en sida-vid-sida filjämförelse över filerna i en ny flik, men det kommer bara att " +"fungera korrekt om de är textfiler!" -#. (itstool) path: page/p -#: C/vc-mode.page:18 +#. (itstool) path: section/p +#: C/folder-mode.page:50 msgid "" -"Meld integrates with many version " -"control systems to let you review local changes and perform simple " -"version control tasks. You can start a new version control comparison by " -"selecting the FileNew... menu item, and clicking on the Version Control tab." +"There are bars on the left and right-hand sides of the window that show you " +"a simple coloured summary of the comparison results. Each file or folder in " +"the comparison corresponds to a small section of these bars, though " +"Meld doesn't show Same files so that it's easier to see " +"any actually important differences. You can click anywhere on this bar to " +"jump straight to that place in the comparison." msgstr "" -"Meld integrerar med många " -"versionshanteringssystem för att kunna låta dig se över lokala " -"ändringar och utföra enkla versionshanteringsuppgifter. Du kan börja en ny " -"versionshanteringsjämförelse genom att välja menyobjektet ArkivNy... och klicka " -"på fliken Versionshantering tab." +"Det finns paneler till vänster och höger om fönstret som visar en enkel " +"färgad summering av jämförelseresultaten. Varje fil eller mapp i jämförelsen " +"motsvaras av ett litet avsnitt i dessa paneler, men Meld visar " +"inte Samma filer så det är enkelt att se viktiga skillnader. Du kan " +"klicka varsomhelst på denna panel för att hoppa direkt till det stället i " +"jämförelsen." #. (itstool) path: section/title -#: C/vc-mode.page:30 -msgid "Version control comparisons" -msgstr "Versionshanteringsjämförelse" +#: C/folder-mode.page:63 +msgid "Navigating folder comparisons" +msgstr "Navigera mappjämförelser" #. (itstool) path: section/p -#: C/vc-mode.page:32 +#: C/folder-mode.page:65 msgid "" -"Version control comparisons show the differences between the contents of " -"your folder and the current repository version. Each file in your local copy " -"has a state that indicates how it differs " -"from the repository copy." +"You can jump between changed files (that is, any files/folders that are " +"not classified as being identical) with the ChangesPrevious change " +"and ChangesNext " +"change menu items, or using the corresponding buttons on the " +"toolbar." msgstr "" -"Versionshanteringsjämförelse visar skillnaderna mellan innehållet i din mapp " -"och nuvarande förrådsstatus. Varje fil i din lokala kopia har ett tillstånd som indikerar hur den skiljer sig från " -"förrådskopian." +"Du kan hoppa mellan ändrade filer (det vill säga filer/mappar som inte är klassificerade som identiska) med menyobjektet ÄndringarFöregående ändring och ÄndringarNästa ändring eller genom att använda motsvarande knappar " +"på verktygsfältet." #. (itstool) path: section/p -#: C/vc-mode.page:46 +#: C/folder-mode.page:73 msgid "" -"If you want to look at a particular file's differences, you can select it " -"and press Enter, or double-click the file to start a file comparison. You can also interact with your " -"version control system using the Changes menu." -msgstr "" -"Om du vill se på en speciell fils skillnader kan du markera den och trycka " -"Retur eller dubbelklicka filen för att starta en filjämförelse. Du kan också interagera med ditt " -"versionshanteringssystem genom användarmenyn Ändringar." +"You can use the Left and Right arrow keys to move " +"between the folders you're comparing. This is useful so that you can select " +"an individual file for copying or deletion." +msgstr "" +"Du kan använda piltangenterna Vänster och Höger för " +"att flytta mellan filerna du jämför. Det är användbart för att markera en " +"individuell fil för kopiering eller borttagning." #. (itstool) path: section/title -#. (itstool) path: table/title -#: C/vc-mode.page:56 C/vc-mode.page:81 -msgid "Version control states" -msgstr "Versionshanteringstillstånd" +#: C/folder-mode.page:83 +msgid "States in folder comparisons" +msgstr "Tillstånd i mappjämförelser" #. (itstool) path: section/p -#: C/vc-mode.page:58 +#: C/folder-mode.page:85 msgid "" -"Each file or folder in a version control comparison has a state, " -"obtained from the version control system itself. Meld maps these " -"different states into a standard set of very similar concepts. As such, " -"Meld might use slightly different names for states than your " -"version control system does. The possible states are:" +"Each file or folder in a tree has its own state, telling you how it " +"differed from its corresponding files/folders. The possible states are:" msgstr "" -"Varje fil eller mapp i ett versionshanteringsjämförelse har ett " -"tillstånd hämtat från versionshanteringssystemet själv. Meld mappar dessa tillstånd till en standardsamling av liknande koncept. " -"Meld kan därför använda något annorlunda namn för tillstånd än " -"ditt versionshanteringssystem gör. Möjliga tillstånd är:" +"Varje fil eller mapp i ett träd har sitt eget tillstånd, som " +"berättar hur mycket den skiljer sig från motsvarande filer/mappar. Möjliga " +"tillstånd är:" -#. (itstool) path: td/p -#: C/vc-mode.page:85 C/folder-mode.page:110 -msgid "State" -msgstr "Tillstånd" +#. (itstool) path: table/title +#: C/folder-mode.page:106 +msgid "Folder comparison states" +msgstr "Tillstånd för mappjämförelser" #. (itstool) path: td/p -#: C/vc-mode.page:86 C/folder-mode.page:111 -msgid "Appearance" -msgstr "Utseende" +#: C/folder-mode.page:126 +msgid "The file/folder is the same across all compared folders." +msgstr "Filen/mappen är densamma över alla jämförda mappar." #. (itstool) path: td/p -#: C/vc-mode.page:87 C/folder-mode.page:112 -msgid "Meaning" -msgstr "Betyder" +#: C/folder-mode.page:132 +msgid "Same when filtered" +msgstr "Samma när filtrerad" #. (itstool) path: td/p -#: C/vc-mode.page:95 C/folder-mode.page:120 -msgid "Normal font" -msgstr "Normalt typsnitt" +#: C/folder-mode.page:134 +msgid "Italics" +msgstr "Kursiva" #. (itstool) path: td/p -#: C/vc-mode.page:101 -msgid "The file/folder is the same as the repository version." -msgstr "Filen/mappen är densamma som förrådsversionen." +#: C/folder-mode.page:140 +msgid "" +"These files are different across folders, but once text filters are applied, these files become identical." +msgstr "" +"Dessa filer är olika över mappar, men så fort textfilter verkställs blir dessa filer identiska." #. (itstool) path: td/p -#: C/vc-mode.page:109 -msgid "Red and bold" -msgstr "Röd och fet" +#: C/folder-mode.page:150 +msgid "Blue and bold" +msgstr "Blå och fet" #. (itstool) path: td/p -#: C/vc-mode.page:115 -msgid "This file is different to the repository version." -msgstr "Filen skiljer sig mot förrådsversionen." +#: C/folder-mode.page:156 +msgid "These files differ between the folders being compared." +msgstr "Dessa filer skiljer mellan mapparna som jämförs." #. (itstool) path: td/p -#: C/vc-mode.page:123 C/folder-mode.page:164 -msgid "Green and bold" -msgstr "Grön och fet" +#: C/folder-mode.page:170 +msgid "This file/folder exists in this folder, but not in the others." +msgstr "Denna fil/mapp existerar i denna mapp, men inte i de andra." #. (itstool) path: td/p -#: C/vc-mode.page:129 -msgid "" -"This file/folder is new, and is scheduled to be added to the repository." -msgstr "Filen/mappen är ny och är schemalagd att läggas till i förrådet." +#: C/folder-mode.page:178 +msgid "Greyed out text with a line through the middle" +msgstr "Utgråad genomstruken text" #. (itstool) path: td/p -#: C/vc-mode.page:136 -msgid "Removed" -msgstr "Borttagen" +#: C/folder-mode.page:184 +msgid "" +"This file/folder doesn't exist in this folder, but does in one of the others." +msgstr "" +"Denna fil/mapp existerar inte i denna mapp, men finns i en av de andra." #. (itstool) path: td/p -#: C/vc-mode.page:138 -msgid "Red bold text with a line through the middle" -msgstr "Röd fet genomstruken text" +#: C/folder-mode.page:199 +msgid "" +"When comparing this file, an error occurred. The most common error causes " +"are file permissions (i.e., Meld was not allowed to open the " +"file) and filename encoding errors." +msgstr "" +"Vid jämförelse av denna fil uppstod ett fel. Den vanligaste felorsaken är " +"filrättigheter (d.v.s. Meld tilläts inte öppna filen) och " +"kodningsproblem med filnamn." -#. (itstool) path: td/p -#: C/vc-mode.page:144 +#. (itstool) path: section/p +#: C/folder-mode.page:217 msgid "" -"This file/folder existed, but is scheduled to be removed from the repository." +"You can filter out files based on these states, for example, to show only " +"files that have been Modified. You can read more about this in " +"." msgstr "" -"Filen/mappen existerade, men är schemalagd till att tas bort från förrådet." +"Du kan filtrera bort filer baserat på dessa tillstånd, till exempel, för att " +"endast visa filer som har Ändrats. Du kan läsa mer om detta i ." -#. (itstool) path: td/p -#: C/vc-mode.page:151 -msgid "Conflict" -msgstr "Konflikt" +#. (itstool) path: section/p +#: C/folder-mode.page:223 +msgid "" +"Finally, the most recently modified file/folder has an small star emblem " +"attached to it." +msgstr "" +"Slutligen, den senast ändrade filen/mappen har ett litet stjärnemblem fäst " +"vid sig." -#. (itstool) path: td/p -#: C/vc-mode.page:153 -msgid "Bright red bold text" -msgstr "Ljust röd fet text" +#. (itstool) path: page/title +#: C/resolving-conflicts.page:15 +msgid "Resolving merge conflicts" +msgstr "Att lösa konflikter vid sammanfogning" -#. (itstool) path: td/p -#: C/vc-mode.page:159 +#. (itstool) path: page/p +#: C/resolving-conflicts.page:17 msgid "" -"When trying to merge with the repository, the differences between the local " -"file and the repository could not be resolved, and the file is now in " -"conflict with the repository contents" +"One of the best uses of Meld is to resolve conflicts that occur " +"while merging different branches." msgstr "" -"Då sammanfogning med förrådet skulle ske kunde inte skillnaderna mellan den " -"lokala filen och förrådet lösas och filen är nu i konflikt med " -"förrådsinnehållet" +"Ett av det bästa användningsområdena för Meld är att lösa " +"konflikter som uppstår när olika grenar sammanfogas." -#. (itstool) path: td/p -#: C/vc-mode.page:167 C/folder-mode.page:176 -msgid "Missing" -msgstr "Saknad" +#. (itstool) path: page/p +#: C/resolving-conflicts.page:22 +msgid "" +"For example, when using Git, git mergetool will start " +"a 'merge helper'; Meld is one such helper. If you want to make " +"git mergetool use Meld by default, you can add" +msgstr "" +"Till exempel, vid användning av Git kommer git mergetool att starta en ”merge helper”; Meld är en sådan hjälp. Om du " +"vill göra så att git mergetool använder Meld som " +"standard kan du lägga till" -#. (itstool) path: td/p -#: C/vc-mode.page:169 -msgid "Blue bold text with a line through the middle" -msgstr "Blå fet genomstruken text" +#. (itstool) path: page/code +#: C/resolving-conflicts.page:27 +#, no-wrap +msgid "" +"\n" +"[merge]\n" +" tool = meld\n" +msgstr "" +"\n" +"[merge]\n" +" tool = meld\n" -#. (itstool) path: td/p -#: C/vc-mode.page:175 -msgid "This file/folder should be present, but isn't." -msgstr "Denna fil/mapp ska finnas, men finns inte." +#. (itstool) path: page/p +#: C/resolving-conflicts.page:31 +msgid "" +"to .git/gitconfig. See the git mergetool manual for " +"details." +msgstr "" +"till .git/gitconfig. Se handboken git mergetool för " +"detaljer." -#. (itstool) path: td/p -#: C/vc-mode.page:181 -msgid "Ignored" -msgstr "Ignorerad" +#. (itstool) path: credit/years +#: C/preferences.page:12 +msgid "2013" +msgstr "2013" -#. (itstool) path: td/p -#: C/vc-mode.page:183 C/vc-mode.page:199 -msgid "Greyed out text" -msgstr "Utgråad text" +#. (itstool) path: page/title +#: C/preferences.page:15 +msgid "Meld's preferences" +msgstr "Melds inställningar" -#. (itstool) path: td/p -#: C/vc-mode.page:189 -msgid "" -"This file/folder has been explicitly ignored (e.g., by an entry in ." -"gitignore) and is not being tracked by version control." -msgstr "" -"Denna fil/mapp har explicit ignorerats (t.ex. genom att finnas i ." -"gitignore) och spåras inte av versionshantering." +#. (itstool) path: terms/title +#: C/preferences.page:18 +msgid "Editor preferences" +msgstr "Redigerarinställningar" -#. (itstool) path: td/p -#: C/vc-mode.page:197 -msgid "Unversioned" -msgstr "Oversionerad" +#. (itstool) path: item/title +#: C/preferences.page:20 +msgid "Editor command" +msgstr "Redigerarkommando" -#. (itstool) path: td/p -#: C/vc-mode.page:205 +#. (itstool) path: item/p +#: C/preferences.page:21 msgid "" -"This file is not in the version control system; it is only in the local copy." +"The name of the command to run to open text files in an external editor. " +"This may be just the command (e.g., gedit) in which case the file " +"to be opened will be passed as the last argument. Alternatively, you can add " +"{file} and {line} elements to the command, in " +"which case Meld will substitute the file path and current line " +"number respectively (e.g., gedit {file}:{line})." msgstr "" -"Denna fil finns inte i versionshanteringssystemet; den finns endast i den " -"lokala kopian." +"Namnet på kommandot att köra för att öppna textfiler i en extern redigerare. " +"Det kan vara bara kommandot (t.ex. gedit) i vilket fall filen att " +"öppna kommer att skickas som sista argumentet. Alternativt kan du lägga till " +"{file} och {line}-element till kommandot i vilket " +"fall Meld kommer att ersätta filsökvägen och aktuellt radnummer " +"(t.ex. gedit {file}:{line})." -#. (itstool) path: td/p -#: C/vc-mode.page:212 C/folder-mode.page:191 -msgid "Error" -msgstr "Fel" +#. (itstool) path: terms/title +#: C/preferences.page:31 +msgid "Folder Comparison preferences" +msgstr "Inställningar för mappjämförelse" -#. (itstool) path: td/p -#: C/vc-mode.page:214 C/folder-mode.page:193 -msgid "Bright red with a yellow background and bold" -msgstr "Ljust röd med en gul bakgrund och fet" +#. (itstool) path: item/title +#: C/preferences.page:33 +msgid "Apply text filters during folder comparisons" +msgstr "Att verkställa textfilter vid mappjämförelser" -#. (itstool) path: td/p -#: C/vc-mode.page:220 -msgid "The version control system has reported a problem with this file." +#. (itstool) path: item/p +#: C/preferences.page:34 +msgid "" +"When comparing files in folder comparison mode, text filters and other text " +"manipulation options can be applied to the contents of files. If this option " +"is enabled, all currently enabled text filters will be applied, the blank " +"line trimming option will be applied as appropriate, and differences in line " +"endings will be ignored." msgstr "" -"Versionshanteringssystemet har rapporterat att denna fil har ett problem." +"Under jämförelse av filer i läget mappjämförelse kan textfilter och andra " +"textmanipulationsalternativ tillämpas på innehållet i filerna. Om detta " +"alternativ är aktiverat kommer alla aktiverade textfilter att tillämpas, " +"alternativet för trimning av tomma rader kommer att tillämpas som önskat och " +"skillnader i radslut kommer att ignoreras." -#. (itstool) path: section/title -#: C/vc-mode.page:230 -msgid "Version control state filtering" -msgstr "Filtrering av versionshanteringstillstånd" +#. (itstool) path: item/p +#: C/preferences.page:40 +msgid "" +"Enabling this option means that Meld must fully read all non-" +"binary files into memory during the folder comparison. With large text " +"files, this can be slow and may cause memory issues." +msgstr "" +"Aktivering av detta alternativ innebär att Meld måste läsa in " +"alla icke-binära filer till minnet vid mappjämförelsen. Med större textfiler " +"kan detta gå långsamt och medföra minnesproblem." -#. (itstool) path: section/p -#: C/vc-mode.page:232 +#. (itstool) path: item/p +#: C/preferences.page:44 msgid "" -"Most often, you will only want to see files that are identified as being in " -"some way different; this is the default setting in Meld. You can " -"change which file states you see by using the ViewVersion Status menu, or " -"by clicking the corresponding Modified, Normal, Unversioned and " -"Ignored buttons on the toolbar." +"This option only has an effect if \"Compare files based only on size and " +"timestamp\" is not enabled." msgstr "" -"Oftast vill du endast se filer som identifieras som annorlunda på något " -"sätt; det är standardinställningen i Meld. Du kan ändra vilka " -"filtillstånd du er genom att använda menyn VyVersionstillstånd eller genom att " -"klicka motsvarande knapparna Ändrade, Normala, Oversionerad och Ignorerade i verktygsfältet." +"Detta alternativ har endast effekt om ”Jämför filer enbart baserat på " +"storlek och tidsstämpel” inte är aktiverad." #. (itstool) path: page/title #: C/keyboard-shortcuts.page:15 @@ -1274,12 +1524,14 @@ msgstr "Genvägar för att arbeta med filer och jämförelser" #. (itstool) path: td/p #: C/keyboard-shortcuts.page:22 C/keyboard-shortcuts.page:56 #: C/keyboard-shortcuts.page:109 C/keyboard-shortcuts.page:131 +#: C/keyboard-shortcuts.page:153 msgid "Shortcut" msgstr "Genväg" #. (itstool) path: td/p #: C/keyboard-shortcuts.page:22 C/keyboard-shortcuts.page:56 #: C/keyboard-shortcuts.page:109 C/keyboard-shortcuts.page:131 +#: C/keyboard-shortcuts.page:153 msgid "Description" msgstr "Beskrivning" @@ -1418,400 +1670,181 @@ msgstr "AltNed" msgid "" "Go to the next difference. (Also CtrlD)" -msgstr "" -"Gå till nästa skillnad. (också CtrlD)" - -#. (itstool) path: td/p -#: C/keyboard-shortcuts.page:96 -msgid "AltUp" -msgstr "AltUpp" - -#. (itstool) path: td/p -#: C/keyboard-shortcuts.page:97 -msgid "" -"Go to the previous difference. (Also CtrlE)" -msgstr "" -"Gå till föregående skillnad. (också CtrlE)" - -#. (itstool) path: table/title -#: C/keyboard-shortcuts.page:105 -msgid "Shortcuts for view settings" -msgstr "Genvägar för visa-inställningar" - -#. (itstool) path: td/p -#: C/keyboard-shortcuts.page:115 -msgid "Escape" -msgstr "Escape" - -#. (itstool) path: td/p -#: C/keyboard-shortcuts.page:116 -msgid "Stop the current comparison." -msgstr "Avsluta pågående jämförelse." - -#. (itstool) path: td/p -#: C/keyboard-shortcuts.page:119 -msgid "CtrlR" -msgstr "CtrlR" - -#. (itstool) path: td/p -#: C/keyboard-shortcuts.page:120 -msgid "Refresh the current comparison." -msgstr "Uppdatera pågående jämförelse." - -#. (itstool) path: table/title -#: C/keyboard-shortcuts.page:127 -msgid "Shortcuts for help" -msgstr "Genvägar för hjälp" - -#. (itstool) path: td/p -#: C/keyboard-shortcuts.page:137 -msgid "F1" -msgstr "F1" - -#. (itstool) path: td/p -#: C/keyboard-shortcuts.page:138 -msgid "Open Meld's user manual." -msgstr "Öppna Melds användarhandbok." - -#. (itstool) path: page/title -#: C/introduction.page:15 -msgid "What is Meld?" -msgstr "Vad är Meld?" - -#. (itstool) path: page/p -#: C/introduction.page:16 -msgid "" -"Meld is a tool for comparing files and directories, and for " -"resolving differences between them. It is also useful for comparing changes " -"captured by version control systems." -msgstr "" -"Meld är ett verktyg för att jämföra filer och kataloger, och för " -"att lösa skillnader mellan dem. Den är också användbar för att jämföra " -"ändringar registrerade i versionshanteringssystem." - -#. (itstool) path: page/p -#: C/introduction.page:22 -msgid "" -"Meld shows differences between two or three files (or two or " -"three directories) and allows you to move content between them, or edit the " -"files manually. Meld's focus is on helping developers compare and " -"merge source files, and get a visual overview of changes in their favourite " -"version control system." -msgstr "" -"Meld visar skillnader mellan två eller tre filer (eller två eller " -"tre kataloger) och låter dig flytta innehåll mellan dem, eller redigera " -"filerna manuellt. Melds fokus ligger på att hjälpa utvecklare " -"jämföra och sammanfoga källfiler, och att ge en visuell överblick av " -"ändringar i deras favorit-versionshanteringssystem." - -#. (itstool) path: page/title -#: C/folder-mode.page:16 -msgid "Getting started comparing folders" -msgstr "Kom igång med att jämföra mappar" - -#. (itstool) path: page/p -#: C/folder-mode.page:18 -msgid "" -"Meld lets you compare two or three folders side-by-side. You can " -"start a new folder comparison by selecting the FileNew... menu item, and " -"clicking on the Directory Comparison tab." -msgstr "" -"Meld låter dig jämföra två eller tre mappar sida-vid-sida. Du kan " -"starta en ny mappjämförelse genom att markera menyobjektet ArkivNy... och " -"klicka på fliken Katalogjämförelse." - -#. (itstool) path: page/p -#: C/folder-mode.page:26 -msgid "" -"Your selected folders will be shown as side-by-side trees, with differences " -"between files in each folder highlighted. You can copy or delete files from " -"either folder, or compare individual text files in more detail." -msgstr "" -"Dina valda mappar kommer att visas som sida-vid-sida-träd, med skillnader " -"mellan filer i olika mappar markerade. Du kan kopiera eller ta bort filer " -"antingen från var mapp, eller jämföra enskilda textfiler i mer detalj." - -#. (itstool) path: section/title -#: C/folder-mode.page:36 -msgid "The folder comparison view" -msgstr "Vyn för mappjämförelse" - -#. (itstool) path: section/p -#: C/folder-mode.page:38 -msgid "" -"The main parts of a folder comparison are the trees showing the folders " -"you're comparing. You can easily move " -"around these comparisons to find changes that you're interested in. " -"When you select a file or folder, more detailed information is given in the " -"status bar at the bottom of the window. Pressing Enter on a " -"selected file, or double-clicking any file in the tree will open a side-by-" -"side file comparison of the files in a new " -"tab, but this will only work properly if they're text files!" -msgstr "" -"Huvuddelarna vid en mappjämförelse är träden som visar mapparna du jämför. " -"Du kan enkelt navigera runt i dessa " -"jämförelser för att hitta skillnader du är intresserad av. När du markerar " -"en fil eller mapp ges mer detaljerad information i statusraden i nedre delen " -"av fönstret. Att trycka Retur på en markerad fil eller att " -"dubbelklicka en fil i trädet öppnar en sida-vid-sida filjämförelse över filerna i en ny flik, men det kommer bara att " -"fungera korrekt om de är textfiler!" - -#. (itstool) path: section/p -#: C/folder-mode.page:50 -msgid "" -"There are bars on the left and right-hand sides of the window that show you " -"a simple coloured summary of the comparison results. Each file or folder in " -"the comparison corresponds to a small section of these bars, though " -"Meld doesn't show Same files so that it's easier to see " -"any actually important differences. You can click anywhere on this bar to " -"jump straight to that place in the comparison." -msgstr "" -"Det finns paneler till vänster och höger om fönstret som visar en enkel " -"färgad summering av jämförelseresultaten. Varje fil eller mapp i jämförelsen " -"motsvaras av ett litet avsnitt i dessa paneler, men Meld visar " -"inte Samma filer så det är enkelt att se viktiga skillnader. Du kan " -"klicka varsomhelst på denna panel för att hoppa direkt till det stället i " -"jämförelsen." - -#. (itstool) path: section/title -#: C/folder-mode.page:63 -msgid "Navigating folder comparisons" -msgstr "Navigera mappjämförelser" - -#. (itstool) path: section/p -#: C/folder-mode.page:65 -msgid "" -"You can jump between changed files (that is, any files/folders that are " -"not classified as being identical) with the ChangesPrevious change " -"and ChangesNext " -"change menu items, or using the corresponding buttons on the " -"toolbar." -msgstr "" -"Du kan hoppa mellan ändrade filer (det vill säga filer/mappar som inte är klassificerade som identiska) med menyobjektet ÄndringarFöregående ändring och ÄndringarNästa ändring eller genom att använda motsvarande knappar " -"på verktygsfältet." - -#. (itstool) path: section/p -#: C/folder-mode.page:73 -msgid "" -"You can use the Left and Right arrow keys to move " -"between the folders you're comparing. This is useful so that you can select " -"an individual file for copying or deletion." -msgstr "" -"Du kan använda piltangenterna Vänster och Höger för " -"att flytta mellan filerna du jämför. Det är användbart för att markera en " -"individuell fil för kopiering eller borttagning." +msgstr "" +"Gå till nästa skillnad. (också CtrlD)" -#. (itstool) path: section/title -#: C/folder-mode.page:83 -msgid "States in folder comparisons" -msgstr "Tillstånd i mappjämförelser" +#. (itstool) path: td/p +#: C/keyboard-shortcuts.page:96 +msgid "AltUp" +msgstr "AltUpp" -#. (itstool) path: section/p -#: C/folder-mode.page:85 +#. (itstool) path: td/p +#: C/keyboard-shortcuts.page:97 msgid "" -"Each file or folder in a tree has its own state, telling you how it " -"differed from its corresponding files/folders. The possible states are:" +"Go to the previous difference. (Also CtrlE)" msgstr "" -"Varje fil eller mapp i ett träd har sitt eget tillstånd, som " -"berättar hur mycket den skiljer sig från motsvarande filer/mappar. Möjliga " -"tillstånd är:" +"Gå till föregående skillnad. (också CtrlE)" #. (itstool) path: table/title -#: C/folder-mode.page:106 -msgid "Folder comparison states" -msgstr "Tillstånd för mappjämförelser" +#: C/keyboard-shortcuts.page:105 +msgid "Shortcuts for folder comparison" +msgstr "Genvägar för mappjämförelse" #. (itstool) path: td/p -#: C/folder-mode.page:126 -msgid "The file/folder is the same across all compared folders." -msgstr "Filen/mappen är densamma över alla jämförda mappar." +#: C/keyboard-shortcuts.page:115 +#| msgid "F1" +msgid "+" +msgstr "+" #. (itstool) path: td/p -#: C/folder-mode.page:132 -msgid "Same when filtered" -msgstr "Samma när filtrerad" +#: C/keyboard-shortcuts.page:116 +msgid "Expand the current folder." +msgstr "Expandera aktuell mapp." #. (itstool) path: td/p -#: C/folder-mode.page:134 -msgid "Italics" -msgstr "Kursiva" +#: C/keyboard-shortcuts.page:119 +#| msgid "F1" +msgid "-" +msgstr "-" #. (itstool) path: td/p -#: C/folder-mode.page:140 -msgid "" -"These files are different across folders, but once text filters are applied, these files become identical." -msgstr "" -"Dessa filer är olika över mappar, men så fort textfilter verkställs blir dessa filer identiska." +#: C/keyboard-shortcuts.page:120 +msgid "Collapse the current folder." +msgstr "Fäll ihop aktuell mapp." -#. (itstool) path: td/p -#: C/folder-mode.page:150 -msgid "Blue and bold" -msgstr "Blå och fet" +#. (itstool) path: table/title +#: C/keyboard-shortcuts.page:127 +msgid "Shortcuts for view settings" +msgstr "Genvägar för visa-inställningar" #. (itstool) path: td/p -#: C/folder-mode.page:156 -msgid "These files differ between the folders being compared." -msgstr "Dessa filer skiljer mellan mapparna som jämförs." +#: C/keyboard-shortcuts.page:137 +msgid "Escape" +msgstr "Escape" #. (itstool) path: td/p -#: C/folder-mode.page:170 -msgid "This file/folder exists in this folder, but not in the others." -msgstr "Denna fil/mapp existerar i denna mapp, men inte i de andra." +#: C/keyboard-shortcuts.page:138 +msgid "Stop the current comparison." +msgstr "Avsluta pågående jämförelse." #. (itstool) path: td/p -#: C/folder-mode.page:178 -msgid "Greyed out text with a line through the middle" -msgstr "Utgråad genomstruken text" +#: C/keyboard-shortcuts.page:141 +msgid "CtrlR" +msgstr "CtrlR" #. (itstool) path: td/p -#: C/folder-mode.page:184 -msgid "" -"This file/folder doesn't exist in this folder, but does in one of the others." -msgstr "" -"Denna fil/mapp existerar inte i denna mapp, men finns i en av de andra." +#: C/keyboard-shortcuts.page:142 +msgid "Refresh the current comparison." +msgstr "Uppdatera pågående jämförelse." -#. (itstool) path: td/p -#: C/folder-mode.page:199 -msgid "" -"When comparing this file, an error occurred. The most common error causes " -"are file permissions (i.e., Meld was not allowed to open the " -"file) and filename encoding errors." -msgstr "" -"Vid jämförelse av denna fil uppstod ett fel. Den vanligaste felorsaken är " -"filrättigheter (d.v.s. Meld tilläts inte öppna filen) och " -"kodningsproblem med filnamn." +#. (itstool) path: table/title +#: C/keyboard-shortcuts.page:149 +msgid "Shortcuts for help" +msgstr "Genvägar för hjälp" -#. (itstool) path: section/p -#: C/folder-mode.page:217 -msgid "" -"You can filter out files based on these states, for example, to show only " -"files that have been Modified. You can read more about this in " -"." -msgstr "" -"Du kan filtrera bort filer baserat på dessa tillstånd, till exempel, för att " -"endast visa filer som har Ändrats. Du kan läsa mer om detta i ." +#. (itstool) path: td/p +#: C/keyboard-shortcuts.page:159 +msgid "F1" +msgstr "F1" -#. (itstool) path: section/p -#: C/folder-mode.page:223 -msgid "" -"Finally, the most recently modified file/folder has an emblem attached to it." -msgstr "" -"Slutligen, den senast ändrade filen/mappen har ett emblem fäst vid sig." +#. (itstool) path: td/p +#: C/keyboard-shortcuts.page:160 +msgid "Open Meld's user manual." +msgstr "Öppna Melds användarhandbok." #. (itstool) path: page/title -#: C/missing-functionality.page:15 -msgid "Things that Meld doesn't do" -msgstr "Saker Meld inte gör" - -#. (itstool) path: page/p -#: C/missing-functionality.page:17 -msgid "" -"Have you ever spent half an hour poking around an application trying to find " -"out how to do something, thinking that surely there must be an " -"option for this?" -msgstr "" -"Har du någonsin spenderat en halvtimme grävandes runt i ett program, " -"letandes efter hur du gör någonting, och tänkt att det säkerligen " -"måste finnas ett alternativ för det här?" +#: C/file-changes.page:16 +msgid "Dealing with changes" +msgstr "Hantera ändringar" #. (itstool) path: page/p -#: C/missing-functionality.page:23 +#: C/file-changes.page:18 msgid "" -"This section lists a few of the common things that Meld " -"doesn't do, either as a deliberate choice, or because we just " -"haven't had time." +"Meld deals with differences between files as a list of change " +"blocks or more simply changes. Each change is a group of lines " +"which correspond between files. Since these changes are what you're usually " +"interested in, Meld gives you specific tools to navigate between " +"these changes and to edit them. You can find these tools in the Changes menu." msgstr "" -"Det här avsnittet listar några saker som Meldinte gör, " -"antingen med avsikt, eller för att vi inte hade tid." +"Meld hanterar skillnader mellan filer som en lista av " +"ändringsblock eller enklare, ändringar. Varje ändring är " +"en grupp rader som motsvaras mellan filer. Eftersom dessa ändringar är vad " +"du vanligtvis är intresserad av, ger dig Meld specifika verktyg " +"för att navigera mellan ändringarna och redigera dem. Du kan hitta dessa " +"verktyg i menyn Ändringar." #. (itstool) path: section/title -#: C/missing-functionality.page:30 -msgid "Aligning changes by adding lines" -msgstr "Justera ändringar genom att lägga till rader" +#: C/file-changes.page:30 +msgid "Navigating between changes" +msgstr "Navigera mellan ändringar" #. (itstool) path: section/p -#: C/missing-functionality.page:31 +#: C/file-changes.page:32 msgid "" -"When Meld shows differences between files, it shows both files as " -"they would appear in a normal text editor. It does not insert " -"additional lines so that the left and right sides of a particular change are " -"the same size. There is no option to do this." +"You can navigate between changes with the ChangesPrevious change and " +"ChangesNext " +"change menu items. You can also use your mouse's scroll wheel " +"to move between changes, by scrolling on the central change bar." msgstr "" -"När Meld visar skillnader mellan filer visar det båda filer som " -"de normalt skulle visas i en textredigerare. Det infogar inte " -"ytterligare rader så att vänstra och högra sidan för en specifik ändring är " -"av samma storlek. Det finns inget alternativ för detta." +"Du kan navigera mellan ändringar med menyobjekten ÄndringarFöregående ändring " +"och ÄndringarNästa " +"ändring. Du kan också använda din mus rullhjul för flytta " +"mellan ändringar genom att rulla på ändringsraden i mitten." -#. (itstool) path: page/title -#: C/command-line.page:15 -msgid "Command line usage" -msgstr "Kommandoradsanvändning" +#. (itstool) path: section/title +#: C/file-changes.page:46 +msgid "Changing changes" +msgstr "Ändra ändringar" -#. (itstool) path: page/p -#: C/command-line.page:17 +#. (itstool) path: section/p +#: C/file-changes.page:48 msgid "" -"If you start Meld from the command line, you can tell it what to " -"do when it starts." +"In addition to directly editing text files, Meld gives you tools " +"to move, copy or delete individual differences between files. The bar " +"between two files not only shows you what parts of the two files correspond, " +"but also lets you selectively merge or delete differing changes by clicking " +"the arrow or cross icons next to the start of each change." msgstr "" -"Om du startar Meld från kommandoraden kan du berätta hur det ska " -"bete sig vid uppstart." +"Förutom att direkt redigera textfiler ger dig Meld verktyg för " +"att flytta, kopiera eller ta bort individuella skillnader mellan filer. " +"Raden mellan två filer visar inte bara vilka delar av de två filerna som " +"motsvaras utan låter dig också selektivt välja att sammanfoga eller ta bort " +"olika ändringar genom att klicka på pilen eller kryssikonen intill början på " +"varje ändring." -#. (itstool) path: page/p -#: C/command-line.page:20 +#. (itstool) path: section/p +#: C/file-changes.page:52 msgid "" -"For a two- or three-way file comparison, " -"start Meld with meld file1 file2 " -"or meld file1 file2 file3 " -"respectively." +"The default action is replace. This action replaces the contents of " +"the corresponding change with the current change." msgstr "" -"För en två- eller trevägsfiljämförelse, " -"starta Meld med meld fil1 fil2 " -"eller meld fil1 fil2 fil3." +"Standardåtgärden är ersätt. Denna åtgärd ersätter innehållet för " +"motsvarande ändring med den aktuella ändringen." -#. (itstool) path: page/p -#: C/command-line.page:26 +#. (itstool) path: section/p +#: C/file-changes.page:59 msgid "" -"For a two- or three-way directory comparison, start Meld with meld dir1 dir2 or meld dir1 dir2 dir3." +"Hold down the Shift key to change the current action to " +"delete. This action deletes the current change." msgstr "" -"För en två- eller trevägs mappjämförelse, " -"starta Meld med meld kat1 kat2 " -"eller meld kat1 kat2 kat3." +"Håll ner tangenten Skift för att ändra aktuell åtgärd till ta " +"bort. Denna åtgärd tar bort aktuell ändring." -#. (itstool) path: page/p -#: C/command-line.page:31 +#. (itstool) path: section/p +#: C/file-changes.page:62 msgid "" -"You can start a version control comparison by " -"just giving a single argument; if that file or directory is managed by a " -"recognized version control system, it " -"will start a version control comparison on that argument. For example, " -"meld . would start a version control view of the current " -"directory." +"Hold down the Ctrl key to change the current action to " +"insert. This action inserts the current change above or below (as " +"selected) the corresponding change." msgstr "" -"Du kan starta en versionshanteringsjämförelse " -"genom att endast ange ett argument; om filen eller katalogen hanteras av ett " -"versionshanteringssystem, kommer det att " -"starta en versionshanteringsjämförelse med det argumentet. Till exempel, " -"meld . skulle starta en versionskontroll av aktuell katalog." - -#. (itstool) path: note/p -#: C/command-line.page:40 -msgid "Run meld --help for a list of all command line options." -msgstr "Kör meld --help för en lista över alla kommandoradsflaggor." +"Håll ner tangenten Ctrl för att ändra den aktuella åtgärden till " +"infoga. Denna åtgärd infogar den aktuella ändringen ovan eller " +"under (beroende på val) motsvarande ändring." #~ msgid "Arch" #~ msgstr "Arch" From f2749cfa384bd32a290325eb439d9ae026373e37 Mon Sep 17 00:00:00 2001 From: Anders Jonsson Date: Wed, 8 Mar 2017 11:46:55 +0100 Subject: [PATCH 0137/1316] Fix grammar in manual https://bugzilla.gnome.org/show_bug.cgi?id=779747 --- help/C/folder-mode.page | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/help/C/folder-mode.page b/help/C/folder-mode.page index ab120576..4ff307ad 100644 --- a/help/C/folder-mode.page +++ b/help/C/folder-mode.page @@ -221,7 +221,7 @@ files that have been Modified. You can read more about this in

-Finally, the most recently modified file/folder has an small star emblem +Finally, the most recently modified file/folder has a small star emblem attached to it.

From 6e4b38adf734bd6b762b92ae2b2a872e7856e573 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sat, 11 Mar 2017 09:06:04 +1000 Subject: [PATCH 0138/1316] Remove .py extension from user script --- maint.py => maint | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename maint.py => maint (99%) diff --git a/maint.py b/maint similarity index 99% rename from maint.py rename to maint index 5bc43baf..944ea537 100755 --- a/maint.py +++ b/maint @@ -1,4 +1,4 @@ -#! /usr/bin/env python3 +#!/usr/bin/env python3 import collections import datetime From c33f3f992f74e7a1953f7e15a5d924675824c83e Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sat, 11 Mar 2017 09:23:52 +1000 Subject: [PATCH 0139/1316] Update NEWS --- NEWS | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/NEWS b/NEWS index d3651b6d..ed6f4fc5 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,37 @@ +2017-03-11 meld 3.17.1 +====================== + + Features: + + * Improve version checking, and try to show users a nice error dialog when + Meld's requirements aren't installed (Vasily Galkin) + + + Fixes: + + * Help and documentation fixes (Anders Jonsson, Kai Willadsen) + * Re-silence GTK+ logging with glib 2.46 structured logging changes (Kai + Willadsen) + * Fix chunk deletion at EOF with CRLF endings (Kai Willadsen) + * Note filter performance effects in folder preferences (Kai Willadsen) + * Fix button alignment for new chunk action buttons (Kai Willadsen) + * Improve use of the newer emblem in folder comparison by showing it only + when meaningful (Kai Willadsen) + * Fix crash caused by bad colour theme lookup (Kai Willadsen) + + + Translations: + + * Alan Mortensen (da) + * Anders Jonsson (sv) + * Daniel Mustieles (es) + * Josef Andersson (sv) + * Marek Černocký (cs) + * Paul Seyfert (de) + * Piotr Drąg (pl) + * Rafael Fontenelle (pt_BR) + * Мирослав Николић (sr, sr@latin) + 2016-12-18 meld 3.17.0 ====================== From ce756201b1de3b75ec500524e94335e913446daa Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sat, 11 Mar 2017 09:25:14 +1000 Subject: [PATCH 0140/1316] maint: Explicitly call python3 for the setup step --- maint | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maint b/maint index 944ea537..1d366ff3 100755 --- a/maint +++ b/maint @@ -346,7 +346,7 @@ def dist(): dist_archive_path = os.path.abspath(os.path.join('dist', archive)) if os.path.exists(dist_archive_path): click.echo('Replacing %s...' % dist_archive_path) - cmd = ['python', 'setup.py', 'sdist', '--formats=bztar'] + cmd = ['python3', 'setup.py', 'sdist', '--formats=bztar'] call_with_output(cmd, echo_stdout=False) if not os.path.exists(dist_archive_path): click.echo('Failed to create archive file %s' % dist_archive_path) From ad4a68d41455c09bd90aa3f82685773b87a17ec6 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sat, 11 Mar 2017 09:36:18 +1000 Subject: [PATCH 0141/1316] Post-release version bump --- meld/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meld/conf.py b/meld/conf.py index 2aafddef..444cd396 100644 --- a/meld/conf.py +++ b/meld/conf.py @@ -3,7 +3,7 @@ import sys __package__ = "meld" -__version__ = "3.17.1" +__version__ = "3.17.2" # START; these paths are clobbered on install by meld.build_helpers DATADIR = os.path.join(sys.prefix, "share", "meld") From 0498e7047b1b4d6a351e5f374059b90aa179a9c8 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sat, 11 Mar 2017 09:55:07 +1000 Subject: [PATCH 0142/1316] meldwindow: Work around broken UIManager life cycle again (bgo#779880) This is very similar to bgo#755407, and the "fix" is basically the same, even though the reproduction is different. This looks like it was reintroduced when we removed the tabs menu, because the code that was previously calling ensure_update() was removed along with the tab menu recreation. This was fine in most cases, but resurfaced with closing the second of multiple windows. I have no desire to find out why, and there's no chance of getting this fixed in GTK+, thus this hack. --- meld/meldwindow.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meld/meldwindow.py b/meld/meldwindow.py index 4078c69d..ce9dbd86 100644 --- a/meld/meldwindow.py +++ b/meld/meldwindow.py @@ -512,6 +512,9 @@ def page_removed(self, page, status): if not self.has_pages(): self.on_switch_page(self.notebook, page, -1) self._update_page_action_sensitivity() + # Synchronise UIManager state; this shouldn't be necessary, + # but upstream aren't touching UIManager bugs. + self.ui.ensure_update() if self.should_close: cancelled = self.widget.emit( 'delete-event', Gdk.Event.new(Gdk.EventType.DELETE)) From 919016bbf7205bebfc542a6f8b7250e61f06f92e Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sat, 11 Mar 2017 11:45:05 +1000 Subject: [PATCH 0143/1316] filediff: Use our buffer variables consistently --- meld/filediff.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meld/filediff.py b/meld/filediff.py index 81a96ce6..974886bb 100644 --- a/meld/filediff.py +++ b/meld/filediff.py @@ -1797,10 +1797,10 @@ def replace_chunk(self, src, dst, chunk): dst_end = b1.get_iter_at_line_or_eof(chunk[4]) t0 = b0.get_text(src_start, src_end, False) mark0 = b1.create_mark(None, dst_start, True) - self.textbuffer[dst].begin_user_action() + b1.begin_user_action() b1.delete(dst_start, dst_end) new_end = b1.insert_at_line(chunk[3], t0) - self.textbuffer[dst].end_user_action() + b1.end_user_action() mark1 = b1.create_mark(None, new_end, True) if chunk[1] == chunk[2]: # TODO: Need a more specific colour here; conflict is wrong From 27fd840ded3e17211591b4853b8bd364761b0aea Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sat, 11 Mar 2017 11:45:44 +1000 Subject: [PATCH 0144/1316] filediff: Place cursor at the start of a replaced chunk This is an ergonomics improvement. In most cases this won't matter at all. It's sort of more intuitive to keep doing what we used to do, and place the cursor after the chunk that's just had the action done to it... after all that's what would happen if you'd just pasted the chunk. However, it doesn't really feel right to me. In particular, it's a pain when pulling chunks, because you've just pulled a chunk into your current pane, and then your cursor is moved off this chunk. Now maybe that's okay because you're done with it, but maybe you're not. You may want to edit that chunk further, or (in three-way diff cases) you may want to then push that chunk to the other side (i.e., in center, pull from left, push to right). If this doesn't end up working out, the change is trivial to revert. However, for now this feels more correct to me. --- meld/filediff.py | 1 + 1 file changed, 1 insertion(+) diff --git a/meld/filediff.py b/meld/filediff.py index 974886bb..12a5678c 100644 --- a/meld/filediff.py +++ b/meld/filediff.py @@ -1800,6 +1800,7 @@ def replace_chunk(self, src, dst, chunk): b1.begin_user_action() b1.delete(dst_start, dst_end) new_end = b1.insert_at_line(chunk[3], t0) + b1.place_cursor(b1.get_iter_at_line(chunk[3])) b1.end_user_action() mark1 = b1.create_mark(None, new_end, True) if chunk[1] == chunk[2]: From 6149926d9b76bad64896323e2c89e2486c5110b6 Mon Sep 17 00:00:00 2001 From: Anders Jonsson Date: Sat, 11 Mar 2017 11:38:52 +0000 Subject: [PATCH 0145/1316] Update Swedish translation --- help/sv/sv.po | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/help/sv/sv.po b/help/sv/sv.po index 1e49b21a..b290315b 100644 --- a/help/sv/sv.po +++ b/help/sv/sv.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: meld master\n" -"POT-Creation-Date: 2017-02-23 20:48+0000\n" -"PO-Revision-Date: 2017-03-08 10:47+0100\n" +"POT-Creation-Date: 2017-03-10 23:07+0000\n" +"PO-Revision-Date: 2017-03-11 12:37+0100\n" "Last-Translator: Anders Jonsson \n" "Language-Team: Swedish \n" "Language: sv\n" @@ -1376,7 +1376,7 @@ msgstr "" #. (itstool) path: section/p #: C/folder-mode.page:223 msgid "" -"Finally, the most recently modified file/folder has an small star emblem " +"Finally, the most recently modified file/folder has a small star emblem " "attached to it." msgstr "" "Slutligen, den senast ändrade filen/mappen har ett litet stjärnemblem fäst " @@ -1694,7 +1694,6 @@ msgstr "Genvägar för mappjämförelse" #. (itstool) path: td/p #: C/keyboard-shortcuts.page:115 -#| msgid "F1" msgid "+" msgstr "+" @@ -1705,7 +1704,6 @@ msgstr "Expandera aktuell mapp." #. (itstool) path: td/p #: C/keyboard-shortcuts.page:119 -#| msgid "F1" msgid "-" msgstr "-" From 7277d87f4d98b531e458a50e41129c3bb3eba615 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 12 Mar 2017 09:26:50 +1000 Subject: [PATCH 0146/1316] diffmap: Call our correct parent init --- meld/diffmap.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meld/diffmap.py b/meld/diffmap.py index 50903c3e..7548cdfa 100644 --- a/meld/diffmap.py +++ b/meld/diffmap.py @@ -18,7 +18,6 @@ import cairo -from gi.repository import GObject from gi.repository import Gdk from gi.repository import Gtk @@ -31,7 +30,7 @@ class DiffMap(Gtk.DrawingArea): __gtype_name__ = "DiffMap" def __init__(self): - GObject.GObject.__init__(self) + Gtk.DrawingArea.__init__(self) self.add_events(Gdk.EventMask.BUTTON_PRESS_MASK) self._scrolladj = None self._difffunc = lambda: None From ef3ba1b87d2cb775901ac9780d464b32e5b3942c Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 12 Mar 2017 09:31:25 +1000 Subject: [PATCH 0147/1316] diffmap: Call the wrong function, for GTK+'s insanity Even though queuing a resize here should be totally fine, GTK+ completely loses it and complains about allocation issues. Given that this is code that should basically never be necessary in our layout (i.e., every time a scrollbar gets a size-allocate, we can basically guarantee that DiffMap will as well) and given how annoying these warnings are, we'll give in and just do the wrong thing. --- meld/diffmap.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meld/diffmap.py b/meld/diffmap.py index 7548cdfa..35202519 100644 --- a/meld/diffmap.py +++ b/meld/diffmap.py @@ -108,7 +108,7 @@ def on_scrollbar_size_allocate(self, scrollbar, allocation): self._scroll_height = allocation.height self._width = max(allocation.width, 10) self._cached_map = None - self.queue_resize() + self.queue_allocate() def do_draw(self, context): if not self._setup: From 0396666bd2a7eeab5e7459059071c876c5a4d791 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 12 Mar 2017 09:42:49 +1000 Subject: [PATCH 0148/1316] dirdiff: Fix GTK+ allocation breakage, part X of Y I'm not going to dive into why this fixes our allocation warnings. You can't make me. I assume it has something to do with animation callbacks and private GtkCSSGadget API and complete disregard for your users. --- meld/dirdiff.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meld/dirdiff.py b/meld/dirdiff.py index 12730a53..f521f9db 100644 --- a/meld/dirdiff.py +++ b/meld/dirdiff.py @@ -578,13 +578,13 @@ def _do_to_others(self, master, objects, methodname, args): def _sync_vscroll(self, adjustment): adjs = [sw.get_vadjustment() for sw in self.scrolledwindow] - self._do_to_others(adjustment, adjs, "set_value", - (adjustment.get_value(), )) + self._do_to_others( + adjustment, adjs, "set_value", (int(adjustment.get_value()),)) def _sync_hscroll(self, adjustment): adjs = [sw.get_hadjustment() for sw in self.scrolledwindow] - self._do_to_others(adjustment, adjs, "set_value", - (adjustment.get_value(), )) + self._do_to_others( + adjustment, adjs, "set_value", (int(adjustment.get_value()),)) def _get_focused_pane(self): for i, treeview in enumerate(self.treeview): From f97ea196fa2375fb3ebb829b3a166297e12aed76 Mon Sep 17 00:00:00 2001 From: Milo Casagrande Date: Tue, 14 Mar 2017 08:58:16 +0000 Subject: [PATCH 0149/1316] Update Italian translation --- po/it.po | 1198 +++++++++++++++++++++++++++++++++--------------------- 1 file changed, 727 insertions(+), 471 deletions(-) diff --git a/po/it.po b/po/it.po index 2871c81f..e07d0223 100644 --- a/po/it.po +++ b/po/it.po @@ -1,15 +1,15 @@ # Italian translation of meld -# Copyright (C) 2013, 2014 Free Software Foundation, Inc. +# Copyright (C) 2013, 2014, 2017 Free Software Foundation, Inc. # This file is distributed under the same license as the meld package. -# Milo Casagrande , 2013, 2014. +# Milo Casagrande , 2013, 2014, 2017. # msgid "" msgstr "" "Project-Id-Version: meld\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" "product=meld&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-10-13 11:42+0000\n" -"PO-Revision-Date: 2015-10-16 09:28+0200\n" +"POT-Creation-Date: 2017-03-11 23:46+0000\n" +"PO-Revision-Date: 2017-03-14 09:57+0100\n" "Last-Translator: Milo Casagrande \n" "Language-Team: Italian \n" "Language: it\n" @@ -17,22 +17,18 @@ 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 1.8.5\n" +"X-Generator: Poedit 2.0beta3\n" -#: ../bin/meld:144 +#: ../bin/meld:179 msgid "Cannot import: " msgstr "Impossibile importare: " -#: ../bin/meld:147 +#: ../bin/meld:182 #, c-format msgid "Meld requires %s or higher." msgstr "Meld richiede %s o più recente." -#: ../bin/meld:151 -msgid "Meld does not support Python 3." -msgstr "Meld non supporta Python 3." - -#: ../bin/meld:199 +#: ../bin/meld:227 #, c-format msgid "" "Couldn't load Meld-specific CSS (%s)\n" @@ -41,7 +37,8 @@ msgstr "" "Impossibile caricare i fogli di stile specifici di Meld (%s)\n" "%s" -#: ../data/meld.desktop.in.h:1 ../data/ui/meldapp.ui.h:1 +#: ../data/meld.desktop.in.h:1 ../data/meld.appdata.xml.in.h:1 +#: ../data/ui/meldapp.ui.h:1 msgid "Meld" msgstr "Meld" @@ -53,16 +50,21 @@ msgstr "Visualizzatore di differenze" msgid "Meld Diff Viewer" msgstr "Visualizzatore di differenze Meld" -#: ../data/meld.desktop.in.h:4 +#: ../data/meld.desktop.in.h:4 ../data/meld.appdata.xml.in.h:2 msgid "Compare and merge your files" msgstr "Confronta e unisce file" -#: ../data/meld.appdata.xml.in.h:1 +#. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! +#: ../data/meld.desktop.in.h:6 +msgid "diff;merge;" +msgstr "diff;merge;differenze;unione;" + +#: ../data/meld.appdata.xml.in.h:3 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." +"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 "" "Meld è un visualizzatore grafico di differenze e uno strumento per l'unione " "di file. Consente di confrontare file, directory e progetti in un sistema di " @@ -70,83 +72,100 @@ msgstr "" "di directory e supporta diversi sistemi di controllo come Git, Mercurial, " "Bazaar e Subversion." -#: ../data/meld.appdata.xml.in.h:2 +#: ../data/meld.appdata.xml.in.h:4 msgid "" "Meld helps you review code changes, understand patches, and makes enormous " "merge conflicts slightly less painful." msgstr "" -"Meld aiuta nella revisione delle modifiche al codice, consente di comprendere " -"le patch e rende più facile l'unione di file in presenza di conflitti." +"Meld aiuta nella revisione delle modifiche al codice, consente di " +"comprendere le patch e rende più facile l'unione di file in presenza di " +"conflitti." + +#: ../data/meld.appdata.xml.in.h:5 +msgid "The GNOME Project" +msgstr "Il progetto GNOME" #: ../data/mime/meld.xml.in.h:1 msgid "Meld comparison description" msgstr "Descrizione confronto Meld" #: ../data/org.gnome.meld.gschema.xml.h:1 -msgid "Default window size" -msgstr "Dimensione predefinita della finestra" +msgid "Default window width" +msgstr "Larghezza predefinita della finestra" #: ../data/org.gnome.meld.gschema.xml.h:2 -msgid "Default window state" -msgstr "Stato predefinito della finestra" +msgid "Default window height" +msgstr "Altezza predefinita della finestra" #: ../data/org.gnome.meld.gschema.xml.h:3 +msgid "Default window maximised state" +msgstr "Stato massimizzato predefinito della finestra" + +#: ../data/org.gnome.meld.gschema.xml.h:4 +msgid "Default window fullscreen state" +msgstr "Stato a schermo intero predefinito della finestra" + +#: ../data/org.gnome.meld.gschema.xml.h:5 msgid "Show toolbar" msgstr "Mostra barra degli strumenti" -#: ../data/org.gnome.meld.gschema.xml.h:4 +#: ../data/org.gnome.meld.gschema.xml.h:6 msgid "If true, the window toolbar is visible." msgstr "Se VERO, viene visualizzata la barra degli strumenti." -#: ../data/org.gnome.meld.gschema.xml.h:5 +#: ../data/org.gnome.meld.gschema.xml.h:7 msgid "Show statusbar" msgstr "Mostra barra di stato" -#: ../data/org.gnome.meld.gschema.xml.h:6 +#: ../data/org.gnome.meld.gschema.xml.h:8 msgid "If true, the window statusbar is visible." msgstr "Se VERO, viene visualizzata la barra di stato." -#: ../data/org.gnome.meld.gschema.xml.h:7 -msgid "Automatically detected text encodings" -msgstr "Codifica automatica del testo" +#: ../data/org.gnome.meld.gschema.xml.h:9 +msgid "Additional automatically detected text encodings" +msgstr "Codifiche testo aggiuntive rilevate automaticamente" -#: ../data/org.gnome.meld.gschema.xml.h:8 +#: ../data/org.gnome.meld.gschema.xml.h:10 msgid "" -"These text encodings will be automatically used (in order) to try to decode " -"loaded text files." +"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 "" -"Queste codifiche di testo verranno utilizzate automaticamente, e in ordine, " -"per decodificare i file di testo caricati." +"Il programma usa queste codifiche per caricare il testo dai file, prima di " +"utilizzare altre codifiche. Oltre alle codifiche elencate, verranno usate " +"sia UTF-8 sia la codifica basata sulla lingua attuale. Altre codifiche " +"possono essere utilizzate in base alla lingua impostata dall'utente." -#: ../data/org.gnome.meld.gschema.xml.h:9 +#: ../data/org.gnome.meld.gschema.xml.h:11 msgid "Width of an indentation step" msgstr "Larghezza di un passa di rientro" -#: ../data/org.gnome.meld.gschema.xml.h:10 +#: ../data/org.gnome.meld.gschema.xml.h:12 msgid "The number of spaces to use for a single indent step" msgstr "Il numero di spazi da usare per un singolo passo d'indentazione" -#: ../data/org.gnome.meld.gschema.xml.h:11 +#: ../data/org.gnome.meld.gschema.xml.h:13 msgid "Whether to indent using spaces or tabs" msgstr "Indica se usare un rientro di spazi o tabulazioni" -#: ../data/org.gnome.meld.gschema.xml.h:12 +#: ../data/org.gnome.meld.gschema.xml.h:14 msgid "If true, any new indentation will use spaces instead of tabs." msgstr "Se VERO, un nuovo rientro userà spazi invece di tabulazioni." -#: ../data/org.gnome.meld.gschema.xml.h:13 +#: ../data/org.gnome.meld.gschema.xml.h:15 msgid "Show line numbers" msgstr "Mostrare numeri di riga" -#: ../data/org.gnome.meld.gschema.xml.h:14 +#: ../data/org.gnome.meld.gschema.xml.h:16 msgid "If true, line numbers will be shown in the gutter of file comparisons." msgstr "Se VERO, verranno mostrati i numeri di riga nel confronto." -#: ../data/org.gnome.meld.gschema.xml.h:15 +#: ../data/org.gnome.meld.gschema.xml.h:17 msgid "Highlight syntax" msgstr "Evidenzia la sintassi" -#: ../data/org.gnome.meld.gschema.xml.h:16 +#: ../data/org.gnome.meld.gschema.xml.h:18 msgid "" "Whether to highlight syntax in comparisons. Because of Meld's own color " "highlighting, this is off by default." @@ -154,21 +173,21 @@ msgstr "" "Indica se evidenziare la sintassi; dato il colore di evidenziazione di Meld, " "è disattivato per impostazione predefinita" -#: ../data/org.gnome.meld.gschema.xml.h:17 +#: ../data/org.gnome.meld.gschema.xml.h:19 msgid "Color scheme to use for syntax highlighting" msgstr "Schema di colori da utilizzare per l'evidenziazione della sintassi" -#: ../data/org.gnome.meld.gschema.xml.h:18 +#: ../data/org.gnome.meld.gschema.xml.h:20 msgid "Used by GtkSourceView to determine colors for syntax highlighting" msgstr "" "Utilizzato da GtkSourceView per determinare i colori per l'evidenziazione " "della sintassi" -#: ../data/org.gnome.meld.gschema.xml.h:19 +#: ../data/org.gnome.meld.gschema.xml.h:21 msgid "Displayed whitespace" msgstr "Spazi bianchi" -#: ../data/org.gnome.meld.gschema.xml.h:20 +#: ../data/org.gnome.meld.gschema.xml.h:22 msgid "" "Selector for individual whitespace character types to be shown. Possible " "values are 'space', 'tab', 'newline' and 'nbsp'." @@ -176,11 +195,11 @@ msgstr "" "Selettore per gli spazi bianchi da visualizzare. I possibili valori sono " "\"space\", \"tab\", \"newline\" e \"nbsp\"." -#: ../data/org.gnome.meld.gschema.xml.h:21 +#: ../data/org.gnome.meld.gschema.xml.h:23 msgid "Wrap mode" msgstr "Modalità a capo" -#: ../data/org.gnome.meld.gschema.xml.h:22 +#: ../data/org.gnome.meld.gschema.xml.h:24 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 " @@ -190,31 +209,32 @@ msgstr "" "niente (\"none\"), a un qualsiasi carattere (\"char\") o solo alla fine di " "una parola (\"word\")." -#: ../data/org.gnome.meld.gschema.xml.h:23 +#: ../data/org.gnome.meld.gschema.xml.h:25 msgid "Highlight current line" msgstr "Evidenzia la riga corrente" -#: ../data/org.gnome.meld.gschema.xml.h:24 +#: ../data/org.gnome.meld.gschema.xml.h:26 msgid "" "If true, the line containing the cursor will be highlighted in file " "comparisons." msgstr "Se VERO, la riga con il cursore viene evidenziata nel confronto." -#: ../data/org.gnome.meld.gschema.xml.h:25 +#: ../data/org.gnome.meld.gschema.xml.h:27 msgid "Use the system default monospace font" msgstr "Usa il carattere a spaziatura fissa di sistema" -#: ../data/org.gnome.meld.gschema.xml.h:26 -msgid "If false, custom-font will be used instead of the system monospace font." +#: ../data/org.gnome.meld.gschema.xml.h:28 +msgid "" +"If false, custom-font will be used instead of the system monospace font." msgstr "" "Se FALSO, viene usato custom-font al posto di quello a spaziatura fissa di " "sistema." -#: ../data/org.gnome.meld.gschema.xml.h:27 +#: ../data/org.gnome.meld.gschema.xml.h:29 msgid "Custom font" msgstr "Carattere personalizzato" -#: ../data/org.gnome.meld.gschema.xml.h:28 +#: ../data/org.gnome.meld.gschema.xml.h:30 msgid "" "The custom font to use, stored as a string and parsed as a Pango font " "description." @@ -222,46 +242,46 @@ msgstr "" "Il carattere personalizzato da usare, salvato come stringa e interpretato " "come una descrizione di carattere Pango." -#: ../data/org.gnome.meld.gschema.xml.h:29 +#: ../data/org.gnome.meld.gschema.xml.h:31 msgid "Ignore blank lines when comparing files" msgstr "Ignora le righe vuote nei confronti" -#: ../data/org.gnome.meld.gschema.xml.h:30 +#: ../data/org.gnome.meld.gschema.xml.h:32 msgid "" "If true, blank lines will be trimmed when highlighting changes between files." msgstr "" "Se VERO, le righe vuote non verranno considerate nell'evidenziare le " "modifiche tra i file." -#: ../data/org.gnome.meld.gschema.xml.h:31 +#: ../data/org.gnome.meld.gschema.xml.h:33 msgid "Use the system default editor" msgstr "Usa l'editor predefinito di sistema" -#: ../data/org.gnome.meld.gschema.xml.h:32 +#: ../data/org.gnome.meld.gschema.xml.h:34 msgid "" "If false, custom-editor-command will be used instead of the system editor " "when opening files externally." msgstr "" -"Se FALSO, viene usato custom-editor-command al posto di quello di sistema per " -"aprire i file esternamente." +"Se FALSO, viene usato custom-editor-command al posto di quello di sistema " +"per aprire i file esternamente." -#: ../data/org.gnome.meld.gschema.xml.h:33 +#: ../data/org.gnome.meld.gschema.xml.h:35 msgid "The custom editor launch command" msgstr "Il comando per lanciare l'editor personalizzato" -#: ../data/org.gnome.meld.gschema.xml.h:34 +#: ../data/org.gnome.meld.gschema.xml.h:36 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 "" -"Il comando usato per lanciare l'editor personalizzato. È supportata una forma " -"basilare di modelli: \"{file}\" e \"{line}\" sono token riconosciuti." +"Il comando usato per lanciare l'editor personalizzato. È supportata una " +"forma basilare di modelli: \"{file}\" e \"{line}\" sono token riconosciuti." -#: ../data/org.gnome.meld.gschema.xml.h:35 +#: ../data/org.gnome.meld.gschema.xml.h:37 msgid "Columns to display" msgstr "Colonne da visualizzare" -#: ../data/org.gnome.meld.gschema.xml.h:36 +#: ../data/org.gnome.meld.gschema.xml.h:38 msgid "" "List of column names in folder comparison and whether they should be " "displayed." @@ -269,21 +289,22 @@ msgstr "" "Elenco di nomi di colonne nel confronto tra directory e se debbano essere " "visualizzate." -#: ../data/org.gnome.meld.gschema.xml.h:37 ../data/ui/preferences.ui.h:32 +#: ../data/org.gnome.meld.gschema.xml.h:39 ../data/ui/preferences.ui.h:25 msgid "Ignore symbolic links" msgstr "Ignorare collegamenti simbolici" -#: ../data/org.gnome.meld.gschema.xml.h:38 +#: ../data/org.gnome.meld.gschema.xml.h:40 msgid "" "If true, folder comparisons do not follow symbolic links when traversing the " "folder tree." -msgstr "Se VERO, il confronto tra directory non segue i collegamenti simbolici." +msgstr "" +"Se VERO, il confronto tra directory non segue i collegamenti simbolici." -#: ../data/org.gnome.meld.gschema.xml.h:39 +#: ../data/org.gnome.meld.gschema.xml.h:41 msgid "Use shallow comparison" msgstr "Usa confronto superficiale" -#: ../data/org.gnome.meld.gschema.xml.h:40 +#: ../data/org.gnome.meld.gschema.xml.h:42 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 " @@ -292,15 +313,15 @@ msgstr "" "Se VERO, il confronto tra directory confronta i file solamente su dimensione " "e mtime, considerando solo i file con stessa dimensione e mtime come uguali." -#: ../data/org.gnome.meld.gschema.xml.h:41 +#: ../data/org.gnome.meld.gschema.xml.h:43 msgid "File timestamp resolution" msgstr "Risoluzione marcatura temporale del file" -#: ../data/org.gnome.meld.gschema.xml.h:42 +#: ../data/org.gnome.meld.gschema.xml.h:44 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 " +"between two files before they're considered to have different mtimes. This " +"is useful when comparing files between filesystems with different timestamp " "resolution." msgstr "" "Quando il confronto è fatto su mtime, questa è la differenza minima in " @@ -308,32 +329,33 @@ msgstr "" "confronto di file provenienti da file system con risoluzioni temporali " "differenti." -#: ../data/org.gnome.meld.gschema.xml.h:43 ../data/ui/preferences.ui.h:30 +#: ../data/org.gnome.meld.gschema.xml.h:45 ../data/ui/preferences.ui.h:22 msgid "Apply text filters during folder comparisons" msgstr "Applicare filtri di testo durante i confronti sulla cartella" -#: ../data/org.gnome.meld.gschema.xml.h:44 +#: ../data/org.gnome.meld.gschema.xml.h:46 msgid "" -"If true, folder comparisons that compare file contents also apply active text " -"filters and the blank line trimming option, and ignore newline differences." +"If true, folder comparisons that compare file contents also apply active " +"text filters and the blank line trimming option, and ignore newline " +"differences." msgstr "" "Se VERO, i confronti sulla cartella che eseguono confronti sui contenuti dei " "file applicano anche i filtri di testo attivi, l'opzione di esclusione delle " "righe vuote e ignorano le differenze sugli a capo." -#: ../data/org.gnome.meld.gschema.xml.h:45 +#: ../data/org.gnome.meld.gschema.xml.h:47 msgid "File status filters" msgstr "Filtri sullo stato dei file" -#: ../data/org.gnome.meld.gschema.xml.h:46 +#: ../data/org.gnome.meld.gschema.xml.h:48 msgid "List of statuses used to filter visible files in folder comparison." msgstr "Elenco di stati usati per filtrare i file nel confronto tra directory." -#: ../data/org.gnome.meld.gschema.xml.h:47 +#: ../data/org.gnome.meld.gschema.xml.h:49 msgid "Show the version control console output" msgstr "Mostra l'output del sistema di controllo della versione" -#: ../data/org.gnome.meld.gschema.xml.h:48 +#: ../data/org.gnome.meld.gschema.xml.h:50 msgid "" "If true, a console output section will be shown in version control views, " "showing the commands run for version control operations." @@ -341,11 +363,11 @@ msgstr "" "Se VERO, viene mostrato l'output della console nella vista del controllo " "della versione, con i comandi eseguiti." -#: ../data/org.gnome.meld.gschema.xml.h:49 +#: ../data/org.gnome.meld.gschema.xml.h:51 msgid "Version control pane position" msgstr "Posizione riquadro controllo versione" -#: ../data/org.gnome.meld.gschema.xml.h:50 +#: ../data/org.gnome.meld.gschema.xml.h:52 msgid "" "This is the height of the main version control tree when the console pane is " "shown." @@ -353,26 +375,26 @@ msgstr "" "Questa è l'altezza dell'albero principale del controllo versione quando il " "riquadro della console è mostrato." -#: ../data/org.gnome.meld.gschema.xml.h:51 +#: ../data/org.gnome.meld.gschema.xml.h:53 msgid "Present version comparisons as left-local/right-remote" msgstr "Confronto come sinistra-locale/destra-remoto" -#: ../data/org.gnome.meld.gschema.xml.h:52 +#: ../data/org.gnome.meld.gschema.xml.h:54 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." +"remote scheme to determine what order to present files in panes. Otherwise, " +"a left-is-theirs, right-is-mine scheme is used." msgstr "" "Se VERO, il confronto con sistemi di controllo della versione usa uno schema " "sinistra-locale destra-remoto per determinare l'ordine con cui mostrare i " "file. Altrimenti viene usato lo schema sinistra-altri destra-personale." -#: ../data/org.gnome.meld.gschema.xml.h:53 +#: ../data/org.gnome.meld.gschema.xml.h:55 msgid "Order for files in three-way version control merge comparisons" msgstr "" "Ordine dei file nel confronto a tre vie su unione da controllo della versione" -#: ../data/org.gnome.meld.gschema.xml.h:54 +#: ../data/org.gnome.meld.gschema.xml.h:56 msgid "" "Choices for file order are remote/merged/local and local/merged/remote. This " "preference only affects three-way comparisons launched from the version " @@ -383,23 +405,23 @@ msgstr "" "dalla visualizzazione del controllo versione: viene quindi utilizzata " "solamente nella risoluzione di unioni/conflitti." -#: ../data/org.gnome.meld.gschema.xml.h:55 +#: ../data/org.gnome.meld.gschema.xml.h:57 msgid "Show margin in commit message editor" msgstr "Mostra i margini nell'editor del messaggio di commit" -#: ../data/org.gnome.meld.gschema.xml.h:56 +#: ../data/org.gnome.meld.gschema.xml.h:58 msgid "" "If true, a guide will be displayed to show what column the margin is at in " "the version control commit message editor." msgstr "" -"Se VERO, viene visualizzata una guida per mostrare il margine nell'editor del " -"messaggio di commit." +"Se VERO, viene visualizzata una guida per mostrare il margine nell'editor " +"del messaggio di commit." -#: ../data/org.gnome.meld.gschema.xml.h:57 +#: ../data/org.gnome.meld.gschema.xml.h:59 msgid "Margin column in commit message editor" msgstr "Colonna nell'editor del messaggio di commit" -#: ../data/org.gnome.meld.gschema.xml.h:58 +#: ../data/org.gnome.meld.gschema.xml.h:60 msgid "" "The column at which to show the margin in the version control commit message " "editor." @@ -407,11 +429,11 @@ msgstr "" "La colonna in cui visualizzare il margine dell'editor per il messaggio di " "commit del controllo versione." -#: ../data/org.gnome.meld.gschema.xml.h:59 +#: ../data/org.gnome.meld.gschema.xml.h:61 msgid "Automatically hard-wrap commit messages" msgstr "A capo automatico nei messaggi di commit" -#: ../data/org.gnome.meld.gschema.xml.h:60 +#: ../data/org.gnome.meld.gschema.xml.h:62 msgid "" "If true, the version control commit message editor will hard-wrap (i.e., " "insert line breaks) at the commit margin before commit." @@ -419,22 +441,22 @@ msgstr "" "Se VERO, l'editor del messaggio di commit andrà a capo automaticamente al " "margine predefinito (inserirà a capo) prima di eseguire il commit." -#: ../data/org.gnome.meld.gschema.xml.h:61 +#: ../data/org.gnome.meld.gschema.xml.h:63 msgid "Version control status filters" msgstr "Filtri sullo stato del sistema di controllo della versione" -#: ../data/org.gnome.meld.gschema.xml.h:62 +#: ../data/org.gnome.meld.gschema.xml.h:64 msgid "" "List of statuses used to filter visible files in version control comparison." msgstr "" "Elenco di stati usati per filtrare i file visualizzati nel confronto per i " "sistemi di controllo della versione." -#: ../data/org.gnome.meld.gschema.xml.h:63 +#: ../data/org.gnome.meld.gschema.xml.h:65 msgid "Filename-based filters" msgstr "Filtri sui nomi dei file" -#: ../data/org.gnome.meld.gschema.xml.h:64 +#: ../data/org.gnome.meld.gschema.xml.h:66 msgid "" "List of predefined filename-based filters that, if active, will remove " "matching files from a folder comparison." @@ -442,15 +464,15 @@ msgstr "" "Elenco di filtri basati sui nomi dei file che, se attivi, rimuovono i file " "dal confronto in un confronto tra directory." -#: ../data/org.gnome.meld.gschema.xml.h:65 +#: ../data/org.gnome.meld.gschema.xml.h:67 msgid "Text-based filters" msgstr "Filtri di testo" -#: ../data/org.gnome.meld.gschema.xml.h:66 +#: ../data/org.gnome.meld.gschema.xml.h:68 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." +"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 "" "Elenco di filtri di testo che, se attivi, rimuovono il testo usato per " "confrontare i file. Il testo verrà visualizzato, ma non farà parte dal " @@ -501,10 +523,14 @@ msgid "_Help" msgstr "A_iuto" #: ../data/ui/application.ui.h:8 +msgid "Keyboard Shortcuts" +msgstr "Scorciatoie da tastiera" + +#: ../data/ui/application.ui.h:9 msgid "_About" msgstr "I_nformazioni" -#: ../data/ui/application.ui.h:9 +#: ../data/ui/application.ui.h:10 msgid "_Quit" msgstr "_Chiudi" @@ -536,7 +562,7 @@ msgstr "Copia a destra" msgid "Delete selected" msgstr "Elimina selezione" -#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:856 ../meld/filediff.py:1422 +#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:858 ../meld/filediff.py:1336 msgid "Hide" msgstr "Nascondi" @@ -573,7 +599,7 @@ msgstr "Nuovi" msgid "Show new" msgstr "Mostra nuovi" -#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:73 +#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:76 msgid "Modified" msgstr "Modificati" @@ -606,7 +632,7 @@ msgid "_Add" msgstr "A_ggiungi" #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11 -#: ../meld/vcview.py:649 +#: ../meld/vcview.py:644 msgid "_Remove" msgstr "_Rimuovi" @@ -628,7 +654,7 @@ msgstr "Sposta _giù" #. Create icon and filename CellRenderer #: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35 -#: ../meld/dirdiff.py:372 +#: ../meld/dirdiff.py:373 msgid "Name" msgstr "Nome" @@ -831,8 +857,8 @@ msgstr "Se non si salva, tutte le modifiche andranno perse per sempre." msgid "Close _without Saving" msgstr "Chiudi senza sal_vare" -#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:947 ../meld/filediff.py:1488 -#: ../meld/filediff.py:1572 ../meld/filediff.py:1597 +#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:940 ../meld/filediff.py:1402 +#: ../meld/filediff.py:1474 msgid "_Cancel" msgstr "A_nnulla" @@ -845,22 +871,19 @@ 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 "" -"Impossibile scrivere su questo file. È possibile fare clic qui per sbloccarlo " -"e apportare le modifiche: tali modifiche devono però essere salvata su un " -"nuovo file." +"Impossibile scrivere su questo file. È possibile fare clic qui per " +"sbloccarlo e apportare le modifiche: tali modifiche devono però essere " +"salvata su un nuovo file." #: ../data/ui/filediff.ui.h:50 -#| msgid "_File" msgid "File 3" msgstr "File 3" #: ../data/ui/filediff.ui.h:51 -#| msgid "_File" msgid "File 2" msgstr "File 2" #: ../data/ui/filediff.ui.h:52 -#| msgid "_File" msgid "File 1" msgstr "File 1" @@ -874,7 +897,7 @@ msgid "Changes made to the following documents will be permanently lost:\n" msgstr "" "Le modifiche apportate ai seguenti documenti andranno perse per sempre:\n" -#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:948 ../meld/filediff.py:1489 +#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:941 ../meld/filediff.py:1403 msgid "_Replace" msgstr "Sostit_uisci" @@ -922,7 +945,7 @@ msgstr "Formatta come patch" msgid "Copy to Clipboard" msgstr "Copia negli appunti" -#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:125 +#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:154 msgid "Save Patch" msgstr "Salva patch" @@ -943,167 +966,141 @@ msgid "_Reverse patch direction" msgstr "Inve_rti direzione patch" #: ../data/ui/preferences.ui.h:1 -msgid "Left is remote, right is local" -msgstr "Sinistra è remoto, destra è locale" - -#: ../data/ui/preferences.ui.h:2 -msgid "Left is local, right is remote" -msgstr "Sinistra è locale, destra è remoto" - -#: ../data/ui/preferences.ui.h:3 -msgid "Remote, merge, local" -msgstr "Remoto, unione, locale" - -#: ../data/ui/preferences.ui.h:4 -msgid "Local, merge, remote" -msgstr "Locale, unione, remoto" - -#: ../data/ui/preferences.ui.h:5 -msgid "1ns (ext4)" -msgstr "1ns (ext4)" - -#: ../data/ui/preferences.ui.h:6 -msgid "100ns (NTFS)" -msgstr "100ns (NTFS)" - -#: ../data/ui/preferences.ui.h:7 -msgid "1s (ext2/ext3)" -msgstr "1s (ext2/ext3)" - -#: ../data/ui/preferences.ui.h:8 -msgid "2s (VFAT)" -msgstr "2s (VFAT)" - -#: ../data/ui/preferences.ui.h:9 msgid "Meld Preferences" msgstr "Preferenze di Meld" -#: ../data/ui/preferences.ui.h:10 +#: ../data/ui/preferences.ui.h:2 msgid "Font" msgstr "Carattere" -#: ../data/ui/preferences.ui.h:11 +#: ../data/ui/preferences.ui.h:3 msgid "_Use the system fixed width font" msgstr "_Usare il carattere a spaziatura fissa di sistema" -#: ../data/ui/preferences.ui.h:12 +#: ../data/ui/preferences.ui.h:4 msgid "_Editor font:" msgstr "_Carattere dell'editor:" -#: ../data/ui/preferences.ui.h:13 +#: ../data/ui/preferences.ui.h:5 msgid "Display" msgstr "Visualizzazione" -#: ../data/ui/preferences.ui.h:14 +#: ../data/ui/preferences.ui.h:6 msgid "_Tab width:" msgstr "Ampiezza _tabulazione:" -#: ../data/ui/preferences.ui.h:15 +#: ../data/ui/preferences.ui.h:7 msgid "_Insert spaces instead of tabs" msgstr "Inserire _spazi invece di tabulazioni" -#: ../data/ui/preferences.ui.h:16 +#: ../data/ui/preferences.ui.h:8 msgid "Enable text _wrapping" msgstr "_Attivare a capo automatico" -#: ../data/ui/preferences.ui.h:17 +#: ../data/ui/preferences.ui.h:9 msgid "Do not _split words over two lines" msgstr "Non _dividere le parole su due righe" -#: ../data/ui/preferences.ui.h:18 +#: ../data/ui/preferences.ui.h:10 msgid "Highlight _current line" msgstr "Evidenziare la ri_ga corrente" -#: ../data/ui/preferences.ui.h:19 +#: ../data/ui/preferences.ui.h:11 msgid "Show _line numbers" msgstr "Mostrare i _numeri di riga" -#: ../data/ui/preferences.ui.h:20 +#: ../data/ui/preferences.ui.h:12 msgid "Show w_hitespace" msgstr "Mostrare gli spazi _bianchi" -#: ../data/ui/preferences.ui.h:21 +#: ../data/ui/preferences.ui.h:13 msgid "Use s_yntax highlighting" msgstr "Usare _evidenziazione sintassi" -#: ../data/ui/preferences.ui.h:22 +#: ../data/ui/preferences.ui.h:14 msgid "Syntax highlighting color scheme:" msgstr "Schema colore per evidenziazione sintassi:" -#: ../data/ui/preferences.ui.h:23 +#: ../data/ui/preferences.ui.h:15 msgid "External Editor" msgstr "Editor esterno" -#: ../data/ui/preferences.ui.h:24 +#: ../data/ui/preferences.ui.h:16 msgid "Use _default system editor" msgstr "Usare editor _predefinito di sistema" -#: ../data/ui/preferences.ui.h:25 +#: ../data/ui/preferences.ui.h:17 msgid "Edito_r command:" msgstr "Comando dell'edito_r:" -#: ../data/ui/preferences.ui.h:26 +#: ../data/ui/preferences.ui.h:18 msgid "Editor" msgstr "Editor" -#: ../data/ui/preferences.ui.h:27 +#: ../data/ui/preferences.ui.h:19 msgid "Shallow Comparison" msgstr "Confronto superficiale" -#: ../data/ui/preferences.ui.h:28 +#: ../data/ui/preferences.ui.h:20 msgid "C_ompare files based only on size and timestamp" msgstr "Confrontare i file solo su _dimensione e marcatura temporale" -#: ../data/ui/preferences.ui.h:29 +#: ../data/ui/preferences.ui.h:21 msgid "_Timestamp resolution:" msgstr "Risoluzione marcatura _temporale:" -#: ../data/ui/preferences.ui.h:31 +#: ../data/ui/preferences.ui.h:23 +msgid "Note: enabling text filters may make comparing large files much slower" +msgstr "" +"Nota: abilitare i filtri sul testo può rendere il confronto di file grandi " +"molto più lento" + +#: ../data/ui/preferences.ui.h:24 msgid "Symbolic Links" msgstr "Collegamenti simbolici" -#: ../data/ui/preferences.ui.h:33 +#: ../data/ui/preferences.ui.h:26 msgid "Visible Columns" msgstr "Colonne visibili" -#: ../data/ui/preferences.ui.h:34 +#: ../data/ui/preferences.ui.h:27 msgid "Folder Comparisons" msgstr "Confronto cartelle" # (ndt) oppure "Salva e comprimi" ? -#: ../data/ui/preferences.ui.h:35 +#: ../data/ui/preferences.ui.h:28 msgid "Version Comparisons" msgstr "Confronto versione" -#: ../data/ui/preferences.ui.h:36 +#: ../data/ui/preferences.ui.h:29 msgid "_Order when comparing file revisions:" msgstr "_Ordine nel confrontare revisioni di file:" -#: ../data/ui/preferences.ui.h:37 +#: ../data/ui/preferences.ui.h:30 msgid "Order when _merging files:" msgstr "Ordine nell'_unione dei file:" -#: ../data/ui/preferences.ui.h:38 +#: ../data/ui/preferences.ui.h:31 msgid "Commit Messages" msgstr "Messaggio di commit" -#: ../data/ui/preferences.ui.h:39 +#: ../data/ui/preferences.ui.h:32 msgid "Show _right margin at:" msgstr "Mostrare _il margine destro a:" -#: ../data/ui/preferences.ui.h:40 +#: ../data/ui/preferences.ui.h:33 msgid "Automatically _break lines at right margin on commit" msgstr "Spe_zzare le righe sul margine destro nel commit" -#: ../data/ui/preferences.ui.h:41 +#: ../data/ui/preferences.ui.h:34 msgid "Version Control" msgstr "Controllo della versione" -#: ../data/ui/preferences.ui.h:42 +#: ../data/ui/preferences.ui.h:35 msgid "Filename filters" msgstr "Filtri sui nomi dei file" -#: ../data/ui/preferences.ui.h:43 +#: ../data/ui/preferences.ui.h:36 msgid "" "When performing directory comparisons, you may filter out files and " "directories by name. Each pattern is a list of shell style wildcards " @@ -1113,42 +1110,321 @@ msgstr "" "directory per nome. Ogni modello è una lista di nomi che possono contenere " "caratteri jolly, analogamente alla shell, separati da spazi." -#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:103 +#: ../data/ui/preferences.ui.h:37 ../meld/meldwindow.py:104 msgid "File Filters" msgstr "Filtri dei file" -#: ../data/ui/preferences.ui.h:45 +#: ../data/ui/preferences.ui.h:38 msgid "Change trimming" msgstr "Modifica eliminazioni" -#: ../data/ui/preferences.ui.h:46 +#: ../data/ui/preferences.ui.h:39 msgid "Trim blank line differences from the start and end of changes" msgstr "" -"Elimina le differenze sulle righe vuote all'inizio e alla fine delle modifiche" +"Elimina le differenze sulle righe vuote all'inizio e alla fine delle " +"modifiche" -#: ../data/ui/preferences.ui.h:47 +#: ../data/ui/preferences.ui.h:40 msgid "Text filters" msgstr "Filtri di testo" -#: ../data/ui/preferences.ui.h:48 +#: ../data/ui/preferences.ui.h:41 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 " +"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 "" "Quando si esegue il confronto tra file, si possono ignorare certi tipi di " "modifiche. Ogni modello è una espressione regolare python che sostituirà il " -"testo corrispondente con la stringa vuota prima che sia effettuata la " -"comparazione. Se l'espressione contiene gruppi, solamente i gruppi saranno " +"testo corrispondente con la stringa vuota prima che sia effettuato il " +"confronto. Se l'espressione contiene gruppi, solamente i gruppi saranno " "sostituiti. Vedere il manuale utente per maggiori dettagli." -#: ../data/ui/preferences.ui.h:49 +#: ../data/ui/preferences.ui.h:42 msgid "Text Filters" msgstr "Filtri di testo" -#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:625 +#: ../data/ui/preferences.ui.h:43 +msgid "Left is remote, right is local" +msgstr "Sinistra è remoto, destra è locale" + +#: ../data/ui/preferences.ui.h:44 +msgid "Left is local, right is remote" +msgstr "Sinistra è locale, destra è remoto" + +#: ../data/ui/preferences.ui.h:45 +msgid "Remote, merge, local" +msgstr "Remoto, unione, locale" + +#: ../data/ui/preferences.ui.h:46 +msgid "Local, merge, remote" +msgstr "Locale, unione, remoto" + +#: ../data/ui/preferences.ui.h:47 +msgid "1ns (ext4)" +msgstr "1ns (ext4)" + +#: ../data/ui/preferences.ui.h:48 +msgid "100ns (NTFS)" +msgstr "100ns (NTFS)" + +#: ../data/ui/preferences.ui.h:49 +msgid "1s (ext2/ext3)" +msgstr "1s (ext2/ext3)" + +#: ../data/ui/preferences.ui.h:50 +msgid "2s (VFAT)" +msgstr "2s (VFAT)" + +#: ../data/ui/shortcuts.ui.h:1 +msgctxt "shortcut window" +msgid "General" +msgstr "Generale" + +#: ../data/ui/shortcuts.ui.h:2 +msgctxt "shortcut window" +msgid "New comparison" +msgstr "Nuovo confronto" + +#: ../data/ui/shortcuts.ui.h:3 +msgctxt "shortcut window" +msgid "Close a comparison" +msgstr "Chiude un confronto" + +#: ../data/ui/shortcuts.ui.h:4 +msgctxt "shortcut window" +msgid "Quit Meld" +msgstr "Esce dal programma" + +#: ../data/ui/shortcuts.ui.h:5 +msgctxt "shortcut window" +msgid "Stop the current action" +msgstr "Ferma l'azione corrente" + +#: ../data/ui/shortcuts.ui.h:6 +msgctxt "shortcut window" +msgid "Refresh comparison" +msgstr "Aggiorna il confronto" + +#: ../data/ui/shortcuts.ui.h:7 +msgctxt "shortcut window" +msgid "Fullscreen" +msgstr "Schermo intero" + +#: ../data/ui/shortcuts.ui.h:8 +msgctxt "shortcut window" +msgid "Tabs" +msgstr "Schede" + +#: ../data/ui/shortcuts.ui.h:9 +msgctxt "shortcut window" +msgid "Go to previous tab" +msgstr "Va alla scheda precedente" + +#: ../data/ui/shortcuts.ui.h:10 +msgctxt "shortcut window" +msgid "Go to next tab" +msgstr "Va alla scheda successiva" + +#: ../data/ui/shortcuts.ui.h:11 +msgctxt "shortcut window" +msgid "Switch to tab" +msgstr "Passa a una scheda" + +#: ../data/ui/shortcuts.ui.h:12 +msgctxt "shortcut window" +msgid "Move tab left" +msgstr "Sposta scheda a sinistra" + +#: ../data/ui/shortcuts.ui.h:13 +msgctxt "shortcut window" +msgid "Move tab right" +msgstr "Sposta scheda a destra" + +#: ../data/ui/shortcuts.ui.h:14 +msgctxt "shortcut window" +msgid "Changes" +msgstr "Modifiche" + +#: ../data/ui/shortcuts.ui.h:15 +msgctxt "shortcut window" +msgid "Go to previous change" +msgstr "Va alla modifica precedente" + +#: ../data/ui/shortcuts.ui.h:16 +msgctxt "shortcut window" +msgid "Go to next change" +msgstr "Va alla modifica successiva" + +#: ../data/ui/shortcuts.ui.h:17 +msgctxt "shortcut window" +msgid "Editing" +msgstr "Modifica" + +#: ../data/ui/shortcuts.ui.h:18 +msgctxt "shortcut window" +msgid "Undo" +msgstr "Annulla" + +#: ../data/ui/shortcuts.ui.h:19 +msgctxt "shortcut window" +msgid "Redo" +msgstr "Ripeti" + +#: ../data/ui/shortcuts.ui.h:20 +msgctxt "shortcut window" +msgid "Cut" +msgstr "Taglia" + +#: ../data/ui/shortcuts.ui.h:21 +msgctxt "shortcut window" +msgid "Copy" +msgstr "Copia" + +#: ../data/ui/shortcuts.ui.h:22 +msgctxt "shortcut window" +msgid "Paste" +msgstr "Incolla" + +#: ../data/ui/shortcuts.ui.h:23 +msgctxt "shortcut window" +msgid "Find" +msgstr "Trova" + +#: ../data/ui/shortcuts.ui.h:24 +msgctxt "shortcut window" +msgid "Find Next" +msgstr "Trova successivo" + +#: ../data/ui/shortcuts.ui.h:25 +msgctxt "shortcut window" +msgid "Find Previous" +msgstr "Trova precedente" + +#: ../data/ui/shortcuts.ui.h:26 +msgctxt "shortcut window" +msgid "Replace" +msgstr "Sostituisce" + +#: ../data/ui/shortcuts.ui.h:27 +msgctxt "shortcut window" +msgid "File comparison" +msgstr "Confronto di file" + +#: ../data/ui/shortcuts.ui.h:28 +msgctxt "shortcut window" +msgid "Save current file" +msgstr "Salva il file corrente" + +#: ../data/ui/shortcuts.ui.h:29 +msgctxt "shortcut window" +msgid "Save current file to new path" +msgstr "Salva il file corrente in un nuovo percorso" + +#: ../data/ui/shortcuts.ui.h:30 +msgctxt "shortcut window" +msgid "Save all files in comparison" +msgstr "Salva tutti i file nel confronto" + +#: ../data/ui/shortcuts.ui.h:31 +msgctxt "shortcut window" +msgid "Previous conflict" +msgstr "Conflitto precedente" + +#: ../data/ui/shortcuts.ui.h:32 +msgctxt "shortcut window" +msgid "Next conflict" +msgstr "Conflitto successivo" + +#: ../data/ui/shortcuts.ui.h:33 +msgctxt "shortcut window" +msgid "Push change to left" +msgstr "Invia la modifica a sinistra" + +#: ../data/ui/shortcuts.ui.h:34 +msgctxt "shortcut window" +msgid "Push change to right" +msgstr "Invia la modifica a destra" + +#: ../data/ui/shortcuts.ui.h:35 +msgctxt "shortcut window" +msgid "Pull change from left" +msgstr "Prende la modifica da sinistra" + +#: ../data/ui/shortcuts.ui.h:36 +msgctxt "shortcut window" +msgid "Pull change from right" +msgstr "Prende la modifica da destra" + +#: ../data/ui/shortcuts.ui.h:37 +msgctxt "shortcut window" +msgid "Copy change above left" +msgstr "Copia la modifica sopra a sinistra" + +#: ../data/ui/shortcuts.ui.h:38 +msgctxt "shortcut window" +msgid "Copy change below left" +msgstr "Copia la modifica sotto a sinistra" + +#: ../data/ui/shortcuts.ui.h:39 +msgctxt "shortcut window" +msgid "Copy change above right" +msgstr "Copia la modifica sopra a destra" + +#: ../data/ui/shortcuts.ui.h:40 +msgctxt "shortcut window" +msgid "Copy change below right" +msgstr "Copia la modifica sotto a destra" + +#: ../data/ui/shortcuts.ui.h:41 +msgctxt "shortcut window" +msgid "Delete change" +msgstr "Elimina la modifica" + +#: ../data/ui/shortcuts.ui.h:42 +msgctxt "shortcut window" +msgid "Previous comparison pane" +msgstr "Riquadro precedente" + +#: ../data/ui/shortcuts.ui.h:43 +msgctxt "shortcut window" +msgid "Next comparison pane" +msgstr "Riquadro successivo" + +#: ../data/ui/shortcuts.ui.h:44 +msgctxt "shortcut window" +msgid "Folder comparison" +msgstr "Confronto cartelle" + +#: ../data/ui/shortcuts.ui.h:45 +msgctxt "shortcut window" +msgid "Copy to left" +msgstr "Copia a sinistra" + +#: ../data/ui/shortcuts.ui.h:46 +msgctxt "shortcut window" +msgid "Copy to right" +msgstr "Copia a destra" + +#: ../data/ui/shortcuts.ui.h:47 +msgctxt "shortcut window" +msgid "Version control comparison" +msgstr "Confronto controllo di versione" + +#: ../data/ui/shortcuts.ui.h:48 +msgctxt "shortcut window" +msgid "Commit to version control" +msgstr "Esegue il commit" + +#: ../data/ui/shortcuts.ui.h:49 +msgctxt "shortcut window" +msgid "Show/hide console output" +msgstr "Mostra/Nasconde output della console" + +#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:562 +#: ../meld/newdifftab.py:38 msgid "New comparison" msgstr "Nuovo confronto" @@ -1298,7 +1574,7 @@ msgstr "Non _monitorati" msgid "Show unversioned files" msgstr "Mostra file non monitorati" -#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:66 +#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69 msgid "Ignored" msgstr "Ignorati" @@ -1326,7 +1602,7 @@ msgstr "Registri precedenti:" msgid "Co_mmit" msgstr "Co_mmit" -#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:337 +#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:332 msgid "Location" msgstr "Posizione" @@ -1355,117 +1631,117 @@ msgstr "" msgid "_Push commits" msgstr "_Push dei commit" -#: ../meld/const.py:10 +#: ../meld/const.py:12 msgid "UNIX (LF)" msgstr "UNIX (LF)" -#: ../meld/const.py:11 +#: ../meld/const.py:13 msgid "DOS/Windows (CR-LF)" msgstr "DOS/Windows (CR-LF)" -#: ../meld/const.py:12 +#: ../meld/const.py:14 msgid "Mac OS (CR)" msgstr "Mac OS (CR)" #. Create file size CellRenderer -#: ../meld/dirdiff.py:390 ../meld/preferences.py:82 +#: ../meld/dirdiff.py:391 ../meld/preferences.py:82 msgid "Size" msgstr "Dimensione" #. Create date-time CellRenderer -#: ../meld/dirdiff.py:398 ../meld/preferences.py:83 +#: ../meld/dirdiff.py:399 ../meld/preferences.py:83 msgid "Modification time" msgstr "Data e ora di modifica" #. Create permissions CellRenderer -#: ../meld/dirdiff.py:406 ../meld/preferences.py:84 +#: ../meld/dirdiff.py:407 ../meld/preferences.py:84 msgid "Permissions" msgstr "Permessi" -#: ../meld/dirdiff.py:536 +#: ../meld/dirdiff.py:537 #, python-format msgid "Hide %s" msgstr "Nascondi %s" -#: ../meld/dirdiff.py:668 ../meld/dirdiff.py:690 +#: ../meld/dirdiff.py:669 ../meld/dirdiff.py:693 #, python-format msgid "[%s] Scanning %s" msgstr "[%s] Analisi di %s" -#: ../meld/dirdiff.py:823 +#: ../meld/dirdiff.py:825 #, python-format msgid "[%s] Done" msgstr "[%s] Fatto" -#: ../meld/dirdiff.py:831 +#: ../meld/dirdiff.py:833 msgid "Folders have no differences" msgstr "Le cartelle non presentano alcuna differenza" -#: ../meld/dirdiff.py:833 +#: ../meld/dirdiff.py:835 msgid "Contents of scanned files in folders are identical." msgstr "Il contenuto dei file analizzati nelle cartelle è identico." -#: ../meld/dirdiff.py:835 +#: ../meld/dirdiff.py:837 msgid "" -"Scanned files in folders appear identical, but contents have not been scanned." +"Scanned files in folders appear identical, but contents have not been " +"scanned." msgstr "" -"I file analizzati nelle cartelle sembrerebbero identici, ma il loro contenuto " -"non è stato analizzato." +"I file analizzati nelle cartelle sembrerebbero identici, ma il loro " +"contenuto non è stato analizzato." -#: ../meld/dirdiff.py:838 +#: ../meld/dirdiff.py:840 msgid "File filters are in use, so not all files have been scanned." msgstr "" "Sono in uso dei filtri sui file: non tutti i file sono stati analizzati." -#: ../meld/dirdiff.py:840 +#: ../meld/dirdiff.py:842 msgid "Text filters are in use and may be masking content differences." msgstr "" "Sono in uso filtri sul testo e potrebbero nascondere differenze tra i file." -#: ../meld/dirdiff.py:858 ../meld/dirdiff.py:911 ../meld/filediff.py:1062 -#: ../meld/filediff.py:1094 ../meld/filediff.py:1229 ../meld/filediff.py:1424 -#: ../meld/filediff.py:1454 ../meld/filediff.py:1456 +#: ../meld/dirdiff.py:860 ../meld/filediff.py:1338 ../meld/filediff.py:1368 +#: ../meld/filediff.py:1370 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 msgid "Hi_de" msgstr "Nascon_di" -#: ../meld/dirdiff.py:868 +#: ../meld/dirdiff.py:870 msgid "Multiple errors occurred while scanning this folder" msgstr "" "Si sono verificati molteplici errore durante l'analisi di questa cartella" -#: ../meld/dirdiff.py:869 +#: ../meld/dirdiff.py:871 msgid "Files with invalid encodings found" msgstr "Trovati file con codifiche non valide" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:871 +#: ../meld/dirdiff.py:873 msgid "Some files were in an incorrect encoding. The names are something like:" msgstr "Alcuni file presentano delle codifiche non corrette. I nomi sono:" -#: ../meld/dirdiff.py:873 +#: ../meld/dirdiff.py:875 msgid "Files hidden by case insensitive comparison" msgstr "File nascosti dal confronto senza distinzione maiuscole/minuscole" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:875 +#: ../meld/dirdiff.py:877 msgid "" -"You are running a case insensitive comparison on a case sensitive filesystem. " -"The following files in this folder are hidden:" +"You are running a case insensitive comparison on a case sensitive " +"filesystem. The following files in this folder are hidden:" msgstr "" "Confronto eseguito senza distinzione tra maiuscole/minuscole su un file " "system che applica tale distinzione. Alcuni file sono nascosti:" -#: ../meld/dirdiff.py:886 +#: ../meld/dirdiff.py:888 #, python-format msgid "'%s' hidden by '%s'" msgstr "«%s» è nascosto da «%s»" -#: ../meld/dirdiff.py:951 +#: ../meld/dirdiff.py:944 #, python-format msgid "Replace folder “%s”?" msgstr "Sostituire la cartella «%s»?" -#: ../meld/dirdiff.py:953 +#: ../meld/dirdiff.py:946 #, python-format msgid "" "Another folder with the same name already exists in “%s”.\n" @@ -1475,11 +1751,11 @@ msgstr "" "Sostituendo la cartella esistente, tutti i file in essa contenuti saranno " "persi." -#: ../meld/dirdiff.py:966 +#: ../meld/dirdiff.py:959 msgid "Error copying file" msgstr "Errore nel copiare il file" -#: ../meld/dirdiff.py:967 +#: ../meld/dirdiff.py:960 #, python-format msgid "" "Couldn't copy %s\n" @@ -1492,121 +1768,101 @@ msgstr "" "\n" "%s." -#: ../meld/dirdiff.py:990 +#: ../meld/dirdiff.py:983 #, python-format msgid "Error deleting %s" msgstr "Errore nell'eliminare %s" -#: ../meld/dirdiff.py:1495 +#: ../meld/dirdiff.py:1494 msgid "No folder" msgstr "Nessuna cartella" #. Abbreviations for insert and overwrite that fit in the status bar -#: ../meld/filediff.py:368 +#: ../meld/filediff.py:311 msgid "INS" msgstr "INS" -#: ../meld/filediff.py:368 +#: ../meld/filediff.py:311 msgid "OVR" msgstr "SSC" #. Abbreviation for line, column so that it will fit in the status bar -#: ../meld/filediff.py:370 +#: ../meld/filediff.py:313 #, python-format msgid "Ln %i, Col %i" msgstr "Rg %i, Col %d" -#: ../meld/filediff.py:783 +#: ../meld/filediff.py:738 msgid "Comparison results will be inaccurate" msgstr "I risultati del confronto non saranno precisi" -#: ../meld/filediff.py:785 -#, python-format +#: ../meld/filediff.py:740 msgid "" -"Filter “%s” changed the number of lines in the file, which is unsupported. " -"The comparison will not be accurate." +"A filter changed the number of lines in the file, which is unsupported. The " +"comparison will not be accurate." msgstr "" -"Il filtro «%s» ha modificato il numero di righe nel file: ciò non è " -"supportato. Il confronto non sarà corretto." +"Un filtro ha modificato il numero di righe nel file: ciò non è supportato. " +"Il confronto non sarà corretto." -#: ../meld/filediff.py:842 +#: ../meld/filediff.py:796 msgid "Mark conflict as resolved?" msgstr "Marcare il conflitto come risolto?" -#: ../meld/filediff.py:844 +#: ../meld/filediff.py:798 msgid "" "If the conflict was resolved successfully, you may mark it as resolved now." msgstr "" "Se il conflitto è stato risolto con successo, è possibile indicarlo ora." -#: ../meld/filediff.py:846 +#: ../meld/filediff.py:800 msgid "Cancel" msgstr "Annulla" -#: ../meld/filediff.py:847 +#: ../meld/filediff.py:801 msgid "Mark _Resolved" msgstr "Marca _risolto" #: ../meld/filediff.py:1049 #, python-format -msgid "[%s] Set num panes" -msgstr "[%s] Impostazione del numero dei pannelli" - -#: ../meld/filediff.py:1056 -#, python-format -msgid "[%s] Opening files" -msgstr "[%s] Apertura dei file" - -#: ../meld/filediff.py:1079 ../meld/filediff.py:1117 ../meld/filediff.py:1123 -msgid "Could not read file" -msgstr "Impossibile leggere il file" +msgid "There was a problem opening the file “%s”." +msgstr "Si è verificato un problema nell'aprire il file «%s»." -#: ../meld/filediff.py:1080 -#, python-format -msgid "[%s] Reading files" -msgstr "[%s] Lettura dei file" - -#: ../meld/filediff.py:1089 +#: ../meld/filediff.py:1057 #, python-format msgid "File %s appears to be a binary file." msgstr "Il file «%s» sembra essere un file binario." -#: ../meld/filediff.py:1090 +#: ../meld/filediff.py:1059 msgid "Do you want to open the file using the default application?" msgstr "Aprire il file utilizzando l'applicazione predefinita?" -#: ../meld/filediff.py:1093 +#: ../meld/filediff.py:1061 msgid "Open" msgstr "Apri" -#: ../meld/filediff.py:1118 -#, python-format -msgid "%s is not in encodings: %s" -msgstr "%s non è presente nelle codifiche: %s" - -#: ../meld/filediff.py:1156 +#: ../meld/filediff.py:1077 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Calcolo delle differenze" -#: ../meld/filediff.py:1224 +#: ../meld/filediff.py:1142 #, python-format msgid "File %s has changed on disk" msgstr "Il file «%s» è stato modificato" -#: ../meld/filediff.py:1225 +#: ../meld/filediff.py:1143 msgid "Do you want to reload the file?" msgstr "Ricaricare il file?" -#: ../meld/filediff.py:1228 +#: ../meld/filediff.py:1145 msgid "_Reload" msgstr "_Ricarica" -#: ../meld/filediff.py:1387 +#: ../meld/filediff.py:1301 msgid "Files are identical" msgstr "I file sono identici" -#: ../meld/filediff.py:1400 +#: ../meld/filediff.py:1314 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1614,11 +1870,11 @@ msgstr "" "Sono in uso filtri sul testo e potrebbero nascondere differenze tra i file. " "Confrontare i file senza i filtri?" -#: ../meld/filediff.py:1405 +#: ../meld/filediff.py:1319 msgid "Files differ in line endings only" msgstr "I file differiscono solo nelle terminazioni di riga" -#: ../meld/filediff.py:1407 +#: ../meld/filediff.py:1321 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1627,38 +1883,38 @@ msgstr "" "I file sono identici, ma differiscono sono nelle terminazioni di riga:\n" "%s" -#: ../meld/filediff.py:1427 +#: ../meld/filediff.py:1341 msgid "Show without filters" msgstr "Mostra senza filtri" -#: ../meld/filediff.py:1449 +#: ../meld/filediff.py:1363 msgid "Change highlighting incomplete" msgstr "Evidenziazione modifica incompleta" # (ndt) un po’ libera… -#: ../meld/filediff.py:1450 +#: ../meld/filediff.py:1364 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 "" -"Alcune modifiche non sono state evidenziate poiché troppo grandi. È possibile " -"fare in modo che anche le modifiche di grandi dimensioni vengano evidenziate, " -"ma potrebbe rallentare il programma." +"Alcune modifiche non sono state evidenziate poiché troppo grandi. È " +"possibile fare in modo che anche le modifiche di grandi dimensioni vengano " +"evidenziate, ma potrebbe rallentare il programma." -#: ../meld/filediff.py:1458 +#: ../meld/filediff.py:1372 msgid "Keep highlighting" msgstr "Continua a evidenziare" -#: ../meld/filediff.py:1460 +#: ../meld/filediff.py:1374 msgid "_Keep highlighting" msgstr "Continua _evidenziazione" -#: ../meld/filediff.py:1492 +#: ../meld/filediff.py:1406 #, python-format msgid "Replace file “%s”?" msgstr "Sostituire il file «%s»?" -#: ../meld/filediff.py:1494 +#: ../meld/filediff.py:1408 #, python-format msgid "" "A file with this name already exists in “%s”.\n" @@ -1667,71 +1923,45 @@ msgstr "" "Un file con lo stesso nome esiste già in «%s».\n" "Sostituendo il file esistente, tutto il suo contenuto sarà perso." -#: ../meld/filediff.py:1512 -#, python-format -msgid "Could not save file %s." -msgstr "Impossibile salvare il file %s." - -#: ../meld/filediff.py:1513 -#, python-format -msgid "" -"Couldn't save file due to:\n" -"%s" -msgstr "" -"Impossibile salvare il file a causa di:\n" -"%s" - -#: ../meld/filediff.py:1525 +#: ../meld/filediff.py:1425 msgid "Save Left Pane As" msgstr "Salva riquadro sinistro come" -#: ../meld/filediff.py:1527 +#: ../meld/filediff.py:1427 msgid "Save Middle Pane As" msgstr "Salva riquadro centrale come" -#: ../meld/filediff.py:1529 +#: ../meld/filediff.py:1429 msgid "Save Right Pane As" msgstr "Salva riquadro destro come" -#: ../meld/filediff.py:1543 +#: ../meld/filediff.py:1443 #, python-format msgid "File %s has changed on disk since it was opened" msgstr "Il file «%s» è stato modificato" -#: ../meld/filediff.py:1545 +#: ../meld/filediff.py:1445 msgid "If you save it, any external changes will be lost." msgstr "Salvare il file può comportare la perdita delle modifiche esterne." -#: ../meld/filediff.py:1548 +#: ../meld/filediff.py:1448 msgid "Save Anyway" msgstr "Salva comunque" -#: ../meld/filediff.py:1549 +#: ../meld/filediff.py:1449 msgid "Don't Save" msgstr "Non salvare" -#: ../meld/filediff.py:1575 -msgid "Inconsistent line endings found" -msgstr "Trovate terminazioni di riga inconsistenti" - -#: ../meld/filediff.py:1577 -#, python-format -msgid "" -"'%s' contains a mixture of line endings. Select the line ending format to use." -msgstr "" -"«%s» contiene un misto di terminazioni di riga. Selezionare il formato da " -"utilizzare." - -#: ../meld/filediff.py:1598 +#: ../meld/filediff.py:1475 msgid "_Save as UTF-8" msgstr "_Salva come UTF-8" -#: ../meld/filediff.py:1601 +#: ../meld/filediff.py:1478 #, python-format msgid "Couldn't encode text as “%s”" msgstr "Impossibile codificare il testo come «%s»" -#: ../meld/filediff.py:1603 +#: ../meld/filediff.py:1480 #, python-format msgid "" "File “%s” contains characters that can't be encoded using encoding “%s”.\n" @@ -1741,11 +1971,25 @@ msgstr "" "«%s»\n" "Salvarlo usando UTF-8?" -#: ../meld/filediff.py:1955 +#: ../meld/filediff.py:1520 ../meld/patchdialog.py:130 +#, python-format +msgid "Could not save file %s." +msgstr "Impossibile salvare il file %s." + +#: ../meld/filediff.py:1521 ../meld/patchdialog.py:131 +#, python-format +msgid "" +"Couldn't save file due to:\n" +"%s" +msgstr "" +"Impossibile salvare il file a causa di:\n" +"%s" + +#: ../meld/filediff.py:1870 msgid "Live comparison updating disabled" msgstr "Aggiornamento automatico dei confronti disabilitato" -#: ../meld/filediff.py:1956 +#: ../meld/filediff.py:1871 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -1756,16 +2000,16 @@ msgstr "" "manualmente, quello automatico verrà ripristinato quando tutti i punti di " "sincronizzazione saranno rimossi." -#: ../meld/filemerge.py:48 +#: ../meld/filemerge.py:37 #, python-format msgid "[%s] Merging files" msgstr "[%s] Unione dei file" -#: ../meld/gutterrendererchunk.py:148 +#: ../meld/gutterrendererchunk.py:210 msgid "Copy _up" msgstr "Copia _su" -#: ../meld/gutterrendererchunk.py:149 +#: ../meld/gutterrendererchunk.py:211 msgid "Copy _down" msgstr "Copia _giù" @@ -1787,15 +2031,15 @@ msgstr "cartella" #: ../meld/meldapp.py:182 msgid "Start a version control comparison" -msgstr "Inizia una comparazione da controllo di versione" +msgstr "Inizia un confronto da controllo di versione" #: ../meld/meldapp.py:184 msgid "Start a 2- or 3-way file comparison" -msgstr "Inizia una comparazione file a 2 o 3 vie" +msgstr "Inizia un confronto file a 2 o 3 vie" #: ../meld/meldapp.py:186 msgid "Start a 2- or 3-way folder comparison" -msgstr "Inizia una comparazione cartella a 2 o 3 vie" +msgstr "Inizia un confronto cartella a 2 o 3 vie" #: ../meld/meldapp.py:229 #, python-format @@ -1861,250 +2105,210 @@ msgid "invalid path or URI \"%s\"" msgstr "percorso o URI «%s» non valido" #. TRANSLATORS: This is the label of a new, currently-unnamed file. -#: ../meld/meldbuffer.py:138 +#: ../meld/meldbuffer.py:131 msgid "" msgstr "" -#: ../meld/melddoc.py:78 ../meld/melddoc.py:79 +#: ../meld/melddoc.py:64 msgid "untitled" msgstr "senza nome" -#: ../meld/meldwindow.py:48 +#: ../meld/meldwindow.py:49 msgid "_File" msgstr "_File" -#: ../meld/meldwindow.py:49 +#: ../meld/meldwindow.py:50 msgid "_New Comparison..." msgstr "N_uovo confronto..." -#: ../meld/meldwindow.py:50 +#: ../meld/meldwindow.py:51 msgid "Start a new comparison" msgstr "Avvia un nuovo confronto" -#: ../meld/meldwindow.py:53 +#: ../meld/meldwindow.py:54 msgid "Save the current file" msgstr "Salva il file corrente" -#: ../meld/meldwindow.py:55 +#: ../meld/meldwindow.py:56 msgid "Save As..." msgstr "Salva come..." -#: ../meld/meldwindow.py:56 +#: ../meld/meldwindow.py:57 msgid "Save the current file with a different name" msgstr "Salva il file corrente con un nome diverso" -#: ../meld/meldwindow.py:59 +#: ../meld/meldwindow.py:60 msgid "Close the current file" msgstr "Chiude il file corrente" -#: ../meld/meldwindow.py:62 +#: ../meld/meldwindow.py:63 msgid "_Edit" msgstr "_Modifica" -#: ../meld/meldwindow.py:64 +#: ../meld/meldwindow.py:65 msgid "Undo the last action" msgstr "Annulla l'ultima azione" -#: ../meld/meldwindow.py:67 +#: ../meld/meldwindow.py:68 msgid "Redo the last undone action" msgstr "Ripete l'ultima azione annullata" -#: ../meld/meldwindow.py:69 +#: ../meld/meldwindow.py:70 msgid "Cut the selection" msgstr "Taglia la selezione" -#: ../meld/meldwindow.py:71 +#: ../meld/meldwindow.py:72 msgid "Copy the selection" msgstr "Copia la selezione" -#: ../meld/meldwindow.py:73 +#: ../meld/meldwindow.py:74 msgid "Paste the clipboard" msgstr "Incolla dagli appunti" -#: ../meld/meldwindow.py:75 +#: ../meld/meldwindow.py:76 msgid "Find..." msgstr "Trova..." -#: ../meld/meldwindow.py:75 +#: ../meld/meldwindow.py:76 msgid "Search for text" msgstr "Cerca una stringa di testo" -#: ../meld/meldwindow.py:77 +#: ../meld/meldwindow.py:78 msgid "Find Ne_xt" msgstr "Trova successi_vo" -#: ../meld/meldwindow.py:78 +#: ../meld/meldwindow.py:79 msgid "Search forwards for the same text" msgstr "Cerca lo stesso testo in avanti" -#: ../meld/meldwindow.py:80 +#: ../meld/meldwindow.py:81 msgid "Find _Previous" msgstr "Trova pr_ecedente" -#: ../meld/meldwindow.py:81 +#: ../meld/meldwindow.py:82 msgid "Search backwards for the same text" msgstr "Cerca lo stesso testo all'indietro" -#: ../meld/meldwindow.py:84 +#: ../meld/meldwindow.py:85 msgid "_Replace..." msgstr "Sostit_uisci..." -#: ../meld/meldwindow.py:85 +#: ../meld/meldwindow.py:86 msgid "Find and replace text" msgstr "Trova e sostituisce testo" -#: ../meld/meldwindow.py:88 +#: ../meld/meldwindow.py:89 msgid "_Changes" msgstr "_Modifiche" -#: ../meld/meldwindow.py:89 +#: ../meld/meldwindow.py:90 msgid "Next Change" msgstr "Modifica successiva" -#: ../meld/meldwindow.py:90 +#: ../meld/meldwindow.py:91 msgid "Go to the next change" msgstr "Va alla modifica successiva" -#: ../meld/meldwindow.py:92 +#: ../meld/meldwindow.py:93 msgid "Previous Change" msgstr "Modifica precedente" -#: ../meld/meldwindow.py:93 +#: ../meld/meldwindow.py:94 msgid "Go to the previous change" msgstr "Va alla modifica precedente" -#: ../meld/meldwindow.py:95 +#: ../meld/meldwindow.py:96 msgid "Open Externally" msgstr "Apri esternamente" -#: ../meld/meldwindow.py:96 +#: ../meld/meldwindow.py:97 msgid "Open selected file or directory in the default external application" msgstr "" "Apre il file o la directory selezionata nell'applicazione esterna predefinita" -#: ../meld/meldwindow.py:100 +#: ../meld/meldwindow.py:101 msgid "_View" msgstr "_Visualizza" -#: ../meld/meldwindow.py:101 +#: ../meld/meldwindow.py:102 msgid "File Status" msgstr "Stato del file" -#: ../meld/meldwindow.py:102 +#: ../meld/meldwindow.py:103 msgid "Version Status" msgstr "Stato versione" -#: ../meld/meldwindow.py:105 +#: ../meld/meldwindow.py:106 msgid "Stop the current action" msgstr "Ferma l'azione corrente" -#: ../meld/meldwindow.py:108 +#: ../meld/meldwindow.py:109 msgid "Refresh the view" msgstr "Aggiorna la vista" -#: ../meld/meldwindow.py:111 -msgid "_Tabs" -msgstr "_Schede" - -#: ../meld/meldwindow.py:112 -msgid "_Previous Tab" -msgstr "Scheda _precedente" - #: ../meld/meldwindow.py:113 -msgid "Activate previous tab" -msgstr "Attiva la scheda precedente" - -#: ../meld/meldwindow.py:115 -msgid "_Next Tab" -msgstr "Scheda _successiva" - -#: ../meld/meldwindow.py:116 -msgid "Activate next tab" -msgstr "Attiva la scheda successiva" - -#: ../meld/meldwindow.py:119 -msgid "Move Tab _Left" -msgstr "Sposta scheda a _sinistra" - -#: ../meld/meldwindow.py:120 -msgid "Move current tab to left" -msgstr "Sposta la scheda corrente a sinistra" - -#: ../meld/meldwindow.py:123 -msgid "Move Tab _Right" -msgstr "Sposta scheda a _destra" - -#: ../meld/meldwindow.py:124 -msgid "Move current tab to right" -msgstr "Sposta la scheda corrente a destra" - -#: ../meld/meldwindow.py:128 msgid "Fullscreen" msgstr "Schermo intero" # (ndt) suggerimento -#: ../meld/meldwindow.py:129 +#: ../meld/meldwindow.py:114 msgid "View the comparison in fullscreen" msgstr "Visualizza a schermo intero" -#: ../meld/meldwindow.py:131 +#: ../meld/meldwindow.py:116 msgid "_Toolbar" msgstr "Barra degli s_trumenti" -#: ../meld/meldwindow.py:132 +#: ../meld/meldwindow.py:117 msgid "Show or hide the toolbar" msgstr "Mostra o nasconde la barra degli strumenti" -#: ../meld/meldwindow.py:141 +#: ../meld/meldwindow.py:127 msgid "Open Recent" msgstr "Apri recenti" -#: ../meld/meldwindow.py:142 +#: ../meld/meldwindow.py:128 msgid "Open recent files" msgstr "Apre i file recenti" -#: ../meld/meldwindow.py:164 +#: ../meld/meldwindow.py:150 msgid "_Meld" msgstr "_Meld" -#: ../meld/meldwindow.py:165 +#: ../meld/meldwindow.py:151 msgid "Quit the program" msgstr "Esce dal programma" -#: ../meld/meldwindow.py:167 +#: ../meld/meldwindow.py:153 msgid "Prefere_nces" msgstr "Preferen_ze" -#: ../meld/meldwindow.py:168 +#: ../meld/meldwindow.py:154 msgid "Configure the application" msgstr "Configura l'applicazione" -#: ../meld/meldwindow.py:170 +#: ../meld/meldwindow.py:156 msgid "_Contents" msgstr "_Sommario" -#: ../meld/meldwindow.py:171 +#: ../meld/meldwindow.py:157 msgid "Open the Meld manual" msgstr "Apre il manuale di Meld" -#: ../meld/meldwindow.py:173 +#: ../meld/meldwindow.py:159 msgid "About this application" msgstr "Informazioni sull'applicazione" -#: ../meld/meldwindow.py:548 -msgid "Switch to this tab" -msgstr "Passa a questa scheda" - -#: ../meld/meldwindow.py:659 +#: ../meld/meldwindow.py:596 #, python-format msgid "Need three files to auto-merge, got: %r" msgstr "Sono necessari tre file per un'unione automatica, ottenuti: %r" -#: ../meld/meldwindow.py:673 +#: ../meld/meldwindow.py:610 msgid "Cannot compare a mixture of files and directories" msgstr "Non è possibile confrontare sia file che directory" -#: ../meld/misc.py:168 +#: ../meld/misc.py:203 #, python-format msgid "Couldn't find colour scheme details for %s-%s; this is a bad install" msgstr "" @@ -2112,7 +2316,7 @@ msgstr "" "danneggiata" #. no common path. empty names get changed to "[None]" -#: ../meld/misc.py:255 +#: ../meld/misc.py:261 msgid "[None]" msgstr "[Nessuno]" @@ -2128,47 +2332,47 @@ msgstr "modello" msgid "Version control:" msgstr "Controllo della versione:" -#: ../meld/ui/notebooklabel.py:65 +#: ../meld/ui/notebooklabel.py:63 msgid "Close tab" msgstr "Chiudi scheda" -#: ../meld/ui/vcdialogs.py:50 +#: ../meld/ui/vcdialogs.py:48 msgid "No files will be committed" msgstr "Non verrà eseguito il commit di alcun file" #. Translators: First %s is replaced by translated "%d unpushed #. commits", second %s is replaced by translated "%d branches" -#: ../meld/vc/git.py:95 +#: ../meld/vc/git.py:94 #, python-format msgid "%s in %s" msgstr "%s su %s" #. Translators: These messages cover the case where there is #. only one branch, and are not part of another message. -#: ../meld/vc/git.py:96 ../meld/vc/git.py:103 +#: ../meld/vc/git.py:95 ../meld/vc/git.py:102 #, python-format msgid "%d unpushed commit" msgid_plural "%d unpushed commits" msgstr[0] "%d commit non inviato" msgstr[1] "%d commit non inviati" -#: ../meld/vc/git.py:98 +#: ../meld/vc/git.py:97 #, python-format msgid "%d branch" msgid_plural "%d branches" msgstr[0] "%d ramo" msgstr[1] "%d rami" -#: ../meld/vc/git.py:350 +#: ../meld/vc/git.py:330 #, python-format msgid "Mode changed from %s to %s" msgstr "Modalità cambiata da %s a %s" -#: ../meld/vc/git.py:358 +#: ../meld/vc/git.py:338 msgid "Partially staged" msgstr "Indicizzato parzialmente" -#: ../meld/vc/git.py:358 +#: ../meld/vc/git.py:338 msgid "Staged" msgstr "Indicizzato" @@ -2178,142 +2382,141 @@ msgstr "Indicizzato" msgid "None" msgstr "Nessuno" -#: ../meld/vc/svn.py:216 +#: ../meld/vc/svn.py:204 #, python-format msgid "Rev %s" msgstr "Rev %s" -#: ../meld/vc/_vc.py:51 +#: ../meld/vc/_vc.py:54 msgid "Merged" msgstr "Unito" -#: ../meld/vc/_vc.py:51 +#: ../meld/vc/_vc.py:54 msgid "Base" msgstr "Base" -#: ../meld/vc/_vc.py:51 +#: ../meld/vc/_vc.py:54 msgid "Local" msgstr "Locale" -#: ../meld/vc/_vc.py:51 +#: ../meld/vc/_vc.py:54 msgid "Remote" msgstr "Remoto" -#: ../meld/vc/_vc.py:67 +#: ../meld/vc/_vc.py:70 msgid "Unversioned" msgstr "Non monitorato" -#: ../meld/vc/_vc.py:70 +#: ../meld/vc/_vc.py:73 msgid "Error" msgstr "Errore" -#: ../meld/vc/_vc.py:72 +#: ../meld/vc/_vc.py:75 msgid "Newly added" msgstr "Aggiunto di recente" -#: ../meld/vc/_vc.py:74 +#: ../meld/vc/_vc.py:77 msgid "Renamed" msgstr "Rinominato" -#: ../meld/vc/_vc.py:75 +#: ../meld/vc/_vc.py:78 msgid "Conflict" msgstr "Conflitto" -#: ../meld/vc/_vc.py:76 +#: ../meld/vc/_vc.py:79 msgid "Removed" msgstr "Rimosso" -#: ../meld/vc/_vc.py:77 +#: ../meld/vc/_vc.py:80 msgid "Missing" msgstr "Mancante" -#: ../meld/vc/_vc.py:78 +#: ../meld/vc/_vc.py:81 msgid "Not present" msgstr "Non presente" #. Translators: This error message is shown when a version #. control binary isn't installed. -#: ../meld/vcview.py:255 +#: ../meld/vcview.py:251 #, python-format msgid "%(name)s (%(cmd)s not installed)" msgstr "%(name)s (%(cmd)s non installato)" #. Translators: This error message is shown when a version #. controlled repository is invalid. -#: ../meld/vcview.py:259 +#: ../meld/vcview.py:255 #, python-format msgid "%(name)s (Invalid repository)" msgstr "%(name)s (repository non valido)" -#: ../meld/vcview.py:280 +#: ../meld/vcview.py:276 msgid "No valid version control system found in this folder" msgstr "" "Nessun sistema di controllo della versione valido trovato in questa cartella" -#: ../meld/vcview.py:282 +#: ../meld/vcview.py:278 msgid "Only one version control system found in this folder" msgstr "Solo un sistema di controllo della versione trovato in questa cartella" -#: ../meld/vcview.py:284 +#: ../meld/vcview.py:280 msgid "Choose which version control system to use" msgstr "Scegliere il sistema di controllo della versione da usare" #. TRANSLATORS: This is the location of the directory being viewed -#: ../meld/vcview.py:337 +#: ../meld/vcview.py:332 #, python-format msgid "%s: %s" msgstr "%s: %s" -#: ../meld/vcview.py:357 +#: ../meld/vcview.py:352 #, python-format msgid "Scanning %s" msgstr "Analisi di %s" -#: ../meld/vcview.py:396 +#: ../meld/vcview.py:391 msgid "(Empty)" msgstr "(vuoto)" -#: ../meld/vcview.py:440 +#: ../meld/vcview.py:435 #, python-format msgid "%s — local" msgstr "%s — locale" -#: ../meld/vcview.py:441 +#: ../meld/vcview.py:436 #, python-format msgid "%s — remote" msgstr "%s — remoto" -#: ../meld/vcview.py:449 +#: ../meld/vcview.py:444 #, python-format msgid "%s (local, merge, remote)" msgstr "%s (locale, unione, remoto)" -#: ../meld/vcview.py:454 +#: ../meld/vcview.py:449 #, python-format msgid "%s (remote, merge, local)" msgstr "%s (remoto, unione, locale)" -#: ../meld/vcview.py:465 +#: ../meld/vcview.py:460 #, python-format -#| msgid "Invalid repository" msgid "%s — repository" msgstr "%s — repository" -#: ../meld/vcview.py:471 +#: ../meld/vcview.py:466 #, python-format msgid "%s (working, repository)" msgstr "%s (in uso, repository)" -#: ../meld/vcview.py:475 +#: ../meld/vcview.py:470 #, python-format msgid "%s (repository, working)" msgstr "%s (repository, in uso)" -#: ../meld/vcview.py:643 +#: ../meld/vcview.py:638 msgid "Remove folder and all its files?" msgstr "Rimuovere la cartella e tutti i suoi file?" -#: ../meld/vcview.py:645 +#: ../meld/vcview.py:640 msgid "" "This will remove all selected files and folders, and all files within any " "selected folders, from version control." @@ -2321,15 +2524,68 @@ msgstr "" "Verranno rimossi dal controllo di versione tutti i file selezionati, le " "cartelle selezionate e tutti i file al loro interno." -#: ../meld/vcview.py:670 +#: ../meld/vcview.py:665 #, python-format msgid "Error removing %s" msgstr "Errore nel rimuovere %s" -#: ../meld/vcview.py:750 +#: ../meld/vcview.py:745 msgid "Clear" msgstr "Azzera" +#~ msgid "Meld does not support Python 3." +#~ msgstr "Meld non supporta Python 3." + +#~ msgid "" +#~ "These text encodings will be automatically used (in order) to try to " +#~ "decode loaded text files." +#~ msgstr "" +#~ "Queste codifiche di testo verranno utilizzate automaticamente, e in " +#~ "ordine, per decodificare i file di testo caricati." + +#~ msgid "[%s] Set num panes" +#~ msgstr "[%s] Impostazione del numero dei pannelli" + +#~ msgid "[%s] Opening files" +#~ msgstr "[%s] Apertura dei file" + +#~ msgid "Could not read file" +#~ msgstr "Impossibile leggere il file" + +#~ msgid "[%s] Reading files" +#~ msgstr "[%s] Lettura dei file" + +#~ msgid "%s is not in encodings: %s" +#~ msgstr "%s non è presente nelle codifiche: %s" + +#~ msgid "Inconsistent line endings found" +#~ msgstr "Trovate terminazioni di riga inconsistenti" + +#~ msgid "" +#~ "'%s' contains a mixture of line endings. Select the line ending format to " +#~ "use." +#~ msgstr "" +#~ "«%s» contiene un misto di terminazioni di riga. Selezionare il formato da " +#~ "utilizzare." + +#~ msgid "_Previous Tab" +#~ msgstr "Scheda _precedente" + +#~ msgid "Activate previous tab" +#~ msgstr "Attiva la scheda precedente" + +#~ msgid "_Next Tab" +#~ msgstr "Scheda _successiva" + +#~ msgid "Activate next tab" +#~ msgstr "Attiva la scheda successiva" + +#~ msgid "Move current tab to left" +#~ msgstr "Sposta la scheda corrente a sinistra" + +#~ msgid "Move current tab to right" +#~ msgstr "Sposta la scheda corrente a destra" + #~ msgid "Copy _Left" #~ msgstr "Copia a _sinistra" From 02474078dd225764d4c19280fc57d3e1600aa92c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20=C4=8Cernock=C3=BD?= Date: Wed, 15 Mar 2017 00:59:54 +0100 Subject: [PATCH 0150/1316] Updated Czech translation --- help/cs/cs.po | 1934 ++++++++++++++++++++++++------------------------- 1 file changed, 967 insertions(+), 967 deletions(-) diff --git a/help/cs/cs.po b/help/cs/cs.po index 03471232..076fd2ca 100644 --- a/help/cs/cs.po +++ b/help/cs/cs.po @@ -1,13 +1,13 @@ # Czech translation for meld. # Copyright (C) 2014 meld's COPYRIGHT HOLDER # This file is distributed under the same license as the meld package. -# Marek Černocký , 2014, 2015, 2016. +# Marek Černocký , 2014, 2015, 2016, 2017. # msgid "" msgstr "" "Project-Id-Version: meld master\n" -"POT-Creation-Date: 2017-01-25 20:54+0000\n" -"PO-Revision-Date: 2017-02-11 09:46+0100\n" +"POT-Creation-Date: 2017-03-10 23:07+0000\n" +"PO-Revision-Date: 2017-03-15 00:58+0100\n" "Last-Translator: Marek Černocký \n" "Language-Team: čeština \n" "Language: cs\n" @@ -23,29 +23,67 @@ msgid "translator-credits" msgstr "Marek Černocký " #. (itstool) path: info/title -#: C/vc-supported.page:5 +#: C/introduction.page:5 C/file-mode.page:5 C/missing-functionality.page:5 +#: C/folder-mode.page:5 C/preferences.page:5 msgctxt "sort" -msgid "3" -msgstr "3" +msgid "1" +msgstr "1" #. (itstool) path: credit/name -#: C/vc-supported.page:10 C/file-filters.page:10 C/text-filters.page:11 -#: C/resolving-conflicts.page:10 C/preferences.page:10 C/file-changes.page:10 -#: C/file-mode.page:11 C/flattened-view.page:10 C/index.page:8 -#: C/vc-mode.page:10 C/keyboard-shortcuts.page:10 C/introduction.page:10 -#: C/folder-mode.page:10 C/missing-functionality.page:10 C/command-line.page:10 +#: C/introduction.page:10 C/vc-supported.page:10 C/file-mode.page:11 +#: C/file-filters.page:10 C/missing-functionality.page:10 C/index.page:8 +#: C/command-line.page:10 C/text-filters.page:11 C/flattened-view.page:10 +#: C/vc-mode.page:10 C/folder-mode.page:10 C/resolving-conflicts.page:10 +#: C/preferences.page:10 C/keyboard-shortcuts.page:10 C/file-changes.page:10 msgid "Kai Willadsen" msgstr "Kai Willadsen" #. (itstool) path: credit/years -#: C/vc-supported.page:12 C/file-filters.page:12 C/text-filters.page:13 -#: C/resolving-conflicts.page:12 C/file-changes.page:12 C/file-mode.page:13 -#: C/flattened-view.page:12 C/index.page:10 C/vc-mode.page:12 -#: C/keyboard-shortcuts.page:12 C/introduction.page:12 C/folder-mode.page:12 -#: C/missing-functionality.page:12 C/command-line.page:12 +#: C/introduction.page:12 C/vc-supported.page:12 C/file-mode.page:13 +#: C/file-filters.page:12 C/missing-functionality.page:12 C/index.page:10 +#: C/command-line.page:12 C/text-filters.page:13 C/flattened-view.page:12 +#: C/vc-mode.page:12 C/folder-mode.page:12 C/resolving-conflicts.page:12 +#: C/keyboard-shortcuts.page:12 C/file-changes.page:12 msgid "2012" msgstr "2012" +#. (itstool) path: page/title +#: C/introduction.page:15 +msgid "What is Meld?" +msgstr "Co je to Meld?" + +#. (itstool) path: page/p +#: C/introduction.page:16 +msgid "" +"Meld is a tool for comparing files and directories, and for " +"resolving differences between them. It is also useful for comparing changes " +"captured by version control systems." +msgstr "" +"Meld je nástroj sloužící k porovnávání souborů a složek a řešení " +"rozdílů mezi nimi. Hodí se také k porovnání změn provedených v rámci systémů " +"pro správu verzí." + +#. (itstool) path: page/p +#: C/introduction.page:22 +msgid "" +"Meld shows differences between two or three files (or two or " +"three directories) and allows you to move content between them, or edit the " +"files manually. Meld's focus is on helping developers compare and " +"merge source files, and get a visual overview of changes in their favourite " +"version control system." +msgstr "" +"Meld zobrazuje rozdíly mezi dvěma nebo třemi soubory (či dvěma " +"nebo třemi složkami) a umožňuje mezi nimi přesouvat obsah nebo soubory ručně " +"upravit. Cílem aplikace Meld je pomoci vývojářům porovnávat a " +"slučovat soubory se zdrojovými kódy a získat vizuální přehled o změnách v " +"jejich oblíbeném systému správy verzí." + +#. (itstool) path: info/title +#: C/vc-supported.page:5 +msgctxt "sort" +msgid "3" +msgstr "3" + #. (itstool) path: page/title #: C/vc-supported.page:15 msgid "Supported version control systems" @@ -98,10 +136,137 @@ msgstr "" "úplně otestovaná. Případné chyby v podpoře správy verzí prosím nahlaste na " "GNOME bugzilla." +#. (itstool) path: page/title +#: C/file-mode.page:17 +msgid "Getting started comparing files" +msgstr "Začínáme s porovnáváním souborů" + +#. (itstool) path: page/p +#: C/file-mode.page:19 +msgid "" +"Meld lets you compare two or three text files side-by-side. You " +"can start a new file comparison by selecting the FileNew... menu item." +msgstr "" +"Meld umožňuje porovnávat vedle sebe dva nebo tři textové soubory. " +"Nové porovnávání souborů můžete začít pomocí položky SouborNové… v nabídce." + +#. (itstool) path: page/p +#: C/file-mode.page:26 +msgid "" +"Once you've selected your files, Meld will show them side-by-" +"side. Differences between the files will be highlighted to make individual " +"changes easier to see. Editing the files will cause the comparison to update " +"on-the-fly. For details on navigating between individual changes, and on how " +"to use change-based editing, see ." +msgstr "" +"Po té, co si vyberete své soubory, Meld je zobrazí vedle sebe. " +"Změny mezi soubory se zvýrazní, aby byly jednotlivé rozdíly lépe viditelné. " +"Během případných úprav se porovnání ihned živě aktualizuje. Více podrobností " +"o pohybu mezi jednotlivými změnami a jak použít úpravy založené na změnách, " +"najdete v oddíle ." + +#. (itstool) path: section/title +#: C/file-mode.page:35 +msgid "Meld's file comparisons" +msgstr "Porovnávání souborů v aplikaci Meld" + +#. (itstool) path: section/p +#: C/file-mode.page:37 +msgid "" +"There are several different parts to a file comparison. The most important " +"parts are the editors where your files appear. In addition to these editors, " +"the areas around and between your files give you a visual overview and " +"actions to help you handle changes between the files." +msgstr "" +"Okno s porovnáním souborů má několik různých části. Nejdůležitějšími částmi " +"jsou editory, ve který se zobrazují soubory. Mimo těchto editorů se v " +"místech okolo nich a mezi nimi nabízí vizuální přehled a funkce, které vám " +"pomáhají se změnami mezi soubory pracovat." + +#. (itstool) path: section/p +#: C/file-mode.page:43 +msgid "" +"On the left and right-hand sides of the window, there are two small vertical " +"bars showing various coloured blocks. These bars are designed to give you an " +"overview of all of the differences between your two files. Each coloured " +"block represents a section that is inserted, deleted, changed or in conflict " +"between your files, depending on the block's colour used." +msgstr "" +"Po levé a pravé straně okna se nachází dvě malé svislé lišty, které " +"zobrazují různorodé barevné bloky. Slouží k tomu, abyste získali přehled o " +"všech změnách mezi vašimi soubory. Každý barevný blok zastupuje úsek, který " +"je v souboru vložený, smazaný, změněný nebo v konfliktu, což se rozlišuje " +"barvou bloku." + +#. (itstool) path: section/p +#: C/file-mode.page:50 +msgid "" +"In between each pair of files is a segment that shows how the changed " +"sections between your files correspond to each other. You can click on the " +"arrows in a segment to replace sections in one file with sections from the " +"other. You can also delete, copy or merge changes. For details on what you " +"can do with individual change segments, see ." +msgstr "" +"Mezi soubory je část zobrazující, které změněné úseky si mezi soubory " +"navzájem odpovídají. Můžete kliknout na šipky v této části, aby se změny " +"mezi soubory navzájem prohodily. Změny můžete také smazat, kopírovat nebo " +"sloučit. Další popis, co s jednotlivými změnami můžete provádět, najdete v " +"kapitole ." + +#. (itstool) path: section/title +#: C/file-mode.page:62 +msgid "Saving your changes" +msgstr "Ukládání vašich změn" + +#. (itstool) path: section/p +#: C/file-mode.page:64 +msgid "" +"Once you've finished editing your files, you need to save each file you've " +"changed." +msgstr "Když dokončíte úpravy svých souborů, musíte je všechny uložit." + +#. (itstool) path: section/p +#: C/file-mode.page:68 +msgid "" +"You can tell whether your files have been saved since they last changed by " +"the save icon that appears next to the file name above each file. Also, the " +"notebook label will show an asterisk (*) after any file that " +"hasn't been saved." +msgstr "" +"Podle ikony, která se objeví vedle názvu souboru nad každým otevřeným " +"souborem, můžete poznat, jestli byl soubor od poslední změny uložen. Navíc " +"se na popisku sešitu zobrazuje hvězdička (*) za každým " +"souborem, který nebyl uložen." + +#. (itstool) path: section/p +#: C/file-mode.page:74 +msgid "" +"You can save the current file by selecting the FileSave menu item, or using " +"the CtrlS keyboard shortcut." +msgstr "" +"Aktuální soubor uložíte pomocí položky nabídky Soubor Uložit nebo pomocí " +"klávesové zkratky Ctrl S." + +#. (itstool) path: note/p +#: C/file-mode.page:81 +msgid "" +"Saving only saves the currently focussed file, which is the file " +"containing the cursor. If you can't tell which file is focussed, you can " +"click on the file to focus it before saving." +msgstr "" +"Uloží se pouze právě zaměřený soubor, což je ten, ve kterém se " +"nachází kurzor. Pokud nedokážete rozlišit, který soubor je zaměřen, prostě " +"na něj před uložením klikněte." + #. (itstool) path: info/title -#: C/file-filters.page:5 C/text-filters.page:5 C/resolving-conflicts.page:5 -#: C/file-changes.page:5 C/flattened-view.page:5 C/keyboard-shortcuts.page:5 -#: C/command-line.page:5 +#: C/file-filters.page:5 C/command-line.page:5 C/text-filters.page:5 +#: C/flattened-view.page:5 C/resolving-conflicts.page:5 +#: C/keyboard-shortcuts.page:5 C/file-changes.page:5 msgctxt "sort" msgid "2" msgstr "2" @@ -407,75 +572,212 @@ msgstr "" "\"menuitem\">Ignorovat velikost písmen v názvu souboru." #. (itstool) path: page/title -#: C/text-filters.page:17 -msgid "Filtering out text" -msgstr "Odfiltrování textu" +#: C/missing-functionality.page:15 +msgid "Things that Meld doesn't do" +msgstr "Věci, které Meld nedělá" #. (itstool) path: page/p -#: C/text-filters.page:19 +#: C/missing-functionality.page:17 msgid "" -"When comparing several files, you may have sections of text where " -"differences aren't really important. For example, you may want to focus on " -"changed sections of code, and ignore any changes in comment lines. With text " -"filters you can tell Meld to ignore text that matches a pattern " -"(i.e., a regular expression) when showing differences between files." +"Have you ever spent half an hour poking around an application trying to find " +"out how to do something, thinking that surely there must be an " +"option for this?" msgstr "" -"Když porovnáváte několik souborů, můžete v nich mít části textu, ve kterých " -"nejsou rozdíly důležité. Například se můžete chtít zaměřit na změny v části " -"s kódem a ignorovat změny v řádcích s komentáři. Díky textovým filtrům stačí " -"aplikaci Meld říci, aby při zobrazování rozdílů mezi soubory " -"ignorovala text, který vyhovuje nějakému vzoru (tj. regulárnímu výrazu)." +"Strávili jste hodinu a půl prozkoumáváním aplikace ve snaze najít, jak se " +"udělá jedna konkrétní věc, protože jste si byli jistí, že to musí " +"nějak jít?" -#. (itstool) path: note/p -#: C/text-filters.page:28 +#. (itstool) path: page/p +#: C/missing-functionality.page:23 msgid "" -"Text filters don't just affect file comparisons, but also folder " -"comparisons. Check the file filtering notes for more details." +"This section lists a few of the common things that Meld " +"doesn't do, either as a deliberate choice, or because we just " +"haven't had time." msgstr "" -"Textové filtry neovlivňují jen porovnání souborů, ale i porovnání složek. " -"Více podrobností najdete v poznámkách k " -"filtrování souborů." +"Tato část uvádí několik běžných věcí, které Meld nedělá, " +"ať už záměrně nebo proto, že na ně ještě nebyl čas." #. (itstool) path: section/title -#: C/text-filters.page:37 -msgid "Adding and using text filters" -msgstr "Přidávání a používání textových filtrů" +#: C/missing-functionality.page:30 +msgid "Aligning changes by adding lines" +msgstr "Zarovnávání změn přidáním řádků" #. (itstool) path: section/p -#: C/text-filters.page:39 +#: C/missing-functionality.page:31 msgid "" -"You can turn text filters on or off from the the Text Filters tab " -"in Preferences dialog. Meld comes with a few simple " -"filters that you might find useful, but you can add your own as well." +"When Meld shows differences between files, it shows both files as " +"they would appear in a normal text editor. It does not insert " +"additional lines so that the left and right sides of a particular change are " +"the same size. There is no option to do this." msgstr "" -"Textové filtry můžete zapínat a vypínat na kartě Filtry textu v " -"dialogovém okně Předvolby. Meld má předdefinováno " -"několik jednoduchých filtrů, které mohou být užitečné, a k tomu si můžete " -"vytvořit své vlastní." +"Když Meld zobrazuje rozdíly mezi soubory, zobrazuje oba soubory " +"stejným způsobem jako běžný textový editor. Nevkládá žádné " +"dodatečné řádky, aby levá a pravá strana se změnami měly stejnou velikost. " +"Není k dispozici ani žádná volba, která by to dělala." -#. (itstool) path: section/p -#: C/text-filters.page:45 -msgid "" -"In Meld, text filters are regular expressions that are matched " -"against the text of files you're comparing. Any text that is matched is " -"ignored during the comparison; you'll still see this text in the comparison " -"view, but it won't be taken into account when finding differences. Text " -"filters are applied in order, so it's possible for the first filter to " -"remove text that now makes the second filter match, and so on." -msgstr "" -"V aplikaci Meld nejsou textové filtry nic jiného, než regulární " -"výrazy spouštěné vůči textu nebo souborům, které porovnáváte. Text, který " -"regulárnímu výrazu vyhovuje, je během porovnávání ignorován. V zobrazení " -"porovnání sice takovýto text stále uvidíte, ale nebude brán v úvahu při " -"hledání rozdílů. Textové filtry se použijí v určeném pořadí, takže je možné, " -"aby první filtr odebral text tak, aby zbytek vyhovoval druhému filtru atd." +#. (itstool) path: page/title +#: C/index.page:14 +msgid "Meld Help" +msgstr "Nápověda k aplikaci Meld" -#. (itstool) path: note/p -#: C/text-filters.page:55 -msgid "" -"If you're not familiar with regular expressions, you might want to check out " -"the Python Regular " +#. (itstool) path: section/title +#: C/index.page:17 +msgid "Introduction" +msgstr "Úvod" + +#. (itstool) path: section/title +#: C/index.page:21 +msgid "Comparing Files" +msgstr "Porovnávání souborů" + +#. (itstool) path: section/title +#: C/index.page:25 +msgid "Comparing Folders" +msgstr "Porovnávání složek" + +#. (itstool) path: section/title +#: C/index.page:29 +msgid "Using Meld with Version Control" +msgstr "Používání aplikace Meld se správou verzí" + +#. (itstool) path: section/title +#: C/index.page:33 +msgid "Advanced Usage" +msgstr "Pokročilé používání" + +#. (itstool) path: page/title +#: C/command-line.page:15 +msgid "Command line usage" +msgstr "Použití příkazového řádku" + +#. (itstool) path: page/p +#: C/command-line.page:17 +msgid "" +"If you start Meld from the command line, you can tell it what to " +"do when it starts." +msgstr "" +"Když spouštíte Meld z příkazové řádky, můžete mu říct, co má po " +"spuštění udělat." + +#. (itstool) path: page/p +#: C/command-line.page:20 +msgid "" +"For a two- or three-way file comparison, " +"start Meld with meld file1 file2 " +"or meld file1 file2 file3 " +"respectively." +msgstr "" +"Pro dvoj nebo trojcestné porovnání souborů " +"spusťte Meld pomocí meld soubor1 soubor2 respektive meld soubor1 soubor2 " +"soubor3." + +#. (itstool) path: page/p +#: C/command-line.page:26 +msgid "" +"For a two- or three-way directory comparison, start Meld with meld dir1 dir2 or meld dir1 dir2 dir3." +msgstr "" +"Pro dvoj nebo trojcestné porovnání složek " +"spusťte Meld pomocí meld složka1 složka2 respektive meld složka1 složka2 " +"složka3." + +#. (itstool) path: page/p +#: C/command-line.page:31 +msgid "" +"You can start a version control comparison by " +"just giving a single argument; if that file or directory is managed by a " +"recognized version control system, it " +"will start a version control comparison on that argument. For example, " +"meld . would start a version control view of the current " +"directory." +msgstr "" +"Porovnání ve správě verzí můžete spustit " +"zadání pouhého jednoho argumentu. Pokud je zadaný soubor nebo složka " +"spravována některým rozpoznaným systémem správy " +"verzí, spustí se porovnání tohoto argumentu ve správě verzí. " +"Například meld . by spustilo zobrazení správy verzí pro aktuální " +"složku." + +#. (itstool) path: note/p +#: C/command-line.page:40 +msgid "Run meld --help for a list of all command line options." +msgstr "" +"Spuštěním meld --help si můžete vypsat všechny možnosti " +"příkazového řádku." + +#. (itstool) path: page/title +#: C/text-filters.page:17 +msgid "Filtering out text" +msgstr "Odfiltrování textu" + +#. (itstool) path: page/p +#: C/text-filters.page:19 +msgid "" +"When comparing several files, you may have sections of text where " +"differences aren't really important. For example, you may want to focus on " +"changed sections of code, and ignore any changes in comment lines. With text " +"filters you can tell Meld to ignore text that matches a pattern " +"(i.e., a regular expression) when showing differences between files." +msgstr "" +"Když porovnáváte několik souborů, můžete v nich mít části textu, ve kterých " +"nejsou rozdíly důležité. Například se můžete chtít zaměřit na změny v části " +"s kódem a ignorovat změny v řádcích s komentáři. Díky textovým filtrům stačí " +"aplikaci Meld říci, aby při zobrazování rozdílů mezi soubory " +"ignorovala text, který vyhovuje nějakému vzoru (tj. regulárnímu výrazu)." + +#. (itstool) path: note/p +#: C/text-filters.page:28 +msgid "" +"Text filters don't just affect file comparisons, but also folder " +"comparisons. Check the file filtering notes for more details." +msgstr "" +"Textové filtry neovlivňují jen porovnání souborů, ale i porovnání složek. " +"Více podrobností najdete v poznámkách k " +"filtrování souborů." + +#. (itstool) path: section/title +#: C/text-filters.page:37 +msgid "Adding and using text filters" +msgstr "Přidávání a používání textových filtrů" + +#. (itstool) path: section/p +#: C/text-filters.page:39 +msgid "" +"You can turn text filters on or off from the the Text Filters tab " +"in Preferences dialog. Meld comes with a few simple " +"filters that you might find useful, but you can add your own as well." +msgstr "" +"Textové filtry můžete zapínat a vypínat na kartě Filtry textu v " +"dialogovém okně Předvolby. Meld má předdefinováno " +"několik jednoduchých filtrů, které mohou být užitečné, a k tomu si můžete " +"vytvořit své vlastní." + +#. (itstool) path: section/p +#: C/text-filters.page:45 +msgid "" +"In Meld, text filters are regular expressions that are matched " +"against the text of files you're comparing. Any text that is matched is " +"ignored during the comparison; you'll still see this text in the comparison " +"view, but it won't be taken into account when finding differences. Text " +"filters are applied in order, so it's possible for the first filter to " +"remove text that now makes the second filter match, and so on." +msgstr "" +"V aplikaci Meld nejsou textové filtry nic jiného, než regulární " +"výrazy spouštěné vůči textu nebo souborům, které porovnáváte. Text, který " +"regulárnímu výrazu vyhovuje, je během porovnávání ignorován. V zobrazení " +"porovnání sice takovýto text stále uvidíte, ale nebude brán v úvahu při " +"hledání rozdílů. Textové filtry se použijí v určeném pořadí, takže je možné, " +"aby první filtr odebral text tak, aby zbytek vyhovoval druhému filtru atd." + +#. (itstool) path: note/p +#: C/text-filters.page:55 +msgid "" +"If you're not familiar with regular expressions, you might want to check out " +"the Python Regular " "Expression HOWTO." msgstr "" "Jestli nejste v regulárních výrazech zběhlí, můžete se podívat na Meld is to resolve conflicts that occur " -"while merging different branches." -msgstr "" -"Jednou z nejlepších věcí na aplikaci Meld je řešení konfliktů, " -"které vznikají při slučování rozdílných větví." +#: C/flattened-view.page:15 +msgid "Flattened view" +msgstr "Zúžené zobrazení" #. (itstool) path: page/p -#: C/resolving-conflicts.page:22 -msgid "" -"For example, when using Git, git mergetool will start " -"a 'merge helper'; Meld is one such helper. If you want to make " -"git mergetool use Meld by default, you can add" -msgstr "" -"Například, když používáte Git, git mergtool spustí " -"„pomocníka se slučováním“. Meld je jedním z možných takovýchto " -"pomocníků. Jestli chcete, aby git mergetool používal Meld jako výchozího pomocníka, můžete přidat" - -#. (itstool) path: page/code -#: C/resolving-conflicts.page:27 -#, no-wrap +#: C/flattened-view.page:17 msgid "" -"\n" -"[merge]\n" -" tool = meld\n" +"When viewing large folders, you may be interested in only a few files among " +"the thousands in the folder itself. For this reason, Meld " +"includes a flattened view of a folder; only files that have not " +"been filtered out (e.g., by ) are " +"shown, and the folder hierarchy is stripped away, with file paths shown in " +"the Location column." msgstr "" -"\n" -"[merge]\n" -" tool = meld\n" +"Když si prohlížíte rozsáhle složky, může vás zajímat jen pár souborů z " +"tisíců dalších. Z tohoto důvodu poskytuje Meld zúžené " +"zobrazení složky. Pak se zobrazují jen soubory, které nejsou " +"odfiltrovány (např. pomocí ) a " +"stromová struktura je zrušena s tím, že ve sloupci Umístění je " +"zobrazena cesta." #. (itstool) path: page/p -#: C/resolving-conflicts.page:31 +#: C/flattened-view.page:27 msgid "" -"to .git/gitconfig. See the git mergetool manual for " -"details." +"You can turn this flattened view on or off by unchecking the ViewFlatten menu " +"item, or by clicking the corresponding Flatten " +"button on the toolbar." msgstr "" -"do souboru .git/gitconfig. Podrobnější informace viz příručka " -"ke git mergetool." +"Toto zúžené zobrazení můžete zapnout nebo vypnout zaškrtnutím položky " +"nabídky ZobrazitZúžené nebo kliknutím na příslušné tlačítko Zúžené na nástrojové liště." #. (itstool) path: info/title -#: C/preferences.page:5 C/file-mode.page:5 C/introduction.page:5 -#: C/folder-mode.page:5 C/missing-functionality.page:5 +#: C/vc-mode.page:5 msgctxt "sort" -msgid "1" -msgstr "1" - -#. (itstool) path: credit/years -#: C/preferences.page:12 -msgid "2013" -msgstr "2013" +msgid "0" +msgstr "0" #. (itstool) path: page/title -#: C/preferences.page:15 -msgid "Meld's preferences" -msgstr "Předvolby Meld" - -#. (itstool) path: terms/title -#: C/preferences.page:18 -msgid "Editor preferences" -msgstr "Předvolby editoru" - -#. (itstool) path: item/title -#: C/preferences.page:20 -msgid "Editor command" -msgstr "Příkaz editoru" +#: C/vc-mode.page:16 +msgid "Viewing version-controlled files" +msgstr "Zobrazení souborů ze správy verzí" -#. (itstool) path: item/p -#: C/preferences.page:21 +#. (itstool) path: page/p +#: C/vc-mode.page:18 msgid "" -"The name of the command to run to open text files in an external editor. " -"This may be just the command (e.g., gedit) in which case the file " -"to be opened will be passed as the last argument. Alternatively, you can add " -"{file} and {line} elements to the command, in " -"which case Meld will substitute the file path and current line " -"number respectively (e.g., gedit {file}:{line})." +"Meld integrates with many version " +"control systems to let you review local changes and perform simple " +"version control tasks. You can start a new version control comparison by " +"selecting the FileNew... menu item, and clicking on the Version Control tab." msgstr "" -"Název příkazu, který provede otevření textových souborů v externím editoru. " -"Stačí samotný příkaz (např. gedit), a otevíraný soubor je pak " -"předán jako poslední argument. Nebo případně můžete do příkazu přidat " -"{file} a {line}, které pak Meld " -"nahradí názvem souboru včetně cesty, respektive číslem aktuálního řádku. " -"(např. gedit {file}:{line})." - -#. (itstool) path: terms/title -#: C/preferences.page:31 -msgid "Folder Comparison preferences" -msgstr "Předvolby porovnávání složek" +"Meld integruje řadu systémů pro " +"správu verzí, abyste si mohli prohlížet místně provedené změny a " +"provádět jednoduché činnosti ve správě verzí. Nové porovnávání správy verzí " +"můžete začít pomocí položky nabídky SouborNový… a kliknutím na kartu Správa verzí." -#. (itstool) path: item/title -#: C/preferences.page:33 -msgid "Apply text filters during folder comparisons" -msgstr "Použití textových filtrů při porovnávání složek" +#. (itstool) path: section/title +#: C/vc-mode.page:30 +msgid "Version control comparisons" +msgstr "Porovnávání správy verzí" -#. (itstool) path: item/p -#: C/preferences.page:34 +#. (itstool) path: section/p +#: C/vc-mode.page:32 msgid "" -"When comparing files in folder comparison mode, text filters and other text " -"manipulation options can be applied to the contents of files. If this option " -"is enabled, all currently enabled text filters will be applied, the blank " -"line trimming option will be applied as appropriate, and differences in line " -"endings will be ignored." +"Version control comparisons show the differences between the contents of " +"your folder and the current repository version. Each file in your local copy " +"has a state that indicates how it differs " +"from the repository copy." msgstr "" -"Když se porovnávají soubory v režimu porovnávání složek, mohou být na obsah " -"souborů použity filtry a další možnosti práce s textem. Pokud je tato volba " -"zapnutá, všechny zapnuté textové filtry se použijí, bude příslušně použita " -"volba ořezávání prázných řádků a rozdíly v zakončeních řádků budou " -"ignorovány." +"Porovnání správy verzí zobrazuje rozdíly mezi obsahem vaší složky a aktuální " +"verzí v repozitáři. Každý soubor ve vaší místní kopii má stav, který určuje, jak se liší od kopie v repozitáři." -#. (itstool) path: item/p -#: C/preferences.page:40 +#. (itstool) path: section/p +#: C/vc-mode.page:46 msgid "" -"Enabling this option means that Meld must fully read all non-" -"binary files into memory during the folder comparison. With large text " -"files, this can be slow and may cause memory issues." +"If you want to look at a particular file's differences, you can select it " +"and press Enter, or double-click the file to start a file comparison. You can also interact with your " +"version control system using the Changes menu." msgstr "" -"Zapnutí této volby znamená, že Meld musí během porovnávání složek " -"načíst všechny nebinární soubory kompletně do paměti. U rozsáhlých textových " -"souborů to může způsobit problémy v podobě zpomalení a velké spotřeby paměti." +"Když se chcete podívat na rozdíly u konkrétního souboru, můžete jej vybrat a " +"zmáčknout Enter nebo na něj dvojitě kliknout a začne porovnávání souboru. Můžete take využí funkce svého " +"systému správy verzí přes nabídku Změny." -#. (itstool) path: item/p -#: C/preferences.page:44 +#. (itstool) path: section/title +#. (itstool) path: table/title +#: C/vc-mode.page:56 C/vc-mode.page:81 +msgid "Version control states" +msgstr "Stavy správy verzí" + +#. (itstool) path: section/p +#: C/vc-mode.page:58 msgid "" -"This option only has an effect if \"Compare files based only on size and " -"timestamp\" is not enabled." +"Each file or folder in a version control comparison has a state, " +"obtained from the version control system itself. Meld maps these " +"different states into a standard set of very similar concepts. As such, " +"Meld might use slightly different names for states than your " +"version control system does. The possible states are:" msgstr "" -"Tato volba má význam, jen když není zapnuto „Porovnávat soubory jen na " -"základě velikosti a časového razítka“." +"Každý soubor nebo složka v porovnání správy verzí má stav získaný " +"přímo ze systém správy verzí. Meld převádí tyto různé stavy na " +"standardní množinu stavů založené na podobném konceptu. Proto může používat " +"mírně odlišné názvy stavů, než používá váš systém správy verzí. Možné stavy " +"jsou:" -#. (itstool) path: page/title -#: C/file-changes.page:16 -msgid "Dealing with changes" -msgstr "Práce se změnami" +#. (itstool) path: td/p +#: C/vc-mode.page:85 C/folder-mode.page:110 +msgid "State" +msgstr "stav" -#. (itstool) path: page/p -#: C/file-changes.page:18 -msgid "" -"Meld deals with differences between files as a list of change " -"blocks or more simply changes. Each change is a group of lines " -"which correspond between files. Since these changes are what you're usually " -"interested in, Meld gives you specific tools to navigate between " -"these changes and to edit them. You can find these tools in the Changes menu." -msgstr "" -"Meld se chová ke změnám mezi soubory jako k seznamu bloků " -"změn, zkráceně jen změn. Každá změna sestává ze skupiny řádků, " -"které si mezi soubory odpovídají. Protože právě tyto změny jsou obvykle to, " -"co vás zajímá, poskytuje Meld nástroje pro přecházení mezi nimi a " -"pro jejich úpravy. Tyto nástroje najdete v nabídce Změny." +#. (itstool) path: td/p +#: C/vc-mode.page:86 C/folder-mode.page:111 +msgid "Appearance" +msgstr "vzhled" -#. (itstool) path: section/title -#: C/file-changes.page:30 -msgid "Navigating between changes" -msgstr "Pohyb mezi změnami" +#. (itstool) path: td/p +#: C/vc-mode.page:87 C/folder-mode.page:112 +msgid "Meaning" +msgstr "význam" -#. (itstool) path: section/p -#: C/file-changes.page:32 -msgid "" -"You can navigate between changes with the ChangesPrevious change and " -"ChangesNext " -"change menu items. You can also use your mouse's scroll wheel " -"to move between changes, by scrolling on the central change bar." -msgstr "" -"Mezi změnami se můžete pohybovat pomocí položek nabídky ZměnyPředchozí změna a " -"ZměnyNásledující " -"změna. Můžete také použít kolečko myši nad středovou lištou " -"se změnami." +#. (itstool) path: td/p +#: C/vc-mode.page:95 C/folder-mode.page:120 +msgid "Normal font" +msgstr "normální písmo" -#. (itstool) path: section/title -#: C/file-changes.page:46 -msgid "Changing changes" -msgstr "Změna změn" +#. (itstool) path: td/p +#: C/vc-mode.page:101 +msgid "The file/folder is the same as the repository version." +msgstr "Soubor/složka jsou stejné jako verze v repozitáři." -#. (itstool) path: section/p -#: C/file-changes.page:48 -msgid "" -"In addition to directly editing text files, Meld gives you tools " -"to move, copy or delete individual differences between files. The bar " -"between two files not only shows you what parts of the two files correspond, " -"but also lets you selectively merge or delete differing changes by clicking " -"the arrow or cross icons next to the start of each change." -msgstr "" -"Mimo přímých úprav textu vám Meld poskytuje nástroje pro přesun, " -"kopírování nebo mazání jednotlivých rozdílů mezi soubory. Lišta mezi dvěma " -"soubory nejen zobrazuje, které části těchto souborů si navzájem odpovídají, " -"ale také umožňuje cíleně slučovat nebo mazat rozdílové změny kliknutím na " -"ikonu se šipkou nebo křížkem vedle začátku každé změny." +#. (itstool) path: td/p +#: C/vc-mode.page:109 +msgid "Red and bold" +msgstr "červené a tučné" -#. (itstool) path: section/p -#: C/file-changes.page:52 -msgid "" -"The default action is replace. This action replaces the contents of " -"the corresponding change with the current change." -msgstr "" -"Výchozí činností je nahrazení. Tím se nahradí obsah odpovídající " -"změny aktuální změnou." +#. (itstool) path: td/p +#: C/vc-mode.page:115 +msgid "This file is different to the repository version." +msgstr "Tento soubor se liší od verze v repozitáři." -#. (itstool) path: section/p -#: C/file-changes.page:59 -msgid "" -"Hold down the Shift key to change the current action to " -"delete. This action deletes the current change." -msgstr "" -"Přidržením klávesy Shift změníte aktuální činnost na smazat. Touto činností se smažou současné změny." +#. (itstool) path: td/p +#: C/vc-mode.page:123 C/folder-mode.page:164 +msgid "Green and bold" +msgstr "zelené a tučné" -#. (itstool) path: section/p -#: C/file-changes.page:62 +#. (itstool) path: td/p +#: C/vc-mode.page:129 msgid "" -"Hold down the Ctrl key to change the current action to " -"insert. This action inserts the current change above or below (as " -"selected) the corresponding change." +"This file/folder is new, and is scheduled to be added to the repository." msgstr "" -"Přidržením klávesy Ctrl změníte aktuální činnost na vložit. Touto činností se současné změny vloží nad nebo pod (podle výběru) " -"odpovídající změny." +"Tento soubor/složka jsou nové a je naplánováno jejich přidání do repozitáře." -#. (itstool) path: page/title -#: C/file-mode.page:17 -msgid "Getting started comparing files" -msgstr "Začínáme s porovnáváním souborů" +#. (itstool) path: td/p +#: C/vc-mode.page:136 +msgid "Removed" +msgstr "Odstraněno" -#. (itstool) path: page/p -#: C/file-mode.page:19 -msgid "" -"Meld lets you compare two or three text files side-by-side. You " -"can start a new file comparison by selecting the FileNew... menu item." -msgstr "" -"Meld umožňuje porovnávat vedle sebe dva nebo tři textové soubory. " -"Nové porovnávání souborů můžete začít pomocí položky SouborNové… v nabídce." +#. (itstool) path: td/p +#: C/vc-mode.page:138 +msgid "Red bold text with a line through the middle" +msgstr "přeškrtnuté červené tučné" -#. (itstool) path: page/p -#: C/file-mode.page:26 +#. (itstool) path: td/p +#: C/vc-mode.page:144 msgid "" -"Once you've selected your files, Meld will show them side-by-" -"side. Differences between the files will be highlighted to make individual " -"changes easier to see. Editing the files will cause the comparison to update " -"on-the-fly. For details on navigating between individual changes, and on how " -"to use change-based editing, see ." +"This file/folder existed, but is scheduled to be removed from the repository." msgstr "" -"Po té, co si vyberete své soubory, Meld je zobrazí vedle sebe. " -"Změny mezi soubory se zvýrazní, aby byly jednotlivé rozdíly lépe viditelné. " -"Během případných úprav se porovnání ihned živě aktualizuje. Více podrobností " -"o pohybu mezi jednotlivými změnami a jak použít úpravy založené na změnách, " -"najdete v oddíle ." +"Tento soubor/složka existují, ale je naplánováno jejich odstranění z " +"repozitáře." -#. (itstool) path: section/title -#: C/file-mode.page:35 -msgid "Meld's file comparisons" -msgstr "Porovnávání souborů v aplikaci Meld" +#. (itstool) path: td/p +#: C/vc-mode.page:151 +msgid "Conflict" +msgstr "Konflikt" -#. (itstool) path: section/p -#: C/file-mode.page:37 -msgid "" -"There are several different parts to a file comparison. The most important " -"parts are the editors where your files appear. In addition to these editors, " -"the areas around and between your files give you a visual overview and " -"actions to help you handle changes between the files." -msgstr "" -"Okno s porovnáním souborů má několik různých části. Nejdůležitějšími částmi " -"jsou editory, ve který se zobrazují soubory. Mimo těchto editorů se v " -"místech okolo nich a mezi nimi nabízí vizuální přehled a funkce, které vám " -"pomáhají se změnami mezi soubory pracovat." +#. (itstool) path: td/p +#: C/vc-mode.page:153 +msgid "Bright red bold text" +msgstr "jasně červené a tučné" -#. (itstool) path: section/p -#: C/file-mode.page:43 +#. (itstool) path: td/p +#: C/vc-mode.page:159 msgid "" -"On the left and right-hand sides of the window, there are two small vertical " -"bars showing various coloured blocks. These bars are designed to give you an " -"overview of all of the differences between your two files. Each coloured " -"block represents a section that is inserted, deleted, changed or in conflict " -"between your files, depending on the block's colour used." +"When trying to merge with the repository, the differences between the local " +"file and the repository could not be resolved, and the file is now in " +"conflict with the repository contents" msgstr "" -"Po levé a pravé straně okna se nachází dvě malé svislé lišty, které " -"zobrazují různorodé barevné bloky. Slouží k tomu, abyste získali přehled o " -"všech změnách mezi vašimi soubory. Každý barevný blok zastupuje úsek, který " -"je v souboru vložený, smazaný, změněný nebo v konfliktu, což se rozlišuje " -"barvou bloku." +"Když se pokoušíte o sloučení s repozitářem, nemusí být možné vyřešit rozdíly " +"mezi místním souborem a repozitářem a soubor se bude nacházet v konfliktu s " +"obsahem repozitáře." -#. (itstool) path: section/p -#: C/file-mode.page:50 -msgid "" -"In between each pair of files is a segment that shows how the changed " -"sections between your files correspond to each other. You can click on the " -"arrows in a segment to replace sections in one file with sections from the " -"other. You can also delete, copy or merge changes. For details on what you " -"can do with individual change segments, see ." -msgstr "" -"Mezi soubory je část zobrazující, které změněné úseky si mezi soubory " -"navzájem odpovídají. Můžete kliknout na šipky v této části, aby se změny " -"mezi soubory navzájem prohodily. Změny můžete také smazat, kopírovat nebo " -"sloučit. Další popis, co s jednotlivými změnami můžete provádět, najdete v " -"kapitole ." +#. (itstool) path: td/p +#: C/vc-mode.page:167 C/folder-mode.page:176 +msgid "Missing" +msgstr "Schází" -#. (itstool) path: section/title -#: C/file-mode.page:62 -msgid "Saving your changes" -msgstr "Ukládání vašich změn" +#. (itstool) path: td/p +#: C/vc-mode.page:169 +msgid "Blue bold text with a line through the middle" +msgstr "modré tučné přeškrtnuté" -#. (itstool) path: section/p -#: C/file-mode.page:64 -msgid "" -"Once you've finished editing your files, you need to save each file you've " -"changed." -msgstr "Když dokončíte úpravy svých souborů, musíte je všechny uložit." +#. (itstool) path: td/p +#: C/vc-mode.page:175 +msgid "This file/folder should be present, but isn't." +msgstr "Tento soubor/složka by měli existovat, ale není tomu tak." -#. (itstool) path: section/p -#: C/file-mode.page:68 +#. (itstool) path: td/p +#: C/vc-mode.page:181 +msgid "Ignored" +msgstr "Ignorováno" + +#. (itstool) path: td/p +#: C/vc-mode.page:183 C/vc-mode.page:199 +msgid "Greyed out text" +msgstr "zašedlý text" + +#. (itstool) path: td/p +#: C/vc-mode.page:189 msgid "" -"You can tell whether your files have been saved since they last changed by " -"the save icon that appears next to the file name above each file. Also, the " -"notebook label will show an asterisk (*) after any file that " -"hasn't been saved." +"This file/folder has been explicitly ignored (e.g., by an entry in ." +"gitignore) and is not being tracked by version control." msgstr "" -"Podle ikony, která se objeví vedle názvu souboru nad každým otevřeným " -"souborem, můžete poznat, jestli byl soubor od poslední změny uložen. Navíc " -"se na popisku sešitu zobrazuje hvězdička (*) za každým " -"souborem, který nebyl uložen." +"Pro tento soubor/složku bylo určeno, že se mají ignorovat (tj. záznamem v " +".gitignore) a nejsou sledovány správou verzí." + +#. (itstool) path: td/p +#: C/vc-mode.page:197 +msgid "Unversioned" +msgstr "Neverzováno" -#. (itstool) path: section/p -#: C/file-mode.page:74 +#. (itstool) path: td/p +#: C/vc-mode.page:205 msgid "" -"You can save the current file by selecting the FileSave menu item, or using " -"the CtrlS keyboard shortcut." +"This file is not in the version control system; it is only in the local copy." msgstr "" -"Aktuální soubor uložíte pomocí položky nabídky Soubor Uložit nebo pomocí " -"klávesové zkratky Ctrl S." +"Tento soubor není v systému správy verzí, nachází se pouze v místní kopii." -#. (itstool) path: note/p -#: C/file-mode.page:81 +#. (itstool) path: td/p +#: C/vc-mode.page:212 C/folder-mode.page:191 +msgid "Error" +msgstr "Chyba" + +#. (itstool) path: td/p +#: C/vc-mode.page:214 C/folder-mode.page:193 +msgid "Bright red with a yellow background and bold" +msgstr "světle červený tučný text na žlutém pozadí" + +#. (itstool) path: td/p +#: C/vc-mode.page:220 +msgid "The version control system has reported a problem with this file." +msgstr "Systém správy verzí oznámil problém s tímto souborem." + +#. (itstool) path: section/title +#: C/vc-mode.page:230 +msgid "Version control state filtering" +msgstr "Filtrování stavu ve správě verzí" + +#. (itstool) path: section/p +#: C/vc-mode.page:232 msgid "" -"Saving only saves the currently focussed file, which is the file " -"containing the cursor. If you can't tell which file is focussed, you can " -"click on the file to focus it before saving." +"Most often, you will only want to see files that are identified as being in " +"some way different; this is the default setting in Meld. You can " +"change which file states you see by using the ViewVersion Status menu, or " +"by clicking the corresponding Modified, Normal, Unversioned and " +"Ignored buttons on the toolbar." msgstr "" -"Uloží se pouze právě zaměřený soubor, což je ten, ve kterém se " -"nachází kurzor. Pokud nedokážete rozlišit, který soubor je zaměřen, prostě " -"na něj před uložením klikněte." +"Velmi často budete chtít vidět jen soubory, u kterých bylo zjištěno, že se " +"nějakým způsobem liší. Proto se jedná o výchozí nastavení aplikace " +"Meld. Které stavy chcete vidět, můžete změnit pomocí nabídky " +"ZobrazitStav " +"verze nebo kliknutím na příslušné tlačítko Změněno, Normální, Neverzováno a Ignorováno na nástrojové " +"liště." #. (itstool) path: page/title -#: C/flattened-view.page:15 -msgid "Flattened view" -msgstr "Zúžené zobrazení" +#: C/folder-mode.page:16 +msgid "Getting started comparing folders" +msgstr "Začínáme s porovnáváním složek" #. (itstool) path: page/p -#: C/flattened-view.page:17 +#: C/folder-mode.page:18 msgid "" -"When viewing large folders, you may be interested in only a few files among " -"the thousands in the folder itself. For this reason, Meld " -"includes a flattened view of a folder; only files that have not " -"been filtered out (e.g., by ) are " -"shown, and the folder hierarchy is stripped away, with file paths shown in " -"the Location column." +"Meld lets you compare two or three folders side-by-side. You can " +"start a new folder comparison by selecting the FileNew... menu item, and " +"clicking on the Directory Comparison tab." msgstr "" -"Když si prohlížíte rozsáhle složky, může vás zajímat jen pár souborů z " -"tisíců dalších. Z tohoto důvodu poskytuje Meld zúžené " -"zobrazení složky. Pak se zobrazují jen soubory, které nejsou " -"odfiltrovány (např. pomocí ) a " -"stromová struktura je zrušena s tím, že ve sloupci Umístění je " -"zobrazena cesta." +"Meld umožňuje porovnávat dvě nebo tři složky vedle sebe. Nové " +"porovnávání složek začnete přes položku nabídky SouborNový… a kliknutím na " +"kartu Porovnávání složek." #. (itstool) path: page/p -#: C/flattened-view.page:27 +#: C/folder-mode.page:26 msgid "" -"You can turn this flattened view on or off by unchecking the ViewFlatten menu " -"item, or by clicking the corresponding Flatten " -"button on the toolbar." +"Your selected folders will be shown as side-by-side trees, with differences " +"between files in each folder highlighted. You can copy or delete files from " +"either folder, or compare individual text files in more detail." msgstr "" -"Toto zúžené zobrazení můžete zapnout nebo vypnout zaškrtnutím položky " -"nabídky ZobrazitZúžené nebo kliknutím na příslušné tlačítko Zúžené na nástrojové liště." - -#. (itstool) path: page/title -#: C/index.page:14 -msgid "Meld Help" -msgstr "Nápověda k aplikaci Meld" - -#. (itstool) path: section/title -#: C/index.page:17 -msgid "Introduction" -msgstr "Úvod" - -#. (itstool) path: section/title -#: C/index.page:21 -msgid "Comparing Files" -msgstr "Porovnávání souborů" - -#. (itstool) path: section/title -#: C/index.page:25 -msgid "Comparing Folders" -msgstr "Porovnávání složek" - -#. (itstool) path: section/title -#: C/index.page:29 -msgid "Using Meld with Version Control" -msgstr "Používání aplikace Meld se správou verzí" +"Vybrané složky budou zobrazeny jako stromové struktury vedle sebe a rozdíly " +"mezi soubory v každé složce budou zvýrazněny. Soubory v každé ze složek " +"můžete kopírovat a mazat, případně si u textových souborů zobrazit rozdíly " +"podrobně." #. (itstool) path: section/title -#: C/index.page:33 -msgid "Advanced Usage" -msgstr "Pokročilé používání" - -#. (itstool) path: info/title -#: C/vc-mode.page:5 -msgctxt "sort" -msgid "0" -msgstr "0" +#: C/folder-mode.page:36 +msgid "The folder comparison view" +msgstr "Zobrazení porovnání složek" -#. (itstool) path: page/title -#: C/vc-mode.page:16 -msgid "Viewing version-controlled files" -msgstr "Zobrazení souborů ze správy verzí" +#. (itstool) path: section/p +#: C/folder-mode.page:38 +msgid "" +"The main parts of a folder comparison are the trees showing the folders " +"you're comparing. You can easily move " +"around these comparisons to find changes that you're interested in. " +"When you select a file or folder, more detailed information is given in the " +"status bar at the bottom of the window. Pressing Enter on a " +"selected file, or double-clicking any file in the tree will open a side-by-" +"side file comparison of the files in a new " +"tab, but this will only work properly if they're text files!" +msgstr "" +"Hlavními částmi v porovnání složek jsou stromy zobrazující porovnávané " +"složky. V těchto porovnáních se můžete snadno pohybovat, abyste našli změny, které vás zajímají. Když vyberete " +"soubor nebo složku, na stavové liště ve spodní části okna se zobrazí " +"podrobné informace. Zmáčknutím klávesy Enter na vybraném souboru " +"nebo dvojitým kliknutím na libovolném souboru se otevře porovnávání souboru vedle sebe v nové kartě, ale rozumné " +"použití to má jen pro textové soubory." -#. (itstool) path: page/p -#: C/vc-mode.page:18 +#. (itstool) path: section/p +#: C/folder-mode.page:50 msgid "" -"Meld integrates with many version " -"control systems to let you review local changes and perform simple " -"version control tasks. You can start a new version control comparison by " -"selecting the FileNew... menu item, and clicking on the Version Control tab." +"There are bars on the left and right-hand sides of the window that show you " +"a simple coloured summary of the comparison results. Each file or folder in " +"the comparison corresponds to a small section of these bars, though " +"Meld doesn't show Same files so that it's easier to see " +"any actually important differences. You can click anywhere on this bar to " +"jump straight to that place in the comparison." msgstr "" -"Meld integruje řadu systémů pro " -"správu verzí, abyste si mohli prohlížet místně provedené změny a " -"provádět jednoduché činnosti ve správě verzí. Nové porovnávání správy verzí " -"můžete začít pomocí položky nabídky SouborNový… a kliknutím na kartu Správa verzí." +"Po levé i pravé straně okna se nachází lišty, které vám zobrazují jednoduchý " +"barevný přehled výsledků porovnávání. Každý soubor nebo složka v porovnání " +"odpovídají malému úseku lišty, přitom ale Meld nezobrazuje " +"stejné soubory, takže jsou lépe vidět opravdu podstatné rozdíly. Na " +"lištu můžete kdekoliv kliknout a dostat se tak přímo na místo v porovnání." #. (itstool) path: section/title -#: C/vc-mode.page:30 -msgid "Version control comparisons" -msgstr "Porovnávání správy verzí" +#: C/folder-mode.page:63 +msgid "Navigating folder comparisons" +msgstr "Pohyb v porovnávání složek" #. (itstool) path: section/p -#: C/vc-mode.page:32 +#: C/folder-mode.page:65 msgid "" -"Version control comparisons show the differences between the contents of " -"your folder and the current repository version. Each file in your local copy " -"has a state that indicates how it differs " -"from the repository copy." +"You can jump between changed files (that is, any files/folders that are " +"not classified as being identical) with the ChangesPrevious change " +"and ChangesNext " +"change menu items, or using the corresponding buttons on the " +"toolbar." msgstr "" -"Porovnání správy verzí zobrazuje rozdíly mezi obsahem vaší složky a aktuální " -"verzí v repozitáři. Každý soubor ve vaší místní kopii má stav, který určuje, jak se liší od kopie v repozitáři." +"Mezi změněnými soubory (to jsou všechny soubory/složky, které nejsou označené jako shodné) se můžete pohybovat pomocí položek nabídky " +"ZměnyPředchozí " +"změna a ZměnyNásledující změna nebo použít příslušné tlačítko " +"na nástrojové liště." #. (itstool) path: section/p -#: C/vc-mode.page:46 +#: C/folder-mode.page:73 msgid "" -"If you want to look at a particular file's differences, you can select it " -"and press Enter, or double-click the file to start a file comparison. You can also interact with your " -"version control system using the Changes menu." +"You can use the Left and Right arrow keys to move " +"between the folders you're comparing. This is useful so that you can select " +"an individual file for copying or deletion." msgstr "" -"Když se chcete podívat na rozdíly u konkrétního souboru, můžete jej vybrat a " -"zmáčknout Enter nebo na něj dvojitě kliknout a začne porovnávání souboru. Můžete take využí funkce svého " -"systému správy verzí přes nabídku Změny." +"Pomocí kláves ← a → můžete přecházet mezi složkami, " +"které porovnáváte. To se hodí, abyste mohli vybírat jednotlivé soubory ke " +"zkopírování nebo ke smazání." #. (itstool) path: section/title -#. (itstool) path: table/title -#: C/vc-mode.page:56 C/vc-mode.page:81 -msgid "Version control states" -msgstr "Stavy správy verzí" +#: C/folder-mode.page:83 +msgid "States in folder comparisons" +msgstr "Stavy při porovnávání složek" #. (itstool) path: section/p -#: C/vc-mode.page:58 +#: C/folder-mode.page:85 msgid "" -"Each file or folder in a version control comparison has a state, " -"obtained from the version control system itself. Meld maps these " -"different states into a standard set of very similar concepts. As such, " -"Meld might use slightly different names for states than your " -"version control system does. The possible states are:" -msgstr "" -"Každý soubor nebo složka v porovnání správy verzí má stav získaný " -"přímo ze systém správy verzí. Meld převádí tyto různé stavy na " -"standardní množinu stavů založené na podobném konceptu. Proto může používat " -"mírně odlišné názvy stavů, než používá váš systém správy verzí. Možné stavy " -"jsou:" +"Each file or folder in a tree has its own state, telling you how it " +"differed from its corresponding files/folders. The possible states are:" +msgstr "" +"Každý soubor či složka ve stromu má svůj vlastní stav, který vám " +"říká, jak se liší od svého protějšku. Možné stavy jsou:" + +#. (itstool) path: table/title +#: C/folder-mode.page:106 +msgid "Folder comparison states" +msgstr "Stavy při porovnávání složek" #. (itstool) path: td/p -#: C/vc-mode.page:85 C/folder-mode.page:110 -msgid "State" -msgstr "stav" +#: C/folder-mode.page:126 +msgid "The file/folder is the same across all compared folders." +msgstr "Soubor/složka je stejná ve všech porovnávaných složkách." #. (itstool) path: td/p -#: C/vc-mode.page:86 C/folder-mode.page:111 -msgid "Appearance" -msgstr "vzhled" +#: C/folder-mode.page:132 +msgid "Same when filtered" +msgstr "Stejné díky filtru" #. (itstool) path: td/p -#: C/vc-mode.page:87 C/folder-mode.page:112 -msgid "Meaning" -msgstr "význam" +#: C/folder-mode.page:134 +msgid "Italics" +msgstr "kurzíva" #. (itstool) path: td/p -#: C/vc-mode.page:95 C/folder-mode.page:120 -msgid "Normal font" -msgstr "normální písmo" +#: C/folder-mode.page:140 +msgid "" +"These files are different across folders, but once text filters are applied, these files become identical." +msgstr "" +"Tyto soubory se napříč složkami liší, ale díky použití textového filtru se tyto soubory jeví jako stejné." #. (itstool) path: td/p -#: C/vc-mode.page:101 -msgid "The file/folder is the same as the repository version." -msgstr "Soubor/složka jsou stejné jako verze v repozitáři." +#: C/folder-mode.page:150 +msgid "Blue and bold" +msgstr "modré a tučné" #. (itstool) path: td/p -#: C/vc-mode.page:109 -msgid "Red and bold" -msgstr "červené a tučné" +#: C/folder-mode.page:156 +msgid "These files differ between the folders being compared." +msgstr "Tyto soubory se liší mezi složkami, které jsou porovnávány." #. (itstool) path: td/p -#: C/vc-mode.page:115 -msgid "This file is different to the repository version." -msgstr "Tento soubor se liší od verze v repozitáři." +#: C/folder-mode.page:170 +msgid "This file/folder exists in this folder, but not in the others." +msgstr "Tento soubor/složka existuje v této složce, ale ne v ostatních." #. (itstool) path: td/p -#: C/vc-mode.page:123 C/folder-mode.page:164 -msgid "Green and bold" -msgstr "zelené a tučné" +#: C/folder-mode.page:178 +msgid "Greyed out text with a line through the middle" +msgstr "zašedlý středem přeškrtnutý text" #. (itstool) path: td/p -#: C/vc-mode.page:129 +#: C/folder-mode.page:184 msgid "" -"This file/folder is new, and is scheduled to be added to the repository." +"This file/folder doesn't exist in this folder, but does in one of the others." msgstr "" -"Tento soubor/složka jsou nové a je naplánováno jejich přidání do repozitáře." - -#. (itstool) path: td/p -#: C/vc-mode.page:136 -msgid "Removed" -msgstr "Odstraněno" +"Tento soubor/složka neexistuje v této složce, ale v některé z ostatních ano." #. (itstool) path: td/p -#: C/vc-mode.page:138 -msgid "Red bold text with a line through the middle" -msgstr "přeškrtnuté červené tučné" +#: C/folder-mode.page:199 +msgid "" +"When comparing this file, an error occurred. The most common error causes " +"are file permissions (i.e., Meld was not allowed to open the " +"file) and filename encoding errors." +msgstr "" +"Při porovnávání tohoto souboru nastala chyba. Nejčastější příčinou chyb jsou " +"oprávnění k souboru (tj. aplikaci Meld nebylo dovoleno soubor " +"otevřít) a chyby v kódování názvu souboru." -#. (itstool) path: td/p -#: C/vc-mode.page:144 +#. (itstool) path: section/p +#: C/folder-mode.page:217 msgid "" -"This file/folder existed, but is scheduled to be removed from the repository." +"You can filter out files based on these states, for example, to show only " +"files that have been Modified. You can read more about this in " +"." msgstr "" -"Tento soubor/složka existují, ale je naplánováno jejich odstranění z " -"repozitáře." +"Můžete odfiltrovat soubory na základě jejich stavu, například aby se " +"zobrazovaly jen soubory, které byly změněné. Více si o tom můžete " +"přečíst v kapitole ." -#. (itstool) path: td/p -#: C/vc-mode.page:151 -msgid "Conflict" -msgstr "Konflikt" +#. (itstool) path: section/p +#: C/folder-mode.page:223 +msgid "" +"Finally, the most recently modified file/folder has a small star emblem " +"attached to it." +msgstr "" +"Navíc mají nejnověji změněné soubory/složky připojen symbol v podobě " +"hvězdičky." -#. (itstool) path: td/p -#: C/vc-mode.page:153 -msgid "Bright red bold text" -msgstr "jasně červené a tučné" +#. (itstool) path: page/title +#: C/resolving-conflicts.page:15 +msgid "Resolving merge conflicts" +msgstr "Řešení konfliktů při slučování" -#. (itstool) path: td/p -#: C/vc-mode.page:159 +#. (itstool) path: page/p +#: C/resolving-conflicts.page:17 msgid "" -"When trying to merge with the repository, the differences between the local " -"file and the repository could not be resolved, and the file is now in " -"conflict with the repository contents" +"One of the best uses of Meld is to resolve conflicts that occur " +"while merging different branches." msgstr "" -"Když se pokoušíte o sloučení s repozitářem, nemusí být možné vyřešit rozdíly " -"mezi místním souborem a repozitářem a soubor se bude nacházet v konfliktu s " -"obsahem repozitáře." +"Jednou z nejlepších věcí na aplikaci Meld je řešení konfliktů, " +"které vznikají při slučování rozdílných větví." -#. (itstool) path: td/p -#: C/vc-mode.page:167 C/folder-mode.page:176 -msgid "Missing" -msgstr "Schází" +#. (itstool) path: page/p +#: C/resolving-conflicts.page:22 +msgid "" +"For example, when using Git, git mergetool will start " +"a 'merge helper'; Meld is one such helper. If you want to make " +"git mergetool use Meld by default, you can add" +msgstr "" +"Například, když používáte Git, git mergtool spustí " +"„pomocníka se slučováním“. Meld je jedním z možných takovýchto " +"pomocníků. Jestli chcete, aby git mergetool používal Meld jako výchozího pomocníka, můžete přidat" -#. (itstool) path: td/p -#: C/vc-mode.page:169 -msgid "Blue bold text with a line through the middle" -msgstr "modré tučné přeškrtnuté" +#. (itstool) path: page/code +#: C/resolving-conflicts.page:27 +#, no-wrap +msgid "" +"\n" +"[merge]\n" +" tool = meld\n" +msgstr "" +"\n" +"[merge]\n" +" tool = meld\n" -#. (itstool) path: td/p -#: C/vc-mode.page:175 -msgid "This file/folder should be present, but isn't." -msgstr "Tento soubor/složka by měli existovat, ale není tomu tak." +#. (itstool) path: page/p +#: C/resolving-conflicts.page:31 +msgid "" +"to .git/gitconfig. See the git mergetool manual for " +"details." +msgstr "" +"do souboru .git/gitconfig. Podrobnější informace viz příručka " +"ke git mergetool." -#. (itstool) path: td/p -#: C/vc-mode.page:181 -msgid "Ignored" -msgstr "Ignorováno" +#. (itstool) path: credit/years +#: C/preferences.page:12 +msgid "2013" +msgstr "2013" -#. (itstool) path: td/p -#: C/vc-mode.page:183 C/vc-mode.page:199 -msgid "Greyed out text" -msgstr "zašedlý text" +#. (itstool) path: page/title +#: C/preferences.page:15 +msgid "Meld's preferences" +msgstr "Předvolby Meld" -#. (itstool) path: td/p -#: C/vc-mode.page:189 -msgid "" -"This file/folder has been explicitly ignored (e.g., by an entry in ." -"gitignore) and is not being tracked by version control." -msgstr "" -"Pro tento soubor/složku bylo určeno, že se mají ignorovat (tj. záznamem v " -".gitignore) a nejsou sledovány správou verzí." +#. (itstool) path: terms/title +#: C/preferences.page:18 +msgid "Editor preferences" +msgstr "Předvolby editoru" -#. (itstool) path: td/p -#: C/vc-mode.page:197 -msgid "Unversioned" -msgstr "Neverzováno" +#. (itstool) path: item/title +#: C/preferences.page:20 +msgid "Editor command" +msgstr "Příkaz editoru" -#. (itstool) path: td/p -#: C/vc-mode.page:205 +#. (itstool) path: item/p +#: C/preferences.page:21 msgid "" -"This file is not in the version control system; it is only in the local copy." +"The name of the command to run to open text files in an external editor. " +"This may be just the command (e.g., gedit) in which case the file " +"to be opened will be passed as the last argument. Alternatively, you can add " +"{file} and {line} elements to the command, in " +"which case Meld will substitute the file path and current line " +"number respectively (e.g., gedit {file}:{line})." msgstr "" -"Tento soubor není v systému správy verzí, nachází se pouze v místní kopii." +"Název příkazu, který provede otevření textových souborů v externím editoru. " +"Stačí samotný příkaz (např. gedit), a otevíraný soubor je pak " +"předán jako poslední argument. Nebo případně můžete do příkazu přidat " +"{file} a {line}, které pak Meld " +"nahradí názvem souboru včetně cesty, respektive číslem aktuálního řádku. " +"(např. gedit {file}:{line})." -#. (itstool) path: td/p -#: C/vc-mode.page:212 C/folder-mode.page:191 -msgid "Error" -msgstr "Chyba" +#. (itstool) path: terms/title +#: C/preferences.page:31 +msgid "Folder Comparison preferences" +msgstr "Předvolby porovnávání složek" -#. (itstool) path: td/p -#: C/vc-mode.page:214 C/folder-mode.page:193 -msgid "Bright red with a yellow background and bold" -msgstr "světle červený tučný text na žlutém pozadí" +#. (itstool) path: item/title +#: C/preferences.page:33 +msgid "Apply text filters during folder comparisons" +msgstr "Použití textových filtrů při porovnávání složek" -#. (itstool) path: td/p -#: C/vc-mode.page:220 -msgid "The version control system has reported a problem with this file." -msgstr "Systém správy verzí oznámil problém s tímto souborem." +#. (itstool) path: item/p +#: C/preferences.page:34 +msgid "" +"When comparing files in folder comparison mode, text filters and other text " +"manipulation options can be applied to the contents of files. If this option " +"is enabled, all currently enabled text filters will be applied, the blank " +"line trimming option will be applied as appropriate, and differences in line " +"endings will be ignored." +msgstr "" +"Když se porovnávají soubory v režimu porovnávání složek, mohou být na obsah " +"souborů použity filtry a další možnosti práce s textem. Pokud je tato volba " +"zapnutá, všechny zapnuté textové filtry se použijí, bude příslušně použita " +"volba ořezávání prázných řádků a rozdíly v zakončeních řádků budou " +"ignorovány." -#. (itstool) path: section/title -#: C/vc-mode.page:230 -msgid "Version control state filtering" -msgstr "Filtrování stavu ve správě verzí" +#. (itstool) path: item/p +#: C/preferences.page:40 +msgid "" +"Enabling this option means that Meld must fully read all non-" +"binary files into memory during the folder comparison. With large text " +"files, this can be slow and may cause memory issues." +msgstr "" +"Zapnutí této volby znamená, že Meld musí během porovnávání složek " +"načíst všechny nebinární soubory kompletně do paměti. U rozsáhlých textových " +"souborů to může způsobit problémy v podobě zpomalení a velké spotřeby paměti." -#. (itstool) path: section/p -#: C/vc-mode.page:232 +#. (itstool) path: item/p +#: C/preferences.page:44 msgid "" -"Most often, you will only want to see files that are identified as being in " -"some way different; this is the default setting in Meld. You can " -"change which file states you see by using the ViewVersion Status menu, or " -"by clicking the corresponding Modified, Normal, Unversioned and " -"Ignored buttons on the toolbar." +"This option only has an effect if \"Compare files based only on size and " +"timestamp\" is not enabled." msgstr "" -"Velmi často budete chtít vidět jen soubory, u kterých bylo zjištěno, že se " -"nějakým způsobem liší. Proto se jedná o výchozí nastavení aplikace " -"Meld. Které stavy chcete vidět, můžete změnit pomocí nabídky " -"ZobrazitStav " -"verze nebo kliknutím na příslušné tlačítko Změněno, Normální, Neverzováno a Ignorováno na nástrojové " -"liště." +"Tato volba má význam, jen když není zapnuto „Porovnávat soubory jen na " +"základě velikosti a časového razítka“." #. (itstool) path: page/title #: C/keyboard-shortcuts.page:15 @@ -1437,414 +1690,161 @@ msgid "" "keyseq>)" msgstr "" "Přejít na předchozí rozdíl (také CtrlE)" - -#. (itstool) path: table/title -#: C/keyboard-shortcuts.page:105 -msgid "Shortcuts for folder comparison" -msgstr "Klávesové zkratky pro porovnávání složek" - -#. (itstool) path: td/p -#: C/keyboard-shortcuts.page:115 -msgid "+" -msgstr "+" - -#. (itstool) path: td/p -#: C/keyboard-shortcuts.page:116 -msgid "Expand the current folder." -msgstr "Rozbalit aktuální složku" - -#. (itstool) path: td/p -#: C/keyboard-shortcuts.page:119 -msgid "-" -msgstr "-" - -#. (itstool) path: td/p -#: C/keyboard-shortcuts.page:120 -msgid "Collapse the current folder." -msgstr "Sbalit aktuální složku" - -#. (itstool) path: table/title -#: C/keyboard-shortcuts.page:127 -msgid "Shortcuts for view settings" -msgstr "Klávesové zkratky pro zobrazení nastavení" - -#. (itstool) path: td/p -#: C/keyboard-shortcuts.page:137 -msgid "Escape" -msgstr "Esc" - -#. (itstool) path: td/p -#: C/keyboard-shortcuts.page:138 -msgid "Stop the current comparison." -msgstr "Zastavit aktuální porovnávání" - -#. (itstool) path: td/p -#: C/keyboard-shortcuts.page:141 -msgid "CtrlR" -msgstr "CtrlR" - -#. (itstool) path: td/p -#: C/keyboard-shortcuts.page:142 -msgid "Refresh the current comparison." -msgstr "Aktualizovat aktuální porovnávání" - -#. (itstool) path: table/title -#: C/keyboard-shortcuts.page:149 -msgid "Shortcuts for help" -msgstr "Klávesové zkratky pro nápovědu" - -#. (itstool) path: td/p -#: C/keyboard-shortcuts.page:159 -msgid "F1" -msgstr "F1" - -#. (itstool) path: td/p -#: C/keyboard-shortcuts.page:160 -msgid "Open Meld's user manual." -msgstr "Otevřít uživatelskou příručku Meld" - -#. (itstool) path: page/title -#: C/introduction.page:15 -msgid "What is Meld?" -msgstr "Co je to Meld?" - -#. (itstool) path: page/p -#: C/introduction.page:16 -msgid "" -"Meld is a tool for comparing files and directories, and for " -"resolving differences between them. It is also useful for comparing changes " -"captured by version control systems." -msgstr "" -"Meld je nástroj sloužící k porovnávání souborů a složek a řešení " -"rozdílů mezi nimi. Hodí se také k porovnání změn provedených v rámci systémů " -"pro správu verzí." - -#. (itstool) path: page/p -#: C/introduction.page:22 -msgid "" -"Meld shows differences between two or three files (or two or " -"three directories) and allows you to move content between them, or edit the " -"files manually. Meld's focus is on helping developers compare and " -"merge source files, and get a visual overview of changes in their favourite " -"version control system." -msgstr "" -"Meld zobrazuje rozdíly mezi dvěma nebo třemi soubory (či dvěma " -"nebo třemi složkami) a umožňuje mezi nimi přesouvat obsah nebo soubory ručně " -"upravit. Cílem aplikace Meld je pomoci vývojářům porovnávat a " -"slučovat soubory se zdrojovými kódy a získat vizuální přehled o změnách v " -"jejich oblíbeném systému správy verzí." - -#. (itstool) path: page/title -#: C/folder-mode.page:16 -msgid "Getting started comparing folders" -msgstr "Začínáme s porovnáváním složek" - -#. (itstool) path: page/p -#: C/folder-mode.page:18 -msgid "" -"Meld lets you compare two or three folders side-by-side. You can " -"start a new folder comparison by selecting the FileNew... menu item, and " -"clicking on the Directory Comparison tab." -msgstr "" -"Meld umožňuje porovnávat dvě nebo tři složky vedle sebe. Nové " -"porovnávání složek začnete přes položku nabídky SouborNový… a kliknutím na " -"kartu Porovnávání složek." - -#. (itstool) path: page/p -#: C/folder-mode.page:26 -msgid "" -"Your selected folders will be shown as side-by-side trees, with differences " -"between files in each folder highlighted. You can copy or delete files from " -"either folder, or compare individual text files in more detail." -msgstr "" -"Vybrané složky budou zobrazeny jako stromové struktury vedle sebe a rozdíly " -"mezi soubory v každé složce budou zvýrazněny. Soubory v každé ze složek " -"můžete kopírovat a mazat, případně si u textových souborů zobrazit rozdíly " -"podrobně." - -#. (itstool) path: section/title -#: C/folder-mode.page:36 -msgid "The folder comparison view" -msgstr "Zobrazení porovnání složek" - -#. (itstool) path: section/p -#: C/folder-mode.page:38 -msgid "" -"The main parts of a folder comparison are the trees showing the folders " -"you're comparing. You can easily move " -"around these comparisons to find changes that you're interested in. " -"When you select a file or folder, more detailed information is given in the " -"status bar at the bottom of the window. Pressing Enter on a " -"selected file, or double-clicking any file in the tree will open a side-by-" -"side file comparison of the files in a new " -"tab, but this will only work properly if they're text files!" -msgstr "" -"Hlavními částmi v porovnání složek jsou stromy zobrazující porovnávané " -"složky. V těchto porovnáních se můžete snadno pohybovat, abyste našli změny, které vás zajímají. Když vyberete " -"soubor nebo složku, na stavové liště ve spodní části okna se zobrazí " -"podrobné informace. Zmáčknutím klávesy Enter na vybraném souboru " -"nebo dvojitým kliknutím na libovolném souboru se otevře porovnávání souboru vedle sebe v nové kartě, ale rozumné " -"použití to má jen pro textové soubory." - -#. (itstool) path: section/p -#: C/folder-mode.page:50 -msgid "" -"There are bars on the left and right-hand sides of the window that show you " -"a simple coloured summary of the comparison results. Each file or folder in " -"the comparison corresponds to a small section of these bars, though " -"Meld doesn't show Same files so that it's easier to see " -"any actually important differences. You can click anywhere on this bar to " -"jump straight to that place in the comparison." -msgstr "" -"Po levé i pravé straně okna se nachází lišty, které vám zobrazují jednoduchý " -"barevný přehled výsledků porovnávání. Každý soubor nebo složka v porovnání " -"odpovídají malému úseku lišty, přitom ale Meld nezobrazuje " -"stejné soubory, takže jsou lépe vidět opravdu podstatné rozdíly. Na " -"lištu můžete kdekoliv kliknout a dostat se tak přímo na místo v porovnání." - -#. (itstool) path: section/title -#: C/folder-mode.page:63 -msgid "Navigating folder comparisons" -msgstr "Pohyb v porovnávání složek" - -#. (itstool) path: section/p -#: C/folder-mode.page:65 -msgid "" -"You can jump between changed files (that is, any files/folders that are " -"not classified as being identical) with the ChangesPrevious change " -"and ChangesNext " -"change menu items, or using the corresponding buttons on the " -"toolbar." -msgstr "" -"Mezi změněnými soubory (to jsou všechny soubory/složky, které nejsou označené jako shodné) se můžete pohybovat pomocí položek nabídky " -"ZměnyPředchozí " -"změna a ZměnyNásledující změna nebo použít příslušné tlačítko " -"na nástrojové liště." - -#. (itstool) path: section/p -#: C/folder-mode.page:73 -msgid "" -"You can use the Left and Right arrow keys to move " -"between the folders you're comparing. This is useful so that you can select " -"an individual file for copying or deletion." -msgstr "" -"Pomocí kláves ← a → můžete přecházet mezi složkami, " -"které porovnáváte. To se hodí, abyste mohli vybírat jednotlivé soubory ke " -"zkopírování nebo ke smazání." - -#. (itstool) path: section/title -#: C/folder-mode.page:83 -msgid "States in folder comparisons" -msgstr "Stavy při porovnávání složek" - -#. (itstool) path: section/p -#: C/folder-mode.page:85 -msgid "" -"Each file or folder in a tree has its own state, telling you how it " -"differed from its corresponding files/folders. The possible states are:" -msgstr "" -"Každý soubor či složka ve stromu má svůj vlastní stav, který vám " -"říká, jak se liší od svého protějšku. Možné stavy jsou:" +"keyseq>)" #. (itstool) path: table/title -#: C/folder-mode.page:106 -msgid "Folder comparison states" -msgstr "Stavy při porovnávání složek" +#: C/keyboard-shortcuts.page:105 +msgid "Shortcuts for folder comparison" +msgstr "Klávesové zkratky pro porovnávání složek" #. (itstool) path: td/p -#: C/folder-mode.page:126 -msgid "The file/folder is the same across all compared folders." -msgstr "Soubor/složka je stejná ve všech porovnávaných složkách." +#: C/keyboard-shortcuts.page:115 +msgid "+" +msgstr "+" #. (itstool) path: td/p -#: C/folder-mode.page:132 -msgid "Same when filtered" -msgstr "Stejné díky filtru" +#: C/keyboard-shortcuts.page:116 +msgid "Expand the current folder." +msgstr "Rozbalit aktuální složku" #. (itstool) path: td/p -#: C/folder-mode.page:134 -msgid "Italics" -msgstr "kurzíva" +#: C/keyboard-shortcuts.page:119 +msgid "-" +msgstr "-" #. (itstool) path: td/p -#: C/folder-mode.page:140 -msgid "" -"These files are different across folders, but once text filters are applied, these files become identical." -msgstr "" -"Tyto soubory se napříč složkami liší, ale díky použití textového filtru se tyto soubory jeví jako stejné." +#: C/keyboard-shortcuts.page:120 +msgid "Collapse the current folder." +msgstr "Sbalit aktuální složku" -#. (itstool) path: td/p -#: C/folder-mode.page:150 -msgid "Blue and bold" -msgstr "modré a tučné" +#. (itstool) path: table/title +#: C/keyboard-shortcuts.page:127 +msgid "Shortcuts for view settings" +msgstr "Klávesové zkratky pro zobrazení nastavení" #. (itstool) path: td/p -#: C/folder-mode.page:156 -msgid "These files differ between the folders being compared." -msgstr "Tyto soubory se liší mezi složkami, které jsou porovnávány." +#: C/keyboard-shortcuts.page:137 +msgid "Escape" +msgstr "Esc" #. (itstool) path: td/p -#: C/folder-mode.page:170 -msgid "This file/folder exists in this folder, but not in the others." -msgstr "Tento soubor/složka existuje v této složce, ale ne v ostatních." +#: C/keyboard-shortcuts.page:138 +msgid "Stop the current comparison." +msgstr "Zastavit aktuální porovnávání" #. (itstool) path: td/p -#: C/folder-mode.page:178 -msgid "Greyed out text with a line through the middle" -msgstr "zašedlý středem přeškrtnutý text" +#: C/keyboard-shortcuts.page:141 +msgid "CtrlR" +msgstr "CtrlR" #. (itstool) path: td/p -#: C/folder-mode.page:184 -msgid "" -"This file/folder doesn't exist in this folder, but does in one of the others." -msgstr "" -"Tento soubor/složka neexistuje v této složce, ale v některé z ostatních ano." +#: C/keyboard-shortcuts.page:142 +msgid "Refresh the current comparison." +msgstr "Aktualizovat aktuální porovnávání" -#. (itstool) path: td/p -#: C/folder-mode.page:199 -msgid "" -"When comparing this file, an error occurred. The most common error causes " -"are file permissions (i.e., Meld was not allowed to open the " -"file) and filename encoding errors." -msgstr "" -"Při porovnávání tohoto souboru nastala chyba. Nejčastější příčinou chyb jsou " -"oprávnění k souboru (tj. aplikaci Meld nebylo dovoleno soubor " -"otevřít) a chyby v kódování názvu souboru." +#. (itstool) path: table/title +#: C/keyboard-shortcuts.page:149 +msgid "Shortcuts for help" +msgstr "Klávesové zkratky pro nápovědu" -#. (itstool) path: section/p -#: C/folder-mode.page:217 -msgid "" -"You can filter out files based on these states, for example, to show only " -"files that have been Modified. You can read more about this in " -"." -msgstr "" -"Můžete odfiltrovat soubory na základě jejich stavu, například aby se " -"zobrazovaly jen soubory, které byly změněné. Více si o tom můžete " -"přečíst v kapitole ." +#. (itstool) path: td/p +#: C/keyboard-shortcuts.page:159 +msgid "F1" +msgstr "F1" -#. (itstool) path: section/p -#: C/folder-mode.page:223 -msgid "" -"Finally, the most recently modified file/folder has an small star emblem " -"attached to it." -msgstr "" -"Navíc mají nejnověji změněné soubory/složky připojen symbol v podobě " -"hvězdičky." +#. (itstool) path: td/p +#: C/keyboard-shortcuts.page:160 +msgid "Open Meld's user manual." +msgstr "Otevřít uživatelskou příručku Meld" #. (itstool) path: page/title -#: C/missing-functionality.page:15 -msgid "Things that Meld doesn't do" -msgstr "Věci, které Meld nedělá" - -#. (itstool) path: page/p -#: C/missing-functionality.page:17 -msgid "" -"Have you ever spent half an hour poking around an application trying to find " -"out how to do something, thinking that surely there must be an " -"option for this?" -msgstr "" -"Strávili jste hodinu a půl prozkoumáváním aplikace ve snaze najít, jak se " -"udělá jedna konkrétní věc, protože jste si byli jistí, že to musí " -"nějak jít?" +#: C/file-changes.page:16 +msgid "Dealing with changes" +msgstr "Práce se změnami" #. (itstool) path: page/p -#: C/missing-functionality.page:23 +#: C/file-changes.page:18 msgid "" -"This section lists a few of the common things that Meld " -"doesn't do, either as a deliberate choice, or because we just " -"haven't had time." +"Meld deals with differences between files as a list of change " +"blocks or more simply changes. Each change is a group of lines " +"which correspond between files. Since these changes are what you're usually " +"interested in, Meld gives you specific tools to navigate between " +"these changes and to edit them. You can find these tools in the Changes menu." msgstr "" -"Tato část uvádí několik běžných věcí, které Meld nedělá, " -"ať už záměrně nebo proto, že na ně ještě nebyl čas." +"Meld se chová ke změnám mezi soubory jako k seznamu bloků " +"změn, zkráceně jen změn. Každá změna sestává ze skupiny řádků, " +"které si mezi soubory odpovídají. Protože právě tyto změny jsou obvykle to, " +"co vás zajímá, poskytuje Meld nástroje pro přecházení mezi nimi a " +"pro jejich úpravy. Tyto nástroje najdete v nabídce Změny." #. (itstool) path: section/title -#: C/missing-functionality.page:30 -msgid "Aligning changes by adding lines" -msgstr "Zarovnávání změn přidáním řádků" +#: C/file-changes.page:30 +msgid "Navigating between changes" +msgstr "Pohyb mezi změnami" #. (itstool) path: section/p -#: C/missing-functionality.page:31 +#: C/file-changes.page:32 msgid "" -"When Meld shows differences between files, it shows both files as " -"they would appear in a normal text editor. It does not insert " -"additional lines so that the left and right sides of a particular change are " -"the same size. There is no option to do this." +"You can navigate between changes with the ChangesPrevious change and " +"ChangesNext " +"change menu items. You can also use your mouse's scroll wheel " +"to move between changes, by scrolling on the central change bar." msgstr "" -"Když Meld zobrazuje rozdíly mezi soubory, zobrazuje oba soubory " -"stejným způsobem jako běžný textový editor. Nevkládá žádné " -"dodatečné řádky, aby levá a pravá strana se změnami měly stejnou velikost. " -"Není k dispozici ani žádná volba, která by to dělala." +"Mezi změnami se můžete pohybovat pomocí položek nabídky ZměnyPředchozí změna a " +"ZměnyNásledující " +"změna. Můžete také použít kolečko myši nad středovou lištou " +"se změnami." -#. (itstool) path: page/title -#: C/command-line.page:15 -msgid "Command line usage" -msgstr "Použití příkazového řádku" +#. (itstool) path: section/title +#: C/file-changes.page:46 +msgid "Changing changes" +msgstr "Změna změn" -#. (itstool) path: page/p -#: C/command-line.page:17 +#. (itstool) path: section/p +#: C/file-changes.page:48 msgid "" -"If you start Meld from the command line, you can tell it what to " -"do when it starts." +"In addition to directly editing text files, Meld gives you tools " +"to move, copy or delete individual differences between files. The bar " +"between two files not only shows you what parts of the two files correspond, " +"but also lets you selectively merge or delete differing changes by clicking " +"the arrow or cross icons next to the start of each change." msgstr "" -"Když spouštíte Meld z příkazové řádky, můžete mu říct, co má po " -"spuštění udělat." +"Mimo přímých úprav textu vám Meld poskytuje nástroje pro přesun, " +"kopírování nebo mazání jednotlivých rozdílů mezi soubory. Lišta mezi dvěma " +"soubory nejen zobrazuje, které části těchto souborů si navzájem odpovídají, " +"ale také umožňuje cíleně slučovat nebo mazat rozdílové změny kliknutím na " +"ikonu se šipkou nebo křížkem vedle začátku každé změny." -#. (itstool) path: page/p -#: C/command-line.page:20 +#. (itstool) path: section/p +#: C/file-changes.page:52 msgid "" -"For a two- or three-way file comparison, " -"start Meld with meld file1 file2 " -"or meld file1 file2 file3 " -"respectively." +"The default action is replace. This action replaces the contents of " +"the corresponding change with the current change." msgstr "" -"Pro dvoj nebo trojcestné porovnání souborů " -"spusťte Meld pomocí meld soubor1 soubor2 respektive meld soubor1 soubor2 " -"soubor3." +"Výchozí činností je nahrazení. Tím se nahradí obsah odpovídající " +"změny aktuální změnou." -#. (itstool) path: page/p -#: C/command-line.page:26 +#. (itstool) path: section/p +#: C/file-changes.page:59 msgid "" -"For a two- or three-way directory comparison, start Meld with meld dir1 dir2 or meld dir1 dir2 dir3." +"Hold down the Shift key to change the current action to " +"delete. This action deletes the current change." msgstr "" -"Pro dvoj nebo trojcestné porovnání složek " -"spusťte Meld pomocí meld složka1 složka2 respektive meld složka1 složka2 " -"složka3." +"Přidržením klávesy Shift změníte aktuální činnost na smazat. Touto činností se smažou současné změny." -#. (itstool) path: page/p -#: C/command-line.page:31 +#. (itstool) path: section/p +#: C/file-changes.page:62 msgid "" -"You can start a version control comparison by " -"just giving a single argument; if that file or directory is managed by a " -"recognized version control system, it " -"will start a version control comparison on that argument. For example, " -"meld . would start a version control view of the current " -"directory." -msgstr "" -"Porovnání ve správě verzí můžete spustit " -"zadání pouhého jednoho argumentu. Pokud je zadaný soubor nebo složka " -"spravována některým rozpoznaným systémem správy " -"verzí, spustí se porovnání tohoto argumentu ve správě verzí. " -"Například meld . by spustilo zobrazení správy verzí pro aktuální " -"složku." - -#. (itstool) path: note/p -#: C/command-line.page:40 -msgid "Run meld --help for a list of all command line options." +"Hold down the Ctrl key to change the current action to " +"insert. This action inserts the current change above or below (as " +"selected) the corresponding change." msgstr "" -"Spuštěním meld --help si můžete vypsat všechny možnosti " -"příkazového řádku." +"Přidržením klávesy Ctrl změníte aktuální činnost na vložit. Touto činností se současné změny vloží nad nebo pod (podle výběru) " +"odpovídající změny." From 5f1307f650511915241118b108d5fc28b3891bef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bal=C3=A1zs=20=C3=9Ar?= Date: Wed, 15 Mar 2017 17:08:52 +0000 Subject: [PATCH 0151/1316] Update Hungarian translation --- po/hu.po | 792 ++++++++++--------------------------------------------- 1 file changed, 141 insertions(+), 651 deletions(-) diff --git a/po/hu.po b/po/hu.po index fdebae67..127e4264 100644 --- a/po/hu.po +++ b/po/hu.po @@ -1,35 +1,36 @@ # Hungarian translation of Meld. # This file is distributed under the same license as the Meld package. -# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013. Free Software Foundation, Inc. +# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017. Free Software Foundation, Inc. # # CSÉCSY László , 2005. # Gabor Kelemen , 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013, 2014, 2015, 2016. +# Balázs Úr , 2017. msgid "" msgstr "" "Project-Id-Version: meld master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" "product=meld&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-09-30 23:28+0000\n" -"PO-Revision-Date: 2016-10-01 22:03+0200\n" -"Last-Translator: Meskó Balázs \n" +"POT-Creation-Date: 2017-03-10 23:07+0000\n" +"PO-Revision-Date: 2017-03-15 18:07+0100\n" +"Last-Translator: Balázs Úr \n" "Language-Team: Hungarian \n" "Language: hu\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 1.8.8\n" +"X-Generator: Lokalize 1.2\n" -#: ../bin/meld:142 +#: ../bin/meld:179 msgid "Cannot import: " msgstr "Nem importálható: " -#: ../bin/meld:145 +#: ../bin/meld:182 #, c-format msgid "Meld requires %s or higher." msgstr "A Meld futásához %s vagy újabb szükséges." -#: ../bin/meld:191 +#: ../bin/meld:227 #, c-format msgid "" "Couldn't load Meld-specific CSS (%s)\n" @@ -292,7 +293,7 @@ msgid "" msgstr "" "Oszlopnevek listája a mappa-összehasonlításban, és hogy megjelenítendők-e." -#: ../data/org.gnome.meld.gschema.xml.h:39 ../data/ui/preferences.ui.h:32 +#: ../data/org.gnome.meld.gschema.xml.h:39 ../data/ui/preferences.ui.h:25 msgid "Ignore symbolic links" msgstr "Szimbolikus linkek figyelmen kívül hagyása" @@ -334,7 +335,7 @@ msgstr "" "számítanának. Ez eltérő időbélyeg-felbontással rendelkező fájlrendszereken " "lévő fájlok összehasonlításakor hasznos." -#: ../data/org.gnome.meld.gschema.xml.h:45 ../data/ui/preferences.ui.h:30 +#: ../data/org.gnome.meld.gschema.xml.h:45 ../data/ui/preferences.ui.h:22 msgid "Apply text filters during folder comparisons" msgstr "Szövegszűrők alkalmazása mappa-összehasonlításkor" @@ -569,7 +570,7 @@ msgstr "Másolás a jobb oldalra" msgid "Delete selected" msgstr "Kijelölt törlése" -#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:858 ../meld/filediff.py:1382 +#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:858 ../meld/filediff.py:1336 msgid "Hide" msgstr "Elrejtés" @@ -860,8 +861,8 @@ 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" -#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:940 ../meld/filediff.py:1448 -#: ../meld/filediff.py:1520 +#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:940 ../meld/filediff.py:1402 +#: ../meld/filediff.py:1474 msgid "_Cancel" msgstr "Mé_gse" @@ -897,7 +898,7 @@ msgstr "Visszavonja a dokumentumok mentetlen változtatásait?" msgid "Changes made to the following documents will be permanently lost:\n" msgstr "A következő dokumentumok változásai véglegesen elvesznek:\n" -#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:941 ../meld/filediff.py:1449 +#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:941 ../meld/filediff.py:1403 msgid "_Replace" msgstr "_Csere" @@ -945,7 +946,7 @@ msgstr "Formázás foltként" msgid "Copy to Clipboard" msgstr "Másolás vágólapra" -#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:155 +#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:154 msgid "Save Patch" msgstr "Folt mentése" @@ -966,166 +967,140 @@ msgid "_Reverse patch direction" msgstr "F_olt irányának megfordítása" #: ../data/ui/preferences.ui.h:1 -msgid "Left is remote, right is local" -msgstr "Bal a távoli, jobb a helyi" - -#: ../data/ui/preferences.ui.h:2 -msgid "Left is local, right is remote" -msgstr "Bal a helyi, jobb a távoli" - -#: ../data/ui/preferences.ui.h:3 -msgid "Remote, merge, local" -msgstr "Távoli, összefésült, helyi" - -#: ../data/ui/preferences.ui.h:4 -msgid "Local, merge, remote" -msgstr "Helyi, összefésült, távoli" - -#: ../data/ui/preferences.ui.h:5 -msgid "1ns (ext4)" -msgstr "1ns (ext4)" - -#: ../data/ui/preferences.ui.h:6 -msgid "100ns (NTFS)" -msgstr "100ns (NTFS)" - -#: ../data/ui/preferences.ui.h:7 -msgid "1s (ext2/ext3)" -msgstr "1s (ext2/ext3)" - -#: ../data/ui/preferences.ui.h:8 -msgid "2s (VFAT)" -msgstr "2s (VFAT)" - -#: ../data/ui/preferences.ui.h:9 msgid "Meld Preferences" msgstr "A Meld beállításai" -#: ../data/ui/preferences.ui.h:10 +#: ../data/ui/preferences.ui.h:2 msgid "Font" msgstr "Betűkészlet" -#: ../data/ui/preferences.ui.h:11 +#: ../data/ui/preferences.ui.h:3 msgid "_Use the system fixed width font" msgstr "A rendszer rögzített szélességű betűkészletének _használata" -#: ../data/ui/preferences.ui.h:12 +#: ../data/ui/preferences.ui.h:4 msgid "_Editor font:" msgstr "Sz_erkesztő betűkészlete:" -#: ../data/ui/preferences.ui.h:13 +#: ../data/ui/preferences.ui.h:5 msgid "Display" msgstr "Megjelenítés" -#: ../data/ui/preferences.ui.h:14 +#: ../data/ui/preferences.ui.h:6 msgid "_Tab width:" msgstr "_Tabulátorok szélessége:" -#: ../data/ui/preferences.ui.h:15 +#: ../data/ui/preferences.ui.h:7 msgid "_Insert spaces instead of tabs" msgstr "Tabulátorok helyett s_zóközök beszúrása" -#: ../data/ui/preferences.ui.h:16 +#: ../data/ui/preferences.ui.h:8 msgid "Enable text _wrapping" msgstr "_Sortörés engedélyezése" -#: ../data/ui/preferences.ui.h:17 +#: ../data/ui/preferences.ui.h:9 msgid "Do not _split words over two lines" msgstr "Ne _törje a szavakat két sorba" -#: ../data/ui/preferences.ui.h:18 +#: ../data/ui/preferences.ui.h:10 msgid "Highlight _current line" msgstr "A jelenlegi s_or kiemelése" -#: ../data/ui/preferences.ui.h:19 +#: ../data/ui/preferences.ui.h:11 msgid "Show _line numbers" msgstr "S_orszámok megjelenítése" -#: ../data/ui/preferences.ui.h:20 +#: ../data/ui/preferences.ui.h:12 msgid "Show w_hitespace" msgstr "Ü_res helyek megjelenítése" -#: ../data/ui/preferences.ui.h:21 +#: ../data/ui/preferences.ui.h:13 msgid "Use s_yntax highlighting" msgstr "S_zintaxiskiemelés használata" -#: ../data/ui/preferences.ui.h:22 +#: ../data/ui/preferences.ui.h:14 msgid "Syntax highlighting color scheme:" msgstr "Szintaxiskiemelés színsémája:" -#: ../data/ui/preferences.ui.h:23 +#: ../data/ui/preferences.ui.h:15 msgid "External Editor" msgstr "Külső szerkesztő" -#: ../data/ui/preferences.ui.h:24 +#: ../data/ui/preferences.ui.h:16 msgid "Use _default system editor" msgstr "Alapértelmezett _rendszerszerkesztő használata" -#: ../data/ui/preferences.ui.h:25 +#: ../data/ui/preferences.ui.h:17 msgid "Edito_r command:" msgstr "Szerkesztő_parancs:" -#: ../data/ui/preferences.ui.h:26 +#: ../data/ui/preferences.ui.h:18 msgid "Editor" msgstr "Szerkesztő" -#: ../data/ui/preferences.ui.h:27 +#: ../data/ui/preferences.ui.h:19 msgid "Shallow Comparison" msgstr "Sekély összehasonlítás" -#: ../data/ui/preferences.ui.h:28 +#: ../data/ui/preferences.ui.h:20 msgid "C_ompare files based only on size and timestamp" msgstr "_Fájlok összehasonlítása csak méret és időbélyeg alapján" -#: ../data/ui/preferences.ui.h:29 +#: ../data/ui/preferences.ui.h:21 msgid "_Timestamp resolution:" msgstr "_Időbélyeg felbontása:" -#: ../data/ui/preferences.ui.h:31 +#: ../data/ui/preferences.ui.h:23 +msgid "Note: enabling text filters may make comparing large files much slower" +msgstr "" +"Megjegyzés: a szövegszűrők engedélyezése sokkal lassabbá teszi a nagy fájlok " +"összehasonlítását" + +#: ../data/ui/preferences.ui.h:24 msgid "Symbolic Links" msgstr "Szimbolikus linkek" -#: ../data/ui/preferences.ui.h:33 +#: ../data/ui/preferences.ui.h:26 msgid "Visible Columns" msgstr "Látható oszlopok" -#: ../data/ui/preferences.ui.h:34 +#: ../data/ui/preferences.ui.h:27 msgid "Folder Comparisons" msgstr "Mappa-összehasonlítás" -#: ../data/ui/preferences.ui.h:35 +#: ../data/ui/preferences.ui.h:28 msgid "Version Comparisons" msgstr "Verzió-összehasonlítás" -#: ../data/ui/preferences.ui.h:36 +#: ../data/ui/preferences.ui.h:29 msgid "_Order when comparing file revisions:" msgstr "So_rrend fájlrevíziók összehasonlításakor:" -#: ../data/ui/preferences.ui.h:37 +#: ../data/ui/preferences.ui.h:30 msgid "Order when _merging files:" msgstr "Sorrend _fájlok összefésülésekor:" -#: ../data/ui/preferences.ui.h:38 +#: ../data/ui/preferences.ui.h:31 msgid "Commit Messages" msgstr "Kommit üzenetek" -#: ../data/ui/preferences.ui.h:39 +#: ../data/ui/preferences.ui.h:32 msgid "Show _right margin at:" msgstr "_Jobb margó megjelenítése:" -#: ../data/ui/preferences.ui.h:40 +#: ../data/ui/preferences.ui.h:33 msgid "Automatically _break lines at right margin on commit" msgstr "Sorok a_utomatikus tördelése a jobb margónál kommitkor" -#: ../data/ui/preferences.ui.h:41 +#: ../data/ui/preferences.ui.h:34 msgid "Version Control" msgstr "Verziókövetés" -#: ../data/ui/preferences.ui.h:42 +#: ../data/ui/preferences.ui.h:35 msgid "Filename filters" msgstr "Fájlnévszűrők" -#: ../data/ui/preferences.ui.h:43 +#: ../data/ui/preferences.ui.h:36 msgid "" "When performing directory comparisons, you may filter out files and " "directories by name. Each pattern is a list of shell style wildcards " @@ -1135,23 +1110,23 @@ msgstr "" "alapján. Minden minta egy shell-stílusú helyettesítőkarakter-lista " "szóközökkel elválasztva." -#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:104 +#: ../data/ui/preferences.ui.h:37 ../meld/meldwindow.py:104 msgid "File Filters" msgstr "Fájlszűrők" -#: ../data/ui/preferences.ui.h:45 +#: ../data/ui/preferences.ui.h:38 msgid "Change trimming" msgstr "Módosítások nyírása" -#: ../data/ui/preferences.ui.h:46 +#: ../data/ui/preferences.ui.h:39 msgid "Trim blank line differences from the start and end of changes" msgstr "Üres sorokból álló eltérés lenyírása a módosítások elejéről és végéről" -#: ../data/ui/preferences.ui.h:47 +#: ../data/ui/preferences.ui.h:40 msgid "Text filters" msgstr "Szövegszűrők" -#: ../data/ui/preferences.ui.h:48 +#: ../data/ui/preferences.ui.h:41 msgid "" "When performing file comparisons, you may ignore certain types of changes. " "Each pattern here is a python regular expression which replaces matching " @@ -1165,10 +1140,42 @@ msgstr "" "csoportokat tartalmaz, csak a csoportok lesznek kicserélve. További " "részletekért lásd a felhasználói kézikönyvet." -#: ../data/ui/preferences.ui.h:49 +#: ../data/ui/preferences.ui.h:42 msgid "Text Filters" msgstr "Szövegszűrők" +#: ../data/ui/preferences.ui.h:43 +msgid "Left is remote, right is local" +msgstr "Bal a távoli, jobb a helyi" + +#: ../data/ui/preferences.ui.h:44 +msgid "Left is local, right is remote" +msgstr "Bal a helyi, jobb a távoli" + +#: ../data/ui/preferences.ui.h:45 +msgid "Remote, merge, local" +msgstr "Távoli, összefésült, helyi" + +#: ../data/ui/preferences.ui.h:46 +msgid "Local, merge, remote" +msgstr "Helyi, összefésült, távoli" + +#: ../data/ui/preferences.ui.h:47 +msgid "1ns (ext4)" +msgstr "1ns (ext4)" + +#: ../data/ui/preferences.ui.h:48 +msgid "100ns (NTFS)" +msgstr "100ns (NTFS)" + +#: ../data/ui/preferences.ui.h:49 +msgid "1s (ext2/ext3)" +msgstr "1s (ext2/ext3)" + +#: ../data/ui/preferences.ui.h:50 +msgid "2s (VFAT)" +msgstr "2s (VFAT)" + #: ../data/ui/shortcuts.ui.h:1 msgctxt "shortcut window" msgid "General" @@ -1687,8 +1694,8 @@ msgstr "" "Szöveges szűrők vannak használatban, és elfedhetik a fájlok közti " "különbségeket." -#: ../meld/dirdiff.py:860 ../meld/filediff.py:1384 ../meld/filediff.py:1414 -#: ../meld/filediff.py:1416 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 +#: ../meld/dirdiff.py:860 ../meld/filediff.py:1338 ../meld/filediff.py:1368 +#: ../meld/filediff.py:1370 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 msgid "Hi_de" msgstr "_Elrejtés" @@ -1761,30 +1768,30 @@ msgstr "" msgid "Error deleting %s" msgstr "Hiba %s törlésekor" -#: ../meld/dirdiff.py:1488 +#: ../meld/dirdiff.py:1494 msgid "No folder" msgstr "Nincs mappa" #. Abbreviations for insert and overwrite that fit in the status bar -#: ../meld/filediff.py:355 +#: ../meld/filediff.py:311 msgid "INS" msgstr "BESZ" -#: ../meld/filediff.py:355 +#: ../meld/filediff.py:311 msgid "OVR" msgstr "ÁTÍR" #. Abbreviation for line, column so that it will fit in the status bar -#: ../meld/filediff.py:357 +#: ../meld/filediff.py:313 #, python-format msgid "Ln %i, Col %i" msgstr "%i. sor, %i. oszlop" -#: ../meld/filediff.py:782 +#: ../meld/filediff.py:738 msgid "Comparison results will be inaccurate" msgstr "Az összehasonlítás eredményei pontatlanok lesznek" -#: ../meld/filediff.py:784 +#: ../meld/filediff.py:740 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1792,65 +1799,65 @@ 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:840 +#: ../meld/filediff.py:796 msgid "Mark conflict as resolved?" msgstr "Megjelöli az ütközést feloldottként?" -#: ../meld/filediff.py:842 +#: ../meld/filediff.py:798 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:844 +#: ../meld/filediff.py:800 msgid "Cancel" msgstr "Mégse" -#: ../meld/filediff.py:845 +#: ../meld/filediff.py:801 msgid "Mark _Resolved" msgstr "Megjelölés _feloldottként" -#: ../meld/filediff.py:1093 +#: ../meld/filediff.py:1049 #, 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:1101 +#: ../meld/filediff.py:1057 #, python-format msgid "File %s appears to be a binary file." msgstr "%s bináris fájlnak tűnik." -#: ../meld/filediff.py:1103 +#: ../meld/filediff.py:1059 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:1105 +#: ../meld/filediff.py:1061 msgid "Open" msgstr "Megnyitás" -#: ../meld/filediff.py:1121 +#: ../meld/filediff.py:1077 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Eltérések számítása" -#: ../meld/filediff.py:1186 +#: ../meld/filediff.py:1142 #, python-format msgid "File %s has changed on disk" msgstr "%s fájl megváltozott a lemezen" -#: ../meld/filediff.py:1187 +#: ../meld/filediff.py:1143 msgid "Do you want to reload the file?" msgstr "Újratölti a fájlt?" -#: ../meld/filediff.py:1189 +#: ../meld/filediff.py:1145 msgid "_Reload" msgstr "Új_ratöltés" -#: ../meld/filediff.py:1347 +#: ../meld/filediff.py:1301 msgid "Files are identical" msgstr "A fájlok azonosak" -#: ../meld/filediff.py:1360 +#: ../meld/filediff.py:1314 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1858,11 +1865,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:1365 +#: ../meld/filediff.py:1319 msgid "Files differ in line endings only" msgstr "A fájlok csak a sorvégekben térnek el" -#: ../meld/filediff.py:1367 +#: ../meld/filediff.py:1321 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1871,15 +1878,15 @@ msgstr "" "A fájlok azonosak a sorvégjelektől eltekintve:\n" "%s" -#: ../meld/filediff.py:1387 +#: ../meld/filediff.py:1341 msgid "Show without filters" msgstr "Megjelenítés szűrők nélkül" -#: ../meld/filediff.py:1409 +#: ../meld/filediff.py:1363 msgid "Change highlighting incomplete" msgstr "Részleges kiemelés módosítása" -#: ../meld/filediff.py:1410 +#: ../meld/filediff.py:1364 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." @@ -1887,20 +1894,20 @@ 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:1418 +#: ../meld/filediff.py:1372 msgid "Keep highlighting" msgstr "Kiemelés továbbra is" -#: ../meld/filediff.py:1420 +#: ../meld/filediff.py:1374 msgid "_Keep highlighting" msgstr "_Kiemelés továbbra is" -#: ../meld/filediff.py:1452 +#: ../meld/filediff.py:1406 #, python-format msgid "Replace file “%s”?" msgstr "Cseréli a fájlt: „%s”?" -#: ../meld/filediff.py:1454 +#: ../meld/filediff.py:1408 #, python-format msgid "" "A file with this name already exists in “%s”.\n" @@ -1909,45 +1916,45 @@ msgstr "" "Már létezik ilyen nevű fájl itt: „%s”.\n" "Ha lecseréli a meglévő fájlt, akkor a tartalma elvész." -#: ../meld/filediff.py:1471 +#: ../meld/filediff.py:1425 msgid "Save Left Pane As" msgstr "Bal ablaktábla mentése másként" -#: ../meld/filediff.py:1473 +#: ../meld/filediff.py:1427 msgid "Save Middle Pane As" msgstr "Középső ablaktábla mentése másként" -#: ../meld/filediff.py:1475 +#: ../meld/filediff.py:1429 msgid "Save Right Pane As" msgstr "Jobb ablaktábla mentése másként" -#: ../meld/filediff.py:1489 +#: ../meld/filediff.py:1443 #, 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:1491 +#: ../meld/filediff.py:1445 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:1494 +#: ../meld/filediff.py:1448 msgid "Save Anyway" msgstr "Mentés mindenképp" -#: ../meld/filediff.py:1495 +#: ../meld/filediff.py:1449 msgid "Don't Save" msgstr "Ne mentse" -#: ../meld/filediff.py:1521 +#: ../meld/filediff.py:1475 msgid "_Save as UTF-8" msgstr "Mentés _UTF-8-ként" -#: ../meld/filediff.py:1524 +#: ../meld/filediff.py:1478 #, python-format msgid "Couldn't encode text as “%s”" msgstr "Nem kódolható a szöveg mint „%s”" -#: ../meld/filediff.py:1526 +#: ../meld/filediff.py:1480 #, python-format msgid "" "File “%s” contains characters that can't be encoded using encoding “%s”.\n" @@ -1956,12 +1963,12 @@ msgstr "" "„%s” a(z) „%s” használatával kódolhatatlan karaktereket tartalmaz.\n" "Szeretné UTF-8 kódolással menteni?" -#: ../meld/filediff.py:1566 ../meld/patchdialog.py:131 +#: ../meld/filediff.py:1520 ../meld/patchdialog.py:130 #, python-format msgid "Could not save file %s." msgstr "A fájl (%s) nem menthető." -#: ../meld/filediff.py:1567 ../meld/patchdialog.py:132 +#: ../meld/filediff.py:1521 ../meld/patchdialog.py:131 #, python-format msgid "" "Couldn't save file due to:\n" @@ -1970,11 +1977,11 @@ msgstr "" "A fájl nem menthető. Ok:\n" "%s" -#: ../meld/filediff.py:1913 +#: ../meld/filediff.py:1869 msgid "Live comparison updating disabled" msgstr "Az élő összehasonlítás-frissítés kikapcsolva" -#: ../meld/filediff.py:1914 +#: ../meld/filediff.py:1870 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -1989,11 +1996,11 @@ msgstr "" msgid "[%s] Merging files" msgstr "[%s] Fájlok összefésülése" -#: ../meld/gutterrendererchunk.py:159 +#: ../meld/gutterrendererchunk.py:210 msgid "Copy _up" msgstr "Másolás _fel" -#: ../meld/gutterrendererchunk.py:160 +#: ../meld/gutterrendererchunk.py:211 msgid "Copy _down" msgstr "Másolás _le" @@ -2297,7 +2304,7 @@ msgid "Couldn't find colour scheme details for %s-%s; this is a bad install" msgstr "Nem találhatók a színséma adatai ehhez: %s-%s, ez telepítési hiba" #. no common path. empty names get changed to "[None]" -#: ../meld/misc.py:263 +#: ../meld/misc.py:261 msgid "[None]" msgstr "[Semmi]" @@ -2513,520 +2520,3 @@ msgstr "Hiba %s eltávolításakor" msgid "Clear" msgstr "Törlés" -#~ msgid "Meld does not support Python 3." -#~ msgstr "A Meld nem támogatja a Python 3-at." - -#~ msgid "_Tabs" -#~ msgstr "_Lapok" - -#~ msgid "_Previous Tab" -#~ msgstr "_Előző lap" - -#~ msgid "Activate previous tab" -#~ msgstr "Előző lap aktiválása" - -#~ msgid "_Next Tab" -#~ msgstr "_Következő lap" - -#~ msgid "Activate next tab" -#~ msgstr "Következő lap aktiválása" - -#~ msgid "Move Tab _Left" -#~ msgstr "Lap _balra" - -#~ msgid "Move current tab to left" -#~ msgstr "A jelenlegi lap mozgatása balra" - -#~ msgid "Move Tab _Right" -#~ msgstr "Lap mozgatása j_obbra" - -#~ msgid "Move current tab to right" -#~ msgstr "A jelenlegi lap mozgatása jobbra" - -#~ msgid "Switch to this tab" -#~ msgstr "Váltás erre a lapra" - -#~ msgid "" -#~ "These text encodings will be automatically used (in order) to try to " -#~ "decode loaded text files." -#~ msgstr "" -#~ "Ezek a szövegkódolások lesznek automatikusan kipróbálva (az adott " -#~ "sorrendben) a betöltött szövegfájlok dekódolásához." - -#~ msgid "[%s] Set num panes" -#~ msgstr "[%s] Panelek számának beállítása" - -#~ msgid "[%s] Opening files" -#~ msgstr "[%s] Fájlok megnyitása" - -#~ msgid "Could not read file" -#~ msgstr "A fájl nem olvasható" - -#~ msgid "[%s] Reading files" -#~ msgstr "[%s] Fájlok olvasása" - -#~ msgid "%s is not in encodings: %s" -#~ msgstr "%s nincs a kódolások között: %s" - -#~ msgid "Inconsistent line endings found" -#~ msgstr "Inkonzisztens fájlvégjelek találhatók" - -#~ msgid "" -#~ "'%s' contains a mixture of line endings. Select the line ending format to " -#~ "use." -#~ msgstr "" -#~ "„%s” fájl különböző sorvégjeleket tartalmaz. Válassza ki, melyik " -#~ "formátumot szeretné használni." - -#~ msgid "Revision" -#~ msgstr "Revízió" - -#~ msgid "Options" -#~ msgstr "Beállítások" - -#~ msgid "%s (%s)" -#~ msgstr "%s (%s)" - -#~ msgid "" -#~ "'%s' exists.\n" -#~ "Overwrite?" -#~ msgstr "" -#~ "„%s” létezik.\n" -#~ "Felülírja?" - -#~ msgid "Clear manual change sychronization points" -#~ msgstr "Egyéni változásszinkronizálási pontok törlése" - -#~ msgid "Cycle Through Documents" -#~ msgstr "Végiglépkedés a dokumentumokon" - -#~ msgid "" -#~ "\"%s\" exists!\n" -#~ "Overwrite?" -#~ msgstr "" -#~ "„%s” létezik!\n" -#~ "Felülírja?" - -#~ msgid "" -#~ "Error writing to %s\n" -#~ "\n" -#~ "%s." -#~ msgstr "" -#~ "Hiba %s írásakor\n" -#~ "\n" -#~ "%s." - -#~ msgid "Regular expression error" -#~ msgstr "Hibás reguláris kifejezés" - -#~ msgid "Copy _Left" -#~ msgstr "Másolás _balra" - -#~ msgid "Copy _Right" -#~ msgstr "Másolás j_obbra" - -#~ msgid "Ignore changes which insert or delete blank lines" -#~ msgstr "Üres sorokat beszúró vagy törlő változások mellőzése" - -#~ msgid "%i second" -#~ msgid_plural "%i seconds" -#~ msgstr[0] "%i másodperc" -#~ msgstr[1] "%i másodperc" - -#~ msgid "%i minute" -#~ msgid_plural "%i minutes" -#~ msgstr[0] "%i perc" -#~ msgstr[1] "%i perc" - -#~ msgid "%i hour" -#~ msgid_plural "%i hours" -#~ msgstr[0] "%i óra" -#~ msgstr[1] "%i óra" - -#~ msgid "%i day" -#~ msgid_plural "%i days" -#~ msgstr[0] "%i nap" -#~ msgstr[1] "%i nap" - -#~ msgid "%i week" -#~ msgid_plural "%i weeks" -#~ msgstr[0] "%i hét" -#~ msgstr[1] "%i hét" - -#~ msgid "%i month" -#~ msgid_plural "%i months" -#~ msgstr[0] "%i hónap" -#~ msgstr[1] "%i hónap" - -#~ msgid "%i year" -#~ msgid_plural "%i years" -#~ msgstr[0] "%i év" -#~ msgstr[1] "%i év" - -#~ msgid "dir" -#~ msgstr "könyvtár" - -#~ msgid "Start a 2- or 3-way directory comparison" -#~ msgstr "2 vagy 3 utas könyvtár-összehasonlítás indítása" - -#~ msgid "_Statusbar" -#~ msgstr "Á_llapotsor" - -#~ msgid "Show or hide the statusbar" -#~ msgstr "Állapotsor megjelenítése vagy elrejtése" - -#~ 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 "" -#~ "A Meld szabad szoftver, terjesztheti és/vagy módosíthatja a Free Software " -#~ "Foundation által kiadott GNU General Public License második (vagy bármely " -#~ "későbbi) változatában foglaltak alapján.\n" -#~ "\n" -#~ "A Meldet abban a reményben terjesztjük, hogy hasznos lesz, de nem " -#~ "vállalunk SEMMIFÉLE GARANCIÁT, még olyan értelemben sem, hogy a program " -#~ "alkalmas-e a KÖZREADÁSRA vagy EGY BIZONYOS FELADAT ELVÉGZÉSÉRE. További " -#~ "részletekért tanulmányozza a GNU GPL licencet.\n" -#~ "\n" -#~ "A Meldhez a GNU General Public License egy példánya is jár, ha nem kapta " -#~ "meg, írjon a Free Software Foundation Inc.-nek. Levélcímük: 51 Franklin " -#~ "Street, Fifth Floor, Boston, MA 02110-1301, USA/>." - -#~ msgid "Loading" -#~ msgstr "Betöltés" - -#~ msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)" -#~ msgstr "" -#~ "Betöltéskor ezen kodekek ilyen sorrendben történő próbálása (például " -#~ "utf8, iso8859)" - -#~ msgid "Encoding" -#~ msgstr "Kódolás" - -#~ msgid "Compare selected" -#~ msgstr "Kijelöltek összehasonlítása" - -#~ msgid "" -#~ "'%s' is a directory.\n" -#~ "Remove recursively?" -#~ msgstr "" -#~ "„%s” egy könyvtár.\n" -#~ "Eltávolítja rekurzívan?" - -#~ msgid "Start a comparison between file and dir/file" -#~ msgstr "Összehasonlítás indítása fájl és könyvtár/fájl között" - -#~ msgid "D-Bus error; comparisons will open in a new window." -#~ msgstr "D-Bus hiba, az összehasonlítások új ablakban nyílnak meg." - -#~ msgid "Report _Bug" -#~ msgstr "Hi_babejelentés" - -#~ msgid "Report a bug in Meld" -#~ msgstr "A Meld hibájának jelentése" - -#~ msgid "About this program" -#~ msgstr "A program névjegye" - -#~| msgid "Only available if you have gnome-python-desktop installed" -#~ msgid "Only available if you have PyGtkSourceView 2 installed" -#~ msgstr "Csak akkor érhető el, ha a PyGtkSourceView 2 telepítve van" - -#~ msgid "Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n" -#~ msgstr "Másolatok\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n" - -#~ msgid "" -#~ "OS-specific metadata\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db " -#~ "Desktop.ini\n" -#~ msgstr "" -#~ "Rendszerspecifikus metaadatok\t0\t.DS_Store ._* .Spotlight-V100 .Trashes " -#~ "Thumbs.db Desktop.ini\n" - -#~ msgid "Version Control\t1\t%s\n" -#~ msgstr "Verziókövetés\t1\t%s\n" - -#~ msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll,exe}\n" -#~ msgstr "Binárisok\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 "Média\t0\t*.{jpg,gif,png,bmp,wav,mp3,ogg,flac,avi,mpg,xcf,xpm}" - -#~ msgid "CVS keywords\t0\t\\$\\w+(:[^\\n$]+)?\\$\n" -#~ msgstr "CVS kulcsszavak\t0\t\\$\\w+(:[^\\n$]+)?\\$\n" - -#~ msgid "C++ comment\t0\t//.*\n" -#~ msgstr "C++ megjegyzés\t0\t//.*\n" - -#~ msgid "C comment\t0\t/\\*.*?\\*/\n" -#~ msgstr "C megjegyzés\t0\t/\\*.*?\\*/\n" - -#~ msgid "All whitespace\t0\t[ \\t\\r\\f\\v]*\n" -#~ msgstr "Üreshely-karakterek\t0\t[ \\t\\r\\f\\v]*\n" - -#~ msgid "Leading whitespace\t0\t^[ \\t\\r\\f\\v]*\n" -#~ msgstr "Kezdő üreshelyek\t0\t^[ \\t\\r\\f\\v]*\n" - -#~ msgid "Script comment\t0\t#.*" -#~ msgstr "Parancsfájl-megjegyzés\t0\t#.*" - -#~ msgid "_Browse..." -#~ msgstr "_Tallózás…" - -#~ msgid "Path" -#~ msgstr "Útvonal" - -#~ msgid "Path to file" -#~ msgstr "Útvonal a fájlhoz" - -#~ msgid "Pop up a file selector to choose a file" -#~ msgstr "Megjelenik egy fájlválasztó egy fájl kiválasztásához" - -#~ msgid "Select directory" -#~ msgstr "Válasszon könyvtárat" - -#~ msgid "Select file" -#~ msgstr "Válasszon fájlt" - -#~ msgid "" -#~ "Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:" -#~ "Missing:Not present" -#~ msgstr "" -#~ "Mellőzve:Verzió nélkül:::Hiba::Újonnan hozzáadva:Módosítva:Ütközés:" -#~ "Eltávolítva:Hiányzik:Nincs jelen" - -#~ msgid "" -#~ "Error converting to a regular expression\n" -#~ "The pattern was '%s'\n" -#~ "The error was '%s'" -#~ msgstr "" -#~ "Hiba szabályos kifejezéssé alakítás közben\n" -#~ "A minta: „%s”\n" -#~ "A hiba: „%s”" - -#~ msgid "Create Patch" -#~ msgstr "Folt létrehozása" - -#~ msgid "Create a patch" -#~ msgstr "Folt létrehozása" - -#~| msgid "Merge all non-conflicting" -#~ msgid "Merge All Non-conflicting" -#~ msgstr "Minden nem ütköző egyesítése" - -#~ msgid "Choose a name for buffer %i." -#~ msgstr "Válasszon nevet a(z) %i puffernek." - -#~ msgid "Save changes to documents before reloading?" -#~ msgstr "Menti a dokumentumok változtatásait újratöltés előtt?" - -#~ msgid "Reload the comparison" -#~ msgstr "Összehasonlítás újratöltése" - -#~ msgid "Show normal" -#~ msgstr "Normál megjelenítése" - -#~ msgid "Tag" -#~ msgstr "Címke" - -#~ msgid "[%s] Applying patch" -#~ msgstr "[%s] Folt alkalmazása" - -#~ msgid "Patch tool not found" -#~ msgstr "A patch eszköz nem található" - -#~ msgid "" -#~ "Meld needs the patch tool to be installed to perform comparisons " -#~ "in %s repositories. Please install patch and try again." -#~ msgstr "" -#~ "A Meld a patch eszköz telepítését igényli az összehasonlítás " -#~ "végzéséhez %s tárolókban. Telepítse a patch csomagot, és próbálja " -#~ "újra." - -#~ msgid "Error fetching original comparison file" -#~ msgstr "Hiba az eredeti összehasonlítás-fájl lekérése közben" - -#~ 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 "" -#~ "A Meld nem tudta beszerezni az összehasonlítás-fájl eredeti verzióját. Ha " -#~ "a Meld legújabb verzióját használja, akkor küldjön hibajelentést a lehető " -#~ "legtöbb részlet megadásával." - -#~ msgid "Report a bug" -#~ msgstr "Hiba bejelentése" - -#~ msgid "VC Log" -#~ msgstr "Verziókövetési napló" - -#~ msgid "Update" -#~ msgstr "Frissítés" - -#~ msgid "Add to VC" -#~ msgstr "Hozzáadás verziókövetéshez" - -#~ msgid "Remove from VC" -#~ msgstr "Törlés a verziókövetésből" - -#~ msgid "Delete locally" -#~ msgstr "Törlés helyben" - -#~ msgid "Non _VC" -#~ msgstr "Nem _verziókövetéses" - -#~ msgid "Rev" -#~ msgstr "Verzió" - -#~ msgid "" -#~ "Some files have been modified.\n" -#~ "Which ones would you like to save?" -#~ msgstr "" -#~ "Néhány fájl megváltozott.\n" -#~ "Melyeket szeretné menteni?" - -#~ msgid "_Discard Changes" -#~ msgstr "_Változások eldobása" - -#~ msgid "_Save Selected" -#~ msgstr "_Kijelöltek mentése" - -#~ msgid "Choose Files" -#~ msgstr "Válasszon fájlokat" - -#~ msgid "_Three Way Compare" -#~ msgstr "_Háromutas összehasonlítás" - -#~ msgid "Mine" -#~ msgstr "Saját" - -#~ msgid "Original" -#~ msgstr "Eredeti" - -#~ msgid "Other" -#~ msgstr "Másik" - -#~ msgid "Select VC Directory" -#~ msgstr "Válasszon VC könyvtárat" - -#~ msgid "Directory" -#~ msgstr "Könyvtár" - -#~ msgid "" -#~ "Reloading will discard changes in:\n" -#~ "%s\n" -#~ "\n" -#~ "You cannot undo this operation." -#~ msgstr "" -#~ "A frissítés eldobja a következő változásait:\n" -#~ "%s\n" -#~ "\n" -#~ "A művelet nem vonható vissza." - -#~ msgid "_New..." -#~ msgstr "Ú_j…" - -#~ msgid "Add _Binary" -#~ msgstr "_Bináris hozzáadása" - -#~ msgid "Add binary to VC" -#~ msgstr "Bináris hozzáadása verziókövetéshez" - -#~ msgid "Select some files first." -#~ msgstr "Először válasszon ki néhány fájlt." - -#~ msgid "" -#~ "\n" -#~ " Invoking 'patch' failed.\n" -#~ " \n" -#~ " Maybe you don't have 'GNU patch' installed,\n" -#~ " or you use an untested version of %s.\n" -#~ " \n" -#~ " Please send email bug report to:\n" -#~ " meld-list@gnome.org\n" -#~ " \n" -#~ " Containing the following information:\n" -#~ " \n" -#~ " - meld version: '%s'\n" -#~ " - source control software type: '%s'\n" -#~ " - source control software version: 'X.Y.Z'\n" -#~ " - the output of '%s somefile.txt'\n" -#~ " - patch command: '%s'\n" -#~ " (no need to actually run it, just provide\n" -#~ " the command line) \n" -#~ " \n" -#~ " Replace 'X.Y.Z' by the actual version for the\n" -#~ " source control software you use.\n" -#~ " " -#~ msgstr "" -#~ "\n" -#~ " A „patch” indítása meghiúsult.\n" -#~ " \n" -#~ " Lehet, hogy a „GNU patch” nincs telepítve,\n" -#~ " vagy a(z) %s nem támogatott verzióját használja.\n" -#~ " \n" -#~ " Küldjön hibajelentést e-mailben ide:\n" -#~ " meld-list@gnome.org\n" -#~ " \n" -#~ " A következő információkkal:\n" -#~ " \n" -#~ " - meld verzió: „%s”\n" -#~ " - verziókövető szoftver típusa: „%s”\n" -#~ " - verziókövető szoftver verziója: „X.Y.Z”\n" -#~ " - a következő kimenetét: „%s valamifájl.txt”\n" -#~ " - patch parancs: „%s”\n" -#~ " (nem kell ténylegesen lefuttatni, csak adja " -#~ "meg a parancssort)\n" -#~ " \n" -#~ " Az „X.Y.Z” helyett a ténylegesen használt " -#~ "verziókövető szoftver verzióját adja meg.\n" -#~ " " - -#~ msgid "_Search for" -#~ msgstr "K_eresés" - -#~ msgid "Compare Options" -#~ msgstr "Összehasonlítás beállításai" - -#~ msgid "Date" -#~ msgstr "Dátum" - -#~ msgid "Local copy against other remote revision" -#~ msgstr "Helyi másolat másik távoli verzióval szemben" - -#~ msgid "Local copy against same remote revision" -#~ msgstr "Helyi másolat ugyanazon távoli verzióval szemben" - -#~ msgid "Left" -#~ msgstr "Bal" - -#~ msgid "Right" -#~ msgstr "Jobb" - -#~ msgid "Case" -#~ msgstr "Kis- és nagybetűk" - -#~ msgid "Ignore case of entries" -#~ msgstr "Kis- és nagybetűk egyenértékűek" - -#~ msgid "Error converting pattern '%s' to regular expression" -#~ msgstr "Hiba „%s” minta szabályos kifejezéssé alakításakor" - -#~ msgid "Regex" -#~ msgstr "Reg.kif." - -#~ msgid "_Commit" -#~ msgstr "_Véglegesítés" - -#~ msgid "No differences found." -#~ msgstr "Nincs eltérés." From 43e3d215c9421c961001dfb002c5d55659e85f55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emin=20Tufan=20=C3=87etin?= Date: Sat, 18 Mar 2017 12:18:22 +0000 Subject: [PATCH 0152/1316] Update Turkish translation --- po/tr.po | 1004 +++++++++++++++++++++++++----------------------------- 1 file changed, 465 insertions(+), 539 deletions(-) diff --git a/po/tr.po b/po/tr.po index 7acf35d5..05f7f287 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,38 +4,35 @@ # Özgür Sarıer , 2013. # Simge Sezgin , 2015. # Muhammet Kara , 2013, 2016. +# Emin Tufan Çetin , 2017. # msgid "" msgstr "" "Project-Id-Version: meld 1.7.3\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" "product=meld&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-03-14 21:06+0000\n" -"PO-Revision-Date: 2016-03-19 17:18+0200\n" -"Last-Translator: Muhammet Kara \n" +"POT-Creation-Date: 2017-02-23 20:47+0000\n" +"PO-Revision-Date: 2017-02-27 16:28+0300\n" +"Last-Translator: Emin Tufan Çetin \n" "Language-Team: Turkish \n" "Language: tr\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: Gtranslator 2.91.6\n" +"X-Generator: Poedit 1.8.9\n" "X-POOTLE-MTIME: 1428188634.000000\n" -#: ../bin/meld:144 +#: ../bin/meld:179 msgid "Cannot import: " msgstr "İçe aktarılamıyor: " -#: ../bin/meld:147 +#: ../bin/meld:182 #, c-format msgid "Meld requires %s or higher." msgstr "Meld %s veya üstünü gerektirir." -#: ../bin/meld:151 -msgid "Meld does not support Python 3." -msgstr "Meld Python 3 desteklemez." - -#: ../bin/meld:200 +#: ../bin/meld:227 #, c-format msgid "" "Couldn't load Meld-specific CSS (%s)\n" @@ -74,10 +71,10 @@ msgid "" "many version control systems including Git, Mercurial, Bazaar and Subversion." msgstr "" "Meld geliştiricileri hedefleyen görsel bir fark gösterme ve birleştirme " -"aracıdır. Meld dosyaları, dizinleri ve sürüm kontrolü yapılan projeleri " +"aracıdır. Meld dosyaları, dizinleri ve sürüm denetimi yapılan projeleri " "karşılaştırmanıza yardımcı olur. Hem dosya hem de dizinkeri iki- ve üç yollu " "karşılaştırmayı sağlar ve Git, Mercurial, Bazaar ve Subversion gibi sürüm " -"kontrol sistelerinin çoğunu destekler." +"denetim sistemlerinin çoğunu destekler." #: ../data/meld.appdata.xml.in.h:4 msgid "" @@ -87,79 +84,93 @@ msgstr "" "Meld kod değişikliklerinizi yeniden incelemenize, yamaları anlamanıza ve çok " "büyük birleştirme çatışmalarını daha sorunsuz çözmenize yardımcı olur." +#: ../data/meld.appdata.xml.in.h:5 +msgid "The GNOME Project" +msgstr "GNOME Projesi" + #: ../data/mime/meld.xml.in.h:1 msgid "Meld comparison description" msgstr "Meld karşılaştırma açıklaması" #: ../data/org.gnome.meld.gschema.xml.h:1 -msgid "Default window size" -msgstr "Öntanımlı pencere boyutu" +msgid "Default window width" +msgstr "Öntanımlı pencere genişliği" #: ../data/org.gnome.meld.gschema.xml.h:2 -msgid "Default window state" -msgstr "Öntanımlı pencere durumu" +msgid "Default window height" +msgstr "Öntanımlı pencere yüksekliği" #: ../data/org.gnome.meld.gschema.xml.h:3 +msgid "Default window maximised state" +msgstr "Öntanımlı pencere büyüklük durumu" + +#: ../data/org.gnome.meld.gschema.xml.h:4 +msgid "Default window fullscreen state" +msgstr "Öntanımlı pencere tam ekran durumu" + +#: ../data/org.gnome.meld.gschema.xml.h:5 msgid "Show toolbar" msgstr "Araç çubuğunu göster" -#: ../data/org.gnome.meld.gschema.xml.h:4 +#: ../data/org.gnome.meld.gschema.xml.h:6 msgid "If true, the window toolbar is visible." msgstr "Eğer doğruysa, pencere araç çubuğu görünürdür." -#: ../data/org.gnome.meld.gschema.xml.h:5 +#: ../data/org.gnome.meld.gschema.xml.h:7 msgid "Show statusbar" msgstr "Durum çubuğu göster" -#: ../data/org.gnome.meld.gschema.xml.h:6 +#: ../data/org.gnome.meld.gschema.xml.h:8 msgid "If true, the window statusbar is visible." msgstr "Eğer doğruysa, pencere durum çubuğu görünürdür." -#: ../data/org.gnome.meld.gschema.xml.h:7 -#, fuzzy -#| msgid "Automatically detected text encodings" +#: ../data/org.gnome.meld.gschema.xml.h:9 msgid "Additional automatically detected text encodings" -msgstr "Metin kodlaması otomatik tespit edildi" +msgstr "Kendiliğinden saptanan ek metin kodlamaları" -#: ../data/org.gnome.meld.gschema.xml.h:8 +#: ../data/org.gnome.meld.gschema.xml.h:10 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, yüklenen metin dosyalarını başka herhangi kodlamayı denemeden önce bu " +"metin kodlamalarını kullanarak çözmeye çalışacak. Bu listedeki kodlamalara " +"ek olarak, UTF-8 ve geçerli yerel-öntanımlı kodlamayı her zaman kullanacak; " +"kullanıcının yereline bağlı olarak diğer kodlamalar da denenebilir." -#: ../data/org.gnome.meld.gschema.xml.h:9 +#: ../data/org.gnome.meld.gschema.xml.h:11 msgid "Width of an indentation step" msgstr "Girinti genişliği" -#: ../data/org.gnome.meld.gschema.xml.h:10 +#: ../data/org.gnome.meld.gschema.xml.h:12 msgid "The number of spaces to use for a single indent step" msgstr "Tek bir girinti için kullanılacak boşluk sayısı" -#: ../data/org.gnome.meld.gschema.xml.h:11 +#: ../data/org.gnome.meld.gschema.xml.h:13 msgid "Whether to indent using spaces or tabs" msgstr "Girinti için boşluk ya da sekme kullanılıp kullanılmaması" -#: ../data/org.gnome.meld.gschema.xml.h:12 +#: ../data/org.gnome.meld.gschema.xml.h:14 msgid "If true, any new indentation will use spaces instead of tabs." msgstr "Eğer doğruysa, her yeni girinti sekme yerine boşluk kullanacak." -#: ../data/org.gnome.meld.gschema.xml.h:13 +#: ../data/org.gnome.meld.gschema.xml.h:15 msgid "Show line numbers" msgstr "Satır numaralarını göster" -#: ../data/org.gnome.meld.gschema.xml.h:14 +#: ../data/org.gnome.meld.gschema.xml.h:16 msgid "If true, line numbers will be shown in the gutter of file comparisons." msgstr "" "Eğer seçiliyse, satır numaraları dosya karşılaştırmalarının kolon arasında " "gösterilecektir." -#: ../data/org.gnome.meld.gschema.xml.h:15 +#: ../data/org.gnome.meld.gschema.xml.h:17 msgid "Highlight syntax" msgstr "Söz dizimini vurgula" -#: ../data/org.gnome.meld.gschema.xml.h:16 +#: ../data/org.gnome.meld.gschema.xml.h:18 msgid "" "Whether to highlight syntax in comparisons. Because of Meld's own color " "highlighting, this is off by default." @@ -168,21 +179,21 @@ msgstr "" "uygulamasının kendi renk vurgulaması yüzünden öntanımlı olarak bu özellik " "kapalıdır." -#: ../data/org.gnome.meld.gschema.xml.h:17 +#: ../data/org.gnome.meld.gschema.xml.h:19 msgid "Color scheme to use for syntax highlighting" msgstr "Söz dizimi vurgulaması için kullanılacak renk şeması" -#: ../data/org.gnome.meld.gschema.xml.h:18 +#: ../data/org.gnome.meld.gschema.xml.h:20 msgid "Used by GtkSourceView to determine colors for syntax highlighting" msgstr "" "Söz dizimi vurgulamasının renklerini tespit etmek için GtkSourceView " "tarafından kullanıldı" -#: ../data/org.gnome.meld.gschema.xml.h:19 +#: ../data/org.gnome.meld.gschema.xml.h:21 msgid "Displayed whitespace" msgstr "Boşluk görüntülendi" -#: ../data/org.gnome.meld.gschema.xml.h:20 +#: ../data/org.gnome.meld.gschema.xml.h:22 msgid "" "Selector for individual whitespace character types to be shown. Possible " "values are 'space', 'tab', 'newline' and 'nbsp'." @@ -190,25 +201,25 @@ msgstr "" "Tek, ayrı boşluk karakter türleri için seçici gösterilecek. Olası değerler " "şunlardır: 'boşluk', 'sekme', 'yeni satır', 'nbsp'." -#: ../data/org.gnome.meld.gschema.xml.h:21 +#: ../data/org.gnome.meld.gschema.xml.h:23 msgid "Wrap mode" msgstr "Kaydırma kipi" -#: ../data/org.gnome.meld.gschema.xml.h:22 +#: ../data/org.gnome.meld.gschema.xml.h:24 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 "" "Dosya karşılaştırmalarındaki satırlar bu ayarlara göre, ya hiç ('none'), ya " -"herhangi bir karakterden ('char') ya da sadece kelimelerin sonundan ('word') " -"kaydırılacaktır." +"herhangi bir karakterden ('char') ya da yalnızca sözcüklerin sonundan " +"('word') kaydırılacaktır." -#: ../data/org.gnome.meld.gschema.xml.h:23 +#: ../data/org.gnome.meld.gschema.xml.h:25 msgid "Highlight current line" msgstr "Şu anki satırı vurgula" -#: ../data/org.gnome.meld.gschema.xml.h:24 +#: ../data/org.gnome.meld.gschema.xml.h:26 msgid "" "If true, the line containing the cursor will be highlighted in file " "comparisons." @@ -216,22 +227,22 @@ msgstr "" "Eğer seçiliyse, dosya karşılaştırmalarında imleç içeren satır " "vurgulanacaktır." -#: ../data/org.gnome.meld.gschema.xml.h:25 +#: ../data/org.gnome.meld.gschema.xml.h:27 msgid "Use the system default monospace font" msgstr "Sistem öntanımlı eşaralıklı yazı tipini kullan" -#: ../data/org.gnome.meld.gschema.xml.h:26 +#: ../data/org.gnome.meld.gschema.xml.h:28 msgid "" "If false, custom-font will be used instead of the system monospace font." msgstr "" "Eğer yanlışsa, sistem eşaralıklı yazı tipi yerine özel-yazı tipi " "kullanılacaktır." -#: ../data/org.gnome.meld.gschema.xml.h:27 +#: ../data/org.gnome.meld.gschema.xml.h:29 msgid "Custom font" msgstr "Özel yazı tipi" -#: ../data/org.gnome.meld.gschema.xml.h:28 +#: ../data/org.gnome.meld.gschema.xml.h:30 msgid "" "The custom font to use, stored as a string and parsed as a Pango font " "description." @@ -239,22 +250,22 @@ msgstr "" "Kullanılacak özel yazı tipi, bir karakter dizisi olarak depolandı ve Pango " "yazı tipi tanımlaması olarak çözümlendi." -#: ../data/org.gnome.meld.gschema.xml.h:29 +#: ../data/org.gnome.meld.gschema.xml.h:31 msgid "Ignore blank lines when comparing files" msgstr "Dosyalar karşılaştırılırken boş satırları yoksay" -#: ../data/org.gnome.meld.gschema.xml.h:30 +#: ../data/org.gnome.meld.gschema.xml.h:32 msgid "" "If true, blank lines will be trimmed when highlighting changes between files." msgstr "" "Eğer seçiliyse, boş satırlar dosyalar arasındaki değişiklikler vurgulanırken " "kırpılacaktır." -#: ../data/org.gnome.meld.gschema.xml.h:31 +#: ../data/org.gnome.meld.gschema.xml.h:33 msgid "Use the system default editor" msgstr "Öntanımlı sistem düzenleyiciyi kullan" -#: ../data/org.gnome.meld.gschema.xml.h:32 +#: ../data/org.gnome.meld.gschema.xml.h:34 msgid "" "If false, custom-editor-command will be used instead of the system editor " "when opening files externally." @@ -262,11 +273,11 @@ msgstr "" "Eğer yanlışsa, dosyalar harici bir şekilde açılırken sistem düzenleyici " "yerine özel-düzenleyici-komut kullanılacaktır." -#: ../data/org.gnome.meld.gschema.xml.h:33 +#: ../data/org.gnome.meld.gschema.xml.h:35 msgid "The custom editor launch command" msgstr "Özel düzenleyici başlatma komutu" -#: ../data/org.gnome.meld.gschema.xml.h:34 +#: ../data/org.gnome.meld.gschema.xml.h:36 msgid "" "The command used to launch a custom editor. Some limited templating is " "supported here; at the moment '{file}' and '{line}' are recognised tokens." @@ -275,11 +286,11 @@ msgstr "" "seviyede şablonlama desteklenir; şu an '{dosya}' ve '{satır}' tanınan " "belirteçlerdir." -#: ../data/org.gnome.meld.gschema.xml.h:35 +#: ../data/org.gnome.meld.gschema.xml.h:37 msgid "Columns to display" msgstr "Görüntülenecek sütunlar" -#: ../data/org.gnome.meld.gschema.xml.h:36 +#: ../data/org.gnome.meld.gschema.xml.h:38 msgid "" "List of column names in folder comparison and whether they should be " "displayed." @@ -287,37 +298,37 @@ msgstr "" "Klasör karşılaştırmasındaki sütun adları listesi ve onların " "görüntülenmesinin gerekliliği." -#: ../data/org.gnome.meld.gschema.xml.h:37 ../data/ui/preferences.ui.h:32 +#: ../data/org.gnome.meld.gschema.xml.h:39 ../data/ui/preferences.ui.h:25 msgid "Ignore symbolic links" msgstr "Simgesel bağlantıları yoksay" -#: ../data/org.gnome.meld.gschema.xml.h:38 +#: ../data/org.gnome.meld.gschema.xml.h:40 msgid "" "If true, folder comparisons do not follow symbolic links when traversing the " "folder tree." msgstr "" -"Eğer seçiliyse, klasör ağacı gezilirken, klasör karşılaştırmaları sembolik " +"Eğer seçiliyse, klasör ağacı gezilirken, klasör karşılaştırmaları simgesel " "bağlantıları takip etmez." -#: ../data/org.gnome.meld.gschema.xml.h:39 +#: ../data/org.gnome.meld.gschema.xml.h:41 msgid "Use shallow comparison" msgstr "Düşük düzeyde karşılaştırma kullan" -#: ../data/org.gnome.meld.gschema.xml.h:40 +#: ../data/org.gnome.meld.gschema.xml.h:42 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ğer seçiliyse, klasör karşılaştırmaları dosyaları sadece mtime ve boyutuna " -"bağlı olarak karşılaştırır, eğer mtime ve boyutları eşleşirse aynı, diğer " -"türlü farklı olduğunu düşünür." +"Eğer seçiliyse, klasör karşılaştırmaları dosyaları yalnızca mtime ve " +"boyutuna bağlı olarak karşılaştırır, eğer mtime ve boyutları eşleşirse aynı, " +"diğer türlü farklı olduğunu düşünür." -#: ../data/org.gnome.meld.gschema.xml.h:41 +#: ../data/org.gnome.meld.gschema.xml.h:43 msgid "File timestamp resolution" msgstr "Dosya zaman damgası çözünürlüğü" -#: ../data/org.gnome.meld.gschema.xml.h:42 +#: ../data/org.gnome.meld.gschema.xml.h:44 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 " @@ -329,132 +340,135 @@ msgstr "" "farkdır. Bu, farklı zaman damgalı dosya sistemleri arasında dosyalar " "karşılaştırılırken faydalıdır." -#: ../data/org.gnome.meld.gschema.xml.h:43 ../data/ui/preferences.ui.h:30 +#: ../data/org.gnome.meld.gschema.xml.h:45 ../data/ui/preferences.ui.h:22 msgid "Apply text filters during folder comparisons" -msgstr "" +msgstr "Klasör karşılaştırmaları sırasında metin süzgeçleri uygula" -#: ../data/org.gnome.meld.gschema.xml.h:44 +#: ../data/org.gnome.meld.gschema.xml.h:46 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ğer seçiliyse, dosya içeriklerini de kapsayan klasör karşılaştırmaları; " +"etkin metin süzgeçlerini ve boş satır kırpma seçeneğini uygulayacak, yeni " +"satır farklılıklarını gözardı edecek." -#: ../data/org.gnome.meld.gschema.xml.h:45 +#: ../data/org.gnome.meld.gschema.xml.h:47 msgid "File status filters" msgstr "Dosya durumu süzgeçleri" -#: ../data/org.gnome.meld.gschema.xml.h:46 +#: ../data/org.gnome.meld.gschema.xml.h:48 msgid "List of statuses used to filter visible files in folder comparison." msgstr "" "Durum listesi klasör karşılaştırmasında görünür dosyaların süzülmesinde " "kullanılırdı." -#: ../data/org.gnome.meld.gschema.xml.h:47 +#: ../data/org.gnome.meld.gschema.xml.h:49 msgid "Show the version control console output" -msgstr "Sürüm kontrol konsol çıktısını göster" +msgstr "Sürüm denetimi konsol çıktısını göster" -#: ../data/org.gnome.meld.gschema.xml.h:48 +#: ../data/org.gnome.meld.gschema.xml.h:50 msgid "" "If true, a console output section will be shown in version control views, " "showing the commands run for version control operations." msgstr "" -"Eğer seçiliyse, sürüm kontrol işlemlerinde çalıştırılan komutları gösteren " -"bir konsol çıktı bölümü sürüm kontrol görünümünde gösterilecektir." +"Eğer seçiliyse, sürüm denetimi işlemlerinde çalıştırılan komutları gösteren " +"bir konsol çıktı bölümü sürüm denetim görünümünde gösterilecektir." -#: ../data/org.gnome.meld.gschema.xml.h:49 +#: ../data/org.gnome.meld.gschema.xml.h:51 msgid "Version control pane position" -msgstr "Sürüm kontrol bölüm konumu" +msgstr "Sürüm denetimi bölümü konumu" -#: ../data/org.gnome.meld.gschema.xml.h:50 +#: ../data/org.gnome.meld.gschema.xml.h:52 msgid "" "This is the height of the main version control tree when the console pane is " "shown." msgstr "" -"Bu, konsol bölümü gösterilirken, ana sürüm kontrol ağacının yüksekliğidir." +"Bu, konsol bölümü gösterilirken, ana sürüm denetimi ağacının yüksekliğidir." -#: ../data/org.gnome.meld.gschema.xml.h:51 +#: ../data/org.gnome.meld.gschema.xml.h:53 msgid "Present version comparisons as left-local/right-remote" msgstr "Sürüm karşılaştırmalarını sol-yerel/sağ-uzak olacak şekilde göster" -#: ../data/org.gnome.meld.gschema.xml.h:52 +#: ../data/org.gnome.meld.gschema.xml.h:54 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 "" -"Eğer seçiliyse, sürüm kontrol karşılaştırmaları bölümlerde gösterilen " +"Eğer seçiliyse, sürüm denetimi karşılaştırmaları bölümlerde gösterilen " "dosyaları tespit için sol-lokal, sağ-uzak şemasını kullanacak. Ayrıca sol-" "onların, sağ-benim şeması kullanılır." -#: ../data/org.gnome.meld.gschema.xml.h:53 +#: ../data/org.gnome.meld.gschema.xml.h:55 msgid "Order for files in three-way version control merge comparisons" msgstr "" -"Üç-yollu sürüm kontrol birleştirme karşılaştırmalarında dosyaları sırala" +"Üç-yollu sürüm denetimi birleştirme karşılaştırmalarında dosyaları sırala" -#: ../data/org.gnome.meld.gschema.xml.h:54 +#: ../data/org.gnome.meld.gschema.xml.h:56 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 "" "Dosya seçimleri için sıra, uzak/birleştirilmiş/yerel ve yerel/birleştirilmiş/" -"uzak şeklindedir. Bu tercih sadece versiyon kontrol görünümünden üç-yollu " -"karşılaştırma başlatıldığında etki eder, bu yüzden Meld içinde sadece " +"uzak şeklindedir. Bu tercih yalnızca sürüm denetimi görünümünden üç-yollu " +"karşılaştırma başlatıldığında etki eder, bu yüzden Meld içinde yalnızca " "birleştirmeler/çatışma çözümü için kullanılır." -#: ../data/org.gnome.meld.gschema.xml.h:55 +#: ../data/org.gnome.meld.gschema.xml.h:57 msgid "Show margin in commit message editor" msgstr "İleti gönderim düzenleyicisinde kenar boşluğu göster" -#: ../data/org.gnome.meld.gschema.xml.h:56 +#: ../data/org.gnome.meld.gschema.xml.h:58 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ğer seçiliyse, bir rehber sürüm kontrol ileti gönderim düzenleyicisinde " +"Eğer seçiliyse, bir rehber sürüm denetim, ileti gönderim düzenleyicisinde " "kenar boşluğu sütununu göstermek için görüntülenecektir." -#: ../data/org.gnome.meld.gschema.xml.h:57 +#: ../data/org.gnome.meld.gschema.xml.h:59 msgid "Margin column in commit message editor" msgstr "İleti gönderim düzenleyicisinde sütun kenar boşluğu" -#: ../data/org.gnome.meld.gschema.xml.h:58 +#: ../data/org.gnome.meld.gschema.xml.h:60 msgid "" "The column at which to show the margin in the version control commit message " "editor." msgstr "" -"Sürüm kontrol ileti gönderim düzenleyicisinde kenar boşluğu gösterilecek " +"Sürüm denetimi ileti gönderim düzenleyicisinde kenar boşluğu gösterilecek " "sütun." -#: ../data/org.gnome.meld.gschema.xml.h:59 +#: ../data/org.gnome.meld.gschema.xml.h:61 msgid "Automatically hard-wrap commit messages" msgstr "Gönderim iletilerini otomatik olarak kaydır" -#: ../data/org.gnome.meld.gschema.xml.h:60 +#: ../data/org.gnome.meld.gschema.xml.h:62 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ğer seçiliyse, sürüm kontrol ileti gönderim düzenleyicisi gönderimden önce, " -"gönderim kenar boşluğunda (yani satır sonları ekleyerek) kaydıracak." +"Eğer seçiliyse, sürüm denetimi ileti gönderim düzenleyicisi gönderimden " +"önce, gönderim kenar boşluğunda (yani satır sonları ekleyerek) kaydıracak." -#: ../data/org.gnome.meld.gschema.xml.h:61 +#: ../data/org.gnome.meld.gschema.xml.h:63 msgid "Version control status filters" -msgstr "Sürüm kontrol durumu süzgeçleri" +msgstr "Sürüm denetimi durumu süzgeçleri" -#: ../data/org.gnome.meld.gschema.xml.h:62 +#: ../data/org.gnome.meld.gschema.xml.h:64 msgid "" "List of statuses used to filter visible files in version control comparison." msgstr "" -"Durum listesi sürüm kontrol karşılaştırmasında görünür dosyaları süzmek için " -"kullanılırdı." +"Durum listesi sürüm denetimi karşılaştırmasında görünür dosyaları süzmek " +"için kullanılırdı." -#: ../data/org.gnome.meld.gschema.xml.h:63 +#: ../data/org.gnome.meld.gschema.xml.h:65 msgid "Filename-based filters" msgstr "Dosya adı tabanlı süzgeçler" -#: ../data/org.gnome.meld.gschema.xml.h:64 +#: ../data/org.gnome.meld.gschema.xml.h:66 msgid "" "List of predefined filename-based filters that, if active, will remove " "matching files from a folder comparison." @@ -462,11 +476,11 @@ msgstr "" "Önceden tanımlanmış dosya adı tabanlı süzgeçlerin listesi, eğer etkin ise, " "klasör karşılaştırmadan eşleşen dosyaları silecek." -#: ../data/org.gnome.meld.gschema.xml.h:65 +#: ../data/org.gnome.meld.gschema.xml.h:67 msgid "Text-based filters" msgstr "Metin tabanlı süzgeçler" -#: ../data/org.gnome.meld.gschema.xml.h:66 +#: ../data/org.gnome.meld.gschema.xml.h:68 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, " @@ -478,23 +492,19 @@ msgstr "" #: ../data/styles/meld-base.xml.h:1 msgid "Meld base scheme" -msgstr "" +msgstr "Meld temel şeması" #: ../data/styles/meld-base.xml.h:2 -#, fuzzy -#| msgid "Color scheme to use for syntax highlighting" msgid "Base color scheme for Meld highlighting" -msgstr "Söz dizimi vurgulaması için kullanılacak renk şeması" +msgstr "Meld vurgulaması için temel renk şeması" #: ../data/styles/meld-dark.xml.h:1 msgid "Meld dark scheme" -msgstr "" +msgstr "Meld koyu şeması" #: ../data/styles/meld-dark.xml.h:2 -#, fuzzy -#| msgid "Color scheme to use for syntax highlighting" msgid "Dark color scheme for Meld highlighting" -msgstr "Söz dizimi vurgulaması için kullanılacak renk şeması" +msgstr "Meld vurgulaması için koyu renk şeması" #: ../data/ui/application.ui.h:1 msgid "About Meld" @@ -526,7 +536,7 @@ msgstr "_Yardım" #: ../data/ui/application.ui.h:8 msgid "Keyboard Shortcuts" -msgstr "" +msgstr "Klavye Kısayolları" #: ../data/ui/application.ui.h:9 msgid "_About" @@ -564,7 +574,7 @@ msgstr "Sağa kopyala" msgid "Delete selected" msgstr "Seçileni Sil" -#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:859 ../meld/filediff.py:1363 +#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:858 ../meld/filediff.py:1336 msgid "Hide" msgstr "Gizle" @@ -600,7 +610,7 @@ msgstr "Yeni" msgid "Show new" msgstr "Yeniyi göster" -#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:74 +#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:76 msgid "Modified" msgstr "Değiştirilmiş" @@ -626,14 +636,14 @@ msgstr "Etkin" #: ../data/ui/EditableList.ui.h:3 msgid "Column Name" -msgstr "Sütun İsmi" +msgstr "Sütun Adı" #: ../data/ui/EditableList.ui.h:4 ../data/ui/vcview.ui.h:9 msgid "_Add" msgstr "_Ekle" #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11 -#: ../meld/vcview.py:649 +#: ../meld/vcview.py:644 msgid "_Remove" msgstr "_Kaldır" @@ -657,7 +667,7 @@ msgstr "_Aşağı Taşı" #: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35 #: ../meld/dirdiff.py:373 msgid "Name" -msgstr "İsim" +msgstr "Ad" #: ../data/ui/EditableList.ui.h:11 msgid "Pattern" @@ -729,7 +739,7 @@ msgstr "Sola Gönder" #: ../data/ui/filediff.ui.h:15 msgid "Push current change to the left" -msgstr "Mevcut değişikliği sola gönder" +msgstr "Geçerli değişikliği sola gönder" #: ../data/ui/filediff.ui.h:16 msgid "Push to Right" @@ -737,7 +747,7 @@ msgstr "Sağa Gönder" #: ../data/ui/filediff.ui.h:17 msgid "Push current change to the right" -msgstr "Mevcut değişikliği sağa gönder" +msgstr "Geçerli değişikliği sağa gönder" #: ../data/ui/filediff.ui.h:18 msgid "Pull from Left" @@ -855,8 +865,8 @@ msgstr "Kaydetmezseniz değişiklikler kaybolacaktır." msgid "Close _without Saving" msgstr "Kaydet_meden Kapat" -#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:941 ../meld/filediff.py:1429 -#: ../meld/filediff.py:1497 +#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:940 ../meld/filediff.py:1402 +#: ../meld/filediff.py:1474 msgid "_Cancel" msgstr "_İptal" @@ -893,7 +903,7 @@ msgstr "Belgedeki kaydedilmemiş değişiklikler geri alınsın mı?" msgid "Changes made to the following documents will be permanently lost:\n" msgstr "Aşağıdaki belgelerde yapılan değişiklikler kaybolacak:\n" -#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:942 ../meld/filediff.py:1430 +#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:941 ../meld/filediff.py:1403 msgid "_Replace" msgstr "_Değiştir" @@ -923,7 +933,7 @@ msgstr "Büyük küçük harf _eşleştir" #: ../data/ui/findbar.ui.h:8 msgid "Who_le word" -msgstr "Büt_ün kelime" +msgstr "T_üm sözcük" #: ../data/ui/findbar.ui.h:9 msgid "Regular e_xpression" @@ -941,7 +951,7 @@ msgstr "Yama olarak Biçimlendir" msgid "Copy to Clipboard" msgstr "Panoya Kopyala" -#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:149 +#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:154 msgid "Save Patch" msgstr "Yamayı Kaydet" @@ -962,166 +972,140 @@ msgid "_Reverse patch direction" msgstr "Yama yönünü _terse çevir" #: ../data/ui/preferences.ui.h:1 -msgid "Left is remote, right is local" -msgstr "Sol uzak, sağ yereldir" - -#: ../data/ui/preferences.ui.h:2 -msgid "Left is local, right is remote" -msgstr "Sol yerel, sağ uzaktır" - -#: ../data/ui/preferences.ui.h:3 -msgid "Remote, merge, local" -msgstr "Uzak, birleştir, yerel" - -#: ../data/ui/preferences.ui.h:4 -msgid "Local, merge, remote" -msgstr "Yerel, birleştir, uzak" - -#: ../data/ui/preferences.ui.h:5 -msgid "1ns (ext4)" -msgstr "1ns (ext4)" - -#: ../data/ui/preferences.ui.h:6 -msgid "100ns (NTFS)" -msgstr "100ns (NTFS)" - -#: ../data/ui/preferences.ui.h:7 -msgid "1s (ext2/ext3)" -msgstr "1s (ext2/ext3)" - -#: ../data/ui/preferences.ui.h:8 -msgid "2s (VFAT)" -msgstr "2s (VFAT)" - -#: ../data/ui/preferences.ui.h:9 msgid "Meld Preferences" msgstr "Meld Tercihleri" -#: ../data/ui/preferences.ui.h:10 +#: ../data/ui/preferences.ui.h:2 msgid "Font" msgstr "Yazı tipi" -#: ../data/ui/preferences.ui.h:11 +#: ../data/ui/preferences.ui.h:3 msgid "_Use the system fixed width font" msgstr "Sabit genişlikli sistem yazı tipini _kullan" -#: ../data/ui/preferences.ui.h:12 +#: ../data/ui/preferences.ui.h:4 msgid "_Editor font:" msgstr "_Düzenleyici yazı tipi:" -#: ../data/ui/preferences.ui.h:13 +#: ../data/ui/preferences.ui.h:5 msgid "Display" msgstr "Görünüm" -#: ../data/ui/preferences.ui.h:14 +#: ../data/ui/preferences.ui.h:6 msgid "_Tab width:" msgstr "_Sekme genişliği:" -#: ../data/ui/preferences.ui.h:15 +#: ../data/ui/preferences.ui.h:7 msgid "_Insert spaces instead of tabs" msgstr "Sekme yerine boşluk _ekle" -#: ../data/ui/preferences.ui.h:16 +#: ../data/ui/preferences.ui.h:8 msgid "Enable text _wrapping" msgstr "Metin _kaydırmayı etkinleştir" -#: ../data/ui/preferences.ui.h:17 +#: ../data/ui/preferences.ui.h:9 msgid "Do not _split words over two lines" -msgstr "Kelimeleri iki satıra _bölme" +msgstr "Sözcükleri iki satıra _bölme" -#: ../data/ui/preferences.ui.h:18 +#: ../data/ui/preferences.ui.h:10 msgid "Highlight _current line" -msgstr "_Mevcut satırı vurgula" +msgstr "_Geçerli satırı vurgula" -#: ../data/ui/preferences.ui.h:19 +#: ../data/ui/preferences.ui.h:11 msgid "Show _line numbers" msgstr "_Satır numaralarını göster" -#: ../data/ui/preferences.ui.h:20 +#: ../data/ui/preferences.ui.h:12 msgid "Show w_hitespace" msgstr "B_oşluğu göster" -#: ../data/ui/preferences.ui.h:21 +#: ../data/ui/preferences.ui.h:13 msgid "Use s_yntax highlighting" msgstr "S_öz dizimi vurgulama kullan" -#: ../data/ui/preferences.ui.h:22 +#: ../data/ui/preferences.ui.h:14 msgid "Syntax highlighting color scheme:" msgstr "Söz dizimi vurgulama renk şeması:" -#: ../data/ui/preferences.ui.h:23 +#: ../data/ui/preferences.ui.h:15 msgid "External Editor" msgstr "Harici Düzenleyici" -#: ../data/ui/preferences.ui.h:24 +#: ../data/ui/preferences.ui.h:16 msgid "Use _default system editor" msgstr "_Öntanımlı sistem düzenleyici kullan" -#: ../data/ui/preferences.ui.h:25 +#: ../data/ui/preferences.ui.h:17 msgid "Edito_r command:" msgstr "Düzenleyic_i komutu:" -#: ../data/ui/preferences.ui.h:26 +#: ../data/ui/preferences.ui.h:18 msgid "Editor" msgstr "Düzenleyici" -#: ../data/ui/preferences.ui.h:27 +#: ../data/ui/preferences.ui.h:19 msgid "Shallow Comparison" msgstr "Düşük Düzeyde Karşılaştırma" -#: ../data/ui/preferences.ui.h:28 +#: ../data/ui/preferences.ui.h:20 msgid "C_ompare files based only on size and timestamp" -msgstr "Dosyaları sadece boyutlarına ve zaman damgalarına göre k_arşılaştır" +msgstr "Dosyaları yalnızca boyutlarına ve zaman damgalarına göre k_arşılaştır" -#: ../data/ui/preferences.ui.h:29 +#: ../data/ui/preferences.ui.h:21 msgid "_Timestamp resolution:" msgstr "_Zaman damgası çözümü:" -#: ../data/ui/preferences.ui.h:31 +#: ../data/ui/preferences.ui.h:23 +msgid "Note: enabling text filters may make comparing large files much slower" +msgstr "" +"Not: metin süzgeçlerini etkinleştirmek büyük dosya karşılaştırmalarını " +"yavaşlatabilir" + +#: ../data/ui/preferences.ui.h:24 msgid "Symbolic Links" -msgstr "Sembolik Bağlantılar" +msgstr "Simgesel Bağlantılar" -#: ../data/ui/preferences.ui.h:33 +#: ../data/ui/preferences.ui.h:26 msgid "Visible Columns" msgstr "Görünür Sütunlar" -#: ../data/ui/preferences.ui.h:34 +#: ../data/ui/preferences.ui.h:27 msgid "Folder Comparisons" msgstr "Klasör Karşılaştırmaları" -#: ../data/ui/preferences.ui.h:35 +#: ../data/ui/preferences.ui.h:28 msgid "Version Comparisons" msgstr "Sürüm Karşılaştırmaları" -#: ../data/ui/preferences.ui.h:36 +#: ../data/ui/preferences.ui.h:29 msgid "_Order when comparing file revisions:" msgstr "Dosya düzeltmeleri karşılaştırılırken _sırala:" -#: ../data/ui/preferences.ui.h:37 +#: ../data/ui/preferences.ui.h:30 msgid "Order when _merging files:" msgstr "Dosyalar _birleştirilirken sırala:" -#: ../data/ui/preferences.ui.h:38 +#: ../data/ui/preferences.ui.h:31 msgid "Commit Messages" msgstr "Gönderim İletileri" -#: ../data/ui/preferences.ui.h:39 +#: ../data/ui/preferences.ui.h:32 msgid "Show _right margin at:" msgstr "_Sağ kenar boşluğunda göster:" -#: ../data/ui/preferences.ui.h:40 +#: ../data/ui/preferences.ui.h:33 msgid "Automatically _break lines at right margin on commit" msgstr "Gönderimde sağ kenar boşluğunda otomatik olarak satırları _bitir" -#: ../data/ui/preferences.ui.h:41 +#: ../data/ui/preferences.ui.h:34 msgid "Version Control" -msgstr "Sürüm Kontrol" +msgstr "Sürüm Denetimi" -#: ../data/ui/preferences.ui.h:42 +#: ../data/ui/preferences.ui.h:35 msgid "Filename filters" msgstr "Dosya adı süzgeçleri" -#: ../data/ui/preferences.ui.h:43 +#: ../data/ui/preferences.ui.h:36 msgid "" "When performing directory comparisons, you may filter out files and " "directories by name. Each pattern is a list of shell style wildcards " @@ -1131,23 +1115,23 @@ msgstr "" "süzebilirsiniz. Her kalıp boşluklara göre ayrılmış kabuk biçemi özel " "sembollerin listesidir." -#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:104 +#: ../data/ui/preferences.ui.h:37 ../meld/meldwindow.py:104 msgid "File Filters" msgstr "Dosya Süzgeçleri" -#: ../data/ui/preferences.ui.h:45 +#: ../data/ui/preferences.ui.h:38 msgid "Change trimming" msgstr "Kırpma işlemini değiştir" -#: ../data/ui/preferences.ui.h:46 +#: ../data/ui/preferences.ui.h:39 msgid "Trim blank line differences from the start and end of changes" msgstr "Değişikliklerin baştan sona boş satır farklılıklarını kırp" -#: ../data/ui/preferences.ui.h:47 +#: ../data/ui/preferences.ui.h:40 msgid "Text filters" msgstr "Metin süzgeçleri" -#: ../data/ui/preferences.ui.h:48 +#: ../data/ui/preferences.ui.h:41 msgid "" "When performing file comparisons, you may ignore certain types of changes. " "Each pattern here is a python regular expression which replaces matching " @@ -1158,117 +1142,126 @@ msgstr "" "Dosya karşılaştırmaları yaparken, belli değişiklik türlerini " "yoksayabilirsiniz. Buradaki her kalıp, karşılaştırma yapılmadan önce boş " "karakter dizisi ile eşleşen metinlerin yer değiştirdiği bir düzenli python " -"ifadesidir. Eğer ifade gruplar içeriyorsa, sadece gruplar yer değiştirir. " -"Daha fazla detay için kullanıcı klavuzunu inceleyin." +"ifadesidir. Eğer ifade gruplar içeriyorsa, yalnızca gruplar yer değiştirir. " +"Daha fazla ayrıntı için kullanıcı kılavuzunu inceleyin." -#: ../data/ui/preferences.ui.h:49 +#: ../data/ui/preferences.ui.h:42 msgid "Text Filters" msgstr "Metin Süzgeçleri" +#: ../data/ui/preferences.ui.h:43 +msgid "Left is remote, right is local" +msgstr "Sol uzak, sağ yereldir" + +#: ../data/ui/preferences.ui.h:44 +msgid "Left is local, right is remote" +msgstr "Sol yerel, sağ uzaktır" + +#: ../data/ui/preferences.ui.h:45 +msgid "Remote, merge, local" +msgstr "Uzak, birleştir, yerel" + +#: ../data/ui/preferences.ui.h:46 +msgid "Local, merge, remote" +msgstr "Yerel, birleştir, uzak" + +#: ../data/ui/preferences.ui.h:47 +msgid "1ns (ext4)" +msgstr "1ns (ext4)" + +#: ../data/ui/preferences.ui.h:48 +msgid "100ns (NTFS)" +msgstr "100ns (NTFS)" + +#: ../data/ui/preferences.ui.h:49 +msgid "1s (ext2/ext3)" +msgstr "1s (ext2/ext3)" + +#: ../data/ui/preferences.ui.h:50 +msgid "2s (VFAT)" +msgstr "2s (VFAT)" + #: ../data/ui/shortcuts.ui.h:1 msgctxt "shortcut window" msgid "General" msgstr "Genel" #: ../data/ui/shortcuts.ui.h:2 -#| msgid "New comparison" msgctxt "shortcut window" msgid "New comparison" msgstr "Yeni karşılaştırma" #: ../data/ui/shortcuts.ui.h:3 -#, fuzzy -#| msgid "File comparison" msgctxt "shortcut window" msgid "Close a comparison" -msgstr "Dosya karşılaştırma" +msgstr "Karşılaştırmayı kapat" #: ../data/ui/shortcuts.ui.h:4 -#| msgid "About Meld" msgctxt "shortcut window" msgid "Quit Meld" -msgstr "Meld'i Kapat" +msgstr "Meld'i kapat" #: ../data/ui/shortcuts.ui.h:5 -#| msgid "Stop the current action" msgctxt "shortcut window" msgid "Stop the current action" msgstr "Geçerli eylemi durdur" #: ../data/ui/shortcuts.ui.h:6 -#, fuzzy -#| msgid "New comparison" msgctxt "shortcut window" msgid "Refresh comparison" -msgstr "Yeni karşılaştırma" +msgstr "Karşılaştırma yenile" #: ../data/ui/shortcuts.ui.h:7 -#| msgid "Fullscreen" msgctxt "shortcut window" msgid "Fullscreen" msgstr "Tam Ekran" #: ../data/ui/shortcuts.ui.h:8 -#| msgid "_Tabs" msgctxt "shortcut window" msgid "Tabs" msgstr "Sekmeler" #: ../data/ui/shortcuts.ui.h:9 -#| msgid "Go to the previous change" msgctxt "shortcut window" msgid "Go to previous tab" msgstr "Önceki sekmeye git" #: ../data/ui/shortcuts.ui.h:10 -#| msgid "Go to the next change" msgctxt "shortcut window" msgid "Go to next tab" msgstr "Sonraki sekmeye git" #: ../data/ui/shortcuts.ui.h:11 -#, fuzzy -#| msgid "Switch to this tab" msgctxt "shortcut window" msgid "Switch to tab" -msgstr "Bu sekmeye geçiş yap" +msgstr "Sekmeye geçiş yap" #: ../data/ui/shortcuts.ui.h:12 -#, fuzzy -#| msgid "Move Tab _Left" msgctxt "shortcut window" msgid "Move tab left" -msgstr "Sekmeyi _Sola Taşı" +msgstr "Sekmeyi sola taşı" #: ../data/ui/shortcuts.ui.h:13 -#, fuzzy -#| msgid "Move Tab _Right" msgctxt "shortcut window" msgid "Move tab right" -msgstr "Sekmeyi _Sağa Taşı" +msgstr "Sekmeyi sağa taşı" #: ../data/ui/shortcuts.ui.h:14 -#| msgid "_Changes" msgctxt "shortcut window" msgid "Changes" msgstr "Değişiklikler" #: ../data/ui/shortcuts.ui.h:15 -#, fuzzy -#| msgid "Go to the previous change" msgctxt "shortcut window" msgid "Go to previous change" msgstr "Önceki değişikliğe git" #: ../data/ui/shortcuts.ui.h:16 -#, fuzzy -#| msgid "Go to the next change" msgctxt "shortcut window" msgid "Go to next change" msgstr "Sonraki değişikliğe git" #: ../data/ui/shortcuts.ui.h:17 -#| msgid "Edit" msgctxt "shortcut window" msgid "Editing" msgstr "Düzenleme" @@ -1289,7 +1282,6 @@ msgid "Cut" msgstr "Kes" #: ../data/ui/shortcuts.ui.h:21 -#| msgid "Copy _up" msgctxt "shortcut window" msgid "Copy" msgstr "Kopyala" @@ -1300,190 +1292,142 @@ msgid "Paste" msgstr "Yapıştır" #: ../data/ui/shortcuts.ui.h:23 -#| msgid "Find:" msgctxt "shortcut window" msgid "Find" msgstr "Bul" #: ../data/ui/shortcuts.ui.h:24 -#| msgid "Find Ne_xt" msgctxt "shortcut window" msgid "Find Next" msgstr "Sonrakini Bul" #: ../data/ui/shortcuts.ui.h:25 -#| msgid "Find _Previous" msgctxt "shortcut window" msgid "Find Previous" msgstr "Öncekini Bul" #: ../data/ui/shortcuts.ui.h:26 -#, fuzzy -#| msgid "_Replace" msgctxt "shortcut window" msgid "Replace" -msgstr "_Değiştir" +msgstr "Değiştir" #: ../data/ui/shortcuts.ui.h:27 -#, fuzzy -#| msgid "File comparison" msgctxt "shortcut window" msgid "File comparison" msgstr "Dosya karşılaştırma" #: ../data/ui/shortcuts.ui.h:28 -#, fuzzy -#| msgid "Save the current file" msgctxt "shortcut window" msgid "Save current file" -msgstr "Mevcut dosyayı kaydet" +msgstr "Geçerli dosyayı kaydet" #: ../data/ui/shortcuts.ui.h:29 -#, fuzzy -#| msgid "Save the current file" msgctxt "shortcut window" msgid "Save current file to new path" -msgstr "Mevcut dosyayı kaydet" +msgstr "Geçerli dosyayı yeni yere kaydet" #: ../data/ui/shortcuts.ui.h:30 -#, fuzzy -#| msgid "Save all files in the current comparison" msgctxt "shortcut window" msgid "Save all files in comparison" -msgstr "Şu anki karşılaştırmadaki tüm dosyaları kaydet" +msgstr "Karşılaştırmadaki tüm dosyaları kaydet" #: ../data/ui/shortcuts.ui.h:31 -#, fuzzy -#| msgid "Previous Conflict" msgctxt "shortcut window" msgid "Previous conflict" -msgstr "Önceki Çakışma" +msgstr "Önceki çakışma" #: ../data/ui/shortcuts.ui.h:32 -#, fuzzy -#| msgid "Next Conflict" msgctxt "shortcut window" msgid "Next conflict" -msgstr "Sonraki Çakışma" +msgstr "Sonraki çakışma" #: ../data/ui/shortcuts.ui.h:33 -#, fuzzy -#| msgid "Push current change to the left" msgctxt "shortcut window" msgid "Push change to left" -msgstr "Mevcut değişikliği sola gönder" +msgstr "Değişikliği sola gönder" #: ../data/ui/shortcuts.ui.h:34 -#, fuzzy -#| msgid "Push current change to the right" msgctxt "shortcut window" msgid "Push change to right" -msgstr "Mevcut değişikliği sağa gönder" +msgstr "Değişikliği sağa gönder" #: ../data/ui/shortcuts.ui.h:35 -#, fuzzy -#| msgid "Pull change from the left" msgctxt "shortcut window" msgid "Pull change from left" msgstr "Değişikliği soldan iste" #: ../data/ui/shortcuts.ui.h:36 -#, fuzzy -#| msgid "Pull change from the right" msgctxt "shortcut window" msgid "Pull change from right" msgstr "Sağdan değişiklik iste" #: ../data/ui/shortcuts.ui.h:37 -#, fuzzy -#| msgid "Copy change above the left chunk" msgctxt "shortcut window" msgid "Copy change above left" msgstr "Sol yığın üstüne değişiklik kopyala" #: ../data/ui/shortcuts.ui.h:38 -#, fuzzy -#| msgid "Copy change below the left chunk" msgctxt "shortcut window" msgid "Copy change below left" msgstr "Sol yığın altına değişiklik kopyala" #: ../data/ui/shortcuts.ui.h:39 -#, fuzzy -#| msgid "Copy change above the right chunk" msgctxt "shortcut window" msgid "Copy change above right" msgstr "Sağ yığın üstüne değişiklik kopyala" #: ../data/ui/shortcuts.ui.h:40 -#, fuzzy -#| msgid "Copy change below the right chunk" msgctxt "shortcut window" msgid "Copy change below right" msgstr "Sağ yığın altına değişiklik kopyala" #: ../data/ui/shortcuts.ui.h:41 -#, fuzzy -#| msgid "Delete change" msgctxt "shortcut window" msgid "Delete change" msgstr "Değişiklik sil" #: ../data/ui/shortcuts.ui.h:42 -#, fuzzy -#| msgid "Previous Pane" msgctxt "shortcut window" msgid "Previous comparison pane" -msgstr "Önceki Bölme" +msgstr "Önceki karşılaştırma bölmesi" #: ../data/ui/shortcuts.ui.h:43 -#, fuzzy -#| msgid "New comparison" msgctxt "shortcut window" msgid "Next comparison pane" -msgstr "Yeni karşılaştırma" +msgstr "Sonraki karşılaştırma bölmesi" #: ../data/ui/shortcuts.ui.h:44 -#, fuzzy -#| msgid "Folder Comparisons" msgctxt "shortcut window" msgid "Folder comparison" -msgstr "Klasör Karşılaştırmaları" +msgstr "Klasör karşılaştırması" #: ../data/ui/shortcuts.ui.h:45 -#| msgid "Copy to left" msgctxt "shortcut window" msgid "Copy to left" msgstr "Sola kopyala" #: ../data/ui/shortcuts.ui.h:46 -#| msgid "Copy to right" msgctxt "shortcut window" msgid "Copy to right" msgstr "Sağa kopyala" #: ../data/ui/shortcuts.ui.h:47 -#, fuzzy -#| msgid "Start a version control comparison" msgctxt "shortcut window" msgid "Version control comparison" -msgstr "Sürüm kontrol karşılaştırmasına başla" +msgstr "Sürüm denetimi karşılaştırması" #: ../data/ui/shortcuts.ui.h:48 -#, fuzzy -#| msgid "Commit changes to version control" msgctxt "shortcut window" msgid "Commit to version control" -msgstr "Değişiklikleri sürüm kontrole gönder" +msgstr "Sürüm denetimine gönder" #: ../data/ui/shortcuts.ui.h:49 -#, fuzzy -#| msgid "Console output" msgctxt "shortcut window" msgid "Show/hide console output" -msgstr "Konsol çıktısı" +msgstr "Konsol çıktısını göster/gizle" -#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:668 +#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:559 +#: ../meld/newdifftab.py:38 msgid "New comparison" msgstr "Yeni karşılaştırma" @@ -1497,7 +1441,7 @@ msgstr "Dizin karşılaştırma" #: ../data/ui/tab-placeholder.ui.h:4 msgid "Version control view" -msgstr "Sürüm denetim görünümü" +msgstr "Sürüm denetimi görünümü" #: ../data/ui/tab-placeholder.ui.h:5 msgid "_3-way comparison" @@ -1529,7 +1473,7 @@ msgstr "Üçüncü Klasörü Seç" #: ../data/ui/tab-placeholder.ui.h:12 msgid "Select A Version-Controlled Folder" -msgstr "Bir Sürüm Kontrol Klasörü Seç" +msgstr "Bir Sürüm Denetimi Klasörü Seç" #: ../data/ui/tab-placeholder.ui.h:13 msgid "_Blank comparison" @@ -1545,7 +1489,7 @@ msgstr "Gö_nder..." #: ../data/ui/vcview.ui.h:4 msgid "Commit changes to version control" -msgstr "Değişiklikleri sürüm kontrole gönder" +msgstr "Değişiklikleri sürüm denetimine gönder" #: ../data/ui/vcview.ui.h:5 msgid "_Update" @@ -1553,7 +1497,7 @@ msgstr "_Güncelle" #: ../data/ui/vcview.ui.h:6 msgid "Update working copy from version control" -msgstr "Sürüm kontrolden çalışma kopyasını güncelle" +msgstr "Sürüm denetiminden çalışma kopyasını güncelle" #: ../data/ui/vcview.ui.h:7 msgid "_Push" @@ -1565,11 +1509,11 @@ msgstr "Yerel değişiklikleri uzak sunucuya gönder" #: ../data/ui/vcview.ui.h:10 msgid "Add to version control" -msgstr "Sürüm kontrole ekle" +msgstr "Sürüm denetimine ekle" #: ../data/ui/vcview.ui.h:12 msgid "Remove from version control" -msgstr "Sürüm kontrolden sil" +msgstr "Sürüm denetiminden sil" #: ../data/ui/vcview.ui.h:13 msgid "Mar_k as Resolved" @@ -1577,7 +1521,7 @@ msgstr "Çözüldü olarak işaret_le" #: ../data/ui/vcview.ui.h:14 msgid "Mark as resolved in version control" -msgstr "Sürüm kontrolde çözüldü olarak işaretle" +msgstr "Sürüm denetiminde çözüldü olarak işaretle" #: ../data/ui/vcview.ui.h:15 msgid "Re_vert" @@ -1597,7 +1541,7 @@ msgstr "Konsol" #: ../data/ui/vcview.ui.h:19 msgid "Show or hide the version control console output pane" -msgstr "Sürüm kontrol konsol çıktısı bölümünü göster ya da gizle" +msgstr "Sürüm denetimi konsol çıktısı bölümünü göster ya da gizle" #: ../data/ui/vcview.ui.h:20 msgid "_Flatten" @@ -1617,11 +1561,11 @@ msgstr "Değiştirilmiş dosyaları göster" #: ../data/ui/vcview.ui.h:24 msgid "_Normal" -msgstr "_Normal" +msgstr "_Olağan" #: ../data/ui/vcview.ui.h:25 msgid "Show normal files" -msgstr "Normal dosyaları göster" +msgstr "Olağan dosyaları göster" #: ../data/ui/vcview.ui.h:26 msgid "Un_versioned" @@ -1631,7 +1575,7 @@ msgstr "Sü_rümlendirilmemiş" msgid "Show unversioned files" msgstr "Sürümlendirilmemiş dosyaları göster" -#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:67 +#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69 msgid "Ignored" msgstr "Yoksayılmış" @@ -1659,7 +1603,7 @@ msgstr "Önceki kayıtlar:" msgid "Co_mmit" msgstr "Gö_nder" -#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:337 +#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:332 msgid "Location" msgstr "Konum" @@ -1669,7 +1613,7 @@ msgstr "Durum" #: ../data/ui/vcview.ui.h:38 msgid "Extra" -msgstr "" +msgstr "Ek" #: ../data/ui/vcview.ui.h:39 msgid "Console output" @@ -1682,7 +1626,7 @@ msgstr "Yerel gönderimler uzağa gönderilsin mi?" #: ../data/ui/vcview.ui.h:41 msgid "The commits to be pushed are determined by your version control system." msgstr "" -"Sürüm kontrol sisteminiz tarafından uzağa gönderilecek gönderimler tespit " +"Sürüm denetimi sisteminiz tarafından uzağa gönderilecek gönderimler tespit " "edildi." #: ../data/ui/vcview.ui.h:42 @@ -1691,15 +1635,15 @@ msgstr "Gönderimleri _Uzağa Gönder" #: ../meld/const.py:12 msgid "UNIX (LF)" -msgstr "" +msgstr "UNIX (LF)" #: ../meld/const.py:13 msgid "DOS/Windows (CR-LF)" -msgstr "" +msgstr "DOS/Windows (CR-LF)" #: ../meld/const.py:14 msgid "Mac OS (CR)" -msgstr "" +msgstr "Mac OS (CR)" #. Create file size CellRenderer #: ../meld/dirdiff.py:391 ../meld/preferences.py:82 @@ -1726,59 +1670,58 @@ msgstr "Sakla %s" msgid "[%s] Scanning %s" msgstr "[%s] Taranıyor %s" -#: ../meld/dirdiff.py:826 +#: ../meld/dirdiff.py:825 #, python-format msgid "[%s] Done" msgstr "[%s] Yapıldı" -#: ../meld/dirdiff.py:834 +#: ../meld/dirdiff.py:833 msgid "Folders have no differences" msgstr "Klasörlerde fark yok" -#: ../meld/dirdiff.py:836 +#: ../meld/dirdiff.py:835 msgid "Contents of scanned files in folders are identical." msgstr "Klasörlerdeki taranan dosyaların içerikleri aynı." -#: ../meld/dirdiff.py:838 +#: ../meld/dirdiff.py:837 msgid "" "Scanned files in folders appear identical, but contents have not been " "scanned." msgstr "" "Klasördeki taranan dosyalar aynı gözüküyor fakat içerikleri taranmamış." -#: ../meld/dirdiff.py:841 +#: ../meld/dirdiff.py:840 msgid "File filters are in use, so not all files have been scanned." msgstr "Dosya süzgeçleri kullanımda, bu yüzden tüm dosyalar taranamamış." -#: ../meld/dirdiff.py:843 +#: ../meld/dirdiff.py:842 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:861 ../meld/filediff.py:1365 ../meld/filediff.py:1395 -#: ../meld/filediff.py:1397 ../meld/ui/msgarea.py:109 -#: ../meld/ui/msgarea.py:122 +#: ../meld/dirdiff.py:860 ../meld/filediff.py:1338 ../meld/filediff.py:1368 +#: ../meld/filediff.py:1370 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 msgid "Hi_de" msgstr "Gi_zle" -#: ../meld/dirdiff.py:871 +#: ../meld/dirdiff.py:870 msgid "Multiple errors occurred while scanning this folder" msgstr "Bu dizinler taranırken birçok hata oluştu" -#: ../meld/dirdiff.py:872 +#: ../meld/dirdiff.py:871 msgid "Files with invalid encodings found" msgstr "Geçersiz kodlamada dosyalar bulundu" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:874 +#: ../meld/dirdiff.py:873 msgid "Some files were in an incorrect encoding. The names are something like:" msgstr "Bazı dosyalar yanlış kodlamadaydı. Adları şu şekildedir:" -#: ../meld/dirdiff.py:876 +#: ../meld/dirdiff.py:875 msgid "Files hidden by case insensitive comparison" msgstr "Büyük küçük harf duyarsız karşılaştırmaya göre gizli dosyalar" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:878 +#: ../meld/dirdiff.py:877 msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. The following files in this folder are hidden:" @@ -1786,17 +1729,17 @@ msgstr "" "Büyük/küçük harf duyarlı bir dosya sisteminde büyük/küçük harf duyarsız bir " "karşılaştırma yapmaktasınız. Bu klasördeki bazı dosyalar gizlidir:" -#: ../meld/dirdiff.py:889 +#: ../meld/dirdiff.py:888 #, python-format msgid "'%s' hidden by '%s'" msgstr "'%s' '%s' için gizli" -#: ../meld/dirdiff.py:945 +#: ../meld/dirdiff.py:944 #, python-format msgid "Replace folder “%s”?" msgstr "“%s” klasörü değiştirilsin mi?" -#: ../meld/dirdiff.py:947 +#: ../meld/dirdiff.py:946 #, python-format msgid "" "Another folder with the same name already exists in “%s”.\n" @@ -1805,11 +1748,11 @@ msgstr "" "“%s”'de aynı ad ile başka klasör zaten var.\n" "Eğer varolan klasörü değiştirirseniz, içindeki bütün dosyalar kaybolacaktır." -#: ../meld/dirdiff.py:960 +#: ../meld/dirdiff.py:959 msgid "Error copying file" msgstr "Dosya kopyalamada hata" -#: ../meld/dirdiff.py:961 +#: ../meld/dirdiff.py:960 #, python-format msgid "" "Couldn't copy %s\n" @@ -1821,110 +1764,102 @@ msgstr "" "%s dizinine kopyalanamadı.\n" "%s" -#: ../meld/dirdiff.py:984 +#: ../meld/dirdiff.py:983 #, python-format msgid "Error deleting %s" msgstr "%s silinirken hata" -#: ../meld/dirdiff.py:1489 -#| msgid "folder" +#: ../meld/dirdiff.py:1494 msgid "No folder" msgstr "Klasör yok" #. Abbreviations for insert and overwrite that fit in the status bar -#: ../meld/filediff.py:359 +#: ../meld/filediff.py:311 msgid "INS" msgstr "EKLE" -#: ../meld/filediff.py:359 +#: ../meld/filediff.py:311 msgid "OVR" msgstr "ÜZRYZ" #. Abbreviation for line, column so that it will fit in the status bar -#: ../meld/filediff.py:361 +#: ../meld/filediff.py:313 #, python-format msgid "Ln %i, Col %i" msgstr "Satır %i, Sütun %i" -#: ../meld/filediff.py:776 +#: ../meld/filediff.py:738 msgid "Comparison results will be inaccurate" msgstr "Karşılaştırma sonuçları hatalı olacak" -#: ../meld/filediff.py:778 -#, fuzzy -#| msgid "" -#| "Filter “%s” changed the number of lines in the file, which is " -#| "unsupported. The comparison will not be accurate." +#: ../meld/filediff.py:740 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." msgstr "" -"“%s” süzgeci dosyadaki satır numaralarını desteklenmeyen şekilde değiştirdi. " +"Bir süzgeç dosyadaki satır numaralarını desteklenmeyen şekilde değiştirdi. " "Karşılaştırma doğru olmayacaktır." -#: ../meld/filediff.py:836 +#: ../meld/filediff.py:796 msgid "Mark conflict as resolved?" msgstr "Çakışma çözüldü olarak işaretlensin mi?" -#: ../meld/filediff.py:838 +#: ../meld/filediff.py:798 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:840 +#: ../meld/filediff.py:800 msgid "Cancel" msgstr "İptal Et" -#: ../meld/filediff.py:841 +#: ../meld/filediff.py:801 msgid "Mark _Resolved" msgstr "_Çözümlendi olarak işaretle" -#: ../meld/filediff.py:1081 +#: ../meld/filediff.py:1049 #, python-format msgid "There was a problem opening the file “%s”." -msgstr "" +msgstr "“%s” dosyası açılırken bir sorun var." -#: ../meld/filediff.py:1089 -#, fuzzy, python-format -#| msgid "%s appears to be a binary file." +#: ../meld/filediff.py:1057 +#, python-format msgid "File %s appears to be a binary file." -msgstr "%s ikili bir dosya olarak görünüyor." +msgstr "%s dosyası ikili bir dosya olarak görünüyor." -#: ../meld/filediff.py:1091 -#, fuzzy -#| msgid "Open selected file or directory in the default external application" +#: ../meld/filediff.py:1059 msgid "Do you want to open the file using the default application?" -msgstr "Öntanımlı harici bir uygulamada seçilen dosya ya da dizini aç" +msgstr "Dosyayı öntanımlı uygulamayı kullanarak açmak istiyor musunuz?" -#: ../meld/filediff.py:1093 +#: ../meld/filediff.py:1061 msgid "Open" -msgstr "" +msgstr "Aç" -#: ../meld/filediff.py:1109 +#: ../meld/filediff.py:1077 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Farklılıklar hesaplanıyor" -#: ../meld/filediff.py:1174 +#: ../meld/filediff.py:1142 #, python-format msgid "File %s has changed on disk" msgstr "Disk üzerindeki %s dosyası değiştirildi" -#: ../meld/filediff.py:1175 +#: ../meld/filediff.py:1143 msgid "Do you want to reload the file?" msgstr "Dosyayı yeniden yüklemek istiyor musunuz?" -#: ../meld/filediff.py:1177 +#: ../meld/filediff.py:1145 msgid "_Reload" msgstr "_Yeniden yükle" -#: ../meld/filediff.py:1328 +#: ../meld/filediff.py:1301 msgid "Files are identical" msgstr "Dosyalar birbiri ile aynı" -#: ../meld/filediff.py:1341 +#: ../meld/filediff.py:1314 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1932,28 +1867,28 @@ 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:1346 -#, fuzzy -#| msgid "Files with invalid encodings found" +#: ../meld/filediff.py:1319 msgid "Files differ in line endings only" -msgstr "Geçersiz kodlamada dosyalar bulundu" +msgstr "Dosyalar yalnızca satır sonlarında farklılaşıyor" -#: ../meld/filediff.py:1348 +#: ../meld/filediff.py:1321 #, python-format msgid "" "Files are identical except for differing line endings:\n" "%s" msgstr "" +"Dosyalar satır sonları dışında özdeş:\n" +"%s" -#: ../meld/filediff.py:1368 +#: ../meld/filediff.py:1341 msgid "Show without filters" msgstr "Süzgeçsiz göster" -#: ../meld/filediff.py:1390 +#: ../meld/filediff.py:1363 msgid "Change highlighting incomplete" msgstr "Vurgulama değişikliği tamamlanamadı" -#: ../meld/filediff.py:1391 +#: ../meld/filediff.py:1364 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." @@ -1962,20 +1897,20 @@ 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:1399 +#: ../meld/filediff.py:1372 msgid "Keep highlighting" msgstr "Vurgulamayı koru" -#: ../meld/filediff.py:1401 +#: ../meld/filediff.py:1374 msgid "_Keep highlighting" msgstr "Vurgulamayı _koru" -#: ../meld/filediff.py:1433 +#: ../meld/filediff.py:1406 #, python-format msgid "Replace file “%s”?" msgstr "“%s” dosyası değiştirilsin mi?" -#: ../meld/filediff.py:1435 +#: ../meld/filediff.py:1408 #, python-format msgid "" "A file with this name already exists in “%s”.\n" @@ -1984,45 +1919,45 @@ msgstr "" "“%s”'de bu ad ile bir dosya zaten var.\n" "Eğer varolan dosyayı değiştirirseniz, içerikleri kaybolacaktır." -#: ../meld/filediff.py:1452 +#: ../meld/filediff.py:1425 msgid "Save Left Pane As" msgstr "Sol Bölme Olarak Kaydet" -#: ../meld/filediff.py:1454 +#: ../meld/filediff.py:1427 msgid "Save Middle Pane As" msgstr "Orta Bölme Olarak Kaydet" -#: ../meld/filediff.py:1456 +#: ../meld/filediff.py:1429 msgid "Save Right Pane As" msgstr "Sağ Bölme Olarak Kaydet" -#: ../meld/filediff.py:1470 +#: ../meld/filediff.py:1443 #, 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:1472 +#: ../meld/filediff.py:1445 msgid "If you save it, any external changes will be lost." msgstr "Eğer onu kaydederseniz, harici değişiklikler kaybolacaktır." -#: ../meld/filediff.py:1475 +#: ../meld/filediff.py:1448 msgid "Save Anyway" -msgstr "Yinede Kaydet" +msgstr "Yine De Kaydet" -#: ../meld/filediff.py:1476 +#: ../meld/filediff.py:1449 msgid "Don't Save" msgstr "Kaydetme" -#: ../meld/filediff.py:1498 +#: ../meld/filediff.py:1475 msgid "_Save as UTF-8" -msgstr "UTF-8 olarak _kaydet" +msgstr "UTF-8 Olarak _kaydet" -#: ../meld/filediff.py:1501 +#: ../meld/filediff.py:1478 #, python-format msgid "Couldn't encode text as “%s”" msgstr "Metin “%s” olarak kodlanamadı" -#: ../meld/filediff.py:1503 +#: ../meld/filediff.py:1480 #, python-format msgid "" "File “%s” contains characters that can't be encoded using encoding “%s”.\n" @@ -2031,12 +1966,12 @@ msgstr "" "“%s” dosyası “%s” kodlaması kullanılarak kodlanmamış karakterler içeriyor.\n" "UTF-8 olarak kaydetmek ister misiniz?" -#: ../meld/filediff.py:1540 ../meld/patchdialog.py:125 +#: ../meld/filediff.py:1520 ../meld/patchdialog.py:130 #, python-format msgid "Could not save file %s." msgstr "%s dosyası kaydedilemedi." -#: ../meld/filediff.py:1541 ../meld/patchdialog.py:126 +#: ../meld/filediff.py:1521 ../meld/patchdialog.py:131 #, python-format msgid "" "Couldn't save file due to:\n" @@ -2045,11 +1980,11 @@ msgstr "" "Şu nedenle dosya kaydedilemedi:\n" "%s" -#: ../meld/filediff.py:1887 +#: ../meld/filediff.py:1869 msgid "Live comparison updating disabled" msgstr "Canlı karşılaştırma güncellemesi devre dışı bırakıldı" -#: ../meld/filediff.py:1888 +#: ../meld/filediff.py:1870 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -2065,112 +2000,112 @@ msgstr "" msgid "[%s] Merging files" msgstr "[%s] Dosyalar birleştiriliyor" -#: ../meld/gutterrendererchunk.py:159 +#: ../meld/gutterrendererchunk.py:210 msgid "Copy _up" msgstr "_Yukarı kopyala" -#: ../meld/gutterrendererchunk.py:160 +#: ../meld/gutterrendererchunk.py:211 msgid "Copy _down" msgstr "_Aşağı kopyala" -#: ../meld/meldapp.py:177 +#: ../meld/meldapp.py:175 msgid "wrong number of arguments supplied to --diff" msgstr "--diff komutuna yanlış sayıda değişken verildi" -#: ../meld/meldapp.py:182 +#: ../meld/meldapp.py:180 msgid "Start with an empty window" msgstr "Boş bir pencere ile başla" -#: ../meld/meldapp.py:183 ../meld/meldapp.py:185 +#: ../meld/meldapp.py:181 ../meld/meldapp.py:183 msgid "file" msgstr "file" -#: ../meld/meldapp.py:183 ../meld/meldapp.py:187 +#: ../meld/meldapp.py:181 ../meld/meldapp.py:185 msgid "folder" msgstr "folder" -#: ../meld/meldapp.py:184 +#: ../meld/meldapp.py:182 msgid "Start a version control comparison" -msgstr "Sürüm kontrol karşılaştırmasına başla" +msgstr "Sürüm denetimi karşılaştırmasına başla" -#: ../meld/meldapp.py:186 +#: ../meld/meldapp.py:184 msgid "Start a 2- or 3-way file comparison" msgstr "2- ya da 3-yollu dosya karşılaştırmasına başla" -#: ../meld/meldapp.py:188 +#: ../meld/meldapp.py:186 msgid "Start a 2- or 3-way folder comparison" msgstr "2- ya da 3- yollu klasör karşılaştırmasına başla" -#: ../meld/meldapp.py:231 +#: ../meld/meldapp.py:229 #, python-format msgid "Error: %s\n" msgstr "Hata: %s\n" -#: ../meld/meldapp.py:238 +#: ../meld/meldapp.py:236 msgid "Meld is a file and directory comparison tool." msgstr "Meld bir dosya ve dizin karşılaştırma aracıdır." -#: ../meld/meldapp.py:242 +#: ../meld/meldapp.py:240 msgid "Set label to use instead of file name" msgstr "Dosya adı yerine kullanmak istediğiniz etiketi ayarlayın" -#: ../meld/meldapp.py:245 +#: ../meld/meldapp.py:243 msgid "Open a new tab in an already running instance" -msgstr "Zaten çalışan bir örnekte yeni bir sekme açın" +msgstr "Zaten çalışan bir örnekte yeni bir sekme aç" -#: ../meld/meldapp.py:248 +#: ../meld/meldapp.py:246 msgid "Automatically compare all differing files on startup" msgstr "Başlangıçta otomatik olarak tüm farklı dosyaları karşılaştır" -#: ../meld/meldapp.py:251 +#: ../meld/meldapp.py:249 msgid "Ignored for compatibility" msgstr "Uyumluluk için yoksayıldı" -#: ../meld/meldapp.py:255 +#: ../meld/meldapp.py:253 msgid "Set the target file for saving a merge result" msgstr "Birleştirme sonucunu kaydetmek için hedef dosya ayarla" -#: ../meld/meldapp.py:258 +#: ../meld/meldapp.py:256 msgid "Automatically merge files" msgstr "Dosyaları otomatik olarak birleştir" -#: ../meld/meldapp.py:262 +#: ../meld/meldapp.py:260 msgid "Load a saved comparison from a Meld comparison file" msgstr "" "Bir Meld karşılaştırma dosyasından kaydedilmiş bir karşılaştırmayı yükle" -#: ../meld/meldapp.py:266 +#: ../meld/meldapp.py:264 msgid "Create a diff tab for the supplied files or folders" msgstr "Verilen dosya ve klasörler için fark sekmesi oluştur" -#: ../meld/meldapp.py:286 +#: ../meld/meldapp.py:284 #, python-format msgid "too many arguments (wanted 0-3, got %d)" msgstr "çok sayıda değişken (istenen sayı 0-3, verilen %d)" -#: ../meld/meldapp.py:289 +#: ../meld/meldapp.py:287 msgid "can't auto-merge less than 3 files" msgstr "3 dosyadan daha azı otomatik birleştirilemiyor" -#: ../meld/meldapp.py:291 +#: ../meld/meldapp.py:289 msgid "can't auto-merge directories" msgstr "3 dosyadan daha azı otomatik birleştirilemez" -#: ../meld/meldapp.py:305 +#: ../meld/meldapp.py:303 msgid "Error reading saved comparison file" msgstr "Kaydedilmiş karşılaştırma dosyaları okunurken hata" -#: ../meld/meldapp.py:332 +#: ../meld/meldapp.py:330 #, python-format msgid "invalid path or URI \"%s\"" msgstr "geçersiz yol ya da URI \"%s\"" #. TRANSLATORS: This is the label of a new, currently-unnamed file. -#: ../meld/meldbuffer.py:127 +#: ../meld/meldbuffer.py:131 msgid "" msgstr "" -#: ../meld/melddoc.py:83 ../meld/melddoc.py:84 +#: ../meld/melddoc.py:64 msgid "untitled" msgstr "başlıksız" @@ -2188,7 +2123,7 @@ msgstr "Yeni bir karşılaştırma başlat" #: ../meld/meldwindow.py:54 msgid "Save the current file" -msgstr "Mevcut dosyayı kaydet" +msgstr "Geçerli dosyayı kaydet" #: ../meld/meldwindow.py:56 msgid "Save As..." @@ -2196,11 +2131,11 @@ msgstr "Farklı Kaydet..." #: ../meld/meldwindow.py:57 msgid "Save the current file with a different name" -msgstr "Mevcut dosyayı farklı bir isimle kaydet" +msgstr "Geçerli dosyayı farklı bir adla kaydet" #: ../meld/meldwindow.py:60 msgid "Close the current file" -msgstr "Mevcut dosyayı kapat" +msgstr "Geçerli dosyayı kapat" #: ../meld/meldwindow.py:63 msgid "_Edit" @@ -2300,120 +2235,80 @@ msgstr "Sürüm Durumu" #: ../meld/meldwindow.py:106 msgid "Stop the current action" -msgstr "Mevcut işlemi durdur" +msgstr "Geçerli işlemi durdur" #: ../meld/meldwindow.py:109 msgid "Refresh the view" msgstr "Görünümü yenile" -#: ../meld/meldwindow.py:112 -msgid "_Tabs" -msgstr "_Sekmeler" - #: ../meld/meldwindow.py:113 -msgid "_Previous Tab" -msgstr "_Önceki Sekme" - -#: ../meld/meldwindow.py:114 -msgid "Activate previous tab" -msgstr "Önceki sekmeyi etkinleştir" - -#: ../meld/meldwindow.py:116 -msgid "_Next Tab" -msgstr "_Sonraki Sekme" - -#: ../meld/meldwindow.py:117 -msgid "Activate next tab" -msgstr "Bir sonraki sekmeyi etkinleştir" - -#: ../meld/meldwindow.py:120 -msgid "Move Tab _Left" -msgstr "Sekmeyi _Sola Taşı" - -#: ../meld/meldwindow.py:121 -msgid "Move current tab to left" -msgstr "Mevcut sekmeyi sola taşı" - -#: ../meld/meldwindow.py:124 -msgid "Move Tab _Right" -msgstr "Sekmeyi _Sağa Taşı" - -#: ../meld/meldwindow.py:125 -msgid "Move current tab to right" -msgstr "Mevcut sekmeyi sağa taşı" - -#: ../meld/meldwindow.py:129 msgid "Fullscreen" msgstr "Tam Ekran" -#: ../meld/meldwindow.py:130 +#: ../meld/meldwindow.py:114 msgid "View the comparison in fullscreen" msgstr "Karşılaştırmayı tam ekran görüntüle" -#: ../meld/meldwindow.py:132 +#: ../meld/meldwindow.py:116 msgid "_Toolbar" msgstr "_Araç çubuğu" -#: ../meld/meldwindow.py:133 +#: ../meld/meldwindow.py:117 msgid "Show or hide the toolbar" msgstr "Araç çubuğunu göster ya da gizle" -#: ../meld/meldwindow.py:143 +#: ../meld/meldwindow.py:127 msgid "Open Recent" msgstr "En Son Açılanlar" -#: ../meld/meldwindow.py:144 +#: ../meld/meldwindow.py:128 msgid "Open recent files" msgstr "Son açılan dosyaları aç" -#: ../meld/meldwindow.py:166 +#: ../meld/meldwindow.py:150 msgid "_Meld" msgstr "_Meld" -#: ../meld/meldwindow.py:167 +#: ../meld/meldwindow.py:151 msgid "Quit the program" msgstr "Programdan çık" -#: ../meld/meldwindow.py:169 +#: ../meld/meldwindow.py:153 msgid "Prefere_nces" msgstr "Tercih_ler" -#: ../meld/meldwindow.py:170 +#: ../meld/meldwindow.py:154 msgid "Configure the application" msgstr "Uygulamayı yapılandır" -#: ../meld/meldwindow.py:172 +#: ../meld/meldwindow.py:156 msgid "_Contents" msgstr "_İçerikler" -#: ../meld/meldwindow.py:173 +#: ../meld/meldwindow.py:157 msgid "Open the Meld manual" msgstr "Meld klavuzunu aç" -#: ../meld/meldwindow.py:175 +#: ../meld/meldwindow.py:159 msgid "About this application" msgstr "Bu uygulama hakkında" -#: ../meld/meldwindow.py:587 -msgid "Switch to this tab" -msgstr "Bu sekmeye geçiş yap" - -#: ../meld/meldwindow.py:702 +#: ../meld/meldwindow.py:593 #, python-format msgid "Need three files to auto-merge, got: %r" msgstr "Otomatik birleştirme için üç dosya gerekiyor, varolan: %r" -#: ../meld/meldwindow.py:716 +#: ../meld/meldwindow.py:607 msgid "Cannot compare a mixture of files and directories" msgstr "Dosya ve dizinlerin karışımı karşılaştırılamıyor" -#: ../meld/misc.py:179 +#: ../meld/misc.py:203 #, python-format msgid "Couldn't find colour scheme details for %s-%s; this is a bad install" -msgstr "" +msgstr "%s-%s için renk şeması ayrıntıları bulunamadı; bu kötü bir yükleme" #. no common path. empty names get changed to "[None]" -#: ../meld/misc.py:264 +#: ../meld/misc.py:261 msgid "[None]" msgstr "[Hiçbiri]" @@ -2425,49 +2320,49 @@ msgstr "etiket" msgid "pattern" msgstr "örüntü" -#: ../meld/recent.py:115 +#: ../meld/recent.py:114 msgid "Version control:" -msgstr "Sürüm kontrol:" +msgstr "Sürüm denetimi:" #: ../meld/ui/notebooklabel.py:63 msgid "Close tab" msgstr "Sekmeyi kapat" -#: ../meld/ui/vcdialogs.py:50 +#: ../meld/ui/vcdialogs.py:48 msgid "No files will be committed" msgstr "Hiçbir dosya gönderilemeyecektir" #. Translators: First %s is replaced by translated "%d unpushed #. commits", second %s is replaced by translated "%d branches" -#: ../meld/vc/git.py:95 +#: ../meld/vc/git.py:94 #, python-format msgid "%s in %s" msgstr "%s uzağa gönderilmemiş gönderim %s dalında" #. Translators: These messages cover the case where there is #. only one branch, and are not part of another message. -#: ../meld/vc/git.py:96 ../meld/vc/git.py:103 +#: ../meld/vc/git.py:95 ../meld/vc/git.py:102 #, python-format msgid "%d unpushed commit" msgid_plural "%d unpushed commits" msgstr[0] "%d uzağa gönderilmemiş gönderim" -#: ../meld/vc/git.py:98 +#: ../meld/vc/git.py:97 #, python-format msgid "%d branch" msgid_plural "%d branches" msgstr[0] "%d dal" -#: ../meld/vc/git.py:352 +#: ../meld/vc/git.py:330 #, python-format msgid "Mode changed from %s to %s" msgstr "Kip %s'den %s'e değiştirildi" -#: ../meld/vc/git.py:360 +#: ../meld/vc/git.py:338 msgid "Partially staged" msgstr "" -#: ../meld/vc/git.py:360 +#: ../meld/vc/git.py:338 msgid "Staged" msgstr "" @@ -2477,157 +2372,188 @@ msgstr "" msgid "None" msgstr "Hiçbiri" -#: ../meld/vc/svn.py:216 +#: ../meld/vc/svn.py:204 #, python-format msgid "Rev %s" msgstr "" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Merged" msgstr "Birleştirilmiş" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Base" msgstr "Taban" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Local" msgstr "Yerel" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Remote" msgstr "Uzak" -#: ../meld/vc/_vc.py:68 +#: ../meld/vc/_vc.py:70 msgid "Unversioned" msgstr "Sürümlendirilmemiş" -#: ../meld/vc/_vc.py:71 +#: ../meld/vc/_vc.py:73 msgid "Error" msgstr "Hata" -#: ../meld/vc/_vc.py:73 +#: ../meld/vc/_vc.py:75 msgid "Newly added" msgstr "Yakın zamanda eklenmiş" -#: ../meld/vc/_vc.py:75 +#: ../meld/vc/_vc.py:77 msgid "Renamed" msgstr "Yeniden Adlandırılmış" -#: ../meld/vc/_vc.py:76 +#: ../meld/vc/_vc.py:78 msgid "Conflict" msgstr "Çakışma" -#: ../meld/vc/_vc.py:77 +#: ../meld/vc/_vc.py:79 msgid "Removed" msgstr "Silindi" -#: ../meld/vc/_vc.py:78 +#: ../meld/vc/_vc.py:80 msgid "Missing" msgstr "Eksik" -#: ../meld/vc/_vc.py:79 +#: ../meld/vc/_vc.py:81 msgid "Not present" msgstr "Mevcut değil" #. Translators: This error message is shown when a version #. control binary isn't installed. -#: ../meld/vcview.py:255 -#, fuzzy, python-format -#| msgid "%s not installed" +#: ../meld/vcview.py:251 +#, python-format msgid "%(name)s (%(cmd)s not installed)" -msgstr "%s yüklü değil" +msgstr "%(name)s (%(cmd)s yüklü değil)" #. Translators: This error message is shown when a version #. controlled repository is invalid. -#: ../meld/vcview.py:259 -#, fuzzy, python-format -#| msgid "Invalid repository" +#: ../meld/vcview.py:255 +#, python-format msgid "%(name)s (Invalid repository)" -msgstr "Geçersiz depo" +msgstr "%(name)s (Geçersiz depo)" -#: ../meld/vcview.py:280 +#: ../meld/vcview.py:276 msgid "No valid version control system found in this folder" -msgstr "Bu klasörde geçerli bir sürüm denetim sistemi bulunamadı" +msgstr "Bu klasörde geçerli bir sürüm denetimi sistemi bulunamadı" -#: ../meld/vcview.py:282 +#: ../meld/vcview.py:278 msgid "Only one version control system found in this folder" -msgstr "Bu klasörde sadece bir sürüm denetim sistemi bulundu" +msgstr "Bu klasörde yalnızca bir sürüm denetimi sistemi bulundu" -#: ../meld/vcview.py:284 +#: ../meld/vcview.py:280 msgid "Choose which version control system to use" -msgstr "Hangi sürüm denetim sistemini kullanacağınızı seçin" +msgstr "Hangi sürüm denetimi sistemini kullanacağınızı seçin" #. TRANSLATORS: This is the location of the directory being viewed -#: ../meld/vcview.py:337 +#: ../meld/vcview.py:332 #, python-format msgid "%s: %s" msgstr "%s: %s" -#: ../meld/vcview.py:357 +#: ../meld/vcview.py:352 #, python-format msgid "Scanning %s" msgstr "%s taranıyor" -#: ../meld/vcview.py:396 +#: ../meld/vcview.py:391 msgid "(Empty)" msgstr "(Boş)" -#: ../meld/vcview.py:440 +#: ../meld/vcview.py:435 #, python-format msgid "%s — local" msgstr "%s — yerel" -#: ../meld/vcview.py:441 +#: ../meld/vcview.py:436 #, python-format msgid "%s — remote" msgstr "%s — uzak" -#: ../meld/vcview.py:449 +#: ../meld/vcview.py:444 #, python-format msgid "%s (local, merge, remote)" msgstr "%s (yerel, birleştir, uzak)" -#: ../meld/vcview.py:454 +#: ../meld/vcview.py:449 #, python-format msgid "%s (remote, merge, local)" msgstr "%s (uzak, birleştir, yerel)" -#: ../meld/vcview.py:465 +#: ../meld/vcview.py:460 #, python-format msgid "%s — repository" msgstr "%s — depo" -#: ../meld/vcview.py:471 +#: ../meld/vcview.py:466 #, python-format msgid "%s (working, repository)" msgstr "%s (çalışma dizini, depo)" -#: ../meld/vcview.py:475 +#: ../meld/vcview.py:470 #, python-format msgid "%s (repository, working)" msgstr "%s (depo, çalışma dizini)" -#: ../meld/vcview.py:643 +#: ../meld/vcview.py:638 msgid "Remove folder and all its files?" msgstr "Klasör ve dosyaları silinsin mi?" -#: ../meld/vcview.py:645 +#: ../meld/vcview.py:640 msgid "" "This will remove all selected files and folders, and all files within any " "selected folders, from version control." msgstr "" -"Bu işlem, sürüm kontrol sisteminden tüm seçili dosya ve klasörleri, ve " +"Bu işlem, sürüm denetimi sisteminden tüm seçili dosya ve klasörleri, ve " "seçili herhangi bir klasör içindeki tüm dosyaları kaldıracak." -#: ../meld/vcview.py:670 +#: ../meld/vcview.py:665 #, python-format msgid "Error removing %s" msgstr "%s silinirken hata" -#: ../meld/vcview.py:750 +#: ../meld/vcview.py:745 msgid "Clear" -msgstr "" +msgstr "Temizle" + +#~ msgid "Meld does not support Python 3." +#~ msgstr "Meld Python 3 desteklemez." + +#~ msgid "_Tabs" +#~ msgstr "_Sekmeler" + +#~ msgid "_Previous Tab" +#~ msgstr "_Önceki Sekme" + +#~ msgid "Activate previous tab" +#~ msgstr "Önceki sekmeyi etkinleştir" + +#~ msgid "_Next Tab" +#~ msgstr "_Sonraki Sekme" + +#~ msgid "Activate next tab" +#~ msgstr "Bir sonraki sekmeyi etkinleştir" + +#~ msgid "Move Tab _Left" +#~ msgstr "Sekmeyi _Sola Taşı" + +#~ msgid "Move current tab to left" +#~ msgstr "Mevcut sekmeyi sola taşı" + +#~ msgid "Move Tab _Right" +#~ msgstr "Sekmeyi _Sağa Taşı" + +#~ msgid "Move current tab to right" +#~ msgstr "Mevcut sekmeyi sağa taşı" + +#~ msgid "Switch to this tab" +#~ msgstr "Bu sekmeye geçiş yap" #~ msgid "" #~ "These text encodings will be automatically used (in order) to try to " From f016bd067e0a401bf4af3aa887c82d760cee9d93 Mon Sep 17 00:00:00 2001 From: Andika Triwidada Date: Sun, 19 Mar 2017 12:02:30 +0000 Subject: [PATCH 0153/1316] Update Indonesian translation --- po/id.po | 675 +++++++++++++++++++++++++++---------------------------- 1 file changed, 325 insertions(+), 350 deletions(-) diff --git a/po/id.po b/po/id.po index cb445cf0..69bf7b1c 100644 --- a/po/id.po +++ b/po/id.po @@ -1,15 +1,15 @@ # Indonesian translation for meld. # Copyright (C) 2013 meld's COPYRIGHT HOLDER # This file is distributed under the same license as the meld package. -# Andika Triwidada , 2013, 2014. +# Andika Triwidada , 2013, 2014, 2016, 2017. # msgid "" msgstr "" -"Project-Id-Version: meld meld-3-16\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"Project-Id-Version: meld master\n" +"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" "product=meld&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-05-01 10:47+0000\n" -"PO-Revision-Date: 2016-07-06 13:39+0700\n" +"POT-Creation-Date: 2017-03-18 12:18+0000\n" +"PO-Revision-Date: 2017-03-20 02:01+0700\n" "Last-Translator: Andika Triwidada \n" "Language-Team: Indonesian \n" "Language: id\n" @@ -17,22 +17,18 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.12\n" -#: ../bin/meld:144 +#: ../bin/meld:179 msgid "Cannot import: " msgstr "Tak bisa mengimpor:" -#: ../bin/meld:147 +#: ../bin/meld:182 #, c-format msgid "Meld requires %s or higher." msgstr "Meld memerlukan %s atau lebih tinggi." -#: ../bin/meld:151 -msgid "Meld does not support Python 3." -msgstr "Meld tidak mendukung Python 3." - -#: ../bin/meld:200 +#: ../bin/meld:227 #, c-format msgid "" "Couldn't load Meld-specific CSS (%s)\n" @@ -84,39 +80,51 @@ msgstr "" "Meld membantu Anda meninjau perubahan kode, memahami patch, dan membuat " "konflik merge yang besar sedikit lebih mudah." +#: ../data/meld.appdata.xml.in.h:5 +msgid "The GNOME Project" +msgstr "Proyek GNOME" + #: ../data/mime/meld.xml.in.h:1 msgid "Meld comparison description" msgstr "Deskripsi perbandingan Meld" #: ../data/org.gnome.meld.gschema.xml.h:1 -msgid "Default window size" -msgstr "Ukuran jendela baku" +msgid "Default window width" +msgstr "Lebar jendela baku" #: ../data/org.gnome.meld.gschema.xml.h:2 -msgid "Default window state" -msgstr "Keadaan jendela baku" +msgid "Default window height" +msgstr "Tinggi jendela baku" #: ../data/org.gnome.meld.gschema.xml.h:3 +msgid "Default window maximised state" +msgstr "Keadaan termaksimalkan jendela baku" + +#: ../data/org.gnome.meld.gschema.xml.h:4 +msgid "Default window fullscreen state" +msgstr "Keadaan layar penuh jendela baku" + +#: ../data/org.gnome.meld.gschema.xml.h:5 msgid "Show toolbar" msgstr "Tampilkan bilah alat" -#: ../data/org.gnome.meld.gschema.xml.h:4 +#: ../data/org.gnome.meld.gschema.xml.h:6 msgid "If true, the window toolbar is visible." msgstr "Bila berisi true, bilah alat jendela tampak." -#: ../data/org.gnome.meld.gschema.xml.h:5 +#: ../data/org.gnome.meld.gschema.xml.h:7 msgid "Show statusbar" msgstr "Tampilkan bilah status" -#: ../data/org.gnome.meld.gschema.xml.h:6 +#: ../data/org.gnome.meld.gschema.xml.h:8 msgid "If true, the window statusbar is visible." msgstr "Bila berisi true, bilah status jendela tampak." -#: ../data/org.gnome.meld.gschema.xml.h:7 +#: ../data/org.gnome.meld.gschema.xml.h:9 msgid "Additional automatically detected text encodings" msgstr "Tambahan enkoding teks yang dideteksi secara otomatis" -#: ../data/org.gnome.meld.gschema.xml.h:8 +#: ../data/org.gnome.meld.gschema.xml.h:10 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,39 +137,39 @@ msgstr "" "selalu dipakai; encoding lain mungkin juga dicoba, bergantung kepada locale " "pengguna." -#: ../data/org.gnome.meld.gschema.xml.h:9 +#: ../data/org.gnome.meld.gschema.xml.h:11 msgid "Width of an indentation step" msgstr "Lebar langkah indentasi" -#: ../data/org.gnome.meld.gschema.xml.h:10 +#: ../data/org.gnome.meld.gschema.xml.h:12 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.h:11 +#: ../data/org.gnome.meld.gschema.xml.h:13 msgid "Whether to indent using spaces or tabs" msgstr "Apakah indentasi memakai spasi atau tab" -#: ../data/org.gnome.meld.gschema.xml.h:12 +#: ../data/org.gnome.meld.gschema.xml.h:14 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.h:13 +#: ../data/org.gnome.meld.gschema.xml.h:15 msgid "Show line numbers" msgstr "Tampilkan nomor baris" -#: ../data/org.gnome.meld.gschema.xml.h:14 +#: ../data/org.gnome.meld.gschema.xml.h:16 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.h:15 +#: ../data/org.gnome.meld.gschema.xml.h:17 msgid "Highlight syntax" msgstr "Sorot sintaks" -#: ../data/org.gnome.meld.gschema.xml.h:16 +#: ../data/org.gnome.meld.gschema.xml.h:18 msgid "" "Whether to highlight syntax in comparisons. Because of Meld's own color " "highlighting, this is off by default." @@ -169,20 +177,20 @@ msgstr "" "Apakah menyorot sintaks dalam perbandingan. Karena warna penyorotan milik " "Meld, ini secara baku mati." -#: ../data/org.gnome.meld.gschema.xml.h:17 +#: ../data/org.gnome.meld.gschema.xml.h:19 msgid "Color scheme to use for syntax highlighting" msgstr "Skema warna yang digunakan untuk penyorotan sintaks" -#: ../data/org.gnome.meld.gschema.xml.h:18 +#: ../data/org.gnome.meld.gschema.xml.h:20 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.h:19 +#: ../data/org.gnome.meld.gschema.xml.h:21 msgid "Displayed whitespace" msgstr "Whitespace yang ditampilkan" -#: ../data/org.gnome.meld.gschema.xml.h:20 +#: ../data/org.gnome.meld.gschema.xml.h:22 msgid "" "Selector for individual whitespace character types to be shown. Possible " "values are 'space', 'tab', 'newline' and 'nbsp'." @@ -191,11 +199,11 @@ msgstr "" "yang mungkin adalah 'space' (spasi), 'tab', 'newline' (baris baru), dan " "'nbsp' (spasi tak putus)." -#: ../data/org.gnome.meld.gschema.xml.h:21 +#: ../data/org.gnome.meld.gschema.xml.h:23 msgid "Wrap mode" msgstr "Mode lipat" -#: ../data/org.gnome.meld.gschema.xml.h:22 +#: ../data/org.gnome.meld.gschema.xml.h:24 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 " @@ -205,11 +213,11 @@ msgstr "" "tidak sedikitpun ('none'), pada sebarang karakter ('char'), atau hanya pada " "akhir kata ('word')." -#: ../data/org.gnome.meld.gschema.xml.h:23 +#: ../data/org.gnome.meld.gschema.xml.h:25 msgid "Highlight current line" msgstr "Sorot baris saat ini" -#: ../data/org.gnome.meld.gschema.xml.h:24 +#: ../data/org.gnome.meld.gschema.xml.h:26 msgid "" "If true, the line containing the cursor will be highlighted in file " "comparisons." @@ -217,22 +225,22 @@ msgstr "" "Bila berisi true, baris yang memuat kursor akan disorot dalam perbandingan " "berkas." -#: ../data/org.gnome.meld.gschema.xml.h:25 +#: ../data/org.gnome.meld.gschema.xml.h:27 msgid "Use the system default monospace font" msgstr "Gunakan fonta monospace bawaan sistem" -#: ../data/org.gnome.meld.gschema.xml.h:26 +#: ../data/org.gnome.meld.gschema.xml.h:28 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.h:27 +#: ../data/org.gnome.meld.gschema.xml.h:29 msgid "Custom font" msgstr "Fonta ubahan" -#: ../data/org.gnome.meld.gschema.xml.h:28 +#: ../data/org.gnome.meld.gschema.xml.h:30 msgid "" "The custom font to use, stored as a string and parsed as a Pango font " "description." @@ -240,22 +248,22 @@ msgstr "" "Fonta ubahan yang dipakai, disimpan sebagai suatu string dan diurai sebagai " "suatu deskripsi fonta Pango." -#: ../data/org.gnome.meld.gschema.xml.h:29 +#: ../data/org.gnome.meld.gschema.xml.h:31 msgid "Ignore blank lines when comparing files" msgstr "Abaikan baris kosong ketika membandingkan berkas" -#: ../data/org.gnome.meld.gschema.xml.h:30 +#: ../data/org.gnome.meld.gschema.xml.h:32 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.h:31 +#: ../data/org.gnome.meld.gschema.xml.h:33 msgid "Use the system default editor" msgstr "Gunakan penyunting bawaan sistem" -#: ../data/org.gnome.meld.gschema.xml.h:32 +#: ../data/org.gnome.meld.gschema.xml.h:34 msgid "" "If false, custom-editor-command will be used instead of the system editor " "when opening files externally." @@ -263,11 +271,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.h:33 +#: ../data/org.gnome.meld.gschema.xml.h:35 msgid "The custom editor launch command" msgstr "Perintah peluncuran penyunting ubahan" -#: ../data/org.gnome.meld.gschema.xml.h:34 +#: ../data/org.gnome.meld.gschema.xml.h:36 msgid "" "The command used to launch a custom editor. Some limited templating is " "supported here; at the moment '{file}' and '{line}' are recognised tokens." @@ -276,11 +284,11 @@ msgstr "" "penemplatan yang terbatas didukung di sini; saat ini '{file}' dan '{line}' " "adalah token yang dikenal." -#: ../data/org.gnome.meld.gschema.xml.h:35 +#: ../data/org.gnome.meld.gschema.xml.h:37 msgid "Columns to display" msgstr "Kolom yang akan ditampilkan" -#: ../data/org.gnome.meld.gschema.xml.h:36 +#: ../data/org.gnome.meld.gschema.xml.h:38 msgid "" "List of column names in folder comparison and whether they should be " "displayed." @@ -288,11 +296,11 @@ msgstr "" "Daftar nama kolom dalam perbandingan folder dan apakah mereka mesti " "ditampilkan." -#: ../data/org.gnome.meld.gschema.xml.h:37 ../data/ui/preferences.ui.h:32 +#: ../data/org.gnome.meld.gschema.xml.h:39 ../data/ui/preferences.ui.h:25 msgid "Ignore symbolic links" msgstr "Abaikan taut simbolik" -#: ../data/org.gnome.meld.gschema.xml.h:38 +#: ../data/org.gnome.meld.gschema.xml.h:40 msgid "" "If true, folder comparisons do not follow symbolic links when traversing the " "folder tree." @@ -300,11 +308,11 @@ msgstr "" "Bila berisi true, perbandingan folder tidak mengikuti taut simbolik ketika " "menelusuri pohon folder." -#: ../data/org.gnome.meld.gschema.xml.h:39 +#: ../data/org.gnome.meld.gschema.xml.h:41 msgid "Use shallow comparison" msgstr "Gunakan perbandingan dangkal" -#: ../data/org.gnome.meld.gschema.xml.h:40 +#: ../data/org.gnome.meld.gschema.xml.h:42 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 " @@ -314,11 +322,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.h:41 +#: ../data/org.gnome.meld.gschema.xml.h:43 msgid "File timestamp resolution" msgstr "Resolusi penanda waktu" -#: ../data/org.gnome.meld.gschema.xml.h:42 +#: ../data/org.gnome.meld.gschema.xml.h:44 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 " @@ -330,11 +338,11 @@ msgstr "" "berbeda. Ini berguna ketika membandingkan berkas antar sistem berkas dengan " "resolusi penanda waktu yang berbeda." -#: ../data/org.gnome.meld.gschema.xml.h:43 ../data/ui/preferences.ui.h:30 +#: ../data/org.gnome.meld.gschema.xml.h:45 ../data/ui/preferences.ui.h:22 msgid "Apply text filters during folder comparisons" msgstr "Terapkan penyaring teks selama perbandingan folder" -#: ../data/org.gnome.meld.gschema.xml.h:44 +#: ../data/org.gnome.meld.gschema.xml.h:46 msgid "" "If true, folder comparisons that compare file contents also apply active " "text filters and the blank line trimming option, and ignore newline " @@ -344,21 +352,21 @@ msgstr "" "menerapkan penyaring teks aktif dan opsi pemangkasan baris kosong, dan " "mengabaikan perbedaan baris baru." -#: ../data/org.gnome.meld.gschema.xml.h:45 +#: ../data/org.gnome.meld.gschema.xml.h:47 msgid "File status filters" msgstr "Penyaring status berkas" -#: ../data/org.gnome.meld.gschema.xml.h:46 +#: ../data/org.gnome.meld.gschema.xml.h:48 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.h:47 +#: ../data/org.gnome.meld.gschema.xml.h:49 msgid "Show the version control console output" msgstr "Tampilkan keluaran konsol kendali versi" -#: ../data/org.gnome.meld.gschema.xml.h:48 +#: ../data/org.gnome.meld.gschema.xml.h:50 msgid "" "If true, a console output section will be shown in version control views, " "showing the commands run for version control operations." @@ -367,22 +375,22 @@ msgstr "" "kendali versi, menunjukkan perintah yang dijalankan bagi operasi kendali " "versi." -#: ../data/org.gnome.meld.gschema.xml.h:49 +#: ../data/org.gnome.meld.gschema.xml.h:51 msgid "Version control pane position" msgstr "Posisi panel kendali versi" -#: ../data/org.gnome.meld.gschema.xml.h:50 +#: ../data/org.gnome.meld.gschema.xml.h:52 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.h:51 +#: ../data/org.gnome.meld.gschema.xml.h:53 msgid "Present version comparisons as left-local/right-remote" msgstr "Sajikan perbandingan versi sebagai kiri-lokal/kanan-jauh" -#: ../data/org.gnome.meld.gschema.xml.h:52 +#: ../data/org.gnome.meld.gschema.xml.h:54 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, " @@ -393,11 +401,11 @@ msgstr "" "dalam panel. Bila tidak, skema left-adalah-milik-mereka, kanan-adalah-" "milikku dipakai." -#: ../data/org.gnome.meld.gschema.xml.h:53 +#: ../data/org.gnome.meld.gschema.xml.h:55 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.h:54 +#: ../data/org.gnome.meld.gschema.xml.h:56 msgid "" "Choices for file order are remote/merged/local and local/merged/remote. This " "preference only affects three-way comparisons launched from the version " @@ -408,11 +416,11 @@ msgstr "" "diluncurkan dari tilikan kendali versi, sehingga hanya dipakai untuk " "resolusi merge/konflik di dalam Meld." -#: ../data/org.gnome.meld.gschema.xml.h:55 +#: ../data/org.gnome.meld.gschema.xml.h:57 msgid "Show margin in commit message editor" msgstr "Tampilkan marjin dalam penyunting pesan komit" -#: ../data/org.gnome.meld.gschema.xml.h:56 +#: ../data/org.gnome.meld.gschema.xml.h:58 msgid "" "If true, a guide will be displayed to show what column the margin is at in " "the version control commit message editor." @@ -420,11 +428,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.h:57 +#: ../data/org.gnome.meld.gschema.xml.h:59 msgid "Margin column in commit message editor" msgstr "Marjin kolom dalam penyunting pesan komit" -#: ../data/org.gnome.meld.gschema.xml.h:58 +#: ../data/org.gnome.meld.gschema.xml.h:60 msgid "" "The column at which to show the margin in the version control commit message " "editor." @@ -432,11 +440,11 @@ msgstr "" "Kolom tempat menunjukkan posisi marjin dalam penyunting pesan komit kendali " "versi." -#: ../data/org.gnome.meld.gschema.xml.h:59 +#: ../data/org.gnome.meld.gschema.xml.h:61 msgid "Automatically hard-wrap commit messages" msgstr "Secara otomatis melipat isi pesan komit" -#: ../data/org.gnome.meld.gschema.xml.h:60 +#: ../data/org.gnome.meld.gschema.xml.h:62 msgid "" "If true, the version control commit message editor will hard-wrap (i.e., " "insert line breaks) at the commit margin before commit." @@ -444,22 +452,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.h:61 +#: ../data/org.gnome.meld.gschema.xml.h:63 msgid "Version control status filters" msgstr "Penyaring status kendali versi" -#: ../data/org.gnome.meld.gschema.xml.h:62 +#: ../data/org.gnome.meld.gschema.xml.h:64 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.h:63 +#: ../data/org.gnome.meld.gschema.xml.h:65 msgid "Filename-based filters" msgstr "Penyaring berbasis nama berkas" -#: ../data/org.gnome.meld.gschema.xml.h:64 +#: ../data/org.gnome.meld.gschema.xml.h:66 msgid "" "List of predefined filename-based filters that, if active, will remove " "matching files from a folder comparison." @@ -467,11 +475,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.h:65 +#: ../data/org.gnome.meld.gschema.xml.h:67 msgid "Text-based filters" msgstr "Penyaring berbasis teks" -#: ../data/org.gnome.meld.gschema.xml.h:66 +#: ../data/org.gnome.meld.gschema.xml.h:68 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, " @@ -565,7 +573,7 @@ msgstr "Salin ke kanan" msgid "Delete selected" msgstr "Hapus yang dipilih" -#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:860 ../meld/filediff.py:1366 +#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:858 ../meld/filediff.py:1336 msgid "Hide" msgstr "Sembunyikan" @@ -601,7 +609,7 @@ msgstr "Baru" msgid "Show new" msgstr "Tampilkan yang baru" -#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:74 +#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:76 msgid "Modified" msgstr "Diubah" @@ -634,7 +642,7 @@ msgid "_Add" msgstr "T_ambah" #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11 -#: ../meld/vcview.py:649 +#: ../meld/vcview.py:644 msgid "_Remove" msgstr "_Hapus" @@ -656,7 +664,7 @@ msgstr "_Turunkan" #. Create icon and filename CellRenderer #: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35 -#: ../meld/dirdiff.py:374 +#: ../meld/dirdiff.py:373 msgid "Name" msgstr "Nama" @@ -857,8 +865,8 @@ msgstr "Bila Anda tak menyimpan, perubahan akan hilang selamanya." msgid "Close _without Saving" msgstr "Tutup _Tanpa Menyimpan" -#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:942 ../meld/filediff.py:1432 -#: ../meld/filediff.py:1500 +#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:940 ../meld/filediff.py:1402 +#: ../meld/filediff.py:1474 msgid "_Cancel" msgstr "_Batal" @@ -896,7 +904,7 @@ msgid "Changes made to the following documents will be permanently lost:\n" msgstr "" "Perubahan yang dibuat ke dokumen-dokumen berikut akan hilang selamanya:\n" -#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:943 ../meld/filediff.py:1433 +#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:941 ../meld/filediff.py:1403 msgid "_Replace" msgstr "_Timpa" @@ -944,7 +952,7 @@ msgstr "Format sebagai Patch" msgid "Copy to Clipboard" msgstr "Salin ke Papan Klip" -#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:149 +#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:154 msgid "Save Patch" msgstr "Simpan Patch" @@ -965,166 +973,140 @@ msgid "_Reverse patch direction" msgstr "Balikkan a_rah patch" #: ../data/ui/preferences.ui.h:1 -msgid "Left is remote, right is local" -msgstr "Kiri remote, kanan lokal" - -#: ../data/ui/preferences.ui.h:2 -msgid "Left is local, right is remote" -msgstr "Kiri lokal, kanan remote" - -#: ../data/ui/preferences.ui.h:3 -msgid "Remote, merge, local" -msgstr "Remote, merge, lokal" - -#: ../data/ui/preferences.ui.h:4 -msgid "Local, merge, remote" -msgstr "Lokal, merge, remote" - -#: ../data/ui/preferences.ui.h:5 -msgid "1ns (ext4)" -msgstr "1ns (ext4)" - -#: ../data/ui/preferences.ui.h:6 -msgid "100ns (NTFS)" -msgstr "100ns (NTFS)" - -#: ../data/ui/preferences.ui.h:7 -msgid "1s (ext2/ext3)" -msgstr "1s (ext2/ext3)" - -#: ../data/ui/preferences.ui.h:8 -msgid "2s (VFAT)" -msgstr "2s (VFAT)" - -#: ../data/ui/preferences.ui.h:9 msgid "Meld Preferences" msgstr "Preferensi Meld" -#: ../data/ui/preferences.ui.h:10 +#: ../data/ui/preferences.ui.h:2 msgid "Font" msgstr "Fonta" -#: ../data/ui/preferences.ui.h:11 +#: ../data/ui/preferences.ui.h:3 msgid "_Use the system fixed width font" msgstr "G_unakan fonta lebar tetap sistem" -#: ../data/ui/preferences.ui.h:12 +#: ../data/ui/preferences.ui.h:4 msgid "_Editor font:" msgstr "Fonta p_enyunting:" -#: ../data/ui/preferences.ui.h:13 +#: ../data/ui/preferences.ui.h:5 msgid "Display" msgstr "Tampilan" -#: ../data/ui/preferences.ui.h:14 +#: ../data/ui/preferences.ui.h:6 msgid "_Tab width:" msgstr "Lebar _tab:" -#: ../data/ui/preferences.ui.h:15 +#: ../data/ui/preferences.ui.h:7 msgid "_Insert spaces instead of tabs" msgstr "S_isipkan spasi-spasi sebagai penggati tab" -#: ../data/ui/preferences.ui.h:16 +#: ../data/ui/preferences.ui.h:8 msgid "Enable text _wrapping" msgstr "Fungsikan pe_lipatan text" -#: ../data/ui/preferences.ui.h:17 +#: ../data/ui/preferences.ui.h:9 msgid "Do not _split words over two lines" msgstr "Jangan penggal kata ke dua bari_s" -#: ../data/ui/preferences.ui.h:18 +#: ../data/ui/preferences.ui.h:10 msgid "Highlight _current line" msgstr "Sorot baris _saat ini" -#: ../data/ui/preferences.ui.h:19 +#: ../data/ui/preferences.ui.h:11 msgid "Show _line numbers" msgstr "Tampi_lkan nomor baris" -#: ../data/ui/preferences.ui.h:20 +#: ../data/ui/preferences.ui.h:12 msgid "Show w_hitespace" msgstr "Tampilkan w_hitespace" -#: ../data/ui/preferences.ui.h:21 +#: ../data/ui/preferences.ui.h:13 msgid "Use s_yntax highlighting" msgstr "Gunakan penyorotan s_intaks" -#: ../data/ui/preferences.ui.h:22 +#: ../data/ui/preferences.ui.h:14 msgid "Syntax highlighting color scheme:" msgstr "Skema warna penyorotan sintaks:" -#: ../data/ui/preferences.ui.h:23 +#: ../data/ui/preferences.ui.h:15 msgid "External Editor" msgstr "Penyunting Eksternal" -#: ../data/ui/preferences.ui.h:24 +#: ../data/ui/preferences.ui.h:16 msgid "Use _default system editor" msgstr "_Gunakan penyunting bawaan sistem" -#: ../data/ui/preferences.ui.h:25 +#: ../data/ui/preferences.ui.h:17 msgid "Edito_r command:" msgstr "Pe_rintah penyunting:" -#: ../data/ui/preferences.ui.h:26 +#: ../data/ui/preferences.ui.h:18 msgid "Editor" msgstr "Penyunting" -#: ../data/ui/preferences.ui.h:27 +#: ../data/ui/preferences.ui.h:19 msgid "Shallow Comparison" msgstr "Perbandingan Dangkal" -#: ../data/ui/preferences.ui.h:28 +#: ../data/ui/preferences.ui.h:20 msgid "C_ompare files based only on size and timestamp" msgstr "B_andingkan berkas hanya berdasarkan ukuran dan penanda waktu" -#: ../data/ui/preferences.ui.h:29 +#: ../data/ui/preferences.ui.h:21 msgid "_Timestamp resolution:" msgstr "Resolusi penanda wak_tu:" -#: ../data/ui/preferences.ui.h:31 +#: ../data/ui/preferences.ui.h:23 +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" + +#: ../data/ui/preferences.ui.h:24 msgid "Symbolic Links" msgstr "Taut Simbolik" -#: ../data/ui/preferences.ui.h:33 +#: ../data/ui/preferences.ui.h:26 msgid "Visible Columns" msgstr "Kolom Yang Nampak" -#: ../data/ui/preferences.ui.h:34 +#: ../data/ui/preferences.ui.h:27 msgid "Folder Comparisons" msgstr "Perbandingan Folder" -#: ../data/ui/preferences.ui.h:35 +#: ../data/ui/preferences.ui.h:28 msgid "Version Comparisons" msgstr "Perbandingan Versi" -#: ../data/ui/preferences.ui.h:36 +#: ../data/ui/preferences.ui.h:29 msgid "_Order when comparing file revisions:" msgstr "_Urutan ketika membandingkan revisi berkas:" -#: ../data/ui/preferences.ui.h:37 +#: ../data/ui/preferences.ui.h:30 msgid "Order when _merging files:" msgstr "Urutan ketika _merge berkas" -#: ../data/ui/preferences.ui.h:38 +#: ../data/ui/preferences.ui.h:31 msgid "Commit Messages" msgstr "Pesan Komit" -#: ../data/ui/preferences.ui.h:39 +#: ../data/ui/preferences.ui.h:32 msgid "Show _right margin at:" msgstr "Tampilkan ma_rjin kanan pada:" -#: ../data/ui/preferences.ui.h:40 +#: ../data/ui/preferences.ui.h:33 msgid "Automatically _break lines at right margin on commit" msgstr "Otomatis lipat _baris pada marjin kanan saat komit" -#: ../data/ui/preferences.ui.h:41 +#: ../data/ui/preferences.ui.h:34 msgid "Version Control" msgstr "Kendali Versi" -#: ../data/ui/preferences.ui.h:42 +#: ../data/ui/preferences.ui.h:35 msgid "Filename filters" msgstr "Penyaring nama berkas" -#: ../data/ui/preferences.ui.h:43 +#: ../data/ui/preferences.ui.h:36 msgid "" "When performing directory comparisons, you may filter out files and " "directories by name. Each pattern is a list of shell style wildcards " @@ -1134,23 +1116,23 @@ msgstr "" "direktori menurut namanya. Setiap pola adalah daftar dari wildcard gaya " "shell yang dipisahkan oleh spasi." -#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:104 +#: ../data/ui/preferences.ui.h:37 ../meld/meldwindow.py:104 msgid "File Filters" msgstr "Penyaring Berkas" -#: ../data/ui/preferences.ui.h:45 +#: ../data/ui/preferences.ui.h:38 msgid "Change trimming" msgstr "Ubah pemangkasan" -#: ../data/ui/preferences.ui.h:46 +#: ../data/ui/preferences.ui.h:39 msgid "Trim blank line differences from the start and end of changes" msgstr "Pangkas perbedaan baris kosong dari awal dan akhir perubahan" -#: ../data/ui/preferences.ui.h:47 +#: ../data/ui/preferences.ui.h:40 msgid "Text filters" msgstr "Penyaring teks" -#: ../data/ui/preferences.ui.h:48 +#: ../data/ui/preferences.ui.h:41 msgid "" "When performing file comparisons, you may ignore certain types of changes. " "Each pattern here is a python regular expression which replaces matching " @@ -1164,10 +1146,42 @@ msgstr "" "dilakukan. Bila ekspresi memuat grup, hanya grup tersebut yang diganti. " "Lihat manual pengguna untuk rincian lebih lanjut." -#: ../data/ui/preferences.ui.h:49 +#: ../data/ui/preferences.ui.h:42 msgid "Text Filters" msgstr "Penyaring Teks" +#: ../data/ui/preferences.ui.h:43 +msgid "Left is remote, right is local" +msgstr "Kiri remote, kanan lokal" + +#: ../data/ui/preferences.ui.h:44 +msgid "Left is local, right is remote" +msgstr "Kiri lokal, kanan remote" + +#: ../data/ui/preferences.ui.h:45 +msgid "Remote, merge, local" +msgstr "Remote, merge, lokal" + +#: ../data/ui/preferences.ui.h:46 +msgid "Local, merge, remote" +msgstr "Lokal, merge, remote" + +#: ../data/ui/preferences.ui.h:47 +msgid "1ns (ext4)" +msgstr "1ns (ext4)" + +#: ../data/ui/preferences.ui.h:48 +msgid "100ns (NTFS)" +msgstr "100ns (NTFS)" + +#: ../data/ui/preferences.ui.h:49 +msgid "1s (ext2/ext3)" +msgstr "1s (ext2/ext3)" + +#: ../data/ui/preferences.ui.h:50 +msgid "2s (VFAT)" +msgstr "2s (VFAT)" + #: ../data/ui/shortcuts.ui.h:1 msgctxt "shortcut window" msgid "General" @@ -1413,7 +1427,8 @@ msgctxt "shortcut window" msgid "Show/hide console output" msgstr "Tampilkan/sembunyikan keluaran konsol" -#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:668 +#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:562 +#: ../meld/newdifftab.py:38 msgid "New comparison" msgstr "Perbandingan baru" @@ -1561,7 +1576,7 @@ msgstr "Tanpa _Versi" msgid "Show unversioned files" msgstr "Tampilkan berkas tanpa versi" -#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:67 +#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69 msgid "Ignored" msgstr "Diabaikan" @@ -1589,7 +1604,7 @@ msgstr "Log sebelumnya:" msgid "Co_mmit" msgstr "Ko_mit" -#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:337 +#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:332 msgid "Location" msgstr "Lokasi" @@ -1630,44 +1645,44 @@ msgid "Mac OS (CR)" msgstr "Mac OS (CR)" #. Create file size CellRenderer -#: ../meld/dirdiff.py:392 ../meld/preferences.py:82 +#: ../meld/dirdiff.py:391 ../meld/preferences.py:82 msgid "Size" msgstr "Ukuran" #. Create date-time CellRenderer -#: ../meld/dirdiff.py:400 ../meld/preferences.py:83 +#: ../meld/dirdiff.py:399 ../meld/preferences.py:83 msgid "Modification time" msgstr "Waktu modifikasi" #. Create permissions CellRenderer -#: ../meld/dirdiff.py:408 ../meld/preferences.py:84 +#: ../meld/dirdiff.py:407 ../meld/preferences.py:84 msgid "Permissions" msgstr "Ijin" -#: ../meld/dirdiff.py:538 +#: ../meld/dirdiff.py:537 #, python-format msgid "Hide %s" msgstr "Sembunyikan %s" -#: ../meld/dirdiff.py:670 ../meld/dirdiff.py:694 +#: ../meld/dirdiff.py:669 ../meld/dirdiff.py:693 #, python-format msgid "[%s] Scanning %s" msgstr "[%s] Memindai %s" -#: ../meld/dirdiff.py:827 +#: ../meld/dirdiff.py:825 #, python-format msgid "[%s] Done" msgstr "[%s] Selesai" -#: ../meld/dirdiff.py:835 +#: ../meld/dirdiff.py:833 msgid "Folders have no differences" msgstr "Folder-folder tak punya perbedaan" -#: ../meld/dirdiff.py:837 +#: ../meld/dirdiff.py:835 msgid "Contents of scanned files in folders are identical." msgstr "Isi berkas yang dipindai dalam folder-folder identik." -#: ../meld/dirdiff.py:839 +#: ../meld/dirdiff.py:837 msgid "" "Scanned files in folders appear identical, but contents have not been " "scanned." @@ -1675,42 +1690,42 @@ msgstr "" "Berkas-berkas yang dipindai dalam folder-folder tampak identik, tapi isi " "belum dipindai." -#: ../meld/dirdiff.py:842 +#: ../meld/dirdiff.py:840 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:844 +#: ../meld/dirdiff.py:842 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:862 ../meld/filediff.py:1368 ../meld/filediff.py:1398 -#: ../meld/filediff.py:1400 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 +#: ../meld/dirdiff.py:860 ../meld/filediff.py:1338 ../meld/filediff.py:1368 +#: ../meld/filediff.py:1370 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122 msgid "Hi_de" msgstr "Sem_bunyikan" -#: ../meld/dirdiff.py:872 +#: ../meld/dirdiff.py:870 msgid "Multiple errors occurred while scanning this folder" msgstr "Galat berganda terjadi ketika memindai folder ini" -#: ../meld/dirdiff.py:873 +#: ../meld/dirdiff.py:871 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:875 +#: ../meld/dirdiff.py:873 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:877 +#: ../meld/dirdiff.py:875 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:879 +#: ../meld/dirdiff.py:877 msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. The following files in this folder are hidden:" @@ -1719,17 +1734,17 @@ msgstr "" "sistem berkas yang peka huruf besar kecil. Berkas-berkas berikut dalam " "folder ini tersembunyi:
" -#: ../meld/dirdiff.py:890 +#: ../meld/dirdiff.py:888 #, python-format msgid "'%s' hidden by '%s'" msgstr "'%s' disembunyikan oleh '%s'" -#: ../meld/dirdiff.py:946 +#: ../meld/dirdiff.py:944 #, python-format msgid "Replace folder “%s”?" msgstr "Timpa folder “%s”?" -#: ../meld/dirdiff.py:948 +#: ../meld/dirdiff.py:946 #, python-format msgid "" "Another folder with the same name already exists in “%s”.\n" @@ -1738,11 +1753,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:961 +#: ../meld/dirdiff.py:959 msgid "Error copying file" msgstr "Galat saat menyalin berkas" -#: ../meld/dirdiff.py:962 +#: ../meld/dirdiff.py:960 #, python-format msgid "" "Couldn't copy %s\n" @@ -1755,35 +1770,35 @@ msgstr "" "\n" "%s" -#: ../meld/dirdiff.py:985 +#: ../meld/dirdiff.py:983 #, python-format msgid "Error deleting %s" msgstr "Galat saat menghapus %s" -#: ../meld/dirdiff.py:1492 +#: ../meld/dirdiff.py:1494 msgid "No folder" msgstr "Tidak ada folder" #. Abbreviations for insert and overwrite that fit in the status bar -#: ../meld/filediff.py:357 +#: ../meld/filediff.py:311 msgid "INS" msgstr "INS" -#: ../meld/filediff.py:357 +#: ../meld/filediff.py:311 msgid "OVR" msgstr "OVR" #. Abbreviation for line, column so that it will fit in the status bar -#: ../meld/filediff.py:359 +#: ../meld/filediff.py:313 #, python-format msgid "Ln %i, Col %i" msgstr "Brs %i, Kol %i" -#: ../meld/filediff.py:774 +#: ../meld/filediff.py:738 msgid "Comparison results will be inaccurate" msgstr "Hasil perbandingan tidak akan akurat" -#: ../meld/filediff.py:776 +#: ../meld/filediff.py:740 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1791,66 +1806,66 @@ msgstr "" "Suatu penyaring mengubah cacah baris dalam berkas, yang tidak didukung. " "Perbandingan tidak akan akurat." -#: ../meld/filediff.py:834 +#: ../meld/filediff.py:796 msgid "Mark conflict as resolved?" msgstr "Tandai konflik sebagai terselesaikan?" -#: ../meld/filediff.py:836 +#: ../meld/filediff.py:798 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:838 +#: ../meld/filediff.py:800 msgid "Cancel" msgstr "Batal" -#: ../meld/filediff.py:839 +#: ../meld/filediff.py:801 msgid "Mark _Resolved" msgstr "Tandai Te_rselesaikan" -#: ../meld/filediff.py:1084 +#: ../meld/filediff.py:1049 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Ada masalah saat membuka berkas \"%s\"." -#: ../meld/filediff.py:1092 +#: ../meld/filediff.py:1057 #, python-format msgid "File %s appears to be a binary file." msgstr "Berkas %s tampaknya berkas biner." -#: ../meld/filediff.py:1094 +#: ../meld/filediff.py:1059 msgid "Do you want to open the file using the default application?" msgstr "Apakah Anda ingin membuka berkas memakai aplikasi baku?" -#: ../meld/filediff.py:1096 +#: ../meld/filediff.py:1061 msgid "Open" msgstr "Buka" -#: ../meld/filediff.py:1112 +#: ../meld/filediff.py:1077 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Menghitung perbedaan" -#: ../meld/filediff.py:1177 +#: ../meld/filediff.py:1142 #, python-format msgid "File %s has changed on disk" msgstr "Berkas %s telah berubah pada disk" -#: ../meld/filediff.py:1178 +#: ../meld/filediff.py:1143 msgid "Do you want to reload the file?" msgstr "Apakah Anda ingin memuat ulang berkas?" -#: ../meld/filediff.py:1180 +#: ../meld/filediff.py:1145 msgid "_Reload" msgstr "Muat _Ulang" -#: ../meld/filediff.py:1331 +#: ../meld/filediff.py:1301 msgid "Files are identical" msgstr "Berkas identik" -#: ../meld/filediff.py:1344 +#: ../meld/filediff.py:1314 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1858,11 +1873,11 @@ msgstr "" "Penyaring teks sedang dipakai, dan mungkin menutupi perbedaan antara berkas. " "Apakah Anda ingin membandingkan berkas-berkas yang tak tersaring?" -#: ../meld/filediff.py:1349 +#: ../meld/filediff.py:1319 msgid "Files differ in line endings only" msgstr "Berkas berbeda hanya pada akhiran baris" -#: ../meld/filediff.py:1351 +#: ../meld/filediff.py:1321 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1871,15 +1886,15 @@ msgstr "" "Berkas-berkas identik kecuali perbedaan akhiran baris:\n" "%s" -#: ../meld/filediff.py:1371 +#: ../meld/filediff.py:1341 msgid "Show without filters" msgstr "Tampilkan tanpa penyaring" -#: ../meld/filediff.py:1393 +#: ../meld/filediff.py:1363 msgid "Change highlighting incomplete" msgstr "Penyorotan perubahan tak lengkap" -#: ../meld/filediff.py:1394 +#: ../meld/filediff.py:1364 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." @@ -1888,20 +1903,20 @@ msgstr "" "untuk lebih panjanga sehingga menyorot perubahan yang lebih besar, walaupun " "ini mungkin lambat." -#: ../meld/filediff.py:1402 +#: ../meld/filediff.py:1372 msgid "Keep highlighting" msgstr "Tetap menyorot" -#: ../meld/filediff.py:1404 +#: ../meld/filediff.py:1374 msgid "_Keep highlighting" msgstr "_Tetap menyorot" -#: ../meld/filediff.py:1436 +#: ../meld/filediff.py:1406 #, python-format msgid "Replace file “%s”?" msgstr "Timpa berkas “%s”?" -#: ../meld/filediff.py:1438 +#: ../meld/filediff.py:1408 #, python-format msgid "" "A file with this name already exists in “%s”.\n" @@ -1910,45 +1925,45 @@ msgstr "" "Sebuah berkas dengan nama ini telah ada dalam \"%s\".\n" "Bila Anda menimpa berkas yang ada, isinya akan hilang." -#: ../meld/filediff.py:1455 +#: ../meld/filediff.py:1425 msgid "Save Left Pane As" msgstr "Simpan Panel Kiri Sebagai" -#: ../meld/filediff.py:1457 +#: ../meld/filediff.py:1427 msgid "Save Middle Pane As" msgstr "Simpan Panel Tengah Sebagai" -#: ../meld/filediff.py:1459 +#: ../meld/filediff.py:1429 msgid "Save Right Pane As" msgstr "Simpan Panel Kanan Sebagai" -#: ../meld/filediff.py:1473 +#: ../meld/filediff.py:1443 #, 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:1475 +#: ../meld/filediff.py:1445 msgid "If you save it, any external changes will be lost." msgstr "Bila Anda menyimpannya, perubahan eksternal akan hilang." -#: ../meld/filediff.py:1478 +#: ../meld/filediff.py:1448 msgid "Save Anyway" msgstr "Simpan Saja" -#: ../meld/filediff.py:1479 +#: ../meld/filediff.py:1449 msgid "Don't Save" msgstr "Jangan Simpan" -#: ../meld/filediff.py:1501 +#: ../meld/filediff.py:1475 msgid "_Save as UTF-8" msgstr "_Simpan sebagai UTF-8" -#: ../meld/filediff.py:1504 +#: ../meld/filediff.py:1478 #, python-format msgid "Couldn't encode text as “%s”" msgstr "Tak bisa meng-encode teks sebagai \"%s\"" -#: ../meld/filediff.py:1506 +#: ../meld/filediff.py:1480 #, python-format msgid "" "File “%s” contains characters that can't be encoded using encoding “%s”.\n" @@ -1957,12 +1972,12 @@ msgstr "" "Berkas \"%s\" memuat karakter yang tak bisa dienkode dengan \"%s\".\n" "Apakah Anda ingin menyimpan sebagai UTF-8?" -#: ../meld/filediff.py:1543 ../meld/patchdialog.py:125 +#: ../meld/filediff.py:1520 ../meld/patchdialog.py:130 #, python-format msgid "Could not save file %s." msgstr "Tak bisa menyimpan berkas %s." -#: ../meld/filediff.py:1544 ../meld/patchdialog.py:126 +#: ../meld/filediff.py:1521 ../meld/patchdialog.py:131 #, python-format msgid "" "Couldn't save file due to:\n" @@ -1971,11 +1986,11 @@ msgstr "" "Tidak bisa menyimpan berkas karena:\n" "%s" -#: ../meld/filediff.py:1890 +#: ../meld/filediff.py:1870 msgid "Live comparison updating disabled" msgstr "Pemutakhiran perbandingan live dinonaktifkan" -#: ../meld/filediff.py:1891 +#: ../meld/filediff.py:1871 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -1991,111 +2006,111 @@ msgstr "" msgid "[%s] Merging files" msgstr "[%s] Sedang merge berkas" -#: ../meld/gutterrendererchunk.py:159 +#: ../meld/gutterrendererchunk.py:210 msgid "Copy _up" msgstr "Salin _naik" -#: ../meld/gutterrendererchunk.py:160 +#: ../meld/gutterrendererchunk.py:211 msgid "Copy _down" msgstr "Salin _turun" -#: ../meld/meldapp.py:177 +#: ../meld/meldapp.py:175 msgid "wrong number of arguments supplied to --diff" msgstr "banyaknya argumen yang diberikan ke --diff salah" -#: ../meld/meldapp.py:182 +#: ../meld/meldapp.py:180 msgid "Start with an empty window" msgstr "Mulai dengan jendela kosong" -#: ../meld/meldapp.py:183 ../meld/meldapp.py:185 +#: ../meld/meldapp.py:181 ../meld/meldapp.py:183 msgid "file" msgstr "berkas" -#: ../meld/meldapp.py:183 ../meld/meldapp.py:187 +#: ../meld/meldapp.py:181 ../meld/meldapp.py:185 msgid "folder" msgstr "folder" -#: ../meld/meldapp.py:184 +#: ../meld/meldapp.py:182 msgid "Start a version control comparison" msgstr "Mulai suatu perbandingan kendali versi" -#: ../meld/meldapp.py:186 +#: ../meld/meldapp.py:184 msgid "Start a 2- or 3-way file comparison" msgstr "Mulai perbandingan berkas 2 atau 3 pihak" -#: ../meld/meldapp.py:188 +#: ../meld/meldapp.py:186 msgid "Start a 2- or 3-way folder comparison" msgstr "Mulai perbandingan folder 2 atau 3 pihak" -#: ../meld/meldapp.py:231 +#: ../meld/meldapp.py:229 #, python-format msgid "Error: %s\n" msgstr "Galat: %s\n" -#: ../meld/meldapp.py:238 +#: ../meld/meldapp.py:236 msgid "Meld is a file and directory comparison tool." msgstr "Meld adalah alat perbandingan berkas dan direktori." -#: ../meld/meldapp.py:242 +#: ../meld/meldapp.py:240 msgid "Set label to use instead of file name" msgstr "Tata label yang akan dipakai sebagai ganti nama berkas" -#: ../meld/meldapp.py:245 +#: ../meld/meldapp.py:243 msgid "Open a new tab in an already running instance" msgstr "Buka tab baru pada instansi yang sedang berjalan" -#: ../meld/meldapp.py:248 +#: ../meld/meldapp.py:246 msgid "Automatically compare all differing files on startup" msgstr "Otomatis membandingkan semua berkas yang berbeda saat awal mula" -#: ../meld/meldapp.py:251 +#: ../meld/meldapp.py:249 msgid "Ignored for compatibility" msgstr "Diabaikan untuk kompatibilitas" -#: ../meld/meldapp.py:255 +#: ../meld/meldapp.py:253 msgid "Set the target file for saving a merge result" msgstr "Tata berkas target untuk menyimpan hasil merge" -#: ../meld/meldapp.py:258 +#: ../meld/meldapp.py:256 msgid "Automatically merge files" msgstr "Otomatis me-merge berkas" -#: ../meld/meldapp.py:262 +#: ../meld/meldapp.py:260 msgid "Load a saved comparison from a Meld comparison file" msgstr "Muat perbandingan yang disimpan dari suatu berkas perbandingan Meld" -#: ../meld/meldapp.py:266 +#: ../meld/meldapp.py:264 msgid "Create a diff tab for the supplied files or folders" msgstr "Buat suatu tab diff bagi berkas atau folder yang diberikan" -#: ../meld/meldapp.py:286 +#: ../meld/meldapp.py:284 #, python-format msgid "too many arguments (wanted 0-3, got %d)" msgstr "terlalu banyak argumen (diinginkan 0-3, diperoleh %d)" -#: ../meld/meldapp.py:289 +#: ../meld/meldapp.py:287 msgid "can't auto-merge less than 3 files" msgstr "tak bisa merge otomatis kurang dari 3 berkas" -#: ../meld/meldapp.py:291 +#: ../meld/meldapp.py:289 msgid "can't auto-merge directories" msgstr "tak bisa merge otomatis direktori" -#: ../meld/meldapp.py:305 +#: ../meld/meldapp.py:303 msgid "Error reading saved comparison file" msgstr "Galat saat membaca berkas perbandingan yang disimpan" -#: ../meld/meldapp.py:332 +#: ../meld/meldapp.py:330 #, python-format msgid "invalid path or URI \"%s\"" msgstr "path atau URI \"%s\" tidak valid" #. TRANSLATORS: This is the label of a new, currently-unnamed file. -#: ../meld/meldbuffer.py:132 +#: ../meld/meldbuffer.py:131 msgid "" msgstr "" -#: ../meld/melddoc.py:83 ../meld/melddoc.py:84 +#: ../meld/melddoc.py:64 msgid "untitled" msgstr "tanpa judul" @@ -2231,108 +2246,68 @@ msgstr "Hentikan aksi saat ini" msgid "Refresh the view" msgstr "Segarkan tilikan" -#: ../meld/meldwindow.py:112 -msgid "_Tabs" -msgstr "_Tab" - #: ../meld/meldwindow.py:113 -msgid "_Previous Tab" -msgstr "Tab Se_belumnya" - -#: ../meld/meldwindow.py:114 -msgid "Activate previous tab" -msgstr "Aktifkan tab sebelumnya" - -#: ../meld/meldwindow.py:116 -msgid "_Next Tab" -msgstr "Tab Sela_njutnya" - -#: ../meld/meldwindow.py:117 -msgid "Activate next tab" -msgstr "Aktifkan tab selanjutnya" - -#: ../meld/meldwindow.py:120 -msgid "Move Tab _Left" -msgstr "Pindahkan Tab Ke K_iri" - -#: ../meld/meldwindow.py:121 -msgid "Move current tab to left" -msgstr "Pindahkan tab saat ini ke kiri" - -#: ../meld/meldwindow.py:124 -msgid "Move Tab _Right" -msgstr "Pindahkan Tab Ke K_anan" - -#: ../meld/meldwindow.py:125 -msgid "Move current tab to right" -msgstr "Pindahkan tab saat ini ke kanan" - -#: ../meld/meldwindow.py:129 msgid "Fullscreen" msgstr "Layar Penuh" -#: ../meld/meldwindow.py:130 +#: ../meld/meldwindow.py:114 msgid "View the comparison in fullscreen" msgstr "Tilik perbandingan dalam layar penuh" -#: ../meld/meldwindow.py:132 +#: ../meld/meldwindow.py:116 msgid "_Toolbar" msgstr "Bilah Ala_t" -#: ../meld/meldwindow.py:133 +#: ../meld/meldwindow.py:117 msgid "Show or hide the toolbar" msgstr "Tampilkan atau sembunyikan bilah alat" -#: ../meld/meldwindow.py:143 +#: ../meld/meldwindow.py:127 msgid "Open Recent" msgstr "Buka Terkini" -#: ../meld/meldwindow.py:144 +#: ../meld/meldwindow.py:128 msgid "Open recent files" msgstr "Buka berkas yang baru-baru ini" -#: ../meld/meldwindow.py:166 +#: ../meld/meldwindow.py:150 msgid "_Meld" msgstr "_Meld" -#: ../meld/meldwindow.py:167 +#: ../meld/meldwindow.py:151 msgid "Quit the program" msgstr "Keluar program" -#: ../meld/meldwindow.py:169 +#: ../meld/meldwindow.py:153 msgid "Prefere_nces" msgstr "Prefere_nsi" -#: ../meld/meldwindow.py:170 +#: ../meld/meldwindow.py:154 msgid "Configure the application" msgstr "Atur konfigurasi aplikasi" -#: ../meld/meldwindow.py:172 +#: ../meld/meldwindow.py:156 msgid "_Contents" msgstr "_Isi" -#: ../meld/meldwindow.py:173 +#: ../meld/meldwindow.py:157 msgid "Open the Meld manual" msgstr "Buka manual Meld" -#: ../meld/meldwindow.py:175 +#: ../meld/meldwindow.py:159 msgid "About this application" msgstr "Tentang aplikasi ini" -#: ../meld/meldwindow.py:587 -msgid "Switch to this tab" -msgstr "Tukar ke tab ini" - -#: ../meld/meldwindow.py:702 +#: ../meld/meldwindow.py:596 #, python-format msgid "Need three files to auto-merge, got: %r" msgstr "Perlu tiga berkas untuk merge otomatis, mendapat: %r" -#: ../meld/meldwindow.py:716 +#: ../meld/meldwindow.py:610 msgid "Cannot compare a mixture of files and directories" msgstr "Tak bisa membandingkan campuran berkas dan direktori" -#: ../meld/misc.py:202 +#: ../meld/misc.py:203 #, python-format msgid "Couldn't find colour scheme details for %s-%s; this is a bad install" msgstr "" @@ -2340,7 +2315,7 @@ msgstr "" "buruk" #. no common path. empty names get changed to "[None]" -#: ../meld/misc.py:287 +#: ../meld/misc.py:261 msgid "[None]" msgstr "[Nihil]" @@ -2352,7 +2327,7 @@ msgstr "label" msgid "pattern" msgstr "pola" -#: ../meld/recent.py:115 +#: ../meld/recent.py:114 msgid "Version control:" msgstr "Kendali versi:" @@ -2360,41 +2335,41 @@ msgstr "Kendali versi:" msgid "Close tab" msgstr "Tutup tab" -#: ../meld/ui/vcdialogs.py:50 +#: ../meld/ui/vcdialogs.py:48 msgid "No files will be committed" msgstr "Tak ada berkas yang akan dikomit" #. Translators: First %s is replaced by translated "%d unpushed #. commits", second %s is replaced by translated "%d branches" -#: ../meld/vc/git.py:95 +#: ../meld/vc/git.py:94 #, python-format msgid "%s in %s" msgstr "%s dalam %s" #. Translators: These messages cover the case where there is #. only one branch, and are not part of another message. -#: ../meld/vc/git.py:96 ../meld/vc/git.py:103 +#: ../meld/vc/git.py:95 ../meld/vc/git.py:102 #, python-format msgid "%d unpushed commit" msgid_plural "%d unpushed commits" msgstr[0] "%d komit belum di-push" -#: ../meld/vc/git.py:98 +#: ../meld/vc/git.py:97 #, python-format msgid "%d branch" msgid_plural "%d branches" msgstr[0] "%d branch" -#: ../meld/vc/git.py:352 +#: ../meld/vc/git.py:330 #, python-format msgid "Mode changed from %s to %s" msgstr "Mode diubah dari %s ke %s" -#: ../meld/vc/git.py:360 +#: ../meld/vc/git.py:338 msgid "Partially staged" msgstr "Di-stage sebagian" -#: ../meld/vc/git.py:360 +#: ../meld/vc/git.py:338 msgid "Staged" msgstr "Di-stage" @@ -2404,140 +2379,140 @@ msgstr "Di-stage" msgid "None" msgstr "Nihil" -#: ../meld/vc/svn.py:216 +#: ../meld/vc/svn.py:204 #, python-format msgid "Rev %s" msgstr "Rev %s" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Merged" msgstr "Di-merge" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Base" msgstr "Basis" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Local" msgstr "Lokal" -#: ../meld/vc/_vc.py:52 +#: ../meld/vc/_vc.py:54 msgid "Remote" msgstr "Remote" -#: ../meld/vc/_vc.py:68 +#: ../meld/vc/_vc.py:70 msgid "Unversioned" msgstr "Tanpa versi" -#: ../meld/vc/_vc.py:71 +#: ../meld/vc/_vc.py:73 msgid "Error" msgstr "Galat" -#: ../meld/vc/_vc.py:73 +#: ../meld/vc/_vc.py:75 msgid "Newly added" msgstr "Baru ditambahkan" -#: ../meld/vc/_vc.py:75 +#: ../meld/vc/_vc.py:77 msgid "Renamed" msgstr "Diubah nama" -#: ../meld/vc/_vc.py:76 +#: ../meld/vc/_vc.py:78 msgid "Conflict" msgstr "Konflik" -#: ../meld/vc/_vc.py:77 +#: ../meld/vc/_vc.py:79 msgid "Removed" msgstr "Dihapus" -#: ../meld/vc/_vc.py:78 +#: ../meld/vc/_vc.py:80 msgid "Missing" msgstr "Kurang" -#: ../meld/vc/_vc.py:79 +#: ../meld/vc/_vc.py:81 msgid "Not present" msgstr "Tak ada" #. Translators: This error message is shown when a version #. control binary isn't installed. -#: ../meld/vcview.py:255 +#: ../meld/vcview.py:251 #, 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:259 +#: ../meld/vcview.py:255 #, python-format msgid "%(name)s (Invalid repository)" msgstr "%(name)s (Repositori tak valid)" -#: ../meld/vcview.py:280 +#: ../meld/vcview.py:276 msgid "No valid version control system found in this folder" msgstr "Tak ada sistem kendali versi yang valid dalam folder ini" -#: ../meld/vcview.py:282 +#: ../meld/vcview.py:278 msgid "Only one version control system found in this folder" msgstr "Hanya satu sistem kendali versi ditemukan dalam folder ini" -#: ../meld/vcview.py:284 +#: ../meld/vcview.py:280 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:337 +#: ../meld/vcview.py:332 #, python-format msgid "%s: %s" msgstr "%s: %s" -#: ../meld/vcview.py:357 +#: ../meld/vcview.py:352 #, python-format msgid "Scanning %s" msgstr "Memindai %s" -#: ../meld/vcview.py:396 +#: ../meld/vcview.py:391 msgid "(Empty)" msgstr "(Kosong)" -#: ../meld/vcview.py:440 +#: ../meld/vcview.py:435 #, python-format msgid "%s — local" msgstr "%s — lokal" -#: ../meld/vcview.py:441 +#: ../meld/vcview.py:436 #, python-format msgid "%s — remote" msgstr "%s — remote" -#: ../meld/vcview.py:449 +#: ../meld/vcview.py:444 #, python-format msgid "%s (local, merge, remote)" msgstr "%s (lokal, merge, remote)" -#: ../meld/vcview.py:454 +#: ../meld/vcview.py:449 #, python-format msgid "%s (remote, merge, local)" msgstr "%s (remote, merge, lokal)" -#: ../meld/vcview.py:465 +#: ../meld/vcview.py:460 #, python-format msgid "%s — repository" msgstr "%s — repositori" -#: ../meld/vcview.py:471 +#: ../meld/vcview.py:466 #, python-format msgid "%s (working, repository)" msgstr "%s (kerja, repositori)" -#: ../meld/vcview.py:475 +#: ../meld/vcview.py:470 #, python-format msgid "%s (repository, working)" msgstr "%s (repositori, kerja)" -#: ../meld/vcview.py:643 +#: ../meld/vcview.py:638 msgid "Remove folder and all its files?" msgstr "Hapus folder dan semua berkasnya?" -#: ../meld/vcview.py:645 +#: ../meld/vcview.py:640 msgid "" "This will remove all selected files and folders, and all files within any " "selected folders, from version control." @@ -2545,11 +2520,11 @@ 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:670 +#: ../meld/vcview.py:665 #, python-format msgid "Error removing %s" msgstr "Galat saat menghapus %s" -#: ../meld/vcview.py:750 +#: ../meld/vcview.py:745 msgid "Clear" msgstr "Bersihkan" From e4506044b26b190a6465bd3985528c756d637211 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Mon, 13 Mar 2017 07:07:48 +1000 Subject: [PATCH 0154/1316] vc.git: Fix bad argument --- meld/vc/git.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meld/vc/git.py b/meld/vc/git.py index c36fbc3d..6326dba6 100644 --- a/meld/vc/git.py +++ b/meld/vc/git.py @@ -187,7 +187,9 @@ def remerge_with_ancestor(self, local, base, remote): pre-merged result everywhere that has no conflict, and the common ancestor anywhere there *is* a conflict. """ - proc = self.run("merge-file", "-p", "--diff3", local, base, remote, universal_newlines=False) + proc = self.run( + "merge-file", "-p", "--diff3", local, base, remote, + use_locale_encoding=False) vc_file = io.BytesIO( _vc.base_from_diff3(proc.stdout.read())) From 491d6d07d15a6246d443908256f6c4cdbf3ecd0d Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Fri, 31 Mar 2017 06:41:20 +1000 Subject: [PATCH 0155/1316] windowstate: Don't re-read window state from settings after first load This is part of trying to address an infinite re-allocation cycle. Since we really don't care about resizing our window from the settings state anyway, this seems like a low-cost win. --- meld/windowstate.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meld/windowstate.py b/meld/windowstate.py index baf7d987..d1846acd 100644 --- a/meld/windowstate.py +++ b/meld/windowstate.py @@ -40,7 +40,12 @@ def bind(self, window): window.connect('size-allocate', self.on_size_allocate) window.connect('window-state-event', self.on_window_state_event) - bind_flags = Gio.SettingsBindFlags.DEFAULT + # Don't re-read from gsettings after initialisation; we've seen + # what looked like issues with buggy debounce here. + bind_flags = ( + Gio.SettingsBindFlags.DEFAULT | + Gio.SettingsBindFlags.GET_NO_CHANGES + ) self.settings = load_settings_schema(WINDOW_STATE_SCHEMA) self.settings.bind('width', self, 'width', bind_flags) self.settings.bind('height', self, 'height', bind_flags) From a05a8bfa1b3b54d184f684a62c3aff1ec865143f Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Fri, 31 Mar 2017 06:43:02 +1000 Subject: [PATCH 0156/1316] data/ui/vcview.ui: Fix deprecated VPaned usage --- data/ui/vcview.ui | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/ui/vcview.ui b/data/ui/vcview.ui index e60bce96..c2f06771 100644 --- a/data/ui/vcview.ui +++ b/data/ui/vcview.ui @@ -488,9 +488,10 @@ - + True True + vertical 250 + + + False + False + _Add + True + list-add + + + + False + True + + + + + False + False + _Remove + True + list-remove + + + + False + True + + + + + False + + + False + True + + + + + True + False + Move item up + False + Move _Up + True + go-up + + + + False + True + + + + + True + False + Move item down + False + Move _Down + True + go-down + + + + False + True + + + + + False + True + 1 + + + + diff --git a/meld/resources/ui/filter-list.ui b/meld/resources/ui/filter-list.ui new file mode 100644 index 00000000..4e71c220 --- /dev/null +++ b/meld/resources/ui/filter-list.ui @@ -0,0 +1,187 @@ + + + + + + + + + + + + + + + + + diff --git a/meld/ui/listwidget.py b/meld/ui/listwidget.py index efd3a5c9..e4cce18a 100644 --- a/meld/ui/listwidget.py +++ b/meld/ui/listwidget.py @@ -1,5 +1,5 @@ # Copyright (C) 2002-2009 Stephen Kennedy -# Copyright (C) 2010-2011, 2013 Kai Willadsen +# Copyright (C) 2010-2011, 2013, 2018 Kai Willadsen # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -14,21 +14,31 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from . import gnomeglade +class EditableListWidget: -class ListWidget(gnomeglade.Component): + """Helper class with behaviour for simple editable lists - def __init__(self, ui_file, widget, store, treeview, new_row_data=None): - super().__init__(ui_file, widget, store) - self.new_row_data = new_row_data - self.list = getattr(self, treeview) - self.model = self.list.get_model() - selection = self.list.get_selection() - selection.connect("changed", self._update_sensitivity) + The entire point of this is to handle simple list item addition, + removal, and rearrangement, and the associated sensitivity handling. + + This requires template children to be bound as: + * `treeview` + * `remove` + * `move_up` + * `move_down` + """ + + def setup_sensitivity_handling(self): + model = self.treeview.get_model() + model.connect("row-inserted", self._update_sensitivity) + model.connect("rows-reordered", self._update_sensitivity) + self.treeview.get_selection().connect( + "changed", self._update_sensitivity) + self._update_sensitivity() def _update_sensitivity(self, *args): - (model, it, path) = self._get_selected() + model, it, path = self._get_selected() if not it: self.remove.set_sensitive(False) self.move_up.set_sensitive(False) @@ -39,24 +49,21 @@ def _update_sensitivity(self, *args): self.move_down.set_sensitive(path < len(model) - 1) def _get_selected(self): - (model, it) = self.list.get_selection().get_selected() - if it: - path = model.get_path(it)[0] - else: - path = None + model, it = self.treeview.get_selection().get_selected() + path = model.get_path(it)[0] if it else None return (model, it, path) - def on_add_clicked(self, button): - self.model.append(self.new_row_data) + def add_entry(self): + self.treeview.get_model().append(self.default_entry) - def on_remove_clicked(self, button): - (model, it, path) = self._get_selected() - self.model.remove(it) + def remove_selected_entry(self): + model, it, path = self._get_selected() + model.remove(it) - def on_move_up_clicked(self, button): - (model, it, path) = self._get_selected() + def move_up_selected_entry(self): + model, it, path = self._get_selected() model.swap(it, model.get_iter(path - 1)) - def on_move_down_clicked(self, button): - (model, it, path) = self._get_selected() + def move_down_selected_entry(self): + model, it, path = self._get_selected() model.swap(it, model.get_iter(path + 1)) From a5c117ecd87548e9232208e796d23dda1dc073a6 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 2 Dec 2018 12:38:37 +1000 Subject: [PATCH 0726/1316] preferences: Move to template and resource loading --- meld/meldapp.py | 6 ++- meld/preferences.py | 53 ++++++++++++++++------ {data => meld/resources}/ui/preferences.ui | 6 +-- 3 files changed, 47 insertions(+), 18 deletions(-) rename {data => meld/resources}/ui/preferences.ui (99%) diff --git a/meld/meldapp.py b/meld/meldapp.py index 451615f0..2b5cfad0 100644 --- a/meld/meldapp.py +++ b/meld/meldapp.py @@ -25,10 +25,10 @@ from gi.repository import Gtk import meld.conf -import meld.preferences from meld.conf import _ from meld.filediff import FileDiff from meld.meldwindow import MeldWindow +from meld.preferences import PreferencesDialog log = logging.getLogger(__name__) @@ -98,7 +98,9 @@ def done(tab, status): # return False def preferences_callback(self, action, parameter): - meld.preferences.PreferencesDialog(self.get_active_window()) + parent = self.get_active_window() + dialog = PreferencesDialog(transient_for=parent) + dialog.present() def help_callback(self, action, parameter): if meld.conf.DATADIR_IS_UNINSTALLED: diff --git a/meld/preferences.py b/meld/preferences.py index d0f0dc4a..5c3d7214 100644 --- a/meld/preferences.py +++ b/meld/preferences.py @@ -24,7 +24,6 @@ from meld.filters import FilterEntry from meld.settings import settings from meld.ui._gtktemplate import Template -from meld.ui.gnomeglade import Component from meld.ui.listwidget import EditableListWidget @@ -255,17 +254,42 @@ class GSettingsStringComboBox(GSettingsComboBox): gsettings_value = GObject.Property(type=str, default="") -class PreferencesDialog(Component): +@Template(resource_path='/org/gnome/meld/ui/preferences.ui') +class PreferencesDialog(Gtk.Dialog): + + __gtype_name__ = "PreferencesDialog" + + checkbutton_break_commit_lines = Template.Child("checkbutton_break_commit_lines") # noqa: E501 + checkbutton_default_font = Template.Child("checkbutton_default_font") + checkbutton_folder_filter_text = Template.Child("checkbutton_folder_filter_text") # noqa: E501 + checkbutton_highlight_current_line = Template.Child("checkbutton_highlight_current_line") # noqa: E501 + checkbutton_ignore_blank_lines = Template.Child("checkbutton_ignore_blank_lines") # noqa: E501 + checkbutton_ignore_symlinks = Template.Child("checkbutton_ignore_symlinks") + checkbutton_shallow_compare = Template.Child("checkbutton_shallow_compare") + checkbutton_show_commit_margin = Template.Child("checkbutton_show_commit_margin") # noqa: E501 + checkbutton_show_line_numbers = Template.Child("checkbutton_show_line_numbers") # noqa: E501 + checkbutton_show_whitespace = Template.Child("checkbutton_show_whitespace") + checkbutton_spaces_instead_of_tabs = Template.Child("checkbutton_spaces_instead_of_tabs") # noqa: E501 + checkbutton_use_syntax_highlighting = Template.Child("checkbutton_use_syntax_highlighting") # noqa: E501 + checkbutton_wrap_text = Template.Child("checkbutton_wrap_text") + checkbutton_wrap_word = Template.Child("checkbutton_wrap_word") + column_list_vbox = Template.Child("column_list_vbox") + combo_file_order = Template.Child("combo_file_order") + combo_merge_order = Template.Child("combo_merge_order") + combo_timestamp = Template.Child("combo_timestamp") + combobox_style_scheme = Template.Child("combobox_style_scheme") + custom_edit_command_entry = Template.Child("custom_edit_command_entry") + file_filters_vbox = Template.Child("file_filters_vbox") + fontpicker = Template.Child("fontpicker") + spinbutton_commit_margin = Template.Child("spinbutton_commit_margin") + spinbutton_tabsize = Template.Child("spinbutton_tabsize") + syntaxschemestore = Template.Child("syntaxschemestore") + system_editor_checkbutton = Template.Child("system_editor_checkbutton") + text_filters_vbox = Template.Child("text_filters_vbox") - def __init__(self, parent): - super().__init__( - "preferences.ui", "preferencesdialog", [ - "adjustment1", "adjustment2", "fileorderstore", - "sizegroup_editor", "timestampstore", "mergeorderstore", - "sizegroup_file_order_labels", "sizegroup_file_order_combos", - "syntaxschemestore" - ]) - self.widget.set_transient_for(parent) + def __init__(self, **kwargs): + super().__init__(**kwargs) + self.init_template() bindings = [ ('use-system-font', self.checkbutton_default_font, 'active'), @@ -340,8 +364,9 @@ def __init__(self, parent): self.syntaxschemestore.append([scheme_id, scheme.get_name()]) self.combobox_style_scheme.bind_to('style-scheme') - self.widget.show() + self.show() + @Template.Callback() def on_checkbutton_wrap_text_toggled(self, button): if not self.checkbutton_wrap_text.get_active(): wrap_mode = Gtk.WrapMode.NONE @@ -351,9 +376,11 @@ def on_checkbutton_wrap_text_toggled(self, button): wrap_mode = Gtk.WrapMode.CHAR settings.set_enum('wrap-mode', wrap_mode) + @Template.Callback() def on_checkbutton_show_whitespace_toggled(self, widget): value = GtkSource.DrawSpacesFlags.ALL if widget.get_active() else 0 settings.set_flags('draw-spaces', value) + @Template.Callback() def on_response(self, dialog, response_id): - self.widget.destroy() + self.destroy() diff --git a/data/ui/preferences.ui b/meld/resources/ui/preferences.ui similarity index 99% rename from data/ui/preferences.ui rename to meld/resources/ui/preferences.ui index 5d2d1ffe..9f352efe 100644 --- a/data/ui/preferences.ui +++ b/meld/resources/ui/preferences.ui @@ -16,10 +16,10 @@ 1 10 - + From d14f60aa95769e00fdf0f98275fa2e82cfff370c Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 2 Dec 2018 12:45:48 +1000 Subject: [PATCH 0727/1316] resources: Add in omitted prefs dialog --- meld/resources/meld.gresource.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/meld/resources/meld.gresource.xml b/meld/resources/meld.gresource.xml index d4781919..f34feb44 100644 --- a/meld/resources/meld.gresource.xml +++ b/meld/resources/meld.gresource.xml @@ -15,6 +15,7 @@ ui/filter-list.ui ui/language-selector.ui ui/patch-dialog.ui + ui/preferences.ui ui/push-dialog.ui ui/revert-dialog.ui ui/save-confirm-dialog.ui From 9fd5f4ce7b7b352faf503cef59f9a51c1d516ddb Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Tue, 4 Dec 2018 05:56:49 +1000 Subject: [PATCH 0728/1316] meldwindow, ui.notebook: Update containers to handle actual GtkWidgets MeldWindow currently expects to create, and MeldNotebook to contain, just gnomeglade.Component subclasses. Since the idea of moving to template loading is to make things more normal, Component is going away. This commit just makes it so that these places can accept an actual widget instead of a special Python object that wraps the widget in a known way. --- meld/meldwindow.py | 25 ++++++++++++++++--------- meld/ui/notebook.py | 5 ++++- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/meld/meldwindow.py b/meld/meldwindow.py index d19a1548..c3968fcd 100644 --- a/meld/meldwindow.py +++ b/meld/meldwindow.py @@ -37,6 +37,13 @@ from meld.windowstate import SavedWindowState +def tab_widget(widget): + try: + return widget.widget + except RuntimeError: + return widget + + @Template(resource_path='/org/gnome/meld/ui/appwindow.ui') class MeldWindow(Gtk.ApplicationWindow): @@ -268,7 +275,7 @@ def on_delete_event(self, *extra): # control page is open in the far left page, it will be closed last. for c in reversed(self.notebook.get_children()): page = c.pyobject - self.notebook.set_current_page(self.notebook.page_num(page.widget)) + self.notebook.set_current_page(self.notebook.page_num(tab_widget(page))) response = page.on_delete_event() if response == Gtk.ResponseType.CANCEL: should_cancel = True @@ -341,7 +348,7 @@ def on_switch_page(self, notebook, page, which): self.actiongroup.get_action("SaveAs").set_sensitive(True) if newdoc: - nbl = self.notebook.get_tab_label(newdoc.widget) + nbl = self.notebook.get_tab_label(tab_widget(newdoc)) self.set_title(nbl.get_label_text()) else: self.set_title("Meld") @@ -474,7 +481,7 @@ def page_removed(self, page, status): if hasattr(page, 'scheduler'): self.scheduler.remove_scheduler(page.scheduler) - page_num = self.notebook.page_num(page.widget) + page_num = self.notebook.page_num(tab_widget(page)) if self.notebook.get_current_page() == page_num: self.handle_current_doc_switch(page) @@ -507,7 +514,7 @@ def on_file_changed(self, srcpage, filename): def _append_page(self, page, icon): nbl = NotebookLabel(icon, "", lambda b: page.on_delete_event()) - self.notebook.append_page(page.widget, nbl) + self.notebook.append_page(tab_widget(page), nbl) # Change focus to the newly created page only if the user is on a # DirDiff or VcView page, or if it's a new tab page. This prevents @@ -515,7 +522,7 @@ def _append_page(self, page, icon): if isinstance(self.current_doc(), DirDiff) or \ isinstance(self.current_doc(), VcView) or \ isinstance(page, NewDiffTab): - self.notebook.set_current_page(self.notebook.page_num(page.widget)) + self.notebook.set_current_page(self.notebook.page_num(tab_widget(page))) if hasattr(page, 'scheduler'): self.scheduler.add_scheduler(page.scheduler) @@ -526,7 +533,7 @@ def _append_page(self, page, icon): page.connect("state-changed", self.on_page_state_changed) page.connect("close", self.page_removed) - self.notebook.set_tab_reorderable(page.widget, True) + self.notebook.set_tab_reorderable(tab_widget(page), True) def append_new_comparison(self): doc = NewDiffTab(self) @@ -535,7 +542,7 @@ def append_new_comparison(self): def diff_created_cb(doc, newdoc): doc.on_delete_event() - idx = self.notebook.page_num(newdoc.widget) + idx = self.notebook.page_num(tab_widget(newdoc)) self.notebook.set_current_page(idx) doc.connect("diff-created", diff_created_cb) @@ -615,7 +622,7 @@ def append_recent(self, uri): RecentType.VersionControl: self.append_vcview, } tab = comparison_method[comparison_type](gfiles) - self.notebook.set_current_page(self.notebook.page_num(tab.widget)) + self.notebook.set_current_page(self.notebook.page_num(tab_widget(tab))) recent_comparisons.add(tab) return tab @@ -650,7 +657,7 @@ def open_paths(self, gfiles, auto_compare=False, auto_merge=False, recent_comparisons.add(tab) if focus: self.notebook.set_current_page( - self.notebook.page_num(tab.widget)) + self.notebook.page_num(tab_widget(tab))) return tab diff --git a/meld/ui/notebook.py b/meld/ui/notebook.py index 850a547c..4fd23339 100644 --- a/meld/ui/notebook.py +++ b/meld/ui/notebook.py @@ -156,7 +156,10 @@ def on_page_removed(self, notebook, child, page_num, *args): child.pyobject.disconnect_by_func(self.on_label_changed) def on_label_changed(self, component, text, tooltip): - page = component.widget + try: + page = component.widget + except RuntimeError: + page = component nbl = self.get_tab_label(page) nbl.set_label_text(text) nbl.set_tooltip_text(tooltip) From 83605562dfa968bacf1d72daa26b3113196c3dd4 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Tue, 4 Dec 2018 06:14:16 +1000 Subject: [PATCH 0729/1316] newdifftab: Migrate to template and resource loading --- data/ui/tab-placeholder.ui | 612 ------------------------------ meld/newdifftab.py | 58 ++- meld/resources/ui/new-diff-tab.ui | 607 +++++++++++++++++++++++++++++ meld/ui/util.py | 27 ++ 4 files changed, 679 insertions(+), 625 deletions(-) delete mode 100644 data/ui/tab-placeholder.ui create mode 100644 meld/resources/ui/new-diff-tab.ui diff --git a/data/ui/tab-placeholder.ui b/data/ui/tab-placeholder.ui deleted file mode 100644 index 53207fce..00000000 --- a/data/ui/tab-placeholder.ui +++ /dev/null @@ -1,612 +0,0 @@ - - - - - - False - 5 - GtkFileChooserDialog - dialog - - - False - vertical - 2 - - - False - end - - - - - - - - - False - True - end - 0 - - - - - - - - - - False - 5 - GtkFileChooserDialog - dialog - - - False - vertical - 2 - - - False - end - - - - - - - - - False - True - end - 0 - - - - - - - - - - False - 5 - GtkFileChooserDialog - dialog - - - False - vertical - 2 - - - False - end - - - - - - - - - False - True - end - 0 - - - - - - - - - - False - - - True - False - 0.25 - 0 - 0 - - - True - False - 12 - - - True - False - 0 - New comparison - - - - - - True - True - 0 - - - - - True - False - 12 - - - True - False - 12 - - - True - False - 12 - True - - - True - True - True - False - - - - True - False - 6 - - - True - False - gtk-new - 6 - - - True - True - 0 - - - - - True - False - File comparison - - - True - True - 1 - - - - - - - True - True - 0 - - - - - True - True - True - False - - - - True - False - 6 - - - True - False - gtk-directory - 6 - - - True - True - 0 - - - - - True - False - Directory comparison - - - True - True - 1 - - - - - - - True - True - 1 - - - - - True - True - True - False - - - - True - False - 6 - - - True - False - meld-version-control - 6 - - - True - True - 0 - - - - - True - False - Version control view - - - True - True - 1 - - - - - - - True - True - 2 - - - - - True - True - 0 - - - - - True - True - False - False - - - True - False - 12 - True - - - - - - - - - - - - False - - - - - - - - True - False - 6 - 12 - True - - - _3-way comparison - True - True - False - False - True - True - - - - 2 - 1 - 1 - 1 - - - - - True - False - False - False - Select Third File - filechooserdialog2 - - - - 2 - 0 - 1 - 1 - - - - - True - False - False - Select Second File - filechooserdialog1 - - - - 1 - 0 - 1 - 1 - - - - - True - False - False - Select First File - filechooserdialog0 - - - - 0 - 0 - 1 - 1 - - - - - - - - - - - 1 - - - - - - - - True - False - 6 - 12 - True - - - True - False - False - select-folder - Select First Folder - - - 0 - 0 - 1 - 1 - - - - - True - False - False - select-folder - Select Second Folder - - - 1 - 0 - 1 - 1 - - - - - True - False - False - False - select-folder - Select Third Folder - - - 2 - 0 - 1 - 1 - - - - - _3-way comparison - True - True - False - False - True - True - - - - 2 - 1 - 1 - 1 - - - - - - - - - - - 2 - - - - - - - - True - False - 6 - 12 - True - - - True - False - False - select-folder - Select A Version-Controlled Folder - - - 0 - 0 - 1 - 1 - - - - - 3 - - - - - True - True - 1 - - - - - - - True - True - 1 - - - - - True - False - 6 - end - - - gtk-help - - False - True - True - False - True - - - False - False - 0 - True - - - - - _Blank comparison - True - False - True - True - False - True - - - - False - False - 1 - - - - - C_ompare - True - False - True - True - False - True - - - - False - False - 2 - - - - - False - False - 2 - - - - - - - - diff --git a/meld/newdifftab.py b/meld/newdifftab.py index 8ea16d91..944da646 100644 --- a/meld/newdifftab.py +++ b/meld/newdifftab.py @@ -23,7 +23,8 @@ from meld.conf import _ from meld.melddoc import LabeledObjectMixin from meld.recent import recent_comparisons -from meld.ui import gnomeglade +from meld.ui._gtktemplate import Template +from meld.ui.util import map_widgets_into_lists class DiffType(enum.IntEnum): @@ -37,29 +38,47 @@ def supports_blank(self): return self in (self.File, self.Folder) -class NewDiffTab(LabeledObjectMixin, GObject.GObject, gnomeglade.Component): +@Template(resource_path='/org/gnome/meld/ui/new-diff-tab.ui') +class NewDiffTab(Gtk.Alignment, LabeledObjectMixin): __gtype_name__ = "NewDiffTab" __gsignals__ = { + 'label-changed': ( + GObject.SignalFlags.RUN_FIRST, None, + (GObject.TYPE_STRING, GObject.TYPE_STRING)), 'close': (GObject.SignalFlags.RUN_FIRST, None, (bool,)), 'diff-created': (GObject.SignalFlags.RUN_FIRST, None, (object,)), } label_text = _("New comparison") + button_compare = Template.Child() + button_new_blank = Template.Child() + button_type_dir = Template.Child() + button_type_file = Template.Child() + button_type_vc = Template.Child() + choosers_notebook = Template.Child() + dir_chooser0 = Template.Child() + dir_chooser1 = Template.Child() + dir_chooser2 = Template.Child() + dir_three_way_checkbutton = Template.Child() + file_chooser0 = Template.Child() + file_chooser1 = Template.Child() + file_chooser2 = Template.Child() + file_three_way_checkbutton = Template.Child() + filechooserdialog0 = Template.Child() + filechooserdialog1 = Template.Child() + filechooserdialog2 = Template.Child() + vc_chooser0 = Template.Child() + def __init__(self, parentapp): - GObject.GObject.__init__(self) - gnomeglade.Component.__init__( - self, "tab-placeholder.ui", "new_comparison_tab", - [ - "filechooserdialog0", - "filechooserdialog1", - "filechooserdialog2", - ] + super().__init__() + self.init_template() + map_widgets_into_lists( + self, + ["file_chooser", "dir_chooser", "vc_chooser", "filechooserdialog"] ) - self.map_widgets_into_lists( - ["file_chooser", "dir_chooser", "vc_chooser", "filechooserdialog"]) self.button_types = [ self.button_type_file, self.button_type_dir, @@ -76,8 +95,13 @@ def __init__(self, parentapp): for chooser in self.file_chooser: chooser.set_current_folder(default_path) - self.widget.show() + self.show() + + # FIXME: Awful migration hack; this means that we don't have to + # address `.pyobject` access before all tab types are updated. + self.pyobject = self + @Template.Callback() def on_button_type_toggled(self, button, *args): if not button.get_active(): if not any([b.get_active() for b in self.button_types]): @@ -95,12 +119,14 @@ def on_button_type_toggled(self, button, *args): self.diff_type.supports_blank()) self.button_compare.set_sensitive(True) + @Template.Callback() def on_three_way_checkbutton_toggled(self, button, *args): if button is self.file_three_way_checkbutton: self.file_chooser2.set_sensitive(button.get_active()) else: # button is self.dir_three_way_checkbutton self.dir_chooser2.set_sensitive(button.get_active()) + @Template.Callback() def on_file_set(self, filechooser, *args): gfile = filechooser.get_file() if not gfile: @@ -132,6 +158,7 @@ def _get_num_paths(self): num_paths = 1 return num_paths + @Template.Callback() def on_button_compare_clicked(self, *args): type_choosers = (self.file_chooser, self.dir_chooser, self.vc_chooser) choosers = type_choosers[self.diff_type][:self._get_num_paths()] @@ -148,6 +175,7 @@ def on_button_compare_clicked(self, *args): recent_comparisons.add(tab) self.emit('diff-created', tab) + @Template.Callback() def on_button_new_blank_clicked(self, *args): # TODO: This doesn't work the way I'd like for DirDiff and VCView. # It should do something similar to FileDiff; give a tab with empty @@ -171,3 +199,7 @@ def on_container_switch_out_event(self, *args): def on_delete_event(self, *args): self.emit('close', 0) return Gtk.ResponseType.OK + +from gi._signalhelper import install_signals + +install_signals(NewDiffTab) diff --git a/meld/resources/ui/new-diff-tab.ui b/meld/resources/ui/new-diff-tab.ui new file mode 100644 index 00000000..f307daee --- /dev/null +++ b/meld/resources/ui/new-diff-tab.ui @@ -0,0 +1,607 @@ + + + + + + False + 5 + GtkFileChooserDialog + dialog + + + False + vertical + 2 + + + False + end + + + + + + + + + False + True + end + 0 + + + + + + + + + + False + 5 + GtkFileChooserDialog + dialog + + + False + vertical + 2 + + + False + end + + + + + + + + + False + True + end + 0 + + + + + + + + + + False + 5 + GtkFileChooserDialog + dialog + + + False + vertical + 2 + + + False + end + + + + + + + + + False + True + end + 0 + + + + + + + + + + diff --git a/meld/ui/util.py b/meld/ui/util.py index 50d08e86..1f38773a 100644 --- a/meld/ui/util.py +++ b/meld/ui/util.py @@ -13,12 +13,16 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . +import logging + from gi.repository import Gio, Gtk import meld.conf # Import support module to get all builder-constructed widgets in the namespace from meld.ui import gladesupport # noqa: F401 +log = logging.getLogger(__name__) + def get_widget(filename, widget): builder = Gtk.Builder() @@ -36,6 +40,29 @@ def get_builder(filename): return builder +def map_widgets_into_lists(widget, widgetnames): + """Put sequentially numbered widgets into lists. + + Given an object with widgets self.button0, self.button1, ..., + after a call to object.map_widgets_into_lists(["button"]) + object.button == [self.button0, self.button1, ...] + """ + for item in widgetnames: + i, lst = 0, [] + while 1: + key = "%s%i" % (item, i) + try: + val = getattr(widget, key) + except AttributeError: + if i == 0: + log.critical( + f"Tried to map missing attribute {key}") + break + lst.append(val) + i += 1 + setattr(widget, item, lst) + + # The functions `extract_accel_from_menu_item` and `extract_accels_from_menu` # are converted straight from GTK+'s GtkApplication handling. I don't # understand why these aren't public API, but here we are. From 0f5ed7da0b90fdeb3688dc0a75cbd140c1f53554 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Thu, 6 Dec 2018 05:48:23 +1000 Subject: [PATCH 0730/1316] ui._gtktemplate: Raise when we find unmatched callbacks --- meld/ui/_gtktemplate.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meld/ui/_gtktemplate.py b/meld/ui/_gtktemplate.py index efaca339..e66c3b93 100644 --- a/meld/ui/_gtktemplate.py +++ b/meld/ui/_gtktemplate.py @@ -24,7 +24,9 @@ def connect_func(builder, obj, signal_name, handler_name, connect_object, flags, cls): if handler_name not in cls.__gtktemplate_methods__: - return + raise RuntimeError( + "Handler '%s' was specified in template, but has no " + "matching @Gtk.Template.Callback" % handler_name) method_name = cls.__gtktemplate_methods__[handler_name] template_inst = builder.get_object(cls.__gtype_name__) From de3dd6258a00a6629fc339ed527879a61d085b90 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 9 Dec 2018 06:09:30 +1000 Subject: [PATCH 0731/1316] melddoc: Move label-changed to new signal style The main reason for this is that it seems basically impossible to inherit signals (because of a mix of GObject limitations and intentional pygobject barriers). As such, the attribute-style declaration is the easiest and cleanest way I've found to enable "inheriting" these via dumb class-level name assignments. --- meld/dirdiff.py | 2 +- meld/filediff.py | 2 +- meld/melddoc.py | 10 +++------- meld/newdifftab.py | 7 +++---- meld/vcview.py | 2 +- 5 files changed, 9 insertions(+), 14 deletions(-) diff --git a/meld/dirdiff.py b/meld/dirdiff.py index a786fa3f..862251b5 100644 --- a/meld/dirdiff.py +++ b/meld/dirdiff.py @@ -1535,7 +1535,7 @@ def recompute_label(self): shortnames = misc.shorten_names(*filenames) self.label_text = " : ".join(shortnames) self.tooltip_text = self.label_text - self.label_changed() + self.label_changed.emit(self.label_text, self.tooltip_text) def set_labels(self, labels): labels = labels[:self.num_panes] diff --git a/meld/filediff.py b/meld/filediff.py index 9ba3051c..47051350 100644 --- a/meld/filediff.py +++ b/meld/filediff.py @@ -1085,7 +1085,7 @@ def recompute_label(self): else: self.label_text = " — ".join(shortnames) self.tooltip_text = self.label_text - self.label_changed() + self.label_changed.emit(self.label_text, self.tooltip_text) def pre_comparison_init(self): self._disconnect_buffer_handlers() diff --git a/meld/melddoc.py b/meld/melddoc.py index da00de58..617bdbe8 100644 --- a/meld/melddoc.py +++ b/meld/melddoc.py @@ -59,17 +59,13 @@ class ComparisonState(enum.IntEnum): class LabeledObjectMixin(GObject.GObject): - __gsignals__ = { - 'label-changed': ( - GObject.SignalFlags.RUN_FIRST, None, - (GObject.TYPE_STRING, GObject.TYPE_STRING)), - } label_text = _("untitled") tooltip_text = None - def label_changed(self): - self.emit("label-changed", self.label_text, self.tooltip_text) + @GObject.Signal + def label_changed(self, label_text: str, tooltip_text: str) -> None: + ... class MeldDoc(LabeledObjectMixin, GObject.GObject): diff --git a/meld/newdifftab.py b/meld/newdifftab.py index 944da646..7840f53f 100644 --- a/meld/newdifftab.py +++ b/meld/newdifftab.py @@ -44,13 +44,12 @@ class NewDiffTab(Gtk.Alignment, LabeledObjectMixin): __gtype_name__ = "NewDiffTab" __gsignals__ = { - 'label-changed': ( - GObject.SignalFlags.RUN_FIRST, None, - (GObject.TYPE_STRING, GObject.TYPE_STRING)), 'close': (GObject.SignalFlags.RUN_FIRST, None, (bool,)), 'diff-created': (GObject.SignalFlags.RUN_FIRST, None, (object,)), } + label_changed_signal = LabeledObjectMixin.label_changed + label_text = _("New comparison") button_compare = Template.Child() @@ -191,7 +190,7 @@ def on_button_new_blank_clicked(self, *args): self.emit('diff-created', tab) def on_container_switch_in_event(self, *args): - self.label_changed() + self.label_changed.emit(self.label_text, self.tooltip_text) def on_container_switch_out_event(self, *args): pass diff --git a/meld/vcview.py b/meld/vcview.py index 63d2c985..28511fff 100644 --- a/meld/vcview.py +++ b/meld/vcview.py @@ -329,7 +329,7 @@ def recompute_label(self): self.label_text = os.path.basename(self.location) # TRANSLATORS: This is the location of the directory being viewed self.tooltip_text = _("%s: %s") % (_("Location"), self.location) - self.label_changed() + self.label_changed.emit(self.label_text, self.tooltip_text) def _search_recursively_iter(self, start_path, replace=False): From c63de747eb41de5a8b8e9a7a7978952fc3b2d5b0 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 9 Dec 2018 06:45:42 +1000 Subject: [PATCH 0732/1316] Migrate close signal to new Signal style --- meld/dirdiff.py | 2 +- meld/filediff.py | 2 +- meld/meldapp.py | 2 +- meld/melddoc.py | 5 ++++- meld/meldwindow.py | 2 +- meld/newdifftab.py | 10 +++------- meld/vcview.py | 2 +- 7 files changed, 12 insertions(+), 13 deletions(-) diff --git a/meld/dirdiff.py b/meld/dirdiff.py index 862251b5..8943f200 100644 --- a/meld/dirdiff.py +++ b/meld/dirdiff.py @@ -1613,7 +1613,7 @@ def on_refresh_activate(self, *extra): def on_delete_event(self): for h in self.settings_handlers: meldsettings.disconnect(h) - self.emit('close', 0) + self.close_signal.emit(0) return Gtk.ResponseType.OK def on_find_activate(self, *extra): diff --git a/meld/filediff.py b/meld/filediff.py index 47051350..b8d502f1 100644 --- a/meld/filediff.py +++ b/meld/filediff.py @@ -917,7 +917,7 @@ def on_delete_event(self): # figure out what's keeping MeldDocs alive for too long. del self._cached_match # TODO: Base the return code on something meaningful for VC tools - self.emit('close', 0) + self.close_signal.emit(0) return response def _scroll_to_actions(self, actions): diff --git a/meld/meldapp.py b/meld/meldapp.py index 2b5cfad0..a3b4610e 100644 --- a/meld/meldapp.py +++ b/meld/meldapp.py @@ -83,7 +83,7 @@ def done(tab, status): self.hold() tab.command_line = command_line - tab.connect('close', done) + tab.close_signal.connect(done) window = self.get_active_window() if not window.has_pages(): diff --git a/meld/melddoc.py b/meld/melddoc.py index 617bdbe8..cbe21754 100644 --- a/meld/melddoc.py +++ b/meld/melddoc.py @@ -82,10 +82,13 @@ class MeldDoc(LabeledObjectMixin, GObject.GObject): ()), 'next-diff-changed': (GObject.SignalFlags.RUN_FIRST, None, (bool, bool)), - 'close': (GObject.SignalFlags.RUN_FIRST, None, (bool,)), 'state-changed': (GObject.SignalFlags.RUN_FIRST, None, (int, int)), } + @GObject.Signal(name='close') + def close_signal(self, exit_code: int) -> None: + ... + def __init__(self): super().__init__() self.scheduler = FifoScheduler() diff --git a/meld/meldwindow.py b/meld/meldwindow.py index c3968fcd..24c43c97 100644 --- a/meld/meldwindow.py +++ b/meld/meldwindow.py @@ -531,7 +531,7 @@ def _append_page(self, page, icon): page.connect("create-diff", lambda obj, arg, kwargs: self.append_diff(arg, **kwargs)) page.connect("state-changed", self.on_page_state_changed) - page.connect("close", self.page_removed) + page.close_signal.connect(self.page_removed) self.notebook.set_tab_reorderable(tab_widget(page), True) diff --git a/meld/newdifftab.py b/meld/newdifftab.py index 7840f53f..bbc3ef01 100644 --- a/meld/newdifftab.py +++ b/meld/newdifftab.py @@ -21,7 +21,7 @@ from gi.repository import Gtk from meld.conf import _ -from meld.melddoc import LabeledObjectMixin +from meld.melddoc import LabeledObjectMixin, MeldDoc from meld.recent import recent_comparisons from meld.ui._gtktemplate import Template from meld.ui.util import map_widgets_into_lists @@ -44,10 +44,10 @@ class NewDiffTab(Gtk.Alignment, LabeledObjectMixin): __gtype_name__ = "NewDiffTab" __gsignals__ = { - 'close': (GObject.SignalFlags.RUN_FIRST, None, (bool,)), 'diff-created': (GObject.SignalFlags.RUN_FIRST, None, (object,)), } + close_signal = MeldDoc.close_signal label_changed_signal = LabeledObjectMixin.label_changed label_text = _("New comparison") @@ -196,9 +196,5 @@ def on_container_switch_out_event(self, *args): pass def on_delete_event(self, *args): - self.emit('close', 0) + self.close_signal.emit(0) return Gtk.ResponseType.OK - -from gi._signalhelper import install_signals - -install_signals(NewDiffTab) diff --git a/meld/vcview.py b/meld/vcview.py index 28511fff..5d8aaf2b 100644 --- a/meld/vcview.py +++ b/meld/vcview.py @@ -417,7 +417,7 @@ def on_fileentry_file_set(self, fileentry): def on_delete_event(self): self.scheduler.remove_all_tasks() - self.emit('close', 0) + self.close_signal.emit(0) return Gtk.ResponseType.OK def on_row_activated(self, treeview, path, tvc): From 708bae3bf7eedb22ab74d97999a99603a487648b Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 9 Dec 2018 06:46:41 +1000 Subject: [PATCH 0733/1316] Rename state-changed signal to avoid name clash and move to Signal --- meld/melddoc.py | 7 +++++-- meld/meldwindow.py | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/meld/melddoc.py b/meld/melddoc.py index cbe21754..723d8ec9 100644 --- a/meld/melddoc.py +++ b/meld/melddoc.py @@ -82,13 +82,16 @@ class MeldDoc(LabeledObjectMixin, GObject.GObject): ()), 'next-diff-changed': (GObject.SignalFlags.RUN_FIRST, None, (bool, bool)), - 'state-changed': (GObject.SignalFlags.RUN_FIRST, None, (int, int)), } @GObject.Signal(name='close') def close_signal(self, exit_code: int) -> None: ... + @GObject.Signal + def tab_state_changed(self, old_state: int, new_state: int) -> None: + ... + def __init__(self): super().__init__() self.scheduler = FifoScheduler() @@ -104,7 +107,7 @@ def state(self): def state(self, value): if value == self._state: return - self.emit('state-changed', self._state, value) + self.tab_state_changed.emit(self._state, value) self._state = value def get_comparison(self) -> RecentType: diff --git a/meld/meldwindow.py b/meld/meldwindow.py index 24c43c97..bcc91c89 100644 --- a/meld/meldwindow.py +++ b/meld/meldwindow.py @@ -530,7 +530,7 @@ def _append_page(self, page, icon): page.connect("file-changed", self.on_file_changed) page.connect("create-diff", lambda obj, arg, kwargs: self.append_diff(arg, **kwargs)) - page.connect("state-changed", self.on_page_state_changed) + page.tab_state_changed.connect(self.on_page_state_changed) page.close_signal.connect(self.page_removed) self.notebook.set_tab_reorderable(tab_widget(page), True) From 1724d0344157afd8eac6c2e0162e63fc2558ae97 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 9 Dec 2018 06:55:11 +1000 Subject: [PATCH 0734/1316] filediff: Remove current-diff-changed signal It was only used within FileDiff, so there's really no point to it. We can easily add it back once this signal migration is done if it turns out to be useful in some way. --- meld/filediff.py | 5 ++--- meld/melddoc.py | 2 -- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/meld/filediff.py b/meld/filediff.py index b8d502f1..ab2d3bf8 100644 --- a/meld/filediff.py +++ b/meld/filediff.py @@ -194,7 +194,6 @@ def __init__(self, num_panes): self.set_num_panes(num_panes) self.cursor = CursorDetails() - self.connect("current-diff-changed", self.on_current_diff_changed) for t in self.textview: t.connect("focus-in-event", self.on_current_diff_changed) t.connect("focus-out-event", self.on_current_diff_changed) @@ -378,7 +377,7 @@ def on_cursor_position_changed(self, buf, pspec, force=False): chunk, prev, next_ = self.linediffer.locate_chunk(pane, line) if chunk != self.cursor.chunk or force: self.cursor.chunk = chunk - self.emit("current-diff-changed") + self.on_current_diff_changed() if prev != self.cursor.prev or next_ != self.cursor.next or force: self.emit( "next-diff-changed", prev is not None, next_ is not None) @@ -400,7 +399,7 @@ def on_cursor_position_changed(self, buf, pspec, force=False): self.cursor.next_conflict = next_conflict self.cursor.line, self.cursor.offset = line, offset - def on_current_diff_changed(self, widget, *args): + def on_current_diff_changed(self, *args): pane = self._get_focused_pane() if pane != -1: # While this *should* be redundant, it's possible for focus pane diff --git a/meld/melddoc.py b/meld/melddoc.py index 723d8ec9..f5f7aa3f 100644 --- a/meld/melddoc.py +++ b/meld/melddoc.py @@ -78,8 +78,6 @@ class MeldDoc(LabeledObjectMixin, GObject.GObject): 'create-diff': (GObject.SignalFlags.RUN_FIRST, None, (GObject.TYPE_PYOBJECT, GObject.TYPE_PYOBJECT)), - 'current-diff-changed': (GObject.SignalFlags.RUN_FIRST, None, - ()), 'next-diff-changed': (GObject.SignalFlags.RUN_FIRST, None, (bool, bool)), } From 9ce12d048d813a5e6d9fa148f1f08f740634fcc0 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 9 Dec 2018 07:04:06 +1000 Subject: [PATCH 0735/1316] meldbuffer: Move file-changed to Signal Note that this is the buffer-specific file-changed signal, *not* the file-changed from MeldDoc. Naming is hard, okay? --- meld/filediff.py | 2 +- meld/meldbuffer.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meld/filediff.py b/meld/filediff.py index ab2d3bf8..d091b638 100644 --- a/meld/filediff.py +++ b/meld/filediff.py @@ -178,7 +178,7 @@ def __init__(self, num_panes): buf.undo_sequence = self.undosequence buf.connect("notify::has-selection", self.update_text_actions_sensitivity) - buf.data.connect('file-changed', self.notify_file_changed) + buf.data.file_changed_signal.connect(self.notify_file_changed) self.ui_file = ui_file("filediff-ui.xml") self.actiongroup = self.FilediffActions diff --git a/meld/meldbuffer.py b/meld/meldbuffer.py index 35e8f4f9..fd95aa14 100644 --- a/meld/meldbuffer.py +++ b/meld/meldbuffer.py @@ -87,9 +87,9 @@ def insert_at_line(self, line, text): class MeldBufferData(GObject.GObject): - __gsignals__ = { - str('file-changed'): (GObject.SignalFlags.RUN_FIRST, None, ()), - } + @GObject.Signal('file-changed') + def file_changed_signal(self) -> None: + ... encoding = GObject.Property( type=GtkSource.Encoding, @@ -160,7 +160,7 @@ def _query_mtime(self, gfile): def _handle_file_change(self, monitor, f, other_file, event_type): mtime = self._query_mtime(f) if self._disk_mtime and mtime and mtime > self._disk_mtime: - self.emit('file-changed') + self.file_changed_signal.emit() self._disk_mtime = mtime or self._disk_mtime @property From 3319cba74e5d46031eab579aa0bb8ec76a92993f Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 9 Dec 2018 07:07:37 +1000 Subject: [PATCH 0736/1316] melddoc: Move file-changed to Signal --- meld/filediff.py | 2 +- meld/melddoc.py | 6 ++++-- meld/meldwindow.py | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/meld/filediff.py b/meld/filediff.py index d091b638..76ace42f 100644 --- a/meld/filediff.py +++ b/meld/filediff.py @@ -1631,7 +1631,7 @@ def file_saved_cb(self, saver, result, user_data): self.state = ComparisonState.SavingError return - self.emit('file-changed', gfile.get_path()) + self.file_changed_signal.emit(gfile.get_path()) self.undosequence.checkpoint(buf) buf.data.update_mtime() if pane == 1 and self.num_panes == 3: diff --git a/meld/melddoc.py b/meld/melddoc.py index f5f7aa3f..6f4b4dc3 100644 --- a/meld/melddoc.py +++ b/meld/melddoc.py @@ -73,8 +73,6 @@ class MeldDoc(LabeledObjectMixin, GObject.GObject): """ __gsignals__ = { - 'file-changed': (GObject.SignalFlags.RUN_FIRST, None, - (GObject.TYPE_STRING,)), 'create-diff': (GObject.SignalFlags.RUN_FIRST, None, (GObject.TYPE_PYOBJECT, GObject.TYPE_PYOBJECT)), @@ -86,6 +84,10 @@ class MeldDoc(LabeledObjectMixin, GObject.GObject): def close_signal(self, exit_code: int) -> None: ... + @GObject.Signal('file-changed') + def file_changed_signal(self, path: str) -> None: + ... + @GObject.Signal def tab_state_changed(self, old_state: int, new_state: int) -> None: ... diff --git a/meld/meldwindow.py b/meld/meldwindow.py index bcc91c89..98877036 100644 --- a/meld/meldwindow.py +++ b/meld/meldwindow.py @@ -527,7 +527,7 @@ def _append_page(self, page, icon): if hasattr(page, 'scheduler'): self.scheduler.add_scheduler(page.scheduler) if isinstance(page, MeldDoc): - page.connect("file-changed", self.on_file_changed) + page.file_changed_signal.connect(self.on_file_changed) page.connect("create-diff", lambda obj, arg, kwargs: self.append_diff(arg, **kwargs)) page.tab_state_changed.connect(self.on_page_state_changed) From ea1b50e64a8849e4c886b7b7d47b8376af3f8c78 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 9 Dec 2018 07:21:25 +1000 Subject: [PATCH 0737/1316] melddoc: Migrate create-diff to Signal --- meld/dirdiff.py | 8 +++++--- meld/melddoc.py | 8 +++++--- meld/meldwindow.py | 8 ++++---- meld/vcview.py | 8 +++++--- 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/meld/dirdiff.py b/meld/dirdiff.py index 8943f200..88ced436 100644 --- a/meld/dirdiff.py +++ b/meld/dirdiff.py @@ -1195,8 +1195,10 @@ def on_treeview_row_activated(self, view, path, column): if not rows[pane]: return if os.path.isfile(rows[pane]): - self.emit("create-diff", [Gio.File.new_for_path(r) - for r in rows if os.path.isfile(r)], {}) + self.create_diff_signal.emit( + [Gio.File.new_for_path(r) for r in rows if os.path.isfile(r)], + {} + ) elif os.path.isdir(rows[pane]): if view.row_expanded(path): view.collapse_row(path) @@ -1229,7 +1231,7 @@ def run_diff_from_iter(self, it): row_paths = self.model.value_paths(it) gfiles = [Gio.File.new_for_path(p) for p in row_paths if os.path.exists(p)] - self.emit("create-diff", gfiles, {}) + self.create_diff_signal.emit(gfiles, {}) def on_button_diff_clicked(self, button): pane = self._get_focused_pane() diff --git a/meld/melddoc.py b/meld/melddoc.py index 6f4b4dc3..b3953359 100644 --- a/meld/melddoc.py +++ b/meld/melddoc.py @@ -73,9 +73,6 @@ class MeldDoc(LabeledObjectMixin, GObject.GObject): """ __gsignals__ = { - 'create-diff': (GObject.SignalFlags.RUN_FIRST, None, - (GObject.TYPE_PYOBJECT, - GObject.TYPE_PYOBJECT)), 'next-diff-changed': (GObject.SignalFlags.RUN_FIRST, None, (bool, bool)), } @@ -84,6 +81,11 @@ class MeldDoc(LabeledObjectMixin, GObject.GObject): def close_signal(self, exit_code: int) -> None: ... + @GObject.Signal(name='create-diff') + def create_diff_signal( + self, gfiles: object, options: object) -> None: + ... + @GObject.Signal('file-changed') def file_changed_signal(self, path: str) -> None: ... diff --git a/meld/meldwindow.py b/meld/meldwindow.py index 98877036..eac820dd 100644 --- a/meld/meldwindow.py +++ b/meld/meldwindow.py @@ -528,8 +528,8 @@ def _append_page(self, page, icon): self.scheduler.add_scheduler(page.scheduler) if isinstance(page, MeldDoc): page.file_changed_signal.connect(self.on_file_changed) - page.connect("create-diff", lambda obj, arg, kwargs: - self.append_diff(arg, **kwargs)) + page.create_diff_signal.connect( + lambda obj, arg, kwargs: self.append_diff(arg, **kwargs)) page.tab_state_changed.connect(self.on_page_state_changed) page.close_signal.connect(self.page_removed) @@ -635,8 +635,8 @@ def cleanup(): self.scheduler.add_scheduler(doc.scheduler) path = gfile.get_path() doc.set_location(path) - doc.connect("create-diff", lambda obj, arg, kwargs: - self.append_diff(arg, **kwargs)) + doc.create_diff_signal.connect( + lambda obj, arg, kwargs: self.append_diff(arg, **kwargs)) doc.run_diff(path) def open_paths(self, gfiles, auto_compare=False, auto_merge=False, diff --git a/meld/vcview.py b/meld/vcview.py index 5d8aaf2b..e7255177 100644 --- a/meld/vcview.py +++ b/meld/vcview.py @@ -434,7 +434,7 @@ def on_row_activated(self, treeview, path, tvc): def run_diff(self, path): if os.path.isdir(path): - self.emit("create-diff", [Gio.File.new_for_path(path)], {}) + self.create_diff_signal.emit([Gio.File.new_for_path(path)], {}) return basename = os.path.basename(path) @@ -490,8 +490,10 @@ def run_diff(self, path): os.chmod(temp_file, 0o444) _temp_files.append(temp_file) - self.emit("create-diff", - [Gio.File.new_for_path(d) for d in diffs], kwargs) + self.create_diff_signal.emit( + [Gio.File.new_for_path(d) for d in diffs], + kwargs, + ) def on_filter_state_toggled(self, button): active_filters = [ From f2887a2f17ebb0c54ffe74b9b8e861938b2b4951 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 9 Dec 2018 07:25:58 +1000 Subject: [PATCH 0738/1316] melddoc: Move next-diff-changed to Signal --- meld/dirdiff.py | 4 ++-- meld/filediff.py | 4 ++-- meld/melddoc.py | 10 +++++----- meld/meldwindow.py | 4 ++-- meld/vcview.py | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/meld/dirdiff.py b/meld/dirdiff.py index 88ced436..c3e58d66 100644 --- a/meld/dirdiff.py +++ b/meld/dirdiff.py @@ -1121,7 +1121,7 @@ def on_treeview_cursor_changed(self, *args): cursor_path, cursor_col = self.treeview[pane].get_cursor() if not cursor_path: - self.emit("next-diff-changed", False, False) + self.next_diff_changed_signal.emit(False, False) self.current_path = cursor_path return @@ -1158,7 +1158,7 @@ def on_treeview_cursor_changed(self, *args): prev, next = self.model._find_next_prev_diff(cursor_path) self.prev_path, self.next_path = prev, next have_next_diffs = (prev is not None, next is not None) - self.emit("next-diff-changed", *have_next_diffs) + self.next_diff_changed_signal.emit(*have_next_diffs) self.current_path = cursor_path def on_treeview_key_press_event(self, view, event): diff --git a/meld/filediff.py b/meld/filediff.py index 76ace42f..c0cd67da 100644 --- a/meld/filediff.py +++ b/meld/filediff.py @@ -379,8 +379,8 @@ def on_cursor_position_changed(self, buf, pspec, force=False): self.cursor.chunk = chunk self.on_current_diff_changed() if prev != self.cursor.prev or next_ != self.cursor.next or force: - self.emit( - "next-diff-changed", prev is not None, next_ is not None) + self.next_diff_changed_signal.emit( + prev is not None, next_ is not None) prev_conflict, next_conflict = None, None for conflict in self.linediffer.conflicts: diff --git a/meld/melddoc.py b/meld/melddoc.py index b3953359..4268f10d 100644 --- a/meld/melddoc.py +++ b/meld/melddoc.py @@ -72,11 +72,6 @@ class MeldDoc(LabeledObjectMixin, GObject.GObject): """Base class for documents in the meld application. """ - __gsignals__ = { - 'next-diff-changed': (GObject.SignalFlags.RUN_FIRST, None, - (bool, bool)), - } - @GObject.Signal(name='close') def close_signal(self, exit_code: int) -> None: ... @@ -90,6 +85,11 @@ def create_diff_signal( def file_changed_signal(self, path: str) -> None: ... + @GObject.Signal('next-diff-changed') + def next_diff_changed_signal( + self, have_prev: bool, have_next: bool) -> None: + ... + @GObject.Signal def tab_state_changed(self, old_state: int, new_state: int) -> None: ... diff --git a/meld/meldwindow.py b/meld/meldwindow.py index eac820dd..0ca68345 100644 --- a/meld/meldwindow.py +++ b/meld/meldwindow.py @@ -354,8 +354,8 @@ def on_switch_page(self, notebook, page, which): self.set_title("Meld") if isinstance(newdoc, MeldDoc): - self.diff_handler = newdoc.connect("next-diff-changed", - self.on_next_diff_changed) + self.diff_handler = newdoc.next_diff_changed_signal.connect( + self.on_next_diff_changed) else: self.diff_handler = None if hasattr(newdoc, 'scheduler'): diff --git a/meld/vcview.py b/meld/vcview.py index e7255177..957ac3b5 100644 --- a/meld/vcview.py +++ b/meld/vcview.py @@ -763,7 +763,7 @@ def on_consoleview_populate_popup(self, textview, menu): def on_treeview_cursor_changed(self, *args): cursor_path, cursor_col = self.treeview.get_cursor() if not cursor_path: - self.emit("next-diff-changed", False, False) + self.next_diff_changed_signal.emit(False, False) self.current_path = cursor_path return @@ -796,7 +796,7 @@ def on_treeview_cursor_changed(self, *args): prev, next = self.model._find_next_prev_diff(cursor_path) self.prev_path, self.next_path = prev, next have_next_diffs = (prev is not None, next is not None) - self.emit("next-diff-changed", *have_next_diffs) + self.next_diff_changed_signal.emit(*have_next_diffs) self.current_path = cursor_path def next_diff(self, direction): From 6252d978a3a428bc06d0e35760f63bb5e542e505 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 9 Dec 2018 07:38:05 +1000 Subject: [PATCH 0739/1316] vcview: Migrate to template and resource loading --- meld/resources/meld.gresource.xml | 1 + {data => meld/resources}/ui/vcview.ui | 293 +++++++++++++------------- meld/vcview.py | 77 ++++++- 3 files changed, 214 insertions(+), 157 deletions(-) rename {data => meld/resources}/ui/vcview.ui (56%) diff --git a/meld/resources/meld.gresource.xml b/meld/resources/meld.gresource.xml index f34feb44..3512d3bd 100644 --- a/meld/resources/meld.gresource.xml +++ b/meld/resources/meld.gresource.xml @@ -19,5 +19,6 @@ ui/push-dialog.ui ui/revert-dialog.ui ui/save-confirm-dialog.ui + ui/vcview.ui diff --git a/data/ui/vcview.ui b/meld/resources/ui/vcview.ui similarity index 56% rename from data/ui/vcview.ui rename to meld/resources/ui/vcview.ui index b8dad210..1b6c4376 100644 --- a/data/ui/vcview.ui +++ b/meld/resources/ui/vcview.ui @@ -129,221 +129,214 @@ - + diff --git a/meld/vcview.py b/meld/vcview.py index 957ac3b5..3792b3f7 100644 --- a/meld/vcview.py +++ b/meld/vcview.py @@ -37,7 +37,8 @@ from meld.misc import error_dialog, read_pipe_iter from meld.recent import RecentType from meld.settings import bind_settings, settings -from meld.ui.gnomeglade import Component, ui_file +from meld.ui._gtktemplate import Template +from meld.ui.gnomeglade import ui_file from meld.ui.vcdialogs import CommitDialog, PushDialog from meld.vc import _null, get_vcs from meld.vc._vc import Entry @@ -119,7 +120,8 @@ def get_file_path(self, it): return self.get_value(it, self.column_index(tree.COL_PATH, 0)) -class VcView(tree.TreeviewCommon, MeldDoc, Component): +@Template(resource_path='/org/gnome/meld/ui/vcview.ui') +class VcView(Gtk.VBox, tree.TreeviewCommon, MeldDoc): __gtype_name__ = "VcView" @@ -129,6 +131,13 @@ class VcView(tree.TreeviewCommon, MeldDoc, Component): ('vc-merge-file-order', 'merge-file-order'), ) + close_signal = MeldDoc.close_signal + create_diff_signal = MeldDoc.create_diff_signal + file_changed_signal = MeldDoc.file_changed_signal + label_changed = MeldDoc.label_changed + next_diff_changed_signal = MeldDoc.next_diff_changed_signal + tab_state_changed = MeldDoc.tab_state_changed + status_filters = GObject.Property( type=GObject.TYPE_STRV, nick="File status filters", @@ -150,18 +159,44 @@ class VcView(tree.TreeviewCommon, MeldDoc, Component): "ignored": ("VcShowIgnored", Entry.is_ignored), } + combobox_vcs = Template.Child() + console_vbox = Template.Child() + consoleview = Template.Child() + emblem_renderer = Template.Child() + extra_column = Template.Child() + extra_renderer = Template.Child() + fileentry = Template.Child() + liststore_vcs = Template.Child() + location_column = Template.Child() + location_renderer = Template.Child() + name_column = Template.Child() + name_renderer = Template.Child() + status_column = Template.Child() + status_renderer = Template.Child() + treeview = Template.Child() + vc_console_vpaned = Template.Child() + VcviewActions = Template.Child() + def __init__(self): + super().__init__() + # FIXME: + # This unimaginable hack exists because GObject (or GTK+?) + # doesn't actually correctly chain init calls, even if they're + # not to GObjects. As a workaround, we *should* just be able to + # put our class first, but because of Gtk.Template we can't do + # that if it's a GObject, because GObject doesn't support + # multiple inheritance and we need to inherit from our Widget + # parent to make Template work. MeldDoc.__init__(self) - Component.__init__( - self, "vcview.ui", "vcview", ["VcviewActions", 'liststore_vcs']) + self.init_template() bind_settings(self) self.ui_file = ui_file("vcview-ui.xml") self.actiongroup = self.VcviewActions self.actiongroup.set_translation_domain("meld") self.model = VcTreeStore() - self.widget.connect("style-updated", self.model.on_style_updated) - self.model.on_style_updated(self.widget) + self.connect("style-updated", self.model.on_style_updated) + self.model.on_style_updated(self) self.treeview.set_model(self.model) self.treeview.get_selection().connect( "changed", self.on_treeview_selection_changed) @@ -205,6 +240,10 @@ def __init__(self): self.actiongroup.get_action( self.state_actions[s][0]).set_active(True) + # FIXME: Awful migration hack; this means that we don't have to + # address `.pyobject` access before all tab types are updated. + self.pyobject = self + def _set_external_action_sensitivity(self, focused): try: self.main_actiongroup.get_action("OpenExternal").set_sensitive( @@ -280,6 +319,7 @@ def populate_vcs_for_location(self, location): self.combobox_vcs.set_sensitive(len(vcs_model) > 1) self.combobox_vcs.set_active(default_active) + @Template.Callback() def on_vc_change(self, combobox_vcs): active_iter = combobox_vcs.get_active_iter() if active_iter is None: @@ -410,6 +450,7 @@ def _search_recursively_iter(self, start_path, replace=False): self.treeview.expand_row(Gtk.TreePath.new_first(), False) # TODO: This doesn't fire when the user selects a shortcut folder + @Template.Callback() def on_fileentry_file_set(self, fileentry): directory = fileentry.get_file() path = directory.get_path() @@ -420,6 +461,7 @@ def on_delete_event(self): self.close_signal.emit(0) return Gtk.ResponseType.OK + @Template.Callback() def on_row_activated(self, treeview, path, tvc): it = self.model.get_iter(path) if self.model.iter_has_child(it): @@ -495,6 +537,7 @@ def run_diff(self, path): kwargs, ) + @Template.Callback() def on_filter_state_toggled(self, button): active_filters = [ k for k, (action_name, fn) in self.state_actions.items() @@ -616,29 +659,34 @@ def sync_runner(self, command, files, refresh, working_dir): for it in self._command_iter(command, files, refresh, working_dir): pass + @Template.Callback() def on_button_update_clicked(self, obj): self.vc.update(self.runner) + @Template.Callback() def on_button_push_clicked(self, obj): response = PushDialog(self).run() if response == Gtk.ResponseType.OK: self.vc.push(self.runner) + @Template.Callback() def on_button_commit_clicked(self, obj): response, commit_msg = CommitDialog(self).run() if response == Gtk.ResponseType.OK: self.vc.commit( self.runner, self._get_selected_files(), commit_msg) + @Template.Callback() def on_button_add_clicked(self, obj): self.vc.add(self.runner, self._get_selected_files()) + @Template.Callback() def on_button_remove_clicked(self, obj): selected = self._get_selected_files() if any(os.path.isdir(p) for p in selected): # TODO: Improve and reuse this dialog for the non-VC delete action dialog = Gtk.MessageDialog( - parent=self.widget.get_toplevel(), + parent=self.get_toplevel(), flags=(Gtk.DialogFlags.MODAL | Gtk.DialogFlags.DESTROY_WITH_PARENT), type=Gtk.MessageType.WARNING, @@ -656,12 +704,15 @@ def on_button_remove_clicked(self, obj): self.vc.remove(self.runner, selected) + @Template.Callback() def on_button_resolved_clicked(self, obj): self.vc.resolve(self.runner, self._get_selected_files()) + @Template.Callback() def on_button_revert_clicked(self, obj): self.vc.revert(self.runner, self._get_selected_files()) + @Template.Callback() def on_button_delete_clicked(self, obj): files = self._get_selected_files() for name in files: @@ -680,6 +731,7 @@ def on_button_delete_clicked(self, obj): workdir = os.path.dirname(os.path.commonprefix(files)) self.refresh_partial(workdir) + @Template.Callback() def on_button_diff_clicked(self, obj): files = self._get_selected_files() for f in files: @@ -751,6 +803,7 @@ def find_iter_by_name(self, name): break return None + @Template.Callback() def on_consoleview_populate_popup(self, textview, menu): buf = textview.get_buffer() clear_action = Gtk.MenuItem.new_with_label(_("Clear")) @@ -760,6 +813,16 @@ def on_consoleview_populate_popup(self, textview, menu): menu.insert(Gtk.SeparatorMenuItem(), 1) menu.show_all() + @Template.Callback() + def on_treeview_popup_menu(self, treeview): + tree.TreeviewCommon.on_treeview_popup_menu(self, treeview) + + @Template.Callback() + def on_treeview_button_press_event(self, treeview, event): + tree.TreeviewCommon.on_treeview_button_press_event( + self, treeview, event) + + @Template.Callback() def on_treeview_cursor_changed(self, *args): cursor_path, cursor_col = self.treeview.get_cursor() if not cursor_path: From bc873ced4d2b858e54917a291c873b9187b615b7 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 9 Dec 2018 08:49:54 +1000 Subject: [PATCH 0740/1316] dirdiff: Migrate to template and resource loading --- data/ui/dirdiff.ui | 536 ------------------------------ meld/dirdiff.py | 102 +++++- meld/resources/meld.gresource.xml | 1 + meld/resources/ui/dirdiff.ui | 529 +++++++++++++++++++++++++++++ 4 files changed, 620 insertions(+), 548 deletions(-) delete mode 100644 data/ui/dirdiff.ui create mode 100644 meld/resources/ui/dirdiff.ui diff --git a/data/ui/dirdiff.ui b/data/ui/dirdiff.ui deleted file mode 100644 index 3476023a..00000000 --- a/data/ui/dirdiff.ui +++ /dev/null @@ -1,536 +0,0 @@ - - - - - - - - _Compare - Compare selected files - gtk-dialog-info - True - - - - - - Collapse Recursively - Collapse selected folder and all subfolders - gtk-dialog-info - True - - - - - - Expand Recursively - Expand selected folder and all subfolders - gtk-dialog-info - True - - - - - - Copy to _Left - Copy to left - gtk-go-back - True - - - - - - - Copy to _Right - Copy to right - gtk-go-forward - True - - - - - - - Delete selected - gtk-delete - True - - - - - - - Hide - Hide selected - gtk-no - - - - - - Ignore Filename Case - Consider differently-cased filenames that are otherwise-identical to be the same - gtk-italic - - - - - - Same - Show identical - gtk-apply - True - - - - - - New - Show new - gtk-add - True - - - - - - Modified - Show modified - gtk-remove - True - - - - - - Filters - Set active filters - True - - - - - - True - False - window1 - - - True - False - - - True - False - - - True - False - False - 1 - - - - True - False - False - - - True - False - True - select-folder - - - - - - True - - - - - 1 - 0 - 1 - 1 - - - - - True - False - False - 1 - - - - True - False - False - - - True - False - True - select-folder - - - - - - True - - - - - 3 - 0 - 1 - 1 - - - - - True - False - False - 1 - - - - True - False - False - - - True - False - True - select-folder - - - - - - True - - - - - 5 - 0 - 1 - 1 - - - - - True - False - - - - 6 - 0 - 1 - 1 - - - - - True - False - True - - - 6 - 1 - 1 - 1 - - - - - True - False - - - - 4 - 0 - 1 - 1 - - - - - 50 - True - False - GDK_SCROLL_MASK - True - - - - 4 - 1 - 1 - 1 - - - - - True - False - - - - 0 - 0 - 1 - 1 - - - - - True - False - True - - - 0 - 1 - 1 - 1 - - - - - True - False - - - - 2 - 0 - 1 - 1 - - - - - 50 - True - False - GDK_SCROLL_MASK - True - - - - 2 - 1 - 1 - 1 - - - - - True - False - True - - - True - False - - - - - - False - True - 0 - - - - - True - True - True - False - top-right - True - - - True - True - False - - - - - - - - - - - - - - - True - True - 1 - - - - - 1 - 1 - 1 - 1 - - - - - True - False - True - - - True - False - - - - - - False - True - 0 - - - - - True - True - True - False - - - True - True - False - - - - - - - - - - - - - - - True - True - 1 - - - - - 3 - 1 - 1 - 1 - - - - - True - False - True - - - True - False - - - - - - False - True - 0 - - - - - True - True - True - False - - - True - True - False - - - - - - - - - - - - - - - True - True - 1 - - - - - 5 - 1 - 1 - 1 - - - - - True - True - end - 0 - - - - - - diff --git a/meld/dirdiff.py b/meld/dirdiff.py index c3e58d66..8b2abc78 100644 --- a/meld/dirdiff.py +++ b/meld/dirdiff.py @@ -42,10 +42,12 @@ from meld.recent import RecentType from meld.settings import bind_settings, meldsettings, settings from meld.treehelpers import refocus_deleted_path, tree_path_as_tuple +from meld.ui._gtktemplate import Template from meld.ui.cellrenderers import ( CellRendererByteSize, CellRendererDate, CellRendererFileMode) from meld.ui.emblemcellrenderer import EmblemCellRenderer -from meld.ui.gnomeglade import Component, ui_file +from meld.ui.gnomeglade import ui_file +from meld.ui.util import map_widgets_into_lists class StatItem(namedtuple('StatItem', 'mode size time')): @@ -285,11 +287,18 @@ def canonicalize_lower(element): return element.lower() -class DirDiff(tree.TreeviewCommon, MeldDoc, Component): - """Two or three way folder comparison""" +@Template(resource_path='/org/gnome/meld/ui/dirdiff.ui') +class DirDiff(Gtk.VBox, tree.TreeviewCommon, MeldDoc): __gtype_name__ = "DirDiff" + close_signal = MeldDoc.close_signal + create_diff_signal = MeldDoc.create_diff_signal + file_changed_signal = MeldDoc.file_changed_signal + label_changed = MeldDoc.label_changed + next_diff_changed_signal = MeldDoc.next_diff_changed_signal + tab_state_changed = MeldDoc.tab_state_changed + __gsettings_bindings__ = ( ('folder-ignore-symlinks', 'ignore-symlinks'), ('folder-shallow-comparison', 'shallow-comparison'), @@ -339,6 +348,33 @@ class DirDiff(tree.TreeviewCommon, MeldDoc, Component): default=100, ) + actiongroup = Template.Child('DirdiffActions') + + treeview0 = Template.Child() + treeview1 = Template.Child() + treeview2 = Template.Child() + fileentry0 = Template.Child() + fileentry1 = Template.Child() + fileentry2 = Template.Child() + scrolledwindow0 = Template.Child() + scrolledwindow1 = Template.Child() + scrolledwindow2 = Template.Child() + diffmap0 = Template.Child() + diffmap1 = Template.Child() + linkmap0 = Template.Child() + linkmap1 = Template.Child() + msgarea_mgr0 = Template.Child() + msgarea_mgr1 = Template.Child() + msgarea_mgr2 = Template.Child() + vbox0 = Template.Child() + vbox1 = Template.Child() + vbox2 = Template.Child() + dummy_toolbar_linkmap0 = Template.Child() + dummy_toolbar_linkmap1 = Template.Child() + file_toolbar0 = Template.Child() + file_toolbar1 = Template.Child() + file_toolbar2 = Template.Child() + """Dictionary mapping tree states to corresponding difflib-like terms""" chunk_type_map = { tree.STATE_NORMAL: None, @@ -359,12 +395,20 @@ class DirDiff(tree.TreeviewCommon, MeldDoc, Component): } def __init__(self, num_panes): + super().__init__() + # FIXME: + # This unimaginable hack exists because GObject (or GTK+?) + # doesn't actually correctly chain init calls, even if they're + # not to GObjects. As a workaround, we *should* just be able to + # put our class first, but because of Gtk.Template we can't do + # that if it's a GObject, because GObject doesn't support + # multiple inheritance and we need to inherit from our Widget + # parent to make Template work. MeldDoc.__init__(self) - Component.__init__(self, "dirdiff.ui", "dirdiff", ["DirdiffActions"]) + self.init_template() bind_settings(self) self.ui_file = ui_file("dirdiff-ui.xml") - self.actiongroup = self.DirdiffActions self.actiongroup.set_translation_domain("meld") self.name_filters = [] @@ -378,18 +422,22 @@ def __init__(self, num_panes): self.on_text_filters_changed) ] - self.map_widgets_into_lists(["treeview", "fileentry", "scrolledwindow", - "diffmap", "linkmap", "msgarea_mgr", - "vbox", "dummy_toolbar_linkmap", - "file_toolbar"]) + map_widgets_into_lists( + self, + [ + "treeview", "fileentry", "scrolledwindow", "diffmap", + "linkmap", "msgarea_mgr", "vbox", "dummy_toolbar_linkmap", + "file_toolbar", + ] + ) - self.widget.ensure_style() + self.ensure_style() self.custom_labels = [] self.set_num_panes(num_panes) - self.widget.connect("style-updated", self.model.on_style_updated) - self.model.on_style_updated(self.widget) + self.connect("style-updated", self.model.on_style_updated) + self.model.on_style_updated(self) self.do_to_others_lock = False self.focus_in_events = [] @@ -491,6 +539,10 @@ def __init__(self, num_panes): self._scan_in_progress = 0 + # FIXME: Awful migration hack; this means that we don't have to + # address `.pyobject` access before all tab types are updated. + self.pyobject = self + def queue_draw(self): for treeview in self.treeview: treeview.queue_draw() @@ -522,6 +574,7 @@ def update_treeview_columns(self, settings, key): last_column = current_column treeview.set_headers_visible(extra_cols) + @Template.Callback() def on_custom_filter_menu_toggled(self, item): if item.get_active(): self.custom_popup.connect( @@ -668,6 +721,7 @@ def file_created(self, path, pane): it = self.model.iter_parent(it) self._update_diffmaps() + @Template.Callback() def on_fileentry_file_set(self, entry): files = [e.get_file() for e in self.fileentry[:self.num_panes]] paths = [f.get_path() for f in files] @@ -1114,6 +1168,7 @@ def update_action_sensitivity(self): act = self.main_actiongroup.get_action("OpenExternal") act.set_sensitive(False) + @Template.Callback() def on_treeview_cursor_changed(self, *args): pane = self._get_focused_pane() if pane is None or len(self.model) == 0: @@ -1161,6 +1216,16 @@ def on_treeview_cursor_changed(self, *args): self.next_diff_changed_signal.emit(*have_next_diffs) self.current_path = cursor_path + @Template.Callback() + def on_treeview_popup_menu(self, treeview): + tree.TreeviewCommon.on_treeview_popup_menu(self, treeview) + + @Template.Callback() + def on_treeview_button_press_event(self, treeview, event): + tree.TreeviewCommon.on_treeview_button_press_event( + self, treeview, event) + + @Template.Callback() def on_treeview_key_press_event(self, view, event): pane = self.treeview.index(view) tree = None @@ -1182,6 +1247,7 @@ def on_treeview_key_press_event(self, view, event): tree.emit("cursor-changed") return event.keyval in (Gdk.KEY_Left, Gdk.KEY_Right) # handled + @Template.Callback() def on_treeview_row_activated(self, view, path, column): pane = self.treeview.index(view) rows = self.model.value_paths(self.model.get_iter(path)) @@ -1205,6 +1271,7 @@ def on_treeview_row_activated(self, view, path, column): else: view.expand_row(path, False) + @Template.Callback() def on_treeview_row_expanded(self, view, it, path): self.row_expansions.add(str(path)) for row in self.model[path].iterchildren(): @@ -1214,6 +1281,7 @@ def on_treeview_row_expanded(self, view, it, path): self._do_to_others(view, self.treeview, "expand_row", (path, False)) self._update_diffmaps() + @Template.Callback() def on_treeview_row_collapsed(self, view, me, path): self.row_expansions.discard(str(path)) self._do_to_others(view, self.treeview, "collapse_row", (path,)) @@ -1233,6 +1301,7 @@ def run_diff_from_iter(self, it): for p in row_paths if os.path.exists(p)] self.create_diff_signal.emit(gfiles, {}) + @Template.Callback() def on_button_diff_clicked(self, button): pane = self._get_focused_pane() if pane is None: @@ -1242,6 +1311,7 @@ def on_button_diff_clicked(self, button): for row in selected: self.run_diff_from_iter(self.model.get_iter(row)) + @Template.Callback() def on_collapse_recursive_clicked(self, action): pane = self._get_focused_pane() if pane is None: @@ -1262,6 +1332,7 @@ def append_paths_to_collapse( path = filter_model.convert_path_to_child_path(filter_path) paths_to_collapse.append(path) + @Template.Callback() def on_expand_recursive_clicked(self, action): pane = self._get_focused_pane() if pane is None: @@ -1271,12 +1342,15 @@ def on_expand_recursive_clicked(self, action): for path in paths: self.treeview[pane].expand_row(path, True) + @Template.Callback() def on_button_copy_left_clicked(self, button): self.copy_selected(-1) + @Template.Callback() def on_button_copy_right_clicked(self, button): self.copy_selected(1) + @Template.Callback() def on_button_delete_clicked(self, button): self.delete_selected() @@ -1292,9 +1366,11 @@ def open_external(self): if files: self._open_files(files) + @Template.Callback() def on_button_ignore_case_toggled(self, button): self.refresh() + @Template.Callback() def on_filter_state_toggled(self, button): active_filters = [ state for state, (_, action_name) in self.state_actions.items() @@ -1314,6 +1390,7 @@ def _update_name_filter(self, button, idx): self.name_filters[idx].active = button.get_active() self.refresh() + @Template.Callback() def on_filter_hide_current_clicked(self, button): pane = self._get_focused_pane() if pane is not None: @@ -1593,6 +1670,7 @@ def on_file_changed(self, changed_filename): self._update_diffmaps() self.force_cursor_recalculate = True + @Template.Callback() def on_linkmap_scroll_event(self, linkmap, event): self.next_diff(event.direction) diff --git a/meld/resources/meld.gresource.xml b/meld/resources/meld.gresource.xml index 3512d3bd..aae05637 100644 --- a/meld/resources/meld.gresource.xml +++ b/meld/resources/meld.gresource.xml @@ -11,6 +11,7 @@ ui/appwindow.ui ui/column-list.ui ui/commit-dialog.ui + ui/dirdiff.ui ui/encoding-selector.ui ui/filter-list.ui ui/language-selector.ui diff --git a/meld/resources/ui/dirdiff.ui b/meld/resources/ui/dirdiff.ui new file mode 100644 index 00000000..9e82e75e --- /dev/null +++ b/meld/resources/ui/dirdiff.ui @@ -0,0 +1,529 @@ + + + + + + + + _Compare + Compare selected files + gtk-dialog-info + True + + + + + + Collapse Recursively + Collapse selected folder and all subfolders + gtk-dialog-info + True + + + + + + Expand Recursively + Expand selected folder and all subfolders + gtk-dialog-info + True + + + + + + Copy to _Left + Copy to left + gtk-go-back + True + + + + + + + Copy to _Right + Copy to right + gtk-go-forward + True + + + + + + + Delete selected + gtk-delete + True + + + + + + + Hide + Hide selected + gtk-no + + + + + + Ignore Filename Case + Consider differently-cased filenames that are otherwise-identical to be the same + gtk-italic + + + + + + Same + Show identical + gtk-apply + True + + + + + + New + Show new + gtk-add + True + + + + + + Modified + Show modified + gtk-remove + True + + + + + + Filters + Set active filters + True + + + + + + From a15453d9584fa1f5c973d2b1188f5044dd69b907 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Mon, 10 Dec 2018 06:01:55 +1000 Subject: [PATCH 0741/1316] filediff: Move to template and resource loading --- data/ui/filediff.ui | 738 ---------------------------------- meld/filediff.py | 122 +++++- meld/resources/ui/filediff.ui | 731 +++++++++++++++++++++++++++++++++ meld/sourceview.py | 2 +- 4 files changed, 842 insertions(+), 751 deletions(-) delete mode 100644 data/ui/filediff.ui create mode 100644 meld/resources/ui/filediff.ui diff --git a/data/ui/filediff.ui b/data/ui/filediff.ui deleted file mode 100644 index a6d29c21..00000000 --- a/data/ui/filediff.ui +++ /dev/null @@ -1,738 +0,0 @@ - - - - - - - - Format as Patch… - Create a patch using differences between files - - - - - - Save A_ll - Save all files in the current comparison - - - - - - - Revert files to their saved versions - gtk-revert-to-saved - - - - - - Add Synchronization Point - Add a synchronization point for changes between files - - - - - - Clear Synchronization Points - Clear sychronization points for changes between files - - - - - - Previous Conflict - Go to the previous conflict - - - - - - - Next Conflict - Go to the next conflict - - - - - - - Push to Left - Push current change to the left - gtk-go-back - - - - - - - Push to Right - Push current change to the right - gtk-go-forward - - - - - - - - Pull from Left - Pull change from the left - gtk-goto-last - - - - - - - Pull from Right - Pull change from the right - gtk-goto-first - - - - - - - Copy Above Left - Copy change above the left chunk - - - - - - - Copy Below Left - Copy change below the left chunk - - - - - - - Copy Above Right - Copy change above the right chunk - - - - - - - Copy Below Right - Copy change below the right chunk - - - - - - - Delete - Delete change - gtk-delete - - - - - - - Merge All from Left - Merge all non-conflicting changes from the left - - - - - - Merge All from Right - Merge all non-conflicting changes from the right - - - - - - Merge All - Merge all non-conflicting changes from left and right panes - - - - - - Previous Pane - Move keyboard focus to the previous document in this comparison - - - - - - - Next Pane - Move keyboard focus to the next document in this comparison - - - - - - - Lock Scrolling - Lock scrolling of all panes - True - - - - - - True - False - window1 - - - True - False - - - - - True - False - 0 - 0 - - - - - - - - - - - - - - - - - - - - - - - - True - False - False - 1 - - - - False - False - 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. - changes-prevent-symbolic - - - - - - document-save - True - True - False - - - - - - True - False - False - - - True - False - False - - - - - - True - - - - - False - False - False - 12 - - - True - False - 0 - File 3 - - - - - True - - - - - 5 - 1 - 1 - - - - - True - False - False - 1 - - - - False - False - 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. - emblem-readonly - - - - - - document-save-symbolic - True - True - False - - - - - - True - False - False - - - True - False - False - - - - - - True - - - - - False - False - False - 12 - - - True - False - 0 - File 2 - - - - - True - - - - - 3 - 1 - 1 - - - - - True - False - False - 1 - - - - False - False - 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. - emblem-readonly - - - - - - document-save-symbolic - True - True - False - - - - - - True - False - False - - - True - False - False - - - - - - True - - - - - False - False - False - 12 - - - True - False - 0 - File 1 - - - - - True - - - - - 1 - 1 - 1 - - - - - True - False - - - True - False - - - False - True - 0 - - - - - True - False - True - True - always - False - top-right - True - - - - True - True - - - - - - - - - - - True - True - 1 - - - - - 1 - 1 - - - - - True - False - - - True - False - - - False - True - 0 - - - - - True - False - True - True - always - False - - - - True - True - - - - - - - - - - - True - True - 1 - - - - - 5 - 1 - - - - - True - False - - - True - False - - - False - True - 0 - - - - - True - False - True - True - always - False - - - - True - True - - - - - - - - - - - True - True - 1 - - - - - 3 - 1 - - - - - True - False - - - - 6 - 0 - 1 - 1 - - - - - True - False - - - 6 - 1 - 1 - 1 - - - - - True - False - - - - 2 - 0 - 1 - 1 - - - - - 50 - True - False - GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_SCROLL_MASK - - - - 2 - 1 - 1 - 1 - - - - - True - False - - - - 0 - 0 - 1 - 1 - - - - - True - False - - - 0 - 1 - 1 - 1 - - - - - True - False - - - - 4 - 0 - 1 - 1 - - - - - 50 - True - False - GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_SCROLL_MASK - - - - 4 - 1 - 1 - 1 - - - - - True - - - 1 - 3 - 1 - 1 - - - - - True - - - 3 - 3 - 1 - 1 - - - - - True - - - 5 - 3 - 1 - 1 - - - - - True - True - 0 - - - - - - diff --git a/meld/filediff.py b/meld/filediff.py index c0cd67da..607bbd27 100644 --- a/meld/filediff.py +++ b/meld/filediff.py @@ -42,8 +42,10 @@ from meld.settings import bind_settings, meldsettings from meld.sourceview import ( get_custom_encoding_candidates, LanguageManager, TextviewLineAnimationType) +from meld.ui._gtktemplate import Template from meld.ui.findbar import FindBar -from meld.ui.gnomeglade import Component, ui_file +from meld.ui.gnomeglade import ui_file +from meld.ui.util import map_widgets_into_lists from meld.undo import UndoSequence @@ -89,11 +91,19 @@ def __init__(self): setattr(self, var, None) -class FileDiff(MeldDoc, Component): +@Template(resource_path='/org/gnome/meld/ui/filediff.ui') +class FileDiff(Gtk.VBox, MeldDoc): """Two or three way comparison of text files""" __gtype_name__ = "FileDiff" + close_signal = MeldDoc.close_signal + create_diff_signal = MeldDoc.create_diff_signal + file_changed_signal = MeldDoc.file_changed_signal + label_changed = MeldDoc.label_changed + next_diff_changed_signal = MeldDoc.next_diff_changed_signal + tab_state_changed = MeldDoc.tab_state_changed + __gsettings_bindings__ = ( ('ignore-blank-lines', 'ignore-blank-lines'), ) @@ -105,6 +115,53 @@ class FileDiff(MeldDoc, Component): default=False, ) + actiongroup = Template.Child('FilediffActions') + diffmap0 = Template.Child() + diffmap1 = Template.Child() + dummy_toolbar_diffmap0 = Template.Child() + dummy_toolbar_diffmap1 = Template.Child() + dummy_toolbar_linkmap0 = Template.Child() + dummy_toolbar_linkmap1 = Template.Child() + fileentry0 = Template.Child() + fileentry1 = Template.Child() + fileentry2 = Template.Child() + fileentry_toolitem0 = Template.Child() + fileentry_toolitem1 = Template.Child() + fileentry_toolitem2 = Template.Child() + file_save_button0 = Template.Child() + file_save_button1 = Template.Child() + file_save_button2 = Template.Child() + file_toolbar0 = Template.Child() + file_toolbar1 = Template.Child() + file_toolbar2 = Template.Child() + filelabel0 = Template.Child() + filelabel1 = Template.Child() + filelabel2 = Template.Child() + filelabel_toolitem0 = Template.Child() + filelabel_toolitem1 = Template.Child() + filelabel_toolitem2 = Template.Child() + grid = Template.Child() + msgarea_mgr0 = Template.Child() + msgarea_mgr1 = Template.Child() + msgarea_mgr2 = Template.Child() + readonlytoggle0 = Template.Child() + readonlytoggle1 = Template.Child() + readonlytoggle2 = Template.Child() + scrolledwindow0 = Template.Child() + scrolledwindow1 = Template.Child() + scrolledwindow2 = Template.Child() + statusbar0 = Template.Child() + statusbar1 = Template.Child() + statusbar2 = Template.Child() + linkmap0 = Template.Child() + linkmap1 = Template.Child() + textview0 = Template.Child() + textview1 = Template.Child() + textview2 = Template.Child() + vbox0 = Template.Child() + vbox1 = Template.Child() + vbox2 = Template.Child() + differ = Differ keylookup = { @@ -128,11 +185,17 @@ class FileDiff(MeldDoc, Component): } def __init__(self, num_panes): - """Start up an filediff with num_panes empty contents. - """ + super().__init__() + # FIXME: + # This unimaginable hack exists because GObject (or GTK+?) + # doesn't actually correctly chain init calls, even if they're + # not to GObjects. As a workaround, we *should* just be able to + # put our class first, but because of Gtk.Template we can't do + # that if it's a GObject, because GObject doesn't support + # multiple inheritance and we need to inherit from our Widget + # parent to make Template work. MeldDoc.__init__(self) - Component.__init__( - self, "filediff.ui", "filediff", ["FilediffActions"]) + self.init_template() bind_settings(self) widget_lists = [ @@ -142,7 +205,7 @@ def __init__(self, num_panes): "dummy_toolbar_linkmap", "filelabel_toolitem", "filelabel", "fileentry_toolitem", "dummy_toolbar_diffmap", "statusbar", ] - self.map_widgets_into_lists(widget_lists) + map_widgets_into_lists(self, widget_lists) self.warned_bad_comparison = False self._keymask = 0 @@ -181,7 +244,6 @@ def __init__(self, num_panes): buf.data.file_changed_signal.connect(self.notify_file_changed) self.ui_file = ui_file("filediff-ui.xml") - self.actiongroup = self.FilediffActions self.actiongroup.set_translation_domain("meld") # Alternate keybindings for a few commands. @@ -278,6 +340,10 @@ def go_to_line(widget, line, pane): self.connect("notify::ignore-blank-lines", self.refresh_comparison) + # FIXME: Awful migration hack; this means that we don't have to + # address `.pyobject` access before all tab types are updated. + self.pyobject = self + def on_container_switch_in_event(self, ui): MeldDoc.on_container_switch_in_event(self, ui) @@ -308,6 +374,7 @@ def set_keymask(self, value): self.emit("action-mode-changed", mode) keymask = property(get_keymask, set_keymask) + @Template.Callback() def on_key_event(self, object, event): keymap = Gdk.Keymap.get_default() ok, keyval, group, lvl, consumed = keymap.translate_keyboard_state( @@ -520,6 +587,7 @@ def go_to_chunk(self, target, pane=None, centered=False): mark0, mark1, 'focus-highlight', 400000, starting_alpha=0.3, anim_type=TextviewLineAnimationType.stroke) + @Template.Callback() def on_linkmap_scroll_event(self, linkmap, event): self.next_diff(event.direction) @@ -528,9 +596,11 @@ def next_diff(self, direction, centered=False): else self.cursor.prev) self.go_to_chunk(target, centered=centered) + @Template.Callback() def action_previous_conflict(self, *args): self.go_to_chunk(self.cursor.prev_conflict, self.cursor.pane) + @Template.Callback() def action_next_conflict(self, *args): self.go_to_chunk(self.cursor.next_conflict, self.cursor.pane) @@ -556,37 +626,45 @@ def get_action_panes(self, direction, reverse=False): dst = src + direction return (dst, src) if reverse else (src, dst) + @Template.Callback() def action_push_change_left(self, *args): src, dst = self.get_action_panes(PANE_LEFT) self.replace_chunk(src, dst, self.get_action_chunk(src, dst)) + @Template.Callback() def action_push_change_right(self, *args): src, dst = self.get_action_panes(PANE_RIGHT) self.replace_chunk(src, dst, self.get_action_chunk(src, dst)) + @Template.Callback() def action_pull_change_left(self, *args): src, dst = self.get_action_panes(PANE_LEFT, reverse=True) self.replace_chunk(src, dst, self.get_action_chunk(src, dst)) + @Template.Callback() def action_pull_change_right(self, *args): src, dst = self.get_action_panes(PANE_RIGHT, reverse=True) self.replace_chunk(src, dst, self.get_action_chunk(src, dst)) + @Template.Callback() def action_copy_change_left_up(self, *args): src, dst = self.get_action_panes(PANE_LEFT) self.copy_chunk( src, dst, self.get_action_chunk(src, dst), copy_up=True) + @Template.Callback() def action_copy_change_right_up(self, *args): src, dst = self.get_action_panes(PANE_RIGHT) self.copy_chunk( src, dst, self.get_action_chunk(src, dst), copy_up=True) + @Template.Callback() def action_copy_change_left_down(self, *args): src, dst = self.get_action_panes(PANE_LEFT) self.copy_chunk( src, dst, self.get_action_chunk(src, dst), copy_up=False) + @Template.Callback() def action_copy_change_right_down(self, *args): src, dst = self.get_action_panes(PANE_RIGHT) self.copy_chunk( @@ -608,14 +686,17 @@ def resync(): self._sync_vscroll(self.scrolledwindow[src].get_vadjustment(), src) self.scheduler.add_task(resync) + @Template.Callback() def action_pull_all_changes_left(self, *args): src, dst = self.get_action_panes(PANE_LEFT, reverse=True) self.pull_all_non_conflicting_changes(src, dst) + @Template.Callback() def action_pull_all_changes_right(self, *args): src, dst = self.get_action_panes(PANE_RIGHT, reverse=True) self.pull_all_non_conflicting_changes(src, dst) + @Template.Callback() def merge_all_non_conflicting_changes(self, *args): dst = 1 merger = Merger() @@ -633,6 +714,7 @@ def resync(): self._sync_vscroll(self.scrolledwindow[0].get_vadjustment(), 0) self.scheduler.add_task(resync) + @Template.Callback() @with_focused_pane def delete_change(self, pane, *args): chunk = self.linediffer.get_chunk(self.cursor.chunk, pane) @@ -741,11 +823,13 @@ def move_cursor_pane(self, pane, new_pane): new_line = self._corresponding_chunk_line(chunk, line, pane, new_pane) self.move_cursor(new_pane, new_line) + @Template.Callback() def action_prev_pane(self, *args): pane = self._get_focused_pane() new_pane = (pane - 1) % self.num_panes self.move_cursor_pane(pane, new_pane) + @Template.Callback() def action_next_pane(self, *args): pane = self._get_focused_pane() new_pane = (pane + 1) % self.num_panes @@ -775,6 +859,7 @@ def on_textview_drag_data_received( self.set_file(pane, gfiles[0]) return True + @Template.Callback() def on_textview_focus_in_event(self, view, event): self.focus_pane = view self.findbar.textview = view @@ -784,6 +869,7 @@ def on_textview_focus_in_event(self, view, event): self._set_external_action_sensitivity() self.update_text_actions_sensitivity() + @Template.Callback() def on_textview_focus_out_event(self, view, event): self.keymask = 0 self._set_merge_action_sensitivity() @@ -852,7 +938,7 @@ def check_save_modified(self, buffers=None): builder = Gtk.Builder.new_from_resource( '/org/gnome/meld/ui/save-confirm-dialog.ui') dialog = builder.get_object('save-confirm-dialog') - dialog.set_transient_for(self.widget.get_toplevel()) + dialog.set_transient_for(self.get_toplevel()) message_area = dialog.get_message_area() buttons = [] @@ -890,7 +976,7 @@ def check_save_modified(self, buffers=None): buttons = ((_("Cancel"), Gtk.ResponseType.CANCEL), (_("Mark _Resolved"), Gtk.ResponseType.OK)) resolve_response = misc.modal_dialog( - primary, secondary, buttons, parent=self.widget, + primary, secondary, buttons, parent=self, messagetype=Gtk.MessageType.QUESTION) if resolve_response == Gtk.ResponseType.OK: @@ -1008,6 +1094,7 @@ def on_find_previous_activate(self, *args): def on_go_to_line_activate(self, pane, *args): self.statusbar[pane].emit('start-go-to-line') + @Template.Callback() def on_scrolledwindow_size_allocate(self, scrolledwindow, allocation): index = self.scrolledwindow.index(scrolledwindow) if index == 0 or index == 1: @@ -1015,6 +1102,7 @@ def on_scrolledwindow_size_allocate(self, scrolledwindow, allocation): if index == 1 or index == 2: self.linkmap[1].queue_draw() + @Template.Callback() def on_textview_popup_menu(self, textview): buffer = textview.get_buffer() cursor_it = buffer.get_iter_at_mark(buffer.get_insert()) @@ -1033,6 +1121,7 @@ def on_textview_popup_menu(self, textview): ) return True + @Template.Callback() def on_textview_button_press_event(self, textview, event): if event.button == 3: textview.grab_focus() @@ -1557,7 +1646,7 @@ def save_file(self, pane, saveas=False, force_overwrite=False): prompt = _("Save Middle Pane As") else: prompt = _("Save Right Pane As") - gfile = prompt_save_filename(prompt, self.widget) + gfile = prompt_save_filename(prompt, self) if not gfile: return False bufdata.label = gfile.get_path() @@ -1643,6 +1732,7 @@ def file_saved_cb(self, saver, result, user_data): else: self.state = ComparisonState.Normal + @Template.Callback() def make_patch(self, *extra): dialog = PatchDialog(self) dialog.run() @@ -1673,15 +1763,18 @@ def save(self, pane): def save_as(self, pane): self.save_file(pane, saveas=True) + @Template.Callback() def on_save_all_activate(self, action): for i in range(self.num_panes): if self.textbuffer[i].get_modified(): self.save_file(i) + @Template.Callback() def on_file_save_button_clicked(self, button): idx = self.file_save_button.index(button) self.save_file(idx) + @Template.Callback() def on_fileentry_file_set(self, entry): pane = self.fileentry[:self.num_panes].index(entry) buffer = self.textbuffer[pane] @@ -1707,7 +1800,7 @@ def check_unsaved_changes(self, buffers=None): builder = Gtk.Builder.new_from_resource( '/org/gnome/meld/ui/revert-dialog.ui') dialog = builder.get_object('revert_dialog') - dialog.set_transient_for(self.widget.get_toplevel()) + dialog.set_transient_for(self.get_toplevel()) filelist = Gtk.Label("\n".join(["\t• " + f for f in unsaved])) filelist.props.xalign = 0.0 @@ -1719,6 +1812,7 @@ def check_unsaved_changes(self, buffers=None): dialog.destroy() return response == Gtk.ResponseType.OK + @Template.Callback() def on_revert_activate(self, *extra): if not self.check_unsaved_changes(): return @@ -1739,6 +1833,7 @@ def queue_draw(self, junk=None): self.diffmap0.queue_draw() self.diffmap1.queue_draw() + @Template.Callback() def on_action_lock_scrolling_toggled(self, action): self.toggle_scroll_lock(action.get_active()) @@ -1746,6 +1841,7 @@ def toggle_scroll_lock(self, locked): self.actiongroup.get_action("LockScrolling").set_active(locked) self._scroll_lock = not locked + @Template.Callback() def on_readonly_button_toggled(self, button): index = self.readonlytoggle.index(button) buf = self.textbuffer[index] @@ -1962,6 +2058,7 @@ def delete_chunk(self, src, chunk): self.textview[src].add_fading_highlight( mark0, mark1, 'conflict', 500000) + @Template.Callback() @with_focused_pane def add_sync_point(self, pane, action): # Find a non-complete syncpoint, or create a new one @@ -2012,6 +2109,7 @@ def get_line_for_mark(): self.refresh_comparison() + @Template.Callback() def clear_sync_points(self, action): self.syncpoints = [] self.linediffer.syncpoints = [] diff --git a/meld/resources/ui/filediff.ui b/meld/resources/ui/filediff.ui new file mode 100644 index 00000000..d2e061d3 --- /dev/null +++ b/meld/resources/ui/filediff.ui @@ -0,0 +1,731 @@ + + + + + + + + Format as Patch… + Create a patch using differences between files + + + + + + Save A_ll + Save all files in the current comparison + + + + + + + Revert files to their saved versions + gtk-revert-to-saved + + + + + + Add Synchronization Point + Add a synchronization point for changes between files + + + + + + Clear Synchronization Points + Clear sychronization points for changes between files + + + + + + Previous Conflict + Go to the previous conflict + + + + + + + Next Conflict + Go to the next conflict + + + + + + + Push to Left + Push current change to the left + gtk-go-back + + + + + + + Push to Right + Push current change to the right + gtk-go-forward + + + + + + + + Pull from Left + Pull change from the left + gtk-goto-last + + + + + + + Pull from Right + Pull change from the right + gtk-goto-first + + + + + + + Copy Above Left + Copy change above the left chunk + + + + + + + Copy Below Left + Copy change below the left chunk + + + + + + + Copy Above Right + Copy change above the right chunk + + + + + + + Copy Below Right + Copy change below the right chunk + + + + + + + Delete + Delete change + gtk-delete + + + + + + + Merge All from Left + Merge all non-conflicting changes from the left + + + + + + Merge All from Right + Merge all non-conflicting changes from the right + + + + + + Merge All + Merge all non-conflicting changes from left and right panes + + + + + + Previous Pane + Move keyboard focus to the previous document in this comparison + + + + + + + Next Pane + Move keyboard focus to the next document in this comparison + + + + + + + Lock Scrolling + Lock scrolling of all panes + True + + + + + + diff --git a/meld/sourceview.py b/meld/sourceview.py index 41d88908..d3173be6 100644 --- a/meld/sourceview.py +++ b/meld/sourceview.py @@ -113,7 +113,7 @@ def set_show_line_numbers(self, show): if show == self._show_line_numbers: return - if self.line_renderer: + if getattr(self, 'line_renderer', None): self.line_renderer.set_visible(show) self._show_line_numbers = bool(show) From 21c69f5ce8b1d48f5535769c6b3b3ddbaedacb0b Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Mon, 10 Dec 2018 06:09:51 +1000 Subject: [PATCH 0742/1316] preferences: Fix column selector UI for template changes --- meld/resources/ui/column-list.ui | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/meld/resources/ui/column-list.ui b/meld/resources/ui/column-list.ui index bac386ce..08e816eb 100644 --- a/meld/resources/ui/column-list.ui +++ b/meld/resources/ui/column-list.ui @@ -76,20 +76,6 @@ - - - False - False - _Add - True - list-add - - - - False - True - - False @@ -97,16 +83,6 @@ _Remove True list-remove - - - - False - True - - - - - False False From 3a6b647c4829f49ea6a8184197608ae94749fad7 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Mon, 10 Dec 2018 06:25:19 +1000 Subject: [PATCH 0743/1316] findbar: Move to template and resource loading --- data/ui/findbar.ui | 289 ----------------------------------- meld/filediff.py | 2 +- meld/resources/ui/findbar.ui | 284 ++++++++++++++++++++++++++++++++++ meld/ui/findbar.py | 53 +++++-- 4 files changed, 324 insertions(+), 304 deletions(-) delete mode 100644 data/ui/findbar.ui create mode 100644 meld/resources/ui/findbar.ui diff --git a/data/ui/findbar.ui b/data/ui/findbar.ui deleted file mode 100644 index 74b06517..00000000 --- a/data/ui/findbar.ui +++ /dev/null @@ -1,289 +0,0 @@ - - - - - True - False - left - - - True - False - - - False - - - False - 6 - - - True - False - start - - - _Replace - True - True - True - none - True - False - - - - False - False - 0 - - - - - Replace _All - True - True - True - none - True - False - - - - False - False - 1 - - - - - 2 - 1 - 1 - 1 - - - - - True - False - start - - - _Previous - True - True - True - arrow_left - none - True - False - - - - False - True - 0 - - - - - _Next - True - True - True - arrow_right - none - True - False - - - - False - False - 1 - - - - - 2 - 0 - 1 - 1 - - - - - True - False - 0 - Find: - True - find_entry - - - 0 - 0 - 1 - 1 - - - - - True - True - 32 - False - False - - - - - - 1 - 0 - 1 - 1 - - - - - True - False - 0 - Replace _with: - True - replace_entry - - - 0 - 1 - 1 - 1 - - - - - True - True - 32 - False - False - - - - 1 - 1 - 1 - 1 - - - - - True - False - 6 - - - _Match case - True - False - False - True - False - True - - - False - True - 0 - - - - - Who_le word - True - True - False - True - False - True - - - False - True - 1 - - - - - Regular e_xpression - True - True - False - True - False - True - - - False - True - 2 - - - - - 3 - 0 - 1 - 1 - - - - - False - 6 - - - True - False - gtk-info - - - False - False - 0 - - - - - True - False - 0 - Wrapped - True - - - False - False - 1 - - - - - 4 - 0 - 1 - 1 - - - - - - - - - - - - diff --git a/meld/filediff.py b/meld/filediff.py index 607bbd27..85269be1 100644 --- a/meld/filediff.py +++ b/meld/filediff.py @@ -252,7 +252,7 @@ def __init__(self, num_panes): ) self.findbar = FindBar(self.grid) - self.grid.attach(self.findbar.widget, 1, 2, 5, 1) + self.grid.attach(self.findbar, 1, 2, 5, 1) self.set_num_panes(num_panes) self.cursor = CursorDetails() diff --git a/meld/resources/ui/findbar.ui b/meld/resources/ui/findbar.ui new file mode 100644 index 00000000..900decb1 --- /dev/null +++ b/meld/resources/ui/findbar.ui @@ -0,0 +1,284 @@ + + + + + True + False + left + + + True + False + + + diff --git a/meld/ui/findbar.py b/meld/ui/findbar.py index cf9a606a..ed9ad63c 100644 --- a/meld/ui/findbar.py +++ b/meld/ui/findbar.py @@ -14,15 +14,34 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . +from gi.repository import Gtk from gi.repository import GtkSource -from meld.ui import gnomeglade +from meld.ui._gtktemplate import Template -class FindBar(gnomeglade.Component): +@Template(resource_path='/org/gnome/meld/ui/findbar.ui') +class FindBar(Gtk.Grid): + + __gtype_name__ = 'FindBar' + + arrow_left = Template.Child() + arrow_right = Template.Child() + find_entry = Template.Child() + find_next_button = Template.Child() + find_previous_button = Template.Child() + hbuttonbox2 = Template.Child() + match_case = Template.Child() + regex = Template.Child() + replace_entry = Template.Child() + replace_label = Template.Child() + whole_word = Template.Child() + wrap_box = Template.Child() + def __init__(self, parent): - super().__init__("findbar.ui", "findbar", - ["arrow_left", "arrow_right"]) + super().__init__() + self.init_template() + self.set_text_view(None) self.arrow_left.show() self.arrow_right.show() @@ -38,18 +57,15 @@ def __init__(self, parent): def on_focus_child(self, container, widget): if widget is not None: - visible = self.widget.props.visible - if widget is not self.widget and visible: + visible = self.props.visible + if widget is not self and visible: self.hide() return False def hide(self): self.set_text_view(None) self.wrap_box.set_visible(False) - self.widget.hide() - - def on_stop_search(self, search_entry): - self.hide() + Gtk.Widget.hide(self) def set_text_view(self, textview): self.textview = textview @@ -68,8 +84,8 @@ def start_find(self, textview, text=None): self.find_entry.get_style_context().remove_class("not-found") if text: self.find_entry.set_text(text) - self.widget.set_row_spacing(0) - self.widget.show() + self.set_row_spacing(0) + self.show() self.find_entry.grab_focus() def start_find_next(self, textview): @@ -91,17 +107,20 @@ def start_replace(self, textview, text=None): self.find_entry.get_style_context().remove_class("not-found") if text: self.find_entry.set_text(text) - self.widget.set_row_spacing(6) - self.widget.show_all() + self.set_row_spacing(6) + self.show_all() self.find_entry.grab_focus() self.wrap_box.set_visible(False) + @Template.Callback() def on_find_next_button_clicked(self, button): self._find_text() + @Template.Callback() def on_find_previous_button_clicked(self, button): self._find_text(backwards=True) + @Template.Callback() def on_replace_button_clicked(self, entry): buf = self.textview.get_buffer() oldsel = buf.get_selection_bounds() @@ -114,6 +133,7 @@ def on_replace_button_clicked(self, entry): newsel[0], newsel[1], self.replace_entry.get_text(), -1) self._find_text(0) + @Template.Callback() def on_replace_all_button_clicked(self, entry): buf = self.textview.get_buffer() saved_insert = buf.create_mark( @@ -124,10 +144,15 @@ def on_replace_all_button_clicked(self, entry): self.textview.scroll_to_mark( buf.get_insert(), 0.25, True, 0.5, 0.5) + @Template.Callback() def on_find_entry_changed(self, entry): self.find_entry.get_style_context().remove_class("not-found") self._find_text(0) + @Template.Callback() + def on_stop_search(self, search_entry): + self.hide() + def _find_text(self, start_offset=1, backwards=False): assert self.textview assert self.search_context From 189c250276d24a1296cf43a9489691d75d656dd0 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Mon, 10 Dec 2018 06:25:38 +1000 Subject: [PATCH 0744/1316] Fix a few missed widget accesses --- meld/gutterrendererchunk.py | 3 +-- meld/patchdialog.py | 2 +- meld/ui/vcdialogs.py | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/meld/gutterrendererchunk.py b/meld/gutterrendererchunk.py index 9efac262..55746778 100644 --- a/meld/gutterrendererchunk.py +++ b/meld/gutterrendererchunk.py @@ -224,8 +224,7 @@ def _make_copy_menu(self, chunk): copy_menu.show_all() # FIXME: This is horrible - widget = self.filediff.widget - copy_menu.attach_to_widget(widget, None) + copy_menu.attach_to_widget(self.filediff, None) def copy_chunk(widget, chunk, copy_up): self.filediff.copy_chunk(self.from_pane, self.to_pane, chunk, diff --git a/meld/patchdialog.py b/meld/patchdialog.py index f14c018b..c5c4975a 100644 --- a/meld/patchdialog.py +++ b/meld/patchdialog.py @@ -47,7 +47,7 @@ def __init__(self, filediff): super().__init__() self.init_template() - self.set_transient_for(filediff.widget.get_toplevel()) + self.set_transient_for(filediff.get_toplevel()) self.filediff = filediff buf = GtkSource.Buffer() diff --git a/meld/ui/vcdialogs.py b/meld/ui/vcdialogs.py index 3f9dd476..4f761bce 100644 --- a/meld/ui/vcdialogs.py +++ b/meld/ui/vcdialogs.py @@ -43,7 +43,7 @@ def __init__(self, parent): super().__init__() self.init_template() - self.set_transient_for(parent.widget.get_toplevel()) + self.set_transient_for(parent.get_toplevel()) selected = parent._get_selected_files() try: @@ -118,7 +118,7 @@ def __init__(self, parent): super().__init__() self.init_template() - self.set_transient_for(parent.widget.get_toplevel()) + self.set_transient_for(parent.get_toplevel()) self.show_all() def run(self): From e95fb2802d078d467cc57dc9246dba874c2a0873 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Mon, 10 Dec 2018 07:18:32 +1000 Subject: [PATCH 0745/1316] Replace gnomeglade imports with their source We had the alias in the gnomeglade module for compatibility, but that's not a thing any more. --- meld/dirdiff.py | 3 +-- meld/filediff.py | 3 +-- meld/meldwindow.py | 3 +-- meld/vcview.py | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/meld/dirdiff.py b/meld/dirdiff.py index 8b2abc78..76e0bd3b 100644 --- a/meld/dirdiff.py +++ b/meld/dirdiff.py @@ -35,7 +35,7 @@ # TODO: Don't from-import whole modules from meld import misc from meld import tree -from meld.conf import _ +from meld.conf import _, ui_file from meld.iohelpers import trash_or_confirm from meld.melddoc import MeldDoc from meld.misc import all_same, apply_text_filters, with_focused_pane @@ -46,7 +46,6 @@ from meld.ui.cellrenderers import ( CellRendererByteSize, CellRendererDate, CellRendererFileMode) from meld.ui.emblemcellrenderer import EmblemCellRenderer -from meld.ui.gnomeglade import ui_file from meld.ui.util import map_widgets_into_lists diff --git a/meld/filediff.py b/meld/filediff.py index 85269be1..261f64f0 100644 --- a/meld/filediff.py +++ b/meld/filediff.py @@ -27,7 +27,7 @@ # TODO: Don't from-import whole modules from meld import misc -from meld.conf import _ +from meld.conf import _, ui_file from meld.const import MODE_DELETE, MODE_INSERT, MODE_REPLACE, NEWLINES from meld.iohelpers import prompt_save_filename from meld.matchers.diffutil import Differ, merged_chunk_order @@ -44,7 +44,6 @@ get_custom_encoding_candidates, LanguageManager, TextviewLineAnimationType) from meld.ui._gtktemplate import Template from meld.ui.findbar import FindBar -from meld.ui.gnomeglade import ui_file from meld.ui.util import map_widgets_into_lists from meld.undo import UndoSequence diff --git a/meld/meldwindow.py b/meld/meldwindow.py index 0ca68345..9d9b59d8 100644 --- a/meld/meldwindow.py +++ b/meld/meldwindow.py @@ -22,7 +22,7 @@ from gi.repository import Gtk import meld.ui.util -from meld.conf import _ +from meld.conf import _, ui_file from meld.dirdiff import DirDiff from meld.filediff import FileDiff from meld.filemerge import FileMerge @@ -31,7 +31,6 @@ from meld.recent import recent_comparisons, RecentType from meld.task import LifoScheduler from meld.ui._gtktemplate import Template -from meld.ui.gnomeglade import ui_file from meld.ui.notebooklabel import NotebookLabel from meld.vcview import VcView from meld.windowstate import SavedWindowState diff --git a/meld/vcview.py b/meld/vcview.py index 3792b3f7..e531a6b1 100644 --- a/meld/vcview.py +++ b/meld/vcview.py @@ -31,14 +31,13 @@ from gi.repository import Pango from meld import tree -from meld.conf import _ +from meld.conf import _, ui_file from meld.iohelpers import trash_or_confirm from meld.melddoc import MeldDoc from meld.misc import error_dialog, read_pipe_iter from meld.recent import RecentType from meld.settings import bind_settings, settings from meld.ui._gtktemplate import Template -from meld.ui.gnomeglade import ui_file from meld.ui.vcdialogs import CommitDialog, PushDialog from meld.vc import _null, get_vcs from meld.vc._vc import Entry From 1a165cd8effb0328171cd36d4c820877b025c452 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Mon, 10 Dec 2018 07:20:14 +1000 Subject: [PATCH 0746/1316] ui.gnomeglade: Remove this now-unused module --- meld/ui/gnomeglade.py | 72 ------------------------------------------- 1 file changed, 72 deletions(-) delete mode 100644 meld/ui/gnomeglade.py diff --git a/meld/ui/gnomeglade.py b/meld/ui/gnomeglade.py deleted file mode 100644 index e7d877f2..00000000 --- a/meld/ui/gnomeglade.py +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright (C) 2002-2008 Stephen Kennedy -# Copyright (C) 2010, 2013 Kai Willadsen -# -# This program 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. -# -# This program 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. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -from gi.repository import Gtk - -import meld.conf - -# For backwards compat -ui_file = meld.conf.ui_file - - -class Component: - """Base class for all Gtk.Builder created objects - - This class loads the UI file, autoconnects signals, and makes - widgets available as attributes. The toplevel widget is stored as - 'self.widget'. - - The python object can be accessed from the widget itself via - widget.pygobject, which is sadly sometimes necessary. - """ - - def __init__(self, filename, root, extra=None): - """Load the widgets from the node 'root' in file 'filename'""" - self.builder = Gtk.Builder() - self.builder.set_translation_domain(meld.conf.__package__) - objects = [root] + extra if extra else [root] - filename = ui_file(filename) - self.builder.add_objects_from_file(filename, objects) - self.builder.connect_signals(self) - self.widget = getattr(self, root) - self.widget.pyobject = self - - def __getattr__(self, key): - """Allow UI builder widgets to be accessed as self.widgetname""" - widget = self.builder.get_object(key) - if widget: - setattr(self, key, widget) - return widget - raise AttributeError(key) - - def map_widgets_into_lists(self, widgetnames): - """Put sequentially numbered widgets into lists. - - Given an object with widgets self.button0, self.button1, ..., - after a call to object.map_widgets_into_lists(["button"]) - object.button == [self.button0, self.button1, ...] - """ - for item in widgetnames: - i, lst = 0, [] - while 1: - key = "%s%i" % (item, i) - try: - val = getattr(self, key) - except AttributeError: - break - lst.append(val) - i += 1 - setattr(self, item, lst) From c6930cccdf809a294eabfdacbfda2133d3c59d9b Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Mon, 10 Dec 2018 07:23:38 +1000 Subject: [PATCH 0747/1316] Remove remaining `.widget` accesses All of these are now templated, and so actually *are* real widgets. --- meld/meldwindow.py | 26 +++++++++----------------- meld/ui/notebook.py | 6 +----- 2 files changed, 10 insertions(+), 22 deletions(-) diff --git a/meld/meldwindow.py b/meld/meldwindow.py index 9d9b59d8..1654f5c5 100644 --- a/meld/meldwindow.py +++ b/meld/meldwindow.py @@ -36,13 +36,6 @@ from meld.windowstate import SavedWindowState -def tab_widget(widget): - try: - return widget.widget - except RuntimeError: - return widget - - @Template(resource_path='/org/gnome/meld/ui/appwindow.ui') class MeldWindow(Gtk.ApplicationWindow): @@ -274,7 +267,7 @@ def on_delete_event(self, *extra): # control page is open in the far left page, it will be closed last. for c in reversed(self.notebook.get_children()): page = c.pyobject - self.notebook.set_current_page(self.notebook.page_num(tab_widget(page))) + self.notebook.set_current_page(self.notebook.page_num(page)) response = page.on_delete_event() if response == Gtk.ResponseType.CANCEL: should_cancel = True @@ -347,7 +340,7 @@ def on_switch_page(self, notebook, page, which): self.actiongroup.get_action("SaveAs").set_sensitive(True) if newdoc: - nbl = self.notebook.get_tab_label(tab_widget(newdoc)) + nbl = self.notebook.get_tab_label(newdoc) self.set_title(nbl.get_label_text()) else: self.set_title("Meld") @@ -480,7 +473,7 @@ def page_removed(self, page, status): if hasattr(page, 'scheduler'): self.scheduler.remove_scheduler(page.scheduler) - page_num = self.notebook.page_num(tab_widget(page)) + page_num = self.notebook.page_num(page) if self.notebook.get_current_page() == page_num: self.handle_current_doc_switch(page) @@ -513,7 +506,7 @@ def on_file_changed(self, srcpage, filename): def _append_page(self, page, icon): nbl = NotebookLabel(icon, "", lambda b: page.on_delete_event()) - self.notebook.append_page(tab_widget(page), nbl) + self.notebook.append_page(page, nbl) # Change focus to the newly created page only if the user is on a # DirDiff or VcView page, or if it's a new tab page. This prevents @@ -521,7 +514,7 @@ def _append_page(self, page, icon): if isinstance(self.current_doc(), DirDiff) or \ isinstance(self.current_doc(), VcView) or \ isinstance(page, NewDiffTab): - self.notebook.set_current_page(self.notebook.page_num(tab_widget(page))) + self.notebook.set_current_page(self.notebook.page_num(page)) if hasattr(page, 'scheduler'): self.scheduler.add_scheduler(page.scheduler) @@ -532,7 +525,7 @@ def _append_page(self, page, icon): page.tab_state_changed.connect(self.on_page_state_changed) page.close_signal.connect(self.page_removed) - self.notebook.set_tab_reorderable(tab_widget(page), True) + self.notebook.set_tab_reorderable(page, True) def append_new_comparison(self): doc = NewDiffTab(self) @@ -541,7 +534,7 @@ def append_new_comparison(self): def diff_created_cb(doc, newdoc): doc.on_delete_event() - idx = self.notebook.page_num(tab_widget(newdoc)) + idx = self.notebook.page_num(newdoc) self.notebook.set_current_page(idx) doc.connect("diff-created", diff_created_cb) @@ -621,7 +614,7 @@ def append_recent(self, uri): RecentType.VersionControl: self.append_vcview, } tab = comparison_method[comparison_type](gfiles) - self.notebook.set_current_page(self.notebook.page_num(tab_widget(tab))) + self.notebook.set_current_page(self.notebook.page_num(tab)) recent_comparisons.add(tab) return tab @@ -655,8 +648,7 @@ def open_paths(self, gfiles, auto_compare=False, auto_merge=False, if tab: recent_comparisons.add(tab) if focus: - self.notebook.set_current_page( - self.notebook.page_num(tab_widget(tab))) + self.notebook.set_current_page(self.notebook.page_num(tab)) return tab diff --git a/meld/ui/notebook.py b/meld/ui/notebook.py index 4fd23339..29af7f8a 100644 --- a/meld/ui/notebook.py +++ b/meld/ui/notebook.py @@ -155,11 +155,7 @@ def on_page_added(self, notebook, child, page_num, *args): def on_page_removed(self, notebook, child, page_num, *args): child.pyobject.disconnect_by_func(self.on_label_changed) - def on_label_changed(self, component, text, tooltip): - try: - page = component.widget - except RuntimeError: - page = component + def on_label_changed(self, page, text, tooltip): nbl = self.get_tab_label(page) nbl.set_label_text(text) nbl.set_tooltip_text(tooltip) From b637874a53ce137e7facfe81bcdb838a56943ffe Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Mon, 10 Dec 2018 07:27:00 +1000 Subject: [PATCH 0748/1316] Remove remaining pyobject accesses Since these are all templated, the pyobjects *are* the widgets. --- meld/dirdiff.py | 4 ---- meld/filediff.py | 4 ---- meld/meldwindow.py | 18 ++++++++---------- meld/newdifftab.py | 4 ---- meld/ui/notebook.py | 4 ++-- meld/vcview.py | 4 ---- 6 files changed, 10 insertions(+), 28 deletions(-) diff --git a/meld/dirdiff.py b/meld/dirdiff.py index 76e0bd3b..506416fd 100644 --- a/meld/dirdiff.py +++ b/meld/dirdiff.py @@ -538,10 +538,6 @@ def __init__(self, num_panes): self._scan_in_progress = 0 - # FIXME: Awful migration hack; this means that we don't have to - # address `.pyobject` access before all tab types are updated. - self.pyobject = self - def queue_draw(self): for treeview in self.treeview: treeview.queue_draw() diff --git a/meld/filediff.py b/meld/filediff.py index 261f64f0..99fc19ea 100644 --- a/meld/filediff.py +++ b/meld/filediff.py @@ -339,10 +339,6 @@ def go_to_line(widget, line, pane): self.connect("notify::ignore-blank-lines", self.refresh_comparison) - # FIXME: Awful migration hack; this means that we don't have to - # address `.pyobject` access before all tab types are updated. - self.pyobject = self - def on_container_switch_in_event(self, ui): MeldDoc.on_container_switch_in_event(self, ui) diff --git a/meld/meldwindow.py b/meld/meldwindow.py index 1654f5c5..27ce4b28 100644 --- a/meld/meldwindow.py +++ b/meld/meldwindow.py @@ -265,8 +265,7 @@ def on_delete_event(self, *extra): should_cancel = False # Delete pages from right-to-left. This ensures that if a version # control page is open in the far left page, it will be closed last. - for c in reversed(self.notebook.get_children()): - page = c.pyobject + for page in reversed(self.notebook.get_children()): self.notebook.set_current_page(self.notebook.page_num(page)) response = page.on_delete_event() if response == Gtk.ResponseType.CANCEL: @@ -284,7 +283,7 @@ def _update_page_action_sensitivity(self): current_page = self.notebook.get_current_page() if current_page != -1: - page = self.notebook.get_nth_page(current_page).pyobject + page = self.notebook.get_nth_page(current_page) else: page = None @@ -316,10 +315,10 @@ def handle_current_doc_switch(self, page): def on_switch_page(self, notebook, page, which): oldidx = notebook.get_current_page() if oldidx >= 0: - olddoc = notebook.get_nth_page(oldidx).pyobject + olddoc = notebook.get_nth_page(oldidx) self.handle_current_doc_switch(olddoc) - newdoc = notebook.get_nth_page(which).pyobject if which >= 0 else None + newdoc = notebook.get_nth_page(which) if which >= 0 else None try: undoseq = newdoc.undosequence can_undo = undoseq.can_undo() @@ -355,7 +354,7 @@ def on_switch_page(self, notebook, page, which): @Template.Callback() def after_switch_page(self, notebook, page, which): - newdoc = notebook.get_nth_page(which).pyobject + newdoc = notebook.get_nth_page(which) newdoc.on_container_switch_in_event(self.ui) self._update_page_action_sensitivity() @@ -399,7 +398,7 @@ def on_action_recent(self, action): def on_menu_close_activate(self, *extra): i = self.notebook.get_current_page() if i >= 0: - page = self.notebook.get_nth_page(i).pyobject + page = self.notebook.get_nth_page(i) page.on_delete_event() def on_menu_undo_activate(self, *extra): @@ -499,8 +498,7 @@ def on_page_state_changed(self, page, old_state, new_state): self.should_close = False def on_file_changed(self, srcpage, filename): - for c in self.notebook.get_children(): - page = c.pyobject + for page in self.notebook.get_children(): if page != srcpage: page.on_file_changed(filename) @@ -656,7 +654,7 @@ def current_doc(self): "Get the current doc or a dummy object if there is no current" index = self.notebook.get_current_page() if index >= 0: - page = self.notebook.get_nth_page(index).pyobject + page = self.notebook.get_nth_page(index) if isinstance(page, MeldDoc): return page diff --git a/meld/newdifftab.py b/meld/newdifftab.py index bbc3ef01..468002a9 100644 --- a/meld/newdifftab.py +++ b/meld/newdifftab.py @@ -96,10 +96,6 @@ def __init__(self, parentapp): self.show() - # FIXME: Awful migration hack; this means that we don't have to - # address `.pyobject` access before all tab types are updated. - self.pyobject = self - @Template.Callback() def on_button_type_toggled(self, button, *args): if not button.get_active(): diff --git a/meld/ui/notebook.py b/meld/ui/notebook.py index 29af7f8a..a29a3d5e 100644 --- a/meld/ui/notebook.py +++ b/meld/ui/notebook.py @@ -150,10 +150,10 @@ def on_tab_move_right(self, *args): self.reorder_child(child, page_num + 1) def on_page_added(self, notebook, child, page_num, *args): - child.pyobject.connect("label-changed", self.on_label_changed) + child.connect("label-changed", self.on_label_changed) def on_page_removed(self, notebook, child, page_num, *args): - child.pyobject.disconnect_by_func(self.on_label_changed) + child.disconnect_by_func(self.on_label_changed) def on_label_changed(self, page, text, tooltip): nbl = self.get_tab_label(page) diff --git a/meld/vcview.py b/meld/vcview.py index e531a6b1..85cc576e 100644 --- a/meld/vcview.py +++ b/meld/vcview.py @@ -239,10 +239,6 @@ def __init__(self): self.actiongroup.get_action( self.state_actions[s][0]).set_active(True) - # FIXME: Awful migration hack; this means that we don't have to - # address `.pyobject` access before all tab types are updated. - self.pyobject = self - def _set_external_action_sensitivity(self, focused): try: self.main_actiongroup.get_action("OpenExternal").set_sensitive( From d7222d2e869f694dbf982c400f3ad16ec9077b0c Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Mon, 10 Dec 2018 07:28:50 +1000 Subject: [PATCH 0749/1316] Add compiled gresource to git ignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 6e83d795..fc1209e4 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ __pycache__/ # Compiled resources data/gschemas.compiled +data/meld.gresource # External tooling caches .flatpak-builder/ From 34fbe8e61ba97ec21fff3ea246109301b809e010 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Tue, 1 Jan 2019 07:48:43 +1000 Subject: [PATCH 0750/1316] filediff: Simplify save dialog creation --- meld/filediff.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/meld/filediff.py b/meld/filediff.py index f804f0f7..87b11e56 100644 --- a/meld/filediff.py +++ b/meld/filediff.py @@ -856,24 +856,25 @@ def after_text_delete_range(self, buf, it0, it1): def check_save_modified(self, buffers=None): response = Gtk.ResponseType.OK buffers = buffers or self.textbuffer[:self.num_panes] - modified = [b.get_modified() for b in buffers] - labels = [b.data.label for b in buffers] - if any(modified): + if any(b.get_modified() for b in buffers): dialog = Component("filediff.ui", "check_save_dialog") dialog.widget.set_transient_for(self.widget.get_toplevel()) message_area = dialog.widget.get_message_area() buttons = [] - for label, should_save in zip(labels, modified): - button = Gtk.CheckButton.new_with_label(label) - button.set_sensitive(should_save) - button.set_active(should_save) + for buf in buffers: + button = Gtk.CheckButton.new_with_label(buf.data.label) + needs_save = buf.get_modified() + button.set_sensitive(needs_save) + button.set_active(needs_save) message_area.pack_start( button, expand=False, fill=True, padding=0) buttons.append(button) message_area.show_all() + response = dialog.widget.run() try_save = [b.get_active() for b in buttons] dialog.widget.destroy() + if response == Gtk.ResponseType.OK and any(try_save): for i in range(self.num_panes): if try_save[i]: From 9376d7a0a64174e29a3004d278dcea5bd06fd2fd Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Tue, 1 Jan 2019 07:49:15 +1000 Subject: [PATCH 0751/1316] filediff: Break out conflict resolution to helper function --- meld/filediff.py | 47 +++++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/meld/filediff.py b/meld/filediff.py index 87b11e56..154df5de 100644 --- a/meld/filediff.py +++ b/meld/filediff.py @@ -887,33 +887,36 @@ def check_save_modified(self, buffers=None): response = Gtk.ResponseType.OK if response == Gtk.ResponseType.OK and self.meta: - parent = self.meta.get('parent', None) - saved = self.meta.get('middle_saved', False) - prompt_resolve = self.meta.get('prompt_resolve', False) - if prompt_resolve and saved and parent.has_command('resolve'): - primary = _("Mark conflict as resolved?") - secondary = _( - "If the conflict was resolved successfully, you may mark " - "it as resolved now.") - buttons = ((_("Cancel"), Gtk.ResponseType.CANCEL), - (_("Mark _Resolved"), Gtk.ResponseType.OK)) - resolve_response = misc.modal_dialog( - primary, secondary, buttons, parent=self.widget, - messagetype=Gtk.MessageType.QUESTION) - - if resolve_response == Gtk.ResponseType.OK: - bufdata = self.textbuffer[1].data - conflict_gfile = bufdata.savefile or bufdata.gfile - # It's possible that here we're in a quit callback, - # so we can't schedule the resolve action to an - # idle loop; it might never happen. - parent.command( - 'resolve', [conflict_gfile.get_path()], sync=True) + self.prompt_resolve_conflict() elif response == Gtk.ResponseType.CANCEL: self.state = ComparisonState.Normal return response + def prompt_resolve_conflict(self): + parent = self.meta.get('parent', None) + saved = self.meta.get('middle_saved', False) + prompt_resolve = self.meta.get('prompt_resolve', False) + if prompt_resolve and saved and parent.has_command('resolve'): + primary = _("Mark conflict as resolved?") + secondary = _( + "If the conflict was resolved successfully, you may mark " + "it as resolved now.") + buttons = ((_("Cancel"), Gtk.ResponseType.CANCEL), + (_("Mark _Resolved"), Gtk.ResponseType.OK)) + resolve_response = misc.modal_dialog( + primary, secondary, buttons, parent=self.widget, + messagetype=Gtk.MessageType.QUESTION) + + if resolve_response == Gtk.ResponseType.OK: + bufdata = self.textbuffer[1].data + conflict_gfile = bufdata.savefile or bufdata.gfile + # It's possible that here we're in a quit callback, + # so we can't schedule the resolve action to an + # idle loop; it might never happen. + parent.command( + 'resolve', [conflict_gfile.get_path()], sync=True) + def on_delete_event(self): self.state = ComparisonState.Closing response = self.check_save_modified() From 4e46baee3b5d5e038a686b2868f98ba204c02b60 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Tue, 1 Jan 2019 08:33:49 +1000 Subject: [PATCH 0752/1316] dirdiff: Fix menu focus issues by removing a *lot* of code The actual reason I went to change this was that if you tried to use the menu bar items, the main actions (i.e., compare, copy, delete) were all insensitive. This happens because we unset their sensitivity on treeview focus loss. I suspect that the intention here was to keep consistent action state, but in reality we can just invoke the action based on the last focus pane, which is what the user expects. When doing this, I found that the focus handler block/unblock around popup handling was doing nothing useful, and then that the popup menu handling was actually slightly confused with the custom filter menu code, so... now it's mostly deleted. --- data/ui/dirdiff.ui | 3 +++ meld/dirdiff.py | 33 --------------------------------- 2 files changed, 3 insertions(+), 33 deletions(-) diff --git a/data/ui/dirdiff.ui b/data/ui/dirdiff.ui index 3476023a..b5b3a12e 100644 --- a/data/ui/dirdiff.ui +++ b/data/ui/dirdiff.ui @@ -383,6 +383,7 @@ False + @@ -440,6 +441,7 @@ False + @@ -497,6 +499,7 @@ False + diff --git a/meld/dirdiff.py b/meld/dirdiff.py index 2fffadc7..6fb8eb52 100644 --- a/meld/dirdiff.py +++ b/meld/dirdiff.py @@ -392,19 +392,10 @@ def __init__(self, num_panes): self.model.on_style_updated(self.widget) self.do_to_others_lock = False - self.focus_in_events = [] - self.focus_out_events = [] for treeview in self.treeview: - handler_id = treeview.connect( - "focus-in-event", self.on_treeview_focus_in_event) - self.focus_in_events.append(handler_id) - handler_id = treeview.connect( - "focus-out-event", self.on_treeview_focus_out_event) - self.focus_out_events.append(handler_id) treeview.set_search_equal_func(tree.treeview_search_cb, None) self.force_cursor_recalculate = False self.current_path, self.prev_path, self.next_path = None, None, None - self.on_treeview_focus_out_event(None, None) self.focus_pane = None self.row_expansions = set() @@ -532,8 +523,6 @@ def on_custom_filter_menu_toggled(self, item): Gtk.get_current_event_time()) def _cleanup_filter_menu_button(self, ui): - if self.popup_deactivate_id: - self.popup_menu.disconnect(self.popup_deactivate_id) if self.custom_merge_id: ui.remove_ui(self.custom_merge_id) if self.filter_actiongroup in ui.get_action_groups(): @@ -544,8 +533,6 @@ def _create_filter_menu_button(self, ui): self.custom_merge_id = ui.new_merge_id() for x in self.filter_ui: ui.add_ui(self.custom_merge_id, *x) - self.popup_deactivate_id = self.popup_menu.connect( - "deactivate", self.on_popup_deactivate_event) self.custom_popup = ui.get_widget("/CustomPopup") self.filter_menu_button = ui.get_widget( "/Toolbar/FilterActions/CustomFilterMenu") @@ -1210,28 +1197,12 @@ def on_treeview_row_collapsed(self, view, me, path): self._do_to_others(view, self.treeview, "collapse_row", (path,)) self._update_diffmaps() - def on_popup_deactivate_event(self, popup): - for (treeview, inid, outid) in zip( - self.treeview, self.focus_in_events, self.focus_out_events): - treeview.handler_unblock(inid) - treeview.handler_unblock(outid) - def on_treeview_focus_in_event(self, tree, event): self.focus_pane = tree pane = self.treeview.index(tree) self.on_treeview_selection_changed(tree.get_selection(), pane) tree.emit("cursor-changed") - def on_treeview_focus_out_event(self, tree, event): - for action in ("DirCompare", "DirCopyLeft", "DirCopyRight", - "DirDelete", "Hide"): - self.actiongroup.get_action(action).set_sensitive(False) - try: - self.main_actiongroup.get_action("OpenExternal").set_sensitive( - False) - except AttributeError: - pass - def run_diff_from_iter(self, it): row_paths = self.model.value_paths(it) gfiles = [Gio.File.new_for_path(p) @@ -1473,10 +1444,6 @@ def format_name_override(f): return different def popup_in_pane(self, pane, event): - for (treeview, inid, outid) in zip( - self.treeview, self.focus_in_events, self.focus_out_events): - treeview.handler_block(inid) - treeview.handler_block(outid) self.actiongroup.get_action("DirCopyLeft").set_sensitive(pane > 0) self.actiongroup.get_action("DirCopyRight").set_sensitive( pane + 1 < self.num_panes) From d47a58706a21f9c9aaa7f8b25fe2818f02fc88b5 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Tue, 1 Jan 2019 09:47:59 +1000 Subject: [PATCH 0753/1316] dirdiff: Add Enter/Return as an accelerator for Compare (#262) The intention here was for this to essentially be a documentation change, i.e., so that users can see that the shortcut exists. In reality, this is a behaviour change when hitting enter on a folder row. Previously, this would expand/collapse the row because it was a treeview row activation signal and that seemed like a reasonable thing to do. This is still what will happen on actual row activation (i.e., double- clicking a folder row), but now hitting enter will activate the Compare action and will create a new folder comparison when activating a folder row. I don't think either of these options are obviously better than the other, so I'm going to go with this new behaviour for now. --- data/ui/dirdiff.ui | 1 + 1 file changed, 1 insertion(+) diff --git a/data/ui/dirdiff.ui b/data/ui/dirdiff.ui index b5b3a12e..70840405 100644 --- a/data/ui/dirdiff.ui +++ b/data/ui/dirdiff.ui @@ -11,6 +11,7 @@ True + From 1c0c298592a00481c7b9c2f9929cd723cd4151be Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Tue, 1 Jan 2019 11:13:23 +1000 Subject: [PATCH 0754/1316] filediff: Move users of check-save workflow to confirm-discard instead The benefit here is that while state in check-save is async (because we use the async saving of GtkSource.FileSaver), confirm-discard has no state and is a straight up modal confirm with no complications. The places we're now doing this is when the user changes the file selector, and when they drag-n-drop a new file on to the pane. In both cases, I think these aren't situations where the user is likely to actually have accidentally forgotten to save (since they're extremely deliberate manipulations of the current comparison), so the simple confirm seems like a reasonable complexity trade-off. --- meld/filediff.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/meld/filediff.py b/meld/filediff.py index 154df5de..08f12093 100644 --- a/meld/filediff.py +++ b/meld/filediff.py @@ -777,12 +777,12 @@ def on_textview_drag_data_received( gfiles = [Gio.File.new_for_uri(uri) for uri in uris] if len(gfiles) == self.num_panes: - if self.check_save_modified() == Gtk.ResponseType.OK: + if self.check_unsaved_changes(): self.set_files(gfiles) elif len(gfiles) == 1: pane = self.textview.index(widget) buffer = self.textbuffer[pane] - if self.check_save_modified([buffer]) == Gtk.ResponseType.OK: + if self.check_unsaved_changes([buffer]): self.set_file(pane, gfiles[0]) return True @@ -1684,7 +1684,7 @@ def on_file_save_button_clicked(self, button): def on_fileentry_file_set(self, entry): pane = self.fileentry[:self.num_panes].index(entry) buffer = self.textbuffer[pane] - if self.check_save_modified([buffer]) == Gtk.ResponseType.OK: + if self.check_unsaved_changes(): # TODO: Use encoding file selectors in FileDiff self.set_file(pane, entry.get_file()) else: @@ -1698,6 +1698,14 @@ def _get_focused_pane(self): return -1 def check_unsaved_changes(self, buffers=None): + """Confirm discard of any unsaved changes + + Unlike `check_save_modified`, this does *not* prompt the user + to save, but rather just confirms whether they want to discard + changes. This simplifies call sites a *lot* because they don't + then need to deal with the async state/callback issues + associated with saving a file. + """ buffers = buffers or self.textbuffer unsaved = [b.data.label for b in buffers if b.get_modified()] if not unsaved: From 4f947506b67f705e3fad8e7a5bfaf3fea46a5598 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Tue, 1 Jan 2019 10:09:44 +1000 Subject: [PATCH 0755/1316] filediff: Fix check-save workflow when given a list of buffers This isn't currently used, but it was when we were using check_save_modified() for drag-n-drop and file selector save checks. The problem was that when actually trying to save we prompted using the passed buffer list, but didn't refer to that list when trying to save. --- meld/filediff.py | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/meld/filediff.py b/meld/filediff.py index 08f12093..a76a8a93 100644 --- a/meld/filediff.py +++ b/meld/filediff.py @@ -875,16 +875,20 @@ def check_save_modified(self, buffers=None): try_save = [b.get_active() for b in buttons] dialog.widget.destroy() - if response == Gtk.ResponseType.OK and any(try_save): - for i in range(self.num_panes): + if response == Gtk.ResponseType.OK: + for i, buf in enumerate(buffers): if try_save[i]: - self.save_file(i) - return Gtk.ResponseType.CANCEL + self.save_file(self.textbuffer.index(buf)) - if response == Gtk.ResponseType.DELETE_EVENT: - response = Gtk.ResponseType.CANCEL - elif response == Gtk.ResponseType.CLOSE: - response = Gtk.ResponseType.OK + # Regardless of whether these saves are successful or not, + # we return a cancel here, so that other closing logic + # doesn't run. Instead, the file-saved callback from + # save_file() handles closing files and setting state. + return Gtk.ResponseType.CANCEL + elif response == Gtk.ResponseType.DELETE_EVENT: + response = Gtk.ResponseType.CANCEL + elif response == Gtk.ResponseType.CLOSE: + response = Gtk.ResponseType.OK if response == Gtk.ResponseType.OK and self.meta: self.prompt_resolve_conflict() From fc532a2a3139d0ad96bb4ef89d7981c0eff763b3 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 6 Jan 2019 09:38:59 +1000 Subject: [PATCH 0756/1316] conf: Bump release for new stable series --- meld/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meld/conf.py b/meld/conf.py index 2511a967..ec7a2462 100644 --- a/meld/conf.py +++ b/meld/conf.py @@ -3,7 +3,7 @@ import sys __package__ = "meld" -__version__ = "3.19.2" +__version__ = "3.20.0" APPLICATION_ID = "org.gnome.meld" From be2dddb40302409f1c42fa48dd5643b28882ad4c Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 6 Jan 2019 10:29:15 +1000 Subject: [PATCH 0757/1316] Update NEWS --- NEWS | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/NEWS b/NEWS index 0d86405a..214407c8 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,25 @@ +2019-01-06 meld 3.20.0 +====================== + + Fixes: + + * Add Enter as a Compare accelerator in folder comparisons (Kai Willadsen) + * Change entry and drag-n-drop file changes to confirm discarding modified + files instead of offering to save, for simplicity (Kai Willadsen) + * Fix menu sensitivity in folder comparisons (Kai Willadsen) + * Avoid dconf writes of no-op window size allocations (Kai Willadsen) + + * Issues fixed: 247, 262 + + + Translations: + + * Emin Tufan Çetin (tr) + * Milo Casagrande (it) + * Rafael Fontenelle (pt_BR) + + 2018-11-21 meld 3.19.1 ====================== From 0bab0435132965ccad47b5b6f7658017cbec262d Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 6 Jan 2019 10:30:48 +1000 Subject: [PATCH 0758/1316] Post-release version bump --- meld/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meld/conf.py b/meld/conf.py index ec7a2462..fb65797c 100644 --- a/meld/conf.py +++ b/meld/conf.py @@ -3,7 +3,7 @@ import sys __package__ = "meld" -__version__ = "3.20.0" +__version__ = "3.21.0" APPLICATION_ID = "org.gnome.meld" From d0cccee7646877e7909bf18701da8688e20fbaf0 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 6 Jan 2019 12:12:46 +1000 Subject: [PATCH 0759/1316] test: Update tests to 'handle' resource construction --- test/conftest.py | 9 +++++++++ test/dirdiff/test_files_same.py | 10 ++++++---- test/dirdiff/test_remove_blank_lines.py | 6 ++++-- test/test_chunk_actions.py | 8 ++++---- test/test_filediff.py | 6 +++--- 5 files changed, 26 insertions(+), 13 deletions(-) diff --git a/test/conftest.py b/test/conftest.py index 94688e62..f524ff09 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -14,3 +14,12 @@ def default_icon_theme(): 'gi.repository.Gtk.IconTheme.get_default', mock.Mock(spec=Gtk.IconTheme.get_default)): yield + + +@pytest.fixture(autouse=True) +def template_resources(): + from meld.ui import _gtktemplate + with mock.patch( + 'meld.ui._gtktemplate.validate_resource_path', + mock.Mock(return_value=True)): + yield diff --git a/test/dirdiff/test_files_same.py b/test/dirdiff/test_files_same.py index d71fea9e..53fb725e 100644 --- a/test/dirdiff/test_files_same.py +++ b/test/dirdiff/test_files_same.py @@ -1,10 +1,9 @@ -import pytest - from enum import Enum from os import path -from meld.dirdiff import _files_same -from .fixture import make +import pytest + +from .fixture import make DiffResult = Enum('DiffResult', 'Same SameFiltered DodgySame DodgyDifferent Different FileError') @@ -33,6 +32,7 @@ def abspath(*args): dodgy_args = dict(cmp_args) dodgy_args['shallow-comparison'] = True + @pytest.mark.parametrize('files, regexes, comparison_args, expected', [ # empty file list ((), [], cmp_args, DiffResult.Same), @@ -70,6 +70,8 @@ def abspath(*args): (('diffs/a/crlftrailing.txt', 'diffs/b/lftrailing.txt'), [], no_ignore_args, DiffResult.Different), ]) def test_files_same(files, regexes, comparison_args, expected, differnt_dirs): + from meld.dirdiff import _files_same + files_path = abspath(*files) result = _files_same(files_path, regexes, comparison_args) actual = DiffResult(result + 1) diff --git a/test/dirdiff/test_remove_blank_lines.py b/test/dirdiff/test_remove_blank_lines.py index 5daae854..c14a5e93 100644 --- a/test/dirdiff/test_remove_blank_lines.py +++ b/test/dirdiff/test_remove_blank_lines.py @@ -1,5 +1,5 @@ import pytest -from meld.dirdiff import remove_blank_lines + @pytest.mark.parametrize('txt, expected', [ # blank to be equal blank @@ -25,5 +25,7 @@ (b'\n\n\ncontent\n\n\ncontent\n\n\n', b'content\ncontent'), ]) def test_remove_blank_lines(txt, expected): + from meld.dirdiff import remove_blank_lines + result = remove_blank_lines(txt) - assert result == expected \ No newline at end of file + assert result == expected diff --git a/test/test_chunk_actions.py b/test/test_chunk_actions.py index b2c2c108..ba789e72 100644 --- a/test/test_chunk_actions.py +++ b/test/test_chunk_actions.py @@ -4,10 +4,6 @@ import pytest from gi.repository import GtkSource -import meld.meldbuffer -from meld.filediff import FileDiff -from meld.matchers.myers import DiffChunk - @pytest.mark.parametrize("text, newline, expected_text", [ # For the following tests, newlines and text match @@ -30,6 +26,10 @@ ("ree\r\neee\nqqq\r\n", GtkSource.NewlineType.CR_LF, 'ree\r\neee\nqqq'), ]) def test_delete_last_line_crlf(text, newline, expected_text): + import meld.meldbuffer + from meld.filediff import FileDiff + from meld.matchers.myers import DiffChunk + filediff = mock.Mock(FileDiff) with mock.patch.multiple( diff --git a/test/test_filediff.py b/test/test_filediff.py index b0e5501e..59b9c256 100644 --- a/test/test_filediff.py +++ b/test/test_filediff.py @@ -4,9 +4,6 @@ import pytest from gi.repository import Gtk -from meld.filediff import FileDiff -from meld.filters import FilterEntry - @pytest.mark.parametrize("text, ignored_ranges, expected_text", [ # 0123456789012345678901234567890123456789012345678901234567890123456789 @@ -73,6 +70,9 @@ ]) def test_filter_text(text, ignored_ranges, expected_text): + from meld.filediff import FileDiff + from meld.filters import FilterEntry + filter_patterns = [ '#.*', '/\*.*\*/', From 505e7e2f56c8f45c0a92bfa0363c6dbe3ce1d8eb Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 6 Jan 2019 12:14:28 +1000 Subject: [PATCH 0760/1316] ui._gtktemplate: Pacify flake8 import order --- meld/ui/_gtktemplate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meld/ui/_gtktemplate.py b/meld/ui/_gtktemplate.py index e66c3b93..8067de5c 100644 --- a/meld/ui/_gtktemplate.py +++ b/meld/ui/_gtktemplate.py @@ -17,7 +17,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 # USA -from gi.repository import GLib, GObject, Gio +from gi.repository import Gio, GLib, GObject def connect_func(builder, obj, signal_name, handler_name, From 18207602b2982066a5b27c12b768f4ea748f6c11 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Fri, 4 Jan 2019 10:08:13 +1000 Subject: [PATCH 0761/1316] meld.ui.notebook: Reimplement our notebook label widget This started as a migration to a simple template, but now it's basically a complete rewrite to use properties and bindings. --- meld/meldwindow.py | 4 +- meld/resources/ui/notebook-label.ui | 52 +++++++++++ meld/ui/notebook.py | 3 +- meld/ui/notebooklabel.py | 128 ++++++++++++---------------- 4 files changed, 110 insertions(+), 77 deletions(-) create mode 100644 meld/resources/ui/notebook-label.ui diff --git a/meld/meldwindow.py b/meld/meldwindow.py index 27ce4b28..ed776226 100644 --- a/meld/meldwindow.py +++ b/meld/meldwindow.py @@ -340,7 +340,7 @@ def on_switch_page(self, notebook, page, which): if newdoc: nbl = self.notebook.get_tab_label(newdoc) - self.set_title(nbl.get_label_text()) + self.set_title(nbl.props.label_text) else: self.set_title("Meld") @@ -503,7 +503,7 @@ def on_file_changed(self, srcpage, filename): page.on_file_changed(filename) def _append_page(self, page, icon): - nbl = NotebookLabel(icon, "", lambda b: page.on_delete_event()) + nbl = NotebookLabel(icon_name=icon, page=page) self.notebook.append_page(page, nbl) # Change focus to the newly created page only if the user is on a diff --git a/meld/resources/ui/notebook-label.ui b/meld/resources/ui/notebook-label.ui new file mode 100644 index 00000000..7103912e --- /dev/null +++ b/meld/resources/ui/notebook-label.ui @@ -0,0 +1,52 @@ + + + + + + True + window-close-symbolic + + diff --git a/meld/ui/notebook.py b/meld/ui/notebook.py index a29a3d5e..47d37c84 100644 --- a/meld/ui/notebook.py +++ b/meld/ui/notebook.py @@ -157,8 +157,7 @@ def on_page_removed(self, notebook, child, page_num, *args): def on_label_changed(self, page, text, tooltip): nbl = self.get_tab_label(page) - nbl.set_label_text(text) - nbl.set_tooltip_text(tooltip) + nbl.props.label_text = text # Only update the window title if the current page is active if self.get_current_page() == self.page_num(page): diff --git a/meld/ui/notebooklabel.py b/meld/ui/notebooklabel.py index 5d36e22f..a1b11d63 100644 --- a/meld/ui/notebooklabel.py +++ b/meld/ui/notebooklabel.py @@ -1,5 +1,5 @@ # Copyright (C) 2002-2009 Stephen Kennedy -# Copyright (C) 2008-2009, 2013 Kai Willadsen +# Copyright (C) 2008-2009, 2013, 2019 Kai Willadsen # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -15,79 +15,61 @@ # along with this program. If not, see . from gi.repository import Gdk -from gi.repository import Gio +from gi.repository import GObject from gi.repository import Gtk -from gi.repository import Pango -from meld.conf import _ - - -class NotebookLabel(Gtk.HBox): - __gtype_name__ = "NotebookLabel" - - tab_width_in_chars = 30 - - def __init__(self, iconname, text, onclose): - super().__init__(homogeneous=False, spacing=4) - - label = Gtk.Label(label=text) - # FIXME: ideally, we would use custom ellipsization that ellipsized the - # two paths separately, but that requires significant changes to label - # generation in many different parts of the code - label.set_ellipsize(Pango.EllipsizeMode.MIDDLE) - label.set_single_line_mode(True) - label.set_alignment(0.0, 0.5) - label.set_padding(0, 0) - - style_context = self.get_style_context() - style_context.save() - style_context.set_state(Gtk.StateFlags.NORMAL) - font_desc = style_context.get_font(style_context.get_state()) - style_context.restore() - - context = self.get_pango_context() - metrics = context.get_metrics(font_desc, context.get_language()) - char_width = metrics.get_approximate_char_width() / Pango.SCALE - valid, w, h = Gtk.icon_size_lookup_for_settings( - self.get_settings(), Gtk.IconSize.MENU) - # FIXME: PIXELS replacement - self.set_size_request( - self.tab_width_in_chars * char_width + 2 * w, -1) - - button = Gtk.Button() - button.set_relief(Gtk.ReliefStyle.NONE) - button.set_focus_on_click(False) - icon = Gio.ThemedIcon.new_with_default_fallbacks( - 'window-close-symbolic') - image = Gtk.Image.new_from_gicon(icon, Gtk.IconSize.MENU) - image.set_tooltip_text(_("Close tab")) - button.add(image) - button.connect("clicked", onclose) - - icon = Gtk.Image.new_from_icon_name(iconname, Gtk.IconSize.MENU) - - label_box = Gtk.EventBox() - label_box.add_events(Gdk.EventMask.BUTTON_PRESS_MASK) - label_box.props.visible_window = False - label_box.connect("button-press-event", self.on_label_clicked) - label_box.add(label) - - self.pack_start(icon, False, True, 0) - self.pack_start(label_box, True, True, 0) - self.pack_start(button, False, True, 0) - self.set_tooltip_text(text) - self.show_all() - - self.__label = label - self.__onclose = onclose - - def on_label_clicked(self, box, event): +from meld.ui._gtktemplate import Template + + +@Template(resource_path='/org/gnome/meld/ui/notebook-label.ui') +class NotebookLabel(Gtk.EventBox): + + __gtype_name__ = 'NotebookLabel' + + icon = Template.Child() + label = Template.Child() + + icon_name = GObject.Property( + type=str, + nick='Name of the icon to display', + default=None, + ) + + label_text = GObject.Property( + type=str, + nick='Text of this notebook label', + default='', + ) + + page = GObject.Property( + type=object, + nick='Notebook page for which this is the label', + default=None, + ) + + def __init__(self, **kwargs): + super().__init__(**kwargs) + self.init_template() + + self.bind_property( + 'icon-name', self.icon, 'icon-name', + GObject.BindingFlags.DEFAULT | GObject.BindingFlags.SYNC_CREATE, + ) + self.bind_property( + 'label-text', self.label, 'label', + GObject.BindingFlags.DEFAULT | GObject.BindingFlags.SYNC_CREATE, + ) + self.bind_property( + 'label-text', self, 'tooltip-text', + GObject.BindingFlags.DEFAULT | GObject.BindingFlags.SYNC_CREATE, + ) + + @Template.Callback() + def on_label_button_press_event(self, widget, event): + # Middle-click on the tab closes the tab. if event.type == Gdk.EventType.BUTTON_PRESS and event.button == 2: - self.__onclose(None) - - def get_label_text(self): - return self.__label.get_text() + self.page.on_delete_event() - def set_label_text(self, text): - self.__label.set_text(text) - self.set_tooltip_text(text) + @Template.Callback() + def on_close_button_clicked(self, widget): + self.page.on_delete_event() From 133aaccfcb32ed7c5778fbbd8f76bf609d09ba35 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Fri, 4 Jan 2019 10:10:56 +1000 Subject: [PATCH 0762/1316] Move notebook label UI to be full-width and hidden with only one tab This is the UI form used by basically every modern GTK+/GNOME-y MDI UI that I can find. It has its drawbacks (mainly that it's different to the browser MDI UI, which everyone uses), but it circumvents other issues such as us having very long labels in very small tabs. This fixes (even if indirectly) #21 and #263. --- meld/meldwindow.py | 1 + meld/ui/notebook.py | 2 ++ 2 files changed, 3 insertions(+) diff --git a/meld/meldwindow.py b/meld/meldwindow.py index ed776226..76474bbb 100644 --- a/meld/meldwindow.py +++ b/meld/meldwindow.py @@ -505,6 +505,7 @@ def on_file_changed(self, srcpage, filename): def _append_page(self, page, icon): nbl = NotebookLabel(icon_name=icon, page=page) self.notebook.append_page(page, nbl) + self.notebook.child_set_property(page, 'tab-expand', True) # Change focus to the newly created page only if the user is on a # DirDiff or VcView page, or if it's a new tab page. This prevents diff --git a/meld/ui/notebook.py b/meld/ui/notebook.py index 47d37c84..acdadc9f 100644 --- a/meld/ui/notebook.py +++ b/meld/ui/notebook.py @@ -151,9 +151,11 @@ def on_tab_move_right(self, *args): def on_page_added(self, notebook, child, page_num, *args): child.connect("label-changed", self.on_label_changed) + self.props.show_tabs = self.get_n_pages() > 1 def on_page_removed(self, notebook, child, page_num, *args): child.disconnect_by_func(self.on_label_changed) + self.props.show_tabs = self.get_n_pages() > 1 def on_label_changed(self, page, text, tooltip): nbl = self.get_tab_label(page) From a042d2be616038683ec5d55c9474f10840416898 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Tue, 11 Dec 2018 07:08:32 +1000 Subject: [PATCH 0763/1316] recent: Remove flags from recent items return These were never set and never used. --- meld/meldwindow.py | 2 +- meld/recent.py | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/meld/meldwindow.py b/meld/meldwindow.py index 76474bbb..67b4b39f 100644 --- a/meld/meldwindow.py +++ b/meld/meldwindow.py @@ -605,7 +605,7 @@ def append_vcview(self, location, auto_compare=False): return doc def append_recent(self, uri): - comparison_type, gfiles, flags = recent_comparisons.read(uri) + comparison_type, gfiles = recent_comparisons.read(uri) comparison_method = { RecentType.File: self.append_filediff, RecentType.Folder: self.append_dirdiff, diff --git a/meld/recent.py b/meld/recent.py index de780fd2..9cb49ce7 100644 --- a/meld/recent.py +++ b/meld/recent.py @@ -149,9 +149,8 @@ def read(self, uri): else: paths = config.get("Comparison", "paths").split(";") gfiles = tuple(Gio.File.new_for_path(p) for p in paths) - flags = tuple() - return recent_type, gfiles, flags + return recent_type, gfiles def _write_recent_file(self, recent_type: RecentType, uris): # TODO: Use GKeyFile instead, and return a Gio.File. This is why we're @@ -198,10 +197,10 @@ def _update_recent_files(self, *args): self._stored_comparisons = {} for item_uri in item_uris: try: - recent_type, gfiles, flags = self.read(item_uri) + recent_type, gfiles = self.read(item_uri) except (IOError, ValueError): continue - # Store and look up comparisons by type and paths, ignoring flags + # Store and look up comparisons by type and paths gfile_uris = tuple(gfile.get_uri() for gfile in gfiles) self._stored_comparisons[recent_type, gfile_uris] = item_uri From c1a4a9b672e15603113ae092a2b241ff95084459 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Tue, 11 Dec 2018 07:09:06 +1000 Subject: [PATCH 0764/1316] recent: Typing information for read() This also removes docstring that's now captured by the typing. --- meld/recent.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/meld/recent.py b/meld/recent.py index 9cb49ce7..efc21908 100644 --- a/meld/recent.py +++ b/meld/recent.py @@ -29,6 +29,7 @@ import os import sys import tempfile +from typing import List, Tuple from gi.repository import Gio from gi.repository import GLib @@ -116,12 +117,8 @@ def add(self, tab, flags=None): recent_metadata.is_private = True self.recent_manager.add_full(gfile.get_uri(), recent_metadata) - def read(self, uri): - """Read stored comparison from URI - - Returns the comparison type, the URIs involved and the comparison - flags. - """ + def read(self, uri: str) -> Tuple[RecentType, List[Gio.File]]: + """Read stored comparison from URI""" comp_gfile = Gio.File.new_for_uri(uri) comp_path = comp_gfile.get_path() if not comp_gfile.query_exists(None) or not comp_path: @@ -145,10 +142,10 @@ def read(self, uri): if config.has_option("Comparison", "uris"): uris = config.get("Comparison", "uris").split(";") - gfiles = tuple(Gio.File.new_for_uri(u) for u in uris) + gfiles = [Gio.File.new_for_uri(u) for u in uris] else: paths = config.get("Comparison", "paths").split(";") - gfiles = tuple(Gio.File.new_for_path(p) for p in paths) + gfiles = [Gio.File.new_for_path(p) for p in paths] return recent_type, gfiles From a4f409f2c76ee03170e7c34d2117c546ebf9e908 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Tue, 11 Dec 2018 07:11:56 +1000 Subject: [PATCH 0765/1316] recent: Remove support for reading recent-comparison files with paths We migrated a couple of releases back, so this is not unreasonable. --- meld/recent.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/meld/recent.py b/meld/recent.py index efc21908..ad8bfc80 100644 --- a/meld/recent.py +++ b/meld/recent.py @@ -124,14 +124,12 @@ def read(self, uri: str) -> Tuple[RecentType, List[Gio.File]]: if not comp_gfile.query_exists(None) or not comp_path: raise IOError("Recent comparison file does not exist") - # TODO: remove reading paths in next release try: config = configparser.RawConfigParser() config.read(comp_path) assert (config.has_section("Comparison") and config.has_option("Comparison", "type") and - (config.has_option("Comparison", "paths") or - config.has_option("Comparison", "uris"))) + config.has_option("Comparison", "uris")) except (configparser.Error, AssertionError): raise ValueError("Invalid recent comparison file") @@ -140,12 +138,8 @@ def read(self, uri: str) -> Tuple[RecentType, List[Gio.File]]: except ValueError: raise ValueError("Invalid recent comparison file") - if config.has_option("Comparison", "uris"): - uris = config.get("Comparison", "uris").split(";") - gfiles = [Gio.File.new_for_uri(u) for u in uris] - else: - paths = config.get("Comparison", "paths").split(";") - gfiles = [Gio.File.new_for_path(p) for p in paths] + uris = config.get("Comparison", "uris").split(";") + gfiles = [Gio.File.new_for_uri(u) for u in uris] return recent_type, gfiles From d8fdde1ebbb0eb2496be49cc81af19a51df90ee8 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Fri, 14 Dec 2018 08:05:46 +1000 Subject: [PATCH 0766/1316] iohelpers: Add typing information and fix a return value --- meld/iohelpers.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/meld/iohelpers.py b/meld/iohelpers.py index 211e9bbf..e4f74b2e 100644 --- a/meld/iohelpers.py +++ b/meld/iohelpers.py @@ -1,4 +1,6 @@ +from typing import Optional + from gi.repository import Gio from gi.repository import GLib from gi.repository import Gtk @@ -8,7 +10,7 @@ from meld.ui.filechooser import MeldFileChooserDialog -def trash_or_confirm(gfile: Gio.File): +def trash_or_confirm(gfile: Gio.File) -> bool: """Trash or delete the given Gio.File Files and folders will be moved to the system Trash location @@ -63,8 +65,12 @@ def trash_or_confirm(gfile: Gio.File): except Exception as e: raise RuntimeError(str(e)) + return True + + +def prompt_save_filename( + title: str, parent: Optional[Gtk.Widget] = None) -> Optional[Gio.File]: -def prompt_save_filename(title: str, parent: Gtk.Widget = None) -> Gio.File: dialog = MeldFileChooserDialog( title, transient_for=get_modal_parent(parent), @@ -76,7 +82,7 @@ def prompt_save_filename(title: str, parent: Gtk.Widget = None) -> Gio.File: dialog.destroy() if response != Gtk.ResponseType.ACCEPT or not gfile: - return + return None try: file_info = gfile.query_info( @@ -103,6 +109,6 @@ def prompt_save_filename(title: str, parent: Gtk.Widget = None) -> Gio.File: messagetype=Gtk.MessageType.WARNING, ) if replace != Gtk.ResponseType.OK: - return + return None return gfile From 913f1d06d37416c78c91d09c7384505e25314a4b Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Fri, 14 Dec 2018 09:37:04 +1000 Subject: [PATCH 0767/1316] Fix some translation typing --- bin/meld | 3 ++- meld/conf.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/meld b/bin/meld index 32694755..b6a58bf4 100755 --- a/bin/meld +++ b/bin/meld @@ -101,7 +101,8 @@ except locale.Error as e: print("Couldn't set the locale: %s; falling back to 'C' locale" % e) locale.setlocale(locale.LC_ALL, 'C') gettext.textdomain(locale_domain) -trans = gettext.translation(locale_domain, localedir=locale_dir, fallback=True) +trans = gettext.translation( + locale_domain, localedir=str(locale_dir), fallback=True) _ = meld.conf._ = trans.gettext meld.conf.ngettext = trans.ngettext diff --git a/meld/conf.py b/meld/conf.py index efbd4ac3..5bf6cd4d 100644 --- a/meld/conf.py +++ b/meld/conf.py @@ -20,7 +20,7 @@ # Installed from main script -def no_translation(gettext_string, *args): +def no_translation(gettext_string: str) -> str: return gettext_string From 89434e1f556acb16f2331385d94102bf821c13b0 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Fri, 14 Dec 2018 10:49:12 +1000 Subject: [PATCH 0768/1316] misc: A tonne of typing work --- meld/misc.py | 106 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 71 insertions(+), 35 deletions(-) diff --git a/meld/misc.py b/meld/misc.py index aa9cf11c..367b7079 100644 --- a/meld/misc.py +++ b/meld/misc.py @@ -25,7 +25,19 @@ import shutil import subprocess from pathlib import PurePath -from typing import List +from typing import ( + AnyStr, + Callable, + List, + Generator, + Union, + Mapping, + Optional, + Pattern, + Sequence, + Tuple, + TYPE_CHECKING, +) from gi.repository import Gdk from gi.repository import GLib @@ -34,6 +46,9 @@ from meld.conf import _ +if TYPE_CHECKING: + from meld.vcview import ConsoleStream + if os.name != "nt": from select import select @@ -55,7 +70,8 @@ def wrap_function(*args, **kwargs): return wrap_function -def get_modal_parent(widget: Gtk.Widget = None) -> Gtk.Window: +def get_modal_parent(widget: Optional[Gtk.Widget] = None) -> Gtk.Window: + parent: Gtk.Window if not widget: from meld.meldapp import app parent = app.get_active_window() @@ -66,7 +82,7 @@ def get_modal_parent(widget: Gtk.Widget = None) -> Gtk.Window: return parent -def error_dialog(primary, secondary) -> Gtk.ResponseType: +def error_dialog(primary: str, secondary: str) -> Gtk.ResponseType: """A common error dialog handler for Meld This should only ever be used as a last resort, and for errors that @@ -81,8 +97,12 @@ def error_dialog(primary, secondary) -> Gtk.ResponseType: def modal_dialog( - primary, secondary, buttons, parent=None, - messagetype=Gtk.MessageType.WARNING) -> Gtk.ResponseType: + primary: str, + secondary: str, + buttons: Union[Gtk.ButtonsType, Sequence[Tuple[str, int]]], + parent: Optional[Gtk.Window] = None, + messagetype: Gtk.MessageType = Gtk.MessageType.WARNING + ) -> Gtk.ResponseType: """A common message dialog handler for Meld This should only ever be used for interactions that must be resolved @@ -91,9 +111,8 @@ def modal_dialog( Primary must be plain text. Secondary must be valid markup. """ - if isinstance(buttons, Gtk.ButtonsType): - custom_buttons = [] - else: + custom_buttons: Sequence[Tuple[str, int]] = [] + if not isinstance(buttons, Gtk.ButtonsType): custom_buttons, buttons = buttons, Gtk.ButtonsType.NONE dialog = Gtk.MessageDialog( @@ -113,7 +132,8 @@ def modal_dialog( return response -def user_critical(primary, message): +def user_critical( + primary: str, message: str) -> Callable[[Callable], Callable]: """Decorator for when the user must be told about failures The use case here is for e.g., saving a file, where even if we @@ -143,11 +163,11 @@ def wrap_function(locked, *args, **kwargs): return wrap -def make_tool_button_widget(label): +def make_tool_button_widget(label_text: str) -> Gtk.HBox: """Make a GtkToolButton label-widget suggestive of a menu dropdown""" arrow = Gtk.Arrow( arrow_type=Gtk.ArrowType.DOWN, shadow_type=Gtk.ShadowType.NONE) - label = Gtk.Label(label=label) + label = Gtk.Label(label=label_text) hbox = Gtk.HBox(spacing=3) hbox.pack_end(arrow, True, True, 0) hbox.pack_end(label, True, True, 0) @@ -159,7 +179,10 @@ def make_tool_button_widget(label): MELD_STYLE_SCHEME_DARK = "meld-dark" -def get_base_style_scheme(): +base_style_scheme: Optional[GtkSource.StyleScheme] = None + + +def get_base_style_scheme() -> GtkSource.StyleScheme: global base_style_scheme @@ -194,10 +217,7 @@ def get_base_style_scheme(): return base_style_scheme -base_style_scheme = None - - -def colour_lookup_with_fallback(name, attribute): +def colour_lookup_with_fallback(name: str, attribute: str) -> Gdk.RGBA: from meld.settings import meldsettings source_style = meldsettings.style_scheme @@ -223,7 +243,7 @@ def colour_lookup_with_fallback(name, attribute): return colour -def get_common_theme(): +def get_common_theme() -> Tuple[Mapping[str, Gdk.RGBA], Mapping[str, Gdk.RGBA]]: lookup = colour_lookup_with_fallback fill_colours = { "insert": lookup("meld:insert", "background"), @@ -245,7 +265,7 @@ def get_common_theme(): return fill_colours, line_colours -def all_same(iterable): +def all_same(iterable: Sequence) -> bool: """Return True if all elements of the list are equal""" sample, has_no_sample = None, True for item in iterable or (): @@ -256,7 +276,7 @@ def all_same(iterable): return True -def shorten_names(*names) -> List[str]: +def shorten_names(*names: str) -> List[str]: """Remove common parts of a list of paths For example, `('/tmp/foo1', '/tmp/foo2')` would be summarised as @@ -278,7 +298,7 @@ def shorten_names(*names) -> List[str]: basenames = [p.name for p in paths] if all_same(basenames): - def firstpart(path: PurePath): + def firstpart(path: PurePath) -> str: if len(path.parts) > 1 and path.parts[0]: return "[%s] " % path.parts[0] else: @@ -288,7 +308,15 @@ def firstpart(path: PurePath): return [name or _("[None]") for name in basenames] -def read_pipe_iter(command, workdir, errorstream, yield_interval=0.1): +SubprocessGenerator = Generator[Union[Tuple[int, str], None], None, None] + + +def read_pipe_iter( + command: List[str], + workdir: str, + errorstream: 'ConsoleStream', + yield_interval: float = 0.1, + ) -> SubprocessGenerator: """Read the output of a shell command iteratively. Each time 'callback_interval' seconds pass without reading any data, @@ -297,24 +325,26 @@ def read_pipe_iter(command, workdir, errorstream, yield_interval=0.1): """ class Sentinel: - def __init__(self): + proc: Optional[subprocess.Popen] + + def __init__(self) -> None: self.proc = None - def __del__(self): + def __del__(self) -> None: if self.proc: errorstream.error("killing '%s'\n" % command[0]) self.proc.terminate() errorstream.error("killed (status was '%i')\n" % self.proc.wait()) - def __call__(self): + def __call__(self) -> SubprocessGenerator: self.proc = subprocess.Popen( command, cwd=workdir, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True) self.proc.stdin.close() childout, childerr = self.proc.stdout, self.proc.stderr - bits = [] + bits: List[str] = [] while len(bits) == 0 or bits[-1] != "": state = select([childout, childerr], [], [childout, childerr], yield_interval) @@ -347,7 +377,8 @@ def __call__(self): return Sentinel()() -def write_pipe(command, text, error=None): +def write_pipe( + command: List[str], text: str, error: Optional[int] = None) -> int: """Write 'text' into a shell command and discard its stdout output. """ proc = subprocess.Popen(command, stdin=subprocess.PIPE, @@ -356,7 +387,7 @@ def write_pipe(command, text, error=None): return proc.wait() -def copy2(src, dst): +def copy2(src: str, dst: str) -> None: """Like shutil.copy2 but ignores chmod errors, and copies symlinks as links See [Bug 568000] Copying to NTFS fails """ @@ -379,7 +410,7 @@ def copy2(src, dst): raise -def copytree(src, dst): +def copytree(src: str, dst: str) -> None: """Similar to shutil.copytree, but always copies symlinks and doesn't error out if the destination path already exists. """ @@ -411,7 +442,8 @@ def copytree(src, dst): raise -def merge_intervals(interval_list): +def merge_intervals( + interval_list: List[Tuple[int, int]]) -> List[Tuple[int, int]]: """Merge a list of intervals Returns a list of itervals as 2-tuples with all overlapping @@ -424,12 +456,12 @@ def merge_intervals(interval_list): if len(interval_list) < 2: return interval_list - interval_list = collections.deque(sorted(interval_list)) - merged_intervals = [interval_list.popleft()] + interval_deque = collections.deque(sorted(interval_list)) + merged_intervals = [interval_deque.popleft()] current_start, current_end = merged_intervals[-1] - while interval_list: - new_start, new_end = interval_list.popleft() + while interval_deque: + new_start, new_end = interval_deque.popleft() if current_end >= new_end: continue @@ -446,7 +478,11 @@ def merge_intervals(interval_list): return merged_intervals -def apply_text_filters(txt, regexes, apply_fn=None): +def apply_text_filters( + txt: AnyStr, + regexes: Sequence[Pattern], + apply_fn: Optional[Callable[[int, int], None]] = None + ) -> AnyStr: """Apply text filters Text filters "regexes", resolved as regular expressions are applied @@ -492,7 +528,7 @@ def apply_text_filters(txt, regexes, apply_fn=None): return empty_string.join(result_txts) -def calc_syncpoint(adj): +def calc_syncpoint(adj: Gtk.Adjustment) -> float: """Calculate a cross-pane adjustment synchronisation point Our normal syncpoint is the middle of the screen. If the From 60bc75f775850867011c4df97b288193104a01ff Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 6 Jan 2019 12:56:41 +1000 Subject: [PATCH 0769/1316] misc: flake8 corrections --- meld/misc.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/meld/misc.py b/meld/misc.py index 367b7079..8b712fff 100644 --- a/meld/misc.py +++ b/meld/misc.py @@ -28,15 +28,15 @@ from typing import ( AnyStr, Callable, - List, Generator, - Union, + List, Mapping, Optional, Pattern, Sequence, Tuple, TYPE_CHECKING, + Union, ) from gi.repository import Gdk @@ -243,7 +243,10 @@ def colour_lookup_with_fallback(name: str, attribute: str) -> Gdk.RGBA: return colour -def get_common_theme() -> Tuple[Mapping[str, Gdk.RGBA], Mapping[str, Gdk.RGBA]]: +ColourMap = Mapping[str, Gdk.RGBA] + + +def get_common_theme() -> Tuple[ColourMap, ColourMap]: lookup = colour_lookup_with_fallback fill_colours = { "insert": lookup("meld:insert", "background"), From 2dd30f8580e1c5ec0a196f6eff8d2bd983082358 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Dr=C4=85g?= Date: Sun, 6 Jan 2019 17:54:32 +0100 Subject: [PATCH 0770/1316] Update POTFILES.in --- po/POTFILES.in | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index ac27c3c0..26646487 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -5,19 +5,26 @@ data/org.gnome.meld.desktop.in data/org.gnome.meld.gschema.xml [type: gettext/xml]data/styles/meld-base.xml [type: gettext/xml]data/styles/meld-dark.xml -[type: gettext/glade]data/ui/application.ui -[type: gettext/glade]data/ui/dirdiff.ui -[type: gettext/glade]data/ui/EditableList.ui -[type: gettext/glade]data/ui/encoding-selector.ui -[type: gettext/glade]data/ui/filediff.ui -[type: gettext/glade]data/ui/findbar.ui -[type: gettext/glade]data/ui/language-selector.ui -[type: gettext/glade]data/ui/meldapp.ui -[type: gettext/glade]data/ui/patch-dialog.ui -[type: gettext/glade]data/ui/preferences.ui -[type: gettext/glade]data/ui/shortcuts.ui -[type: gettext/glade]data/ui/tab-placeholder.ui -[type: gettext/glade]data/ui/vcview.ui +[type: gettext/glade]meld/resources/gtk/help-overlay.ui +[type: gettext/glade]meld/resources/gtk/menus.ui +[type: gettext/glade]meld/resources/ui/about-dialog.ui +[type: gettext/glade]meld/resources/ui/appwindow.ui +[type: gettext/glade]meld/resources/ui/column-list.ui +[type: gettext/glade]meld/resources/ui/commit-dialog.ui +[type: gettext/glade]meld/resources/ui/dirdiff.ui +[type: gettext/glade]meld/resources/ui/encoding-selector.ui +[type: gettext/glade]meld/resources/ui/filediff.ui +[type: gettext/glade]meld/resources/ui/filter-list.ui +[type: gettext/glade]meld/resources/ui/findbar.ui +[type: gettext/glade]meld/resources/ui/language-selector.ui +[type: gettext/glade]meld/resources/ui/new-diff-tab.ui +[type: gettext/glade]meld/resources/ui/notebook-label.ui +[type: gettext/glade]meld/resources/ui/patch-dialog.ui +[type: gettext/glade]meld/resources/ui/preferences.ui +[type: gettext/glade]meld/resources/ui/push-dialog.ui +[type: gettext/glade]meld/resources/ui/revert-dialog.ui +[type: gettext/glade]meld/resources/ui/save-confirm-dialog.ui +[type: gettext/glade]meld/resources/ui/vcview.ui meld/const.py meld/dirdiff.py meld/filediff.py From 5fc910864bf3df9b1ae902959bdb063397d8e35f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Dr=C4=85g?= Date: Sun, 6 Jan 2019 18:53:39 +0100 Subject: [PATCH 0771/1316] Update Polish translation --- po/pl.po | 1939 ++++++++++++++++++++++++++---------------------------- 1 file changed, 947 insertions(+), 992 deletions(-) diff --git a/po/pl.po b/po/pl.po index 20e004ff..12e51c08 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1,16 +1,16 @@ # Polish translation for meld. -# Copyright © 2011-2018 the meld authors. +# Copyright © 2011-2019 the meld authors. # This file is distributed under the same license as the meld package. # Marcin Floryan , 2011. -# Piotr Drąg , 2011-2018. -# Aviary.pl , 2011-2018. +# Piotr Drąg , 2011-2019. +# Aviary.pl , 2011-2019. # msgid "" msgstr "" "Project-Id-Version: meld\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-18 13:04+0100\n" -"PO-Revision-Date: 2018-11-18 13:05+0100\n" +"POT-Creation-Date: 2019-01-06 18:52+0100\n" +"PO-Revision-Date: 2019-01-06 18:53+0100\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "Language: pl\n" @@ -20,16 +20,16 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -#: ../bin/meld:194 +#: ../bin/meld:190 msgid "Cannot import: " msgstr "Nie można zaimportować: " -#: ../bin/meld:197 +#: ../bin/meld:193 #, c-format msgid "Meld requires %s or higher." msgstr "Program Meld wymaga wersji %s lub nowszej." -#: ../bin/meld:243 +#: ../bin/meld:249 #, c-format msgid "" "Couldn’t load Meld-specific CSS (%s)\n" @@ -39,7 +39,8 @@ msgstr "" "%s" #: ../data/org.gnome.meld.desktop.in.h:1 -#: ../data/org.gnome.meld.appdata.xml.in.h:1 ../data/ui/meldapp.ui.h:1 +#: ../data/org.gnome.meld.appdata.xml.in.h:1 +#: ../meld/resources/ui/appwindow.ui.h:1 msgid "Meld" msgstr "Meld" @@ -107,26 +108,10 @@ msgid "Default window fullscreen state" msgstr "Domyślny stan trybu pełnoekranowego okna" #: ../data/org.gnome.meld.gschema.xml.h:5 -msgid "Show toolbar" -msgstr "Wyświetlanie paska narzędziowego" - -#: ../data/org.gnome.meld.gschema.xml.h:6 -msgid "If true, the window toolbar is visible." -msgstr "Jeśli wynosi „true”, to pasek narzędziowy okna jest widoczny." - -#: ../data/org.gnome.meld.gschema.xml.h:7 -msgid "Show statusbar" -msgstr "Wyświetlanie paska stanu" - -#: ../data/org.gnome.meld.gschema.xml.h:8 -msgid "If true, the window statusbar is visible." -msgstr "Jeśli wynosi „true”, to pasek stanu okna jest widoczny." - -#: ../data/org.gnome.meld.gschema.xml.h:9 msgid "Additional automatically detected text encodings" msgstr "Dodatkowe automatycznie wykrywane kodowania tekstu" -#: ../data/org.gnome.meld.gschema.xml.h:10 +#: ../data/org.gnome.meld.gschema.xml.h:6 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 " @@ -139,38 +124,38 @@ msgstr "" "będą zawsze używane. Inne kodowania mogą być także próbowane, w zależności " "od lokalizacji użytkownika." -#: ../data/org.gnome.meld.gschema.xml.h:11 +#: ../data/org.gnome.meld.gschema.xml.h:7 msgid "Width of an indentation step" msgstr "Szerokość kroku wcięcia" -#: ../data/org.gnome.meld.gschema.xml.h:12 +#: ../data/org.gnome.meld.gschema.xml.h:8 msgid "The number of spaces to use for a single indent step" msgstr "Liczba spacji używanych dla jednego kroku wcięcia" -#: ../data/org.gnome.meld.gschema.xml.h:13 +#: ../data/org.gnome.meld.gschema.xml.h:9 msgid "Whether to indent using spaces or tabs" msgstr "Określa, czy wcięcia używają spacji, czy tabulatorów" -#: ../data/org.gnome.meld.gschema.xml.h:14 +#: ../data/org.gnome.meld.gschema.xml.h:10 msgid "If true, any new indentation will use spaces instead of tabs." msgstr "" "Jeśli wynosi „true”, to każde nowe wcięcie będzie używało spacji zamiast " "tabulatorów." -#: ../data/org.gnome.meld.gschema.xml.h:15 +#: ../data/org.gnome.meld.gschema.xml.h:11 msgid "Show line numbers" msgstr "Wyświetlanie numerów wierszy" -#: ../data/org.gnome.meld.gschema.xml.h:16 +#: ../data/org.gnome.meld.gschema.xml.h:12 msgid "If true, line numbers will be shown in the gutter of file comparisons." msgstr "" "Jeśli wynosi „true”, to numery wierszy będą wyświetlane obok porównań plików." -#: ../data/org.gnome.meld.gschema.xml.h:17 +#: ../data/org.gnome.meld.gschema.xml.h:13 msgid "Highlight syntax" msgstr "Wyróżnianie składni" -#: ../data/org.gnome.meld.gschema.xml.h:18 +#: ../data/org.gnome.meld.gschema.xml.h:14 msgid "" "Whether to highlight syntax in comparisons. Because of Meld’s own color " "highlighting, this is off by default." @@ -178,21 +163,21 @@ msgstr "" "Określa, czy wyróżniać składnię w porównaniach. Jest to domyślnie wyłączone " "z powodu własnego wyróżniania kolorów programu Meld." -#: ../data/org.gnome.meld.gschema.xml.h:19 +#: ../data/org.gnome.meld.gschema.xml.h:15 msgid "Color scheme to use for syntax highlighting" msgstr "Schemat kolorów używany do wyróżniania elementów składni" -#: ../data/org.gnome.meld.gschema.xml.h:20 +#: ../data/org.gnome.meld.gschema.xml.h:16 msgid "Used by GtkSourceView to determine colors for syntax highlighting" msgstr "" "Używane przez bibliotekę GtkSourceView do ustalania kolorów dla wyróżniania " "elementów składni" -#: ../data/org.gnome.meld.gschema.xml.h:21 +#: ../data/org.gnome.meld.gschema.xml.h:17 msgid "Displayed whitespace" msgstr "Wyświetlane białe znaki" -#: ../data/org.gnome.meld.gschema.xml.h:22 +#: ../data/org.gnome.meld.gschema.xml.h:18 msgid "" "Selector for individual whitespace character types to be shown. Possible " "values are 'space', 'tab', 'newline' and 'nbsp'." @@ -200,11 +185,11 @@ msgstr "" "Wybór poszczególnych typów białych znaków do wyświetlania. Możliwe wartości: " "„space”, „tab”, „newline” i „nbsp”." -#: ../data/org.gnome.meld.gschema.xml.h:23 +#: ../data/org.gnome.meld.gschema.xml.h:19 msgid "Wrap mode" msgstr "Tryb zawijania" -#: ../data/org.gnome.meld.gschema.xml.h:24 +#: ../data/org.gnome.meld.gschema.xml.h:20 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 " @@ -214,11 +199,11 @@ msgstr "" "wartości: „none” (brak zawijania), „char” (na dowolnym znaku) lub " "„word” (tylko na końcu wyrazów)." -#: ../data/org.gnome.meld.gschema.xml.h:25 +#: ../data/org.gnome.meld.gschema.xml.h:21 msgid "Highlight current line" msgstr "Wyróżnianie bieżącego wiersza" -#: ../data/org.gnome.meld.gschema.xml.h:26 +#: ../data/org.gnome.meld.gschema.xml.h:22 msgid "" "If true, the line containing the cursor will be highlighted in file " "comparisons." @@ -226,22 +211,22 @@ msgstr "" "Jeśli wynosi „true”, to wiersz zawierający kursor będzie wyróżniany " "w porównaniach plików." -#: ../data/org.gnome.meld.gschema.xml.h:27 +#: ../data/org.gnome.meld.gschema.xml.h:23 msgid "Use the system default monospace font" msgstr "Używanie domyślnej systemowej czcionki o stałej szerokości" -#: ../data/org.gnome.meld.gschema.xml.h:28 +#: ../data/org.gnome.meld.gschema.xml.h:24 msgid "" "If false, custom-font will be used instead of the system monospace font." msgstr "" "Jeśli wynosi „false”, to podana własna czcionka w „custom-font” będzie " "używana zamiast systemowej czcionki o stałej szerokości." -#: ../data/org.gnome.meld.gschema.xml.h:29 +#: ../data/org.gnome.meld.gschema.xml.h:25 msgid "Custom font" msgstr "Własna czcionka" -#: ../data/org.gnome.meld.gschema.xml.h:30 +#: ../data/org.gnome.meld.gschema.xml.h:26 msgid "" "The custom font to use, stored as a string and parsed as a Pango font " "description." @@ -249,22 +234,22 @@ msgstr "" "Używana własna czcionka, przechowywana jako ciąg i przetwarzana jako opis " "czcionki biblioteki Pango." -#: ../data/org.gnome.meld.gschema.xml.h:31 +#: ../data/org.gnome.meld.gschema.xml.h:27 msgid "Ignore blank lines when comparing files" msgstr "Ignorowanie pustych wierszy podczas porównywania plików" -#: ../data/org.gnome.meld.gschema.xml.h:32 +#: ../data/org.gnome.meld.gschema.xml.h:28 msgid "" "If true, blank lines will be trimmed when highlighting changes between files." msgstr "" "Jeśli wynosi „true”, to puste wiersze będą obcinane podczas wyróżniania " "zmian między plikami." -#: ../data/org.gnome.meld.gschema.xml.h:33 +#: ../data/org.gnome.meld.gschema.xml.h:29 msgid "Use the system default editor" msgstr "Używanie domyślnego edytora systemu" -#: ../data/org.gnome.meld.gschema.xml.h:34 +#: ../data/org.gnome.meld.gschema.xml.h:30 msgid "" "If false, custom-editor-command will be used instead of the system editor " "when opening files externally." @@ -273,11 +258,11 @@ msgstr "" "będzie używany zamiast systemowego edytora podczas zewnętrznego otwierania " "plików." -#: ../data/org.gnome.meld.gschema.xml.h:35 +#: ../data/org.gnome.meld.gschema.xml.h:31 msgid "The custom editor launch command" msgstr "Polecenie uruchamiania własnego edytora" -#: ../data/org.gnome.meld.gschema.xml.h:36 +#: ../data/org.gnome.meld.gschema.xml.h:32 msgid "" "The command used to launch a custom editor. Some limited templating is " "supported here; at the moment '{file}' and '{line}' are recognised tokens." @@ -286,22 +271,23 @@ msgstr "" "szablony są obsługiwane. W tej chwili „{file}” i „{line}” są rozpoznawanymi " "tokenami." -#: ../data/org.gnome.meld.gschema.xml.h:37 +#: ../data/org.gnome.meld.gschema.xml.h:33 msgid "Columns to display" msgstr "Kolumny do wyświetlania" -#: ../data/org.gnome.meld.gschema.xml.h:38 +#: ../data/org.gnome.meld.gschema.xml.h:34 msgid "" "List of column names in folder comparison and whether they should be " "displayed." msgstr "" "Lista nazwa kolumn w porównaniu katalogów i czy powinny być wyświetlane." -#: ../data/org.gnome.meld.gschema.xml.h:39 ../data/ui/preferences.ui.h:25 +#: ../data/org.gnome.meld.gschema.xml.h:35 +#: ../meld/resources/ui/preferences.ui.h:25 msgid "Ignore symbolic links" msgstr "Ignorowanie dowiązań symbolicznych" -#: ../data/org.gnome.meld.gschema.xml.h:40 +#: ../data/org.gnome.meld.gschema.xml.h:36 msgid "" "If true, folder comparisons do not follow symbolic links when traversing the " "folder tree." @@ -309,11 +295,11 @@ msgstr "" "Jeśli wynosi „true”, to porównania katalogów nie będą podążały za " "dowiązaniami symbolicznymi podczas przeglądania drzewa katalogów." -#: ../data/org.gnome.meld.gschema.xml.h:41 +#: ../data/org.gnome.meld.gschema.xml.h:37 msgid "Use shallow comparison" msgstr "Używanie płytkiego porównania" -#: ../data/org.gnome.meld.gschema.xml.h:42 +#: ../data/org.gnome.meld.gschema.xml.h:38 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 " @@ -323,11 +309,11 @@ msgstr "" "podstawie wyłącznie rozmiaru i czasu modyfikacji. Pliki o identycznym " "rozmiarze i czasie modyfikacji będą uznawane za identyczne." -#: ../data/org.gnome.meld.gschema.xml.h:43 +#: ../data/org.gnome.meld.gschema.xml.h:39 msgid "File timestamp resolution" msgstr "Rozwiązywanie czasu modyfikacji plików" -#: ../data/org.gnome.meld.gschema.xml.h:44 +#: ../data/org.gnome.meld.gschema.xml.h:40 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 " @@ -339,11 +325,12 @@ msgstr "" "Jest to przydatne podczas porównywania plików między systemami plików " "z różnym rozwiązywaniem czasu modyfikacji." -#: ../data/org.gnome.meld.gschema.xml.h:45 ../data/ui/preferences.ui.h:22 +#: ../data/org.gnome.meld.gschema.xml.h:41 +#: ../meld/resources/ui/preferences.ui.h:22 msgid "Apply text filters during folder comparisons" msgstr "Zastosowywanie filtrów tekstowych podczas porównywania katalogów" -#: ../data/org.gnome.meld.gschema.xml.h:46 +#: ../data/org.gnome.meld.gschema.xml.h:42 msgid "" "If true, folder comparisons that compare file contents also apply active " "text filters and the blank line trimming option, and ignore newline " @@ -353,21 +340,21 @@ msgstr "" "także zastosowują aktywne filtry tekstowe i opcję usuwania pustych wierszy, " "oraz ignorują różnice znaczników nowych wierszy." -#: ../data/org.gnome.meld.gschema.xml.h:47 +#: ../data/org.gnome.meld.gschema.xml.h:43 msgid "File status filters" msgstr "Filtry stanu plików" -#: ../data/org.gnome.meld.gschema.xml.h:48 +#: ../data/org.gnome.meld.gschema.xml.h:44 msgid "List of statuses used to filter visible files in folder comparison." msgstr "" "Lista stanów używanych do filtrowania widocznym plików w porównaniu " "katalogów." -#: ../data/org.gnome.meld.gschema.xml.h:49 +#: ../data/org.gnome.meld.gschema.xml.h:45 msgid "Show the version control console output" msgstr "Wyświetlanie wyjścia konsoli systemu kontroli wersji" -#: ../data/org.gnome.meld.gschema.xml.h:50 +#: ../data/org.gnome.meld.gschema.xml.h:46 msgid "" "If true, a console output section will be shown in version control views, " "showing the commands run for version control operations." @@ -376,11 +363,11 @@ msgstr "" "kontroli wersji, wyświetlając polecenia wykonywane do działań kontroli " "wersji." -#: ../data/org.gnome.meld.gschema.xml.h:51 +#: ../data/org.gnome.meld.gschema.xml.h:47 msgid "Version control pane position" msgstr "Położenie panelu kontroli wersji" -#: ../data/org.gnome.meld.gschema.xml.h:52 +#: ../data/org.gnome.meld.gschema.xml.h:48 msgid "" "This is the height of the main version control tree when the console pane is " "shown." @@ -388,11 +375,11 @@ msgstr "" "Jest to wysokość głównego drzewa kontroli wersji, kiedy wyświetlany jest " "panel konsoli." -#: ../data/org.gnome.meld.gschema.xml.h:53 +#: ../data/org.gnome.meld.gschema.xml.h:49 msgid "Present version comparisons as left-local/right-remote" msgstr "Wyświetlanie porównań wersji jako lewo-lokalne/prawo-zdalne" -#: ../data/org.gnome.meld.gschema.xml.h:54 +#: ../data/org.gnome.meld.gschema.xml.h:50 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, " @@ -403,13 +390,13 @@ msgstr "" "plików w panelach. W przeciwnym wypadku używany będzie schemat lewo-jest-" "ich, prawo-jest-moje." -#: ../data/org.gnome.meld.gschema.xml.h:55 +#: ../data/org.gnome.meld.gschema.xml.h:51 msgid "Order for files in three-way version control merge comparisons" msgstr "" "Kolejność plików podczas porównywania trzech plików w czasie scalania " "w systemie kontroli wersji" -#: ../data/org.gnome.meld.gschema.xml.h:56 +#: ../data/org.gnome.meld.gschema.xml.h:52 msgid "" "Choices for file order are remote/merged/local and local/merged/remote. This " "preference only affects three-way comparisons launched from the version " @@ -420,11 +407,11 @@ msgstr "" "kontroli wersji, więc jest używana wyłącznie do scalania/rozwiązywania " "konfliktów w ramach programu Meld." -#: ../data/org.gnome.meld.gschema.xml.h:57 +#: ../data/org.gnome.meld.gschema.xml.h:53 msgid "Show margin in commit message editor" msgstr "Wyświetlanie marginesów w edytorze komunikatów zatwierdzeń" -#: ../data/org.gnome.meld.gschema.xml.h:58 +#: ../data/org.gnome.meld.gschema.xml.h:54 msgid "" "If true, a guide will be displayed to show what column the margin is at in " "the version control commit message editor." @@ -432,11 +419,11 @@ msgstr "" "Jeśli wynosi „true”, to wyświetlana będzie linia oznaczająca kolumnę " "marginesu w edytorze komunikatów zatwierdzeń kontroli wersji." -#: ../data/org.gnome.meld.gschema.xml.h:59 +#: ../data/org.gnome.meld.gschema.xml.h:55 msgid "Margin column in commit message editor" msgstr "Kolumna marginesu w edytorze komunikatów zatwierdzeń" -#: ../data/org.gnome.meld.gschema.xml.h:60 +#: ../data/org.gnome.meld.gschema.xml.h:56 msgid "" "The column at which to show the margin in the version control commit message " "editor." @@ -444,11 +431,11 @@ msgstr "" "Kolumna, w której wyświetlać margines w edytorze komunikatów zatwierdzeń " "kontroli wersji." -#: ../data/org.gnome.meld.gschema.xml.h:61 +#: ../data/org.gnome.meld.gschema.xml.h:57 msgid "Automatically hard-wrap commit messages" msgstr "Automatyczne twarde zawijanie komunikatów zatwierdzeń" -#: ../data/org.gnome.meld.gschema.xml.h:62 +#: ../data/org.gnome.meld.gschema.xml.h:58 msgid "" "If true, the version control commit message editor will hard-wrap (i.e., " "insert line breaks) at the commit margin before commit." @@ -457,22 +444,22 @@ msgstr "" "będzie twardo zawijał (tzn. wstawiał łamanie wierszy) na marginesie przed " "zatwierdzeniem." -#: ../data/org.gnome.meld.gschema.xml.h:63 +#: ../data/org.gnome.meld.gschema.xml.h:59 msgid "Version control status filters" msgstr "Filtry stanu kontroli wersji" -#: ../data/org.gnome.meld.gschema.xml.h:64 +#: ../data/org.gnome.meld.gschema.xml.h:60 msgid "" "List of statuses used to filter visible files in version control comparison." msgstr "" "Lista stanów używanych do filtrowania widocznych plików w porównaniu " "kontroli wersji." -#: ../data/org.gnome.meld.gschema.xml.h:65 +#: ../data/org.gnome.meld.gschema.xml.h:61 msgid "Filename-based filters" msgstr "Filtry na podstawie nazw plików" -#: ../data/org.gnome.meld.gschema.xml.h:66 +#: ../data/org.gnome.meld.gschema.xml.h:62 msgid "" "List of predefined filename-based filters that, if active, will remove " "matching files from a folder comparison." @@ -480,11 +467,11 @@ msgstr "" "Lista uprzednio podanych filtrów na podstawie nazw plików, które jeśli są " "aktywne, będą usuwały pasujące pliki z porównania katalogów." -#: ../data/org.gnome.meld.gschema.xml.h:67 +#: ../data/org.gnome.meld.gschema.xml.h:63 msgid "Text-based filters" msgstr "Filtry na podstawie tekstu" -#: ../data/org.gnome.meld.gschema.xml.h:68 +#: ../data/org.gnome.meld.gschema.xml.h:64 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, " @@ -514,397 +501,621 @@ msgstr "" "Ciemny schemat kolorów używany do wyróżniania elementów składni w programie " "Meld" -#: ../data/ui/application.ui.h:1 -msgid "About Meld" -msgstr "O programie Meld" +#: ../meld/resources/gtk/help-overlay.ui.h:1 +msgctxt "shortcut window" +msgid "General" +msgstr "Ogólne" -#: ../data/ui/application.ui.h:2 -msgid "" -"Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2017 Kai Willadsen" -msgstr "" -"Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2017 Kai Willadsen" +#: ../meld/resources/gtk/help-overlay.ui.h:2 +msgctxt "shortcut window" +msgid "New comparison" +msgstr "Nowe porównanie" -#: ../data/ui/application.ui.h:4 -msgid "Website" -msgstr "Witryna" +#: ../meld/resources/gtk/help-overlay.ui.h:3 +msgctxt "shortcut window" +msgid "Close a comparison" +msgstr "Zamknięcie porównania" -#: ../data/ui/application.ui.h:5 -msgid "translator-credits" -msgstr "" -"Marcin Floryan , 2011\n" -"Piotr Drąg , 2011-2018\n" -"Aviary.pl , 2011-2018" +#: ../meld/resources/gtk/help-overlay.ui.h:4 +msgctxt "shortcut window" +msgid "Quit Meld" +msgstr "Zakończenie działania programu Meld" -#: ../data/ui/application.ui.h:6 -msgid "_Preferences" -msgstr "P_referencje" +#: ../meld/resources/gtk/help-overlay.ui.h:5 +msgctxt "shortcut window" +msgid "Stop the current action" +msgstr "Przerwanie bieżącego działania" -#: ../data/ui/application.ui.h:7 -msgid "_Help" -msgstr "Pomo_c" +#: ../meld/resources/gtk/help-overlay.ui.h:6 +msgctxt "shortcut window" +msgid "Refresh comparison" +msgstr "Odświeżenie porównania" -#: ../data/ui/application.ui.h:8 -msgid "Keyboard Shortcuts" -msgstr "Skróty klawiszowe" +#: ../meld/resources/gtk/help-overlay.ui.h:7 +msgctxt "shortcut window" +msgid "Fullscreen" +msgstr "Pełny ekran" -#: ../data/ui/application.ui.h:9 -msgid "_About" -msgstr "_O programie" +#: ../meld/resources/gtk/help-overlay.ui.h:8 +msgctxt "shortcut window" +msgid "Tabs" +msgstr "Karty" -#: ../data/ui/application.ui.h:10 -msgid "_Quit" -msgstr "Za_kończ" +#: ../meld/resources/gtk/help-overlay.ui.h:9 +msgctxt "shortcut window" +msgid "Go to previous tab" +msgstr "Przejście do poprzedniej karty" -#: ../data/ui/dirdiff.ui.h:1 ../data/ui/vcview.ui.h:1 -msgid "_Compare" -msgstr "P_orównaj" +#: ../meld/resources/gtk/help-overlay.ui.h:10 +msgctxt "shortcut window" +msgid "Go to next tab" +msgstr "Przejście do następnej karty" -#: ../data/ui/dirdiff.ui.h:2 ../data/ui/vcview.ui.h:2 -msgid "Compare selected files" -msgstr "Porównuje zaznaczone pliki" +#: ../meld/resources/gtk/help-overlay.ui.h:11 +msgctxt "shortcut window" +msgid "Switch to tab" +msgstr "Przełączenie na kartę" -#: ../data/ui/dirdiff.ui.h:3 -msgid "Collapse Recursively" -msgstr "Zwiń rekurencyjnie" +#: ../meld/resources/gtk/help-overlay.ui.h:12 +msgctxt "shortcut window" +msgid "Move tab left" +msgstr "Przesunięcie karty w lewo" -#: ../data/ui/dirdiff.ui.h:4 -msgid "Collapse selected folder and all subfolders" -msgstr "Zwija zaznaczony katalog i wszystkie podkatalogi" +#: ../meld/resources/gtk/help-overlay.ui.h:13 +msgctxt "shortcut window" +msgid "Move tab right" +msgstr "Przesunięcie karty w prawo" -#: ../data/ui/dirdiff.ui.h:5 -msgid "Expand Recursively" -msgstr "Rozwiń rekurencyjnie" +#: ../meld/resources/gtk/help-overlay.ui.h:14 +msgctxt "shortcut window" +msgid "Changes" +msgstr "Zmiany" -#: ../data/ui/dirdiff.ui.h:6 -msgid "Expand selected folder and all subfolders" -msgstr "Rozwija zaznaczony katalog i wszystkie podkatalogi" +#: ../meld/resources/gtk/help-overlay.ui.h:15 +msgctxt "shortcut window" +msgid "Go to previous change" +msgstr "Przejście do poprzedniej zmiany" -#: ../data/ui/dirdiff.ui.h:7 -msgid "Copy to _Left" -msgstr "Skopiuj w _lewo" +#: ../meld/resources/gtk/help-overlay.ui.h:16 +msgctxt "shortcut window" +msgid "Go to next change" +msgstr "Przejście do następnej zmiany" -#: ../data/ui/dirdiff.ui.h:8 -msgid "Copy to left" -msgstr "Kopiuje element na lewo" +#: ../meld/resources/gtk/help-overlay.ui.h:17 +msgctxt "shortcut window" +msgid "Editing" +msgstr "Edycja" -#: ../data/ui/dirdiff.ui.h:9 -msgid "Copy to _Right" -msgstr "Skopiuj w p_rawo" +#: ../meld/resources/gtk/help-overlay.ui.h:18 +msgctxt "shortcut window" +msgid "Undo" +msgstr "Cofnięcie" -#: ../data/ui/dirdiff.ui.h:10 -msgid "Copy to right" -msgstr "Kopiuje element na prawo" +#: ../meld/resources/gtk/help-overlay.ui.h:19 +msgctxt "shortcut window" +msgid "Redo" +msgstr "Ponowienie" -#: ../data/ui/dirdiff.ui.h:11 -msgid "Delete selected" -msgstr "Usuwa zaznaczone" +#: ../meld/resources/gtk/help-overlay.ui.h:20 +msgctxt "shortcut window" +msgid "Cut" +msgstr "Wycięcie" -#: ../data/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:920 ../meld/filediff.py:1489 -msgid "Hide" -msgstr "Ukryj" +#: ../meld/resources/gtk/help-overlay.ui.h:21 +msgctxt "shortcut window" +msgid "Copy" +msgstr "Skopiowanie" -#: ../data/ui/dirdiff.ui.h:13 -msgid "Hide selected" -msgstr "Ukrywa zaznaczone" +#: ../meld/resources/gtk/help-overlay.ui.h:22 +msgctxt "shortcut window" +msgid "Paste" +msgstr "Wklejenie" -#: ../data/ui/dirdiff.ui.h:14 -msgid "Ignore Filename Case" -msgstr "Ignorowanie wielkości liter w nazwach plików" +#: ../meld/resources/gtk/help-overlay.ui.h:23 +msgctxt "shortcut window" +msgid "Find" +msgstr "Wyszukiwanie" -#: ../data/ui/dirdiff.ui.h:15 -msgid "" -"Consider differently-cased filenames that are otherwise-identical to be the " -"same" -msgstr "Traktuje nazwy plików z literami różnej wielkości jako takie same" +#: ../meld/resources/gtk/help-overlay.ui.h:24 +msgctxt "shortcut window" +msgid "Find Next" +msgstr "Wyszukanie następnego" -#: ../data/ui/dirdiff.ui.h:16 -msgid "Same" -msgstr "Takie same" +#: ../meld/resources/gtk/help-overlay.ui.h:25 +msgctxt "shortcut window" +msgid "Find Previous" +msgstr "Wyszukanie poprzedniego" -#: ../data/ui/dirdiff.ui.h:17 -msgid "Show identical" -msgstr "Wyświetla identyczne" +#: ../meld/resources/gtk/help-overlay.ui.h:26 +msgctxt "shortcut window" +msgid "Replace" +msgstr "Zamiana" -#: ../data/ui/dirdiff.ui.h:18 -msgid "New" -msgstr "Nowe" +#: ../meld/resources/gtk/help-overlay.ui.h:27 +msgctxt "shortcut window" +msgid "File comparison" +msgstr "Porównanie plików" -#: ../data/ui/dirdiff.ui.h:19 -msgid "Show new" -msgstr "Wyświetla nowe" +#: ../meld/resources/gtk/help-overlay.ui.h:28 +msgctxt "shortcut window" +msgid "Save current file" +msgstr "Zapisanie bieżącego pliku" -#: ../data/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:76 -msgid "Modified" -msgstr "Zmodyfikowane" +#: ../meld/resources/gtk/help-overlay.ui.h:29 +msgctxt "shortcut window" +msgid "Save current file to new path" +msgstr "Zapisanie bieżącego pliku w nowej ścieżce" -#: ../data/ui/dirdiff.ui.h:21 -msgid "Show modified" -msgstr "Wyświetla zmodyfikowane" +#: ../meld/resources/gtk/help-overlay.ui.h:30 +msgctxt "shortcut window" +msgid "Save all files in comparison" +msgstr "Zapisanie wszystkich plików w porównaniu" -#: ../data/ui/dirdiff.ui.h:22 -msgid "Filters" -msgstr "Filtry" +#: ../meld/resources/gtk/help-overlay.ui.h:31 +msgctxt "shortcut window" +msgid "Previous conflict" +msgstr "Poprzedni konflikt" -#: ../data/ui/dirdiff.ui.h:23 -msgid "Set active filters" -msgstr "Pozwala wybrać aktywne filtry" +#: ../meld/resources/gtk/help-overlay.ui.h:32 +msgctxt "shortcut window" +msgid "Next conflict" +msgstr "Następny konflikt" + +#: ../meld/resources/gtk/help-overlay.ui.h:33 +msgctxt "shortcut window" +msgid "Push change to left" +msgstr "Przeniesienie zmiany na lewo" + +#: ../meld/resources/gtk/help-overlay.ui.h:34 +msgctxt "shortcut window" +msgid "Push change to right" +msgstr "Przeniesienie zmiany na prawo" + +#: ../meld/resources/gtk/help-overlay.ui.h:35 +msgctxt "shortcut window" +msgid "Pull change from left" +msgstr "Wprowadzenie zmiany z lewej" + +#: ../meld/resources/gtk/help-overlay.ui.h:36 +msgctxt "shortcut window" +msgid "Pull change from right" +msgstr "Wprowadzenie zmiany z prawej" + +#: ../meld/resources/gtk/help-overlay.ui.h:37 +msgctxt "shortcut window" +msgid "Copy change above left" +msgstr "Skopiowanie zmiany powyżej fragmentu po lewej" + +#: ../meld/resources/gtk/help-overlay.ui.h:38 +msgctxt "shortcut window" +msgid "Copy change below left" +msgstr "Skopiowanie zmiany poniżej fragmentu po lewej" + +#: ../meld/resources/gtk/help-overlay.ui.h:39 +msgctxt "shortcut window" +msgid "Copy change above right" +msgstr "Skopiowanie zmiany powyżej fragmentu po prawej" + +#: ../meld/resources/gtk/help-overlay.ui.h:40 +msgctxt "shortcut window" +msgid "Copy change below right" +msgstr "Skopiowanie zmiany poniżej fragmentu po prawej" -#: ../data/ui/EditableList.ui.h:1 -msgid "Editable List" -msgstr "Modyfikowalna lista" +#: ../meld/resources/gtk/help-overlay.ui.h:41 +msgctxt "shortcut window" +msgid "Delete change" +msgstr "Usunięcie zmiany" -#: ../data/ui/EditableList.ui.h:2 +#: ../meld/resources/gtk/help-overlay.ui.h:42 +msgctxt "shortcut window" +msgid "Previous comparison pane" +msgstr "Poprzedni panel porównania" + +#: ../meld/resources/gtk/help-overlay.ui.h:43 +msgctxt "shortcut window" +msgid "Next comparison pane" +msgstr "Następny panel porównania" + +#: ../meld/resources/gtk/help-overlay.ui.h:44 +msgctxt "shortcut window" +msgid "Folder comparison" +msgstr "Porównywanie katalogów" + +#: ../meld/resources/gtk/help-overlay.ui.h:45 +msgctxt "shortcut window" +msgid "Copy to left" +msgstr "Skopiowanie na lewo" + +#: ../meld/resources/gtk/help-overlay.ui.h:46 +msgctxt "shortcut window" +msgid "Copy to right" +msgstr "Skopiowanie na prawo" + +#: ../meld/resources/gtk/help-overlay.ui.h:47 +msgctxt "shortcut window" +msgid "Version control comparison" +msgstr "Porównanie systemu kontroli wersji" + +#: ../meld/resources/gtk/help-overlay.ui.h:48 +msgctxt "shortcut window" +msgid "Commit to version control" +msgstr "Zatwierdzenie zmiany w systemie kontroli wersji" + +#: ../meld/resources/gtk/help-overlay.ui.h:49 +msgctxt "shortcut window" +msgid "Show/hide console output" +msgstr "Wyświetlenie/ukrycie wyjścia konsoli" + +#: ../meld/resources/gtk/menus.ui.h:1 +msgid "_Preferences" +msgstr "P_referencje" + +#: ../meld/resources/gtk/menus.ui.h:2 +msgid "_Help" +msgstr "Pomo_c" + +#: ../meld/resources/gtk/menus.ui.h:3 +msgid "Keyboard Shortcuts" +msgstr "Skróty klawiszowe" + +#: ../meld/resources/gtk/menus.ui.h:4 +msgid "_About" +msgstr "_O programie" + +#: ../meld/resources/gtk/menus.ui.h:5 +msgid "_Quit" +msgstr "Za_kończ" + +#: ../meld/resources/ui/about-dialog.ui.h:1 +msgid "About Meld" +msgstr "O programie Meld" + +#: ../meld/resources/ui/about-dialog.ui.h:2 +msgid "" +"Copyright © 2002-2009 Stephen Kennedy\n" +"Copyright © 2009-2017 Kai Willadsen" +msgstr "" +"Copyright © 2002-2009 Stephen Kennedy\n" +"Copyright © 2009-2017 Kai Willadsen" + +#: ../meld/resources/ui/about-dialog.ui.h:4 +msgid "Website" +msgstr "Witryna" + +#: ../meld/resources/ui/about-dialog.ui.h:5 +msgid "translator-credits" +msgstr "" +"Marcin Floryan , 2011\n" +"Piotr Drąg , 2011-2019\n" +"Aviary.pl , 2011-2019" + +#: ../meld/resources/ui/column-list.ui.h:1 +#: ../meld/resources/ui/filter-list.ui.h:1 msgid "Active" msgstr "Aktywne" -#: ../data/ui/EditableList.ui.h:3 +#: ../meld/resources/ui/column-list.ui.h:2 msgid "Column Name" msgstr "Nazwa kolumny" -#: ../data/ui/EditableList.ui.h:4 ../data/ui/vcview.ui.h:9 -msgid "_Add" -msgstr "_Dodaj" - -#: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11 -#: ../meld/vcview.py:680 +#: ../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 msgid "_Remove" msgstr "U_suń" -#: ../data/ui/EditableList.ui.h:6 +#: ../meld/resources/ui/column-list.ui.h:4 +#: ../meld/resources/ui/filter-list.ui.h:8 msgid "Move item up" msgstr "Przesuwa element do góry" -#: ../data/ui/EditableList.ui.h:7 +#: ../meld/resources/ui/column-list.ui.h:5 +#: ../meld/resources/ui/filter-list.ui.h:9 msgid "Move _Up" msgstr "Przesuń do gó_ry" -#: ../data/ui/EditableList.ui.h:8 +#: ../meld/resources/ui/column-list.ui.h:6 +#: ../meld/resources/ui/filter-list.ui.h:10 msgid "Move item down" msgstr "Przesuwa element w dół" -#: ../data/ui/EditableList.ui.h:9 +#: ../meld/resources/ui/column-list.ui.h:7 +#: ../meld/resources/ui/filter-list.ui.h:11 msgid "Move _Down" msgstr "Przesuń w _dół" -#. Create icon and filename CellRenderer -#: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35 -#: ../meld/dirdiff.py:416 -msgid "Name" -msgstr "Nazwa" +#: ../meld/resources/ui/commit-dialog.ui.h:1 +msgid "Commit" +msgstr "Zatwierdź" -#: ../data/ui/EditableList.ui.h:11 -msgid "Pattern" -msgstr "Wzorzec" +#: ../meld/resources/ui/commit-dialog.ui.h:2 +msgid "Commit Files" +msgstr "Zatwierdź pliki" -#: ../data/ui/EditableList.ui.h:12 -msgid "Add new filter" -msgstr "Dodaje nowy filtr" +#: ../meld/resources/ui/commit-dialog.ui.h:3 +msgid "Log Message" +msgstr "Opis zmiany" -#: ../data/ui/EditableList.ui.h:13 -msgid "Remove selected filter" -msgstr "Usuwa zaznaczony filtr" +#: ../meld/resources/ui/commit-dialog.ui.h:4 +msgid "Previous logs:" +msgstr "Wcześniejsze zmiany:" + +#: ../meld/resources/ui/commit-dialog.ui.h:5 +msgid "Co_mmit" +msgstr "_Zatwierdź" + +#: ../meld/resources/ui/dirdiff.ui.h:1 ../meld/resources/ui/vcview.ui.h:1 +msgid "_Compare" +msgstr "P_orównaj" + +#: ../meld/resources/ui/dirdiff.ui.h:2 ../meld/resources/ui/vcview.ui.h:2 +msgid "Compare selected files" +msgstr "Porównuje zaznaczone pliki" + +#: ../meld/resources/ui/dirdiff.ui.h:3 +msgid "Collapse Recursively" +msgstr "Zwiń rekurencyjnie" + +#: ../meld/resources/ui/dirdiff.ui.h:4 +msgid "Collapse selected folder and all subfolders" +msgstr "Zwija zaznaczony katalog i wszystkie podkatalogi" + +#: ../meld/resources/ui/dirdiff.ui.h:5 +msgid "Expand Recursively" +msgstr "Rozwiń rekurencyjnie" + +#: ../meld/resources/ui/dirdiff.ui.h:6 +msgid "Expand selected folder and all subfolders" +msgstr "Rozwija zaznaczony katalog i wszystkie podkatalogi" + +#: ../meld/resources/ui/dirdiff.ui.h:7 +msgid "Copy to _Left" +msgstr "Skopiuj w _lewo" + +#: ../meld/resources/ui/dirdiff.ui.h:8 +msgid "Copy to left" +msgstr "Kopiuje element na lewo" + +#: ../meld/resources/ui/dirdiff.ui.h:9 +msgid "Copy to _Right" +msgstr "Skopiuj w p_rawo" + +#: ../meld/resources/ui/dirdiff.ui.h:10 +msgid "Copy to right" +msgstr "Kopiuje element na prawo" + +#: ../meld/resources/ui/dirdiff.ui.h:11 +msgid "Delete selected" +msgstr "Usuwa zaznaczone" + +#: ../meld/resources/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:958 +#: ../meld/filediff.py:1586 +msgid "Hide" +msgstr "Ukryj" + +#: ../meld/resources/ui/dirdiff.ui.h:13 +msgid "Hide selected" +msgstr "Ukrywa zaznaczone" -#: ../data/ui/encoding-selector.ui.h:1 +#: ../meld/resources/ui/dirdiff.ui.h:14 +msgid "Ignore Filename Case" +msgstr "Ignorowanie wielkości liter w nazwach plików" + +#: ../meld/resources/ui/dirdiff.ui.h:15 +msgid "" +"Consider differently-cased filenames that are otherwise-identical to be the " +"same" +msgstr "Traktuje nazwy plików z literami różnej wielkości jako takie same" + +#: ../meld/resources/ui/dirdiff.ui.h:16 +msgid "Same" +msgstr "Takie same" + +#: ../meld/resources/ui/dirdiff.ui.h:17 +msgid "Show identical" +msgstr "Wyświetla identyczne" + +#: ../meld/resources/ui/dirdiff.ui.h:18 +msgid "New" +msgstr "Nowe" + +#: ../meld/resources/ui/dirdiff.ui.h:19 +msgid "Show new" +msgstr "Wyświetla nowe" + +#: ../meld/resources/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:76 +msgid "Modified" +msgstr "Zmodyfikowane" + +#: ../meld/resources/ui/dirdiff.ui.h:21 +msgid "Show modified" +msgstr "Wyświetla zmodyfikowane" + +#: ../meld/resources/ui/dirdiff.ui.h:22 +msgid "Filters" +msgstr "Filtry" + +#: ../meld/resources/ui/dirdiff.ui.h:23 +msgid "Set active filters" +msgstr "Pozwala wybrać aktywne filtry" + +#: ../meld/resources/ui/encoding-selector.ui.h:1 msgid "Search text encoding…" msgstr "Wyszukiwanie…" -#: ../data/ui/filediff.ui.h:1 +#: ../meld/resources/ui/filediff.ui.h:1 msgid "Format as Patch…" msgstr "Utwórz poprawkę…" -#: ../data/ui/filediff.ui.h:2 +#: ../meld/resources/ui/filediff.ui.h:2 msgid "Create a patch using differences between files" msgstr "Tworzy plik poprawki („patch”) na podstawie różnic między plikami" -#: ../data/ui/filediff.ui.h:3 +#: ../meld/resources/ui/filediff.ui.h:3 msgid "Save A_ll" msgstr "Z_apisz wszystkie" -#: ../data/ui/filediff.ui.h:4 +#: ../meld/resources/ui/filediff.ui.h:4 msgid "Save all files in the current comparison" msgstr "Zapisuje wszystkie pliki w bieżącym porównaniu" -#: ../data/ui/filediff.ui.h:5 +#: ../meld/resources/ui/filediff.ui.h:5 msgid "Revert files to their saved versions" msgstr "Przywraca pliki do ich zapisanych wersji" -#: ../data/ui/filediff.ui.h:6 +#: ../meld/resources/ui/filediff.ui.h:6 msgid "Add Synchronization Point" msgstr "Dodaj punkt synchronizacji" -#: ../data/ui/filediff.ui.h:7 +#: ../meld/resources/ui/filediff.ui.h:7 msgid "Add a synchronization point for changes between files" msgstr "Dodaje punkt synchronizacji zmian między plikami" -#: ../data/ui/filediff.ui.h:8 +#: ../meld/resources/ui/filediff.ui.h:8 msgid "Clear Synchronization Points" msgstr "Wyczyść punkty synchronizacji" -#: ../data/ui/filediff.ui.h:9 +#: ../meld/resources/ui/filediff.ui.h:9 msgid "Clear sychronization points for changes between files" msgstr "Czyści punkty synchronizacji zmian między plikami" -#: ../data/ui/filediff.ui.h:10 +#: ../meld/resources/ui/filediff.ui.h:10 msgid "Previous Conflict" msgstr "Poprzedni konflikt" -#: ../data/ui/filediff.ui.h:11 +#: ../meld/resources/ui/filediff.ui.h:11 msgid "Go to the previous conflict" msgstr "Przechodzi do poprzedniego konfliktu" -#: ../data/ui/filediff.ui.h:12 +#: ../meld/resources/ui/filediff.ui.h:12 msgid "Next Conflict" msgstr "Następny konflikt" -#: ../data/ui/filediff.ui.h:13 +#: ../meld/resources/ui/filediff.ui.h:13 msgid "Go to the next conflict" msgstr "Przechodzi do następnego konfliktu" -#: ../data/ui/filediff.ui.h:14 +#: ../meld/resources/ui/filediff.ui.h:14 msgid "Push to Left" msgstr "Przenieś w lewo" -#: ../data/ui/filediff.ui.h:15 +#: ../meld/resources/ui/filediff.ui.h:15 msgid "Push current change to the left" msgstr "Przenosi bieżącą zmianę na lewo" -#: ../data/ui/filediff.ui.h:16 +#: ../meld/resources/ui/filediff.ui.h:16 msgid "Push to Right" msgstr "Przenieś w prawo" -#: ../data/ui/filediff.ui.h:17 +#: ../meld/resources/ui/filediff.ui.h:17 msgid "Push current change to the right" msgstr "Przenosi bieżącą zmianę na prawo" -#: ../data/ui/filediff.ui.h:18 +#: ../meld/resources/ui/filediff.ui.h:18 msgid "Pull from Left" msgstr "Wprowadź z lewej" -#: ../data/ui/filediff.ui.h:19 +#: ../meld/resources/ui/filediff.ui.h:19 msgid "Pull change from the left" msgstr "Wprowadza zmianę z lewej" -#: ../data/ui/filediff.ui.h:20 +#: ../meld/resources/ui/filediff.ui.h:20 msgid "Pull from Right" msgstr "Wprowadź z prawej" -#: ../data/ui/filediff.ui.h:21 +#: ../meld/resources/ui/filediff.ui.h:21 msgid "Pull change from the right" msgstr "Wprowadza zmianę z prawej" -#: ../data/ui/filediff.ui.h:22 +#: ../meld/resources/ui/filediff.ui.h:22 msgid "Copy Above Left" msgstr "Skopiuj powyżej lewej" -#: ../data/ui/filediff.ui.h:23 +#: ../meld/resources/ui/filediff.ui.h:23 msgid "Copy change above the left chunk" msgstr "Kopiuje zmianę powyżej fragmentu po lewej" -#: ../data/ui/filediff.ui.h:24 +#: ../meld/resources/ui/filediff.ui.h:24 msgid "Copy Below Left" msgstr "Skopiuj poniżej lewej" -#: ../data/ui/filediff.ui.h:25 +#: ../meld/resources/ui/filediff.ui.h:25 msgid "Copy change below the left chunk" msgstr "Kopiuje zmianę poniżej fragmentu po lewej" -#: ../data/ui/filediff.ui.h:26 +#: ../meld/resources/ui/filediff.ui.h:26 msgid "Copy Above Right" msgstr "Skopiuj powyżej prawej" -#: ../data/ui/filediff.ui.h:27 +#: ../meld/resources/ui/filediff.ui.h:27 msgid "Copy change above the right chunk" msgstr "Kopiuje zmianę powyżej fragmentu po prawej" -#: ../data/ui/filediff.ui.h:28 +#: ../meld/resources/ui/filediff.ui.h:28 msgid "Copy Below Right" msgstr "Skopiuj poniżej prawej" -#: ../data/ui/filediff.ui.h:29 +#: ../meld/resources/ui/filediff.ui.h:29 msgid "Copy change below the right chunk" msgstr "Kopiuje zmianę poniżej fragmentu po prawej" -#: ../data/ui/filediff.ui.h:30 +#: ../meld/resources/ui/filediff.ui.h:30 msgid "Delete" msgstr "Usuń" -#: ../data/ui/filediff.ui.h:31 +#: ../meld/resources/ui/filediff.ui.h:31 msgid "Delete change" msgstr "Usuwa zmianę" -#: ../data/ui/filediff.ui.h:32 +#: ../meld/resources/ui/filediff.ui.h:32 msgid "Merge All from Left" msgstr "Scal wszystkie z lewej" -#: ../data/ui/filediff.ui.h:33 +#: ../meld/resources/ui/filediff.ui.h:33 msgid "Merge all non-conflicting changes from the left" msgstr "Scala wszystkie zmiany bez konfliktów z lewej" -#: ../data/ui/filediff.ui.h:34 +#: ../meld/resources/ui/filediff.ui.h:34 msgid "Merge All from Right" msgstr "Scal wszystkie z prawej" -#: ../data/ui/filediff.ui.h:35 +#: ../meld/resources/ui/filediff.ui.h:35 msgid "Merge all non-conflicting changes from the right" msgstr "Scala wszystkie zmiany bez konfliktów z prawej" -#: ../data/ui/filediff.ui.h:36 +#: ../meld/resources/ui/filediff.ui.h:36 msgid "Merge All" msgstr "Scal wszystkie" -#: ../data/ui/filediff.ui.h:37 +#: ../meld/resources/ui/filediff.ui.h:37 msgid "Merge all non-conflicting changes from left and right panes" msgstr "Scala wszystkie zmiany bez konfliktów z lewej oraz z prawej strony" -#: ../data/ui/filediff.ui.h:38 +#: ../meld/resources/ui/filediff.ui.h:38 msgid "Previous Pane" msgstr "Poprzedni panel" -#: ../data/ui/filediff.ui.h:39 +#: ../meld/resources/ui/filediff.ui.h:39 msgid "Move keyboard focus to the previous document in this comparison" msgstr "Przechodzi do poprzedniego dokumentu w porównywanym zestawie" -#: ../data/ui/filediff.ui.h:40 +#: ../meld/resources/ui/filediff.ui.h:40 msgid "Next Pane" msgstr "Następny panel" -#: ../data/ui/filediff.ui.h:41 +#: ../meld/resources/ui/filediff.ui.h:41 msgid "Move keyboard focus to the next document in this comparison" msgstr "Przechodzi do następnego dokumentu w porównywanym zestawie" -#: ../data/ui/filediff.ui.h:42 +#: ../meld/resources/ui/filediff.ui.h:42 msgid "Lock Scrolling" msgstr "Synchronizuj przewijanie" -#: ../data/ui/filediff.ui.h:43 +#: ../meld/resources/ui/filediff.ui.h:43 msgid "Lock scrolling of all panes" msgstr "Synchronizuje przewijanie wszystkich paneli" -#: ../data/ui/filediff.ui.h:44 -msgid "Save changes to documents before closing?" -msgstr "Zapisać zmiany dokumentów przed zamknięciem?" - -#: ../data/ui/filediff.ui.h:45 -msgid "If you don’t save, changes will be permanently lost." -msgstr "" -"Jeżeli dokumenty nie zostaną zapisane, zmiany zostaną bezpowrotnie utracone." - -#: ../data/ui/filediff.ui.h:46 -msgid "Close _without Saving" -msgstr "Zamknij _bez zapisywania" - -#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:1001 ../meld/iohelpers.py:50 -#: ../meld/iohelpers.py:100 -msgid "_Cancel" -msgstr "_Anuluj" - -#: ../data/ui/filediff.ui.h:48 -msgid "_Save" -msgstr "_Zapisz" - -#: ../data/ui/filediff.ui.h:49 +#: ../meld/resources/ui/filediff.ui.h:44 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." @@ -912,764 +1123,548 @@ msgstr "" "Do tego pliku nie można zapisać. Można kliknąć tutaj, aby go odblokować " "i wprowadzić zmiany mimo to, ale muszę być one zapisane do nowego pliku." -#: ../data/ui/filediff.ui.h:50 +#: ../meld/resources/ui/filediff.ui.h:45 msgid "File 3" msgstr "3. plik" -#: ../data/ui/filediff.ui.h:51 +#: ../meld/resources/ui/filediff.ui.h:46 msgid "File 2" msgstr "2. plik" -#: ../data/ui/filediff.ui.h:52 +#: ../meld/resources/ui/filediff.ui.h:47 msgid "File 1" msgstr "1. plik" -#: ../data/ui/filediff.ui.h:53 -msgid "Discard unsaved changes to documents?" -msgstr "Odrzucić niezapisane zmiany w dokumentach?" +#. Create icon and filename CellRenderer +#: ../meld/resources/ui/filter-list.ui.h:2 ../meld/resources/ui/vcview.ui.h:30 +#: ../meld/dirdiff.py:454 +msgid "Name" +msgstr "Nazwa" -#: ../data/ui/filediff.ui.h:54 -msgid "Changes made to the following documents will be permanently lost:" -msgstr "" -"Zmiany naniesione do poniższych dokumentów zostaną bezpowrotnie utracone:" +#: ../meld/resources/ui/filter-list.ui.h:3 +msgid "Pattern" +msgstr "Wzorzec" -#: ../data/ui/filediff.ui.h:55 -msgid "_Discard" -msgstr "_Odrzuć" +#: ../meld/resources/ui/filter-list.ui.h:4 +msgid "Add new filter" +msgstr "Dodaje nowy filtr" -#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:1002 ../meld/iohelpers.py:101 +#: ../meld/resources/ui/filter-list.ui.h:5 ../meld/resources/ui/vcview.ui.h:9 +msgid "_Add" +msgstr "_Dodaj" + +#: ../meld/resources/ui/filter-list.ui.h:6 +msgid "Remove selected filter" +msgstr "Usuwa zaznaczony filtr" + +#: ../meld/resources/ui/findbar.ui.h:1 ../meld/dirdiff.py:1040 +#: ../meld/iohelpers.py:107 msgid "_Replace" msgstr "Z_amień" -#: ../data/ui/findbar.ui.h:2 +#: ../meld/resources/ui/findbar.ui.h:2 msgid "Replace _All" msgstr "Zamień _wszystkie" -#: ../data/ui/findbar.ui.h:3 +#: ../meld/resources/ui/findbar.ui.h:3 msgid "_Previous" msgstr "_Poprzednie" -#: ../data/ui/findbar.ui.h:4 +#: ../meld/resources/ui/findbar.ui.h:4 msgid "_Next" msgstr "_Następne" -#: ../data/ui/findbar.ui.h:5 +#: ../meld/resources/ui/findbar.ui.h:5 msgid "Find:" msgstr "Wyszukiwanie:" -#: ../data/ui/findbar.ui.h:6 +#: ../meld/resources/ui/findbar.ui.h:6 msgid "Replace _with:" msgstr "Zmiana _na:" -#: ../data/ui/findbar.ui.h:7 +#: ../meld/resources/ui/findbar.ui.h:7 msgid "_Match case" msgstr "_Rozróżnianie małych i wielkich liter" -#: ../data/ui/findbar.ui.h:8 +#: ../meld/resources/ui/findbar.ui.h:8 msgid "Who_le word" msgstr "_Cały wyraz" -#: ../data/ui/findbar.ui.h:9 +#: ../meld/resources/ui/findbar.ui.h:9 msgid "Regular e_xpression" msgstr "Wyrażenie r_egularne" -#: ../data/ui/findbar.ui.h:10 +#: ../meld/resources/ui/findbar.ui.h:10 msgid "Wrapped" msgstr "Automatyczny powrót do początku" -#: ../data/ui/language-selector.ui.h:1 +#: ../meld/resources/ui/language-selector.ui.h:1 msgid "Search highlight mode…" msgstr "Wyszukiwanie…" -#: ../data/ui/patch-dialog.ui.h:1 +#: ../meld/resources/ui/new-diff-tab.ui.h:1 ../meld/meldwindow.py:532 +#: ../meld/newdifftab.py:53 +msgid "New comparison" +msgstr "Nowe porównanie" + +#: ../meld/resources/ui/new-diff-tab.ui.h:2 +msgid "File comparison" +msgstr "Porównanie plików" + +#: ../meld/resources/ui/new-diff-tab.ui.h:3 +msgid "Directory comparison" +msgstr "Porównanie katalogów" + +#: ../meld/resources/ui/new-diff-tab.ui.h:4 +msgid "Version control view" +msgstr "Widok kontroli wersji" + +#: ../meld/resources/ui/new-diff-tab.ui.h:5 +msgid "_3-way comparison" +msgstr "Porównanie _3 plików" + +#: ../meld/resources/ui/new-diff-tab.ui.h:6 +msgid "Select Third File" +msgstr "Wybierz trzeci plik" + +#: ../meld/resources/ui/new-diff-tab.ui.h:7 +msgid "Select Second File" +msgstr "Wybierz drugi plik" + +#: ../meld/resources/ui/new-diff-tab.ui.h:8 +msgid "Select First File" +msgstr "Wybierz pierwszy plik" + +#: ../meld/resources/ui/new-diff-tab.ui.h:9 +msgid "Select First Folder" +msgstr "Wybierz pierwszy katalog" + +#: ../meld/resources/ui/new-diff-tab.ui.h:10 +msgid "Select Second Folder" +msgstr "Wybierz drugi katalog" + +#: ../meld/resources/ui/new-diff-tab.ui.h:11 +msgid "Select Third Folder" +msgstr "Wybierz trzeci katalog" + +#: ../meld/resources/ui/new-diff-tab.ui.h:12 +msgid "Select A Version-Controlled Folder" +msgstr "Wybierz katalog z kontrolą wersji" + +#: ../meld/resources/ui/new-diff-tab.ui.h:13 +msgid "_Blank comparison" +msgstr "_Puste porównanie" + +#: ../meld/resources/ui/new-diff-tab.ui.h:14 +msgid "C_ompare" +msgstr "P_orównaj" + +#: ../meld/resources/ui/notebook-label.ui.h:1 +msgid "Close Tab" +msgstr "Zamyka kartę" + +#: ../meld/resources/ui/patch-dialog.ui.h:1 msgid "Format as Patch" msgstr "Sformatowanie jako poprawka" -#: ../data/ui/patch-dialog.ui.h:2 +#: ../meld/resources/ui/patch-dialog.ui.h:2 msgid "Copy to Clipboard" msgstr "Skopiuj do schowka" -#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:152 +#: ../meld/resources/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:163 msgid "Save Patch" msgstr "Zapisz poprawkę" -#: ../data/ui/patch-dialog.ui.h:4 +#: ../meld/resources/ui/patch-dialog.ui.h:4 msgid "Use differences between:" msgstr "Użycie różnic między:" -#: ../data/ui/patch-dialog.ui.h:5 +#: ../meld/resources/ui/patch-dialog.ui.h:5 msgid "Left and middle panes" msgstr "Lewym i środkowym panelem" -#: ../data/ui/patch-dialog.ui.h:6 +#: ../meld/resources/ui/patch-dialog.ui.h:6 msgid "Middle and right panes" msgstr "Środkowym i prawym panelem" -#: ../data/ui/patch-dialog.ui.h:7 +#: ../meld/resources/ui/patch-dialog.ui.h:7 msgid "_Reverse patch direction" msgstr "Przeciwny kie_runek porównania" -#: ../data/ui/preferences.ui.h:1 -msgid "Meld Preferences" -msgstr "Preferencje programu Meld" +#: ../meld/resources/ui/preferences.ui.h:1 +msgid "Preferences" +msgstr "Preferencje" -#: ../data/ui/preferences.ui.h:2 +#: ../meld/resources/ui/preferences.ui.h:2 msgid "Font" msgstr "Czcionka" -#: ../data/ui/preferences.ui.h:3 +#: ../meld/resources/ui/preferences.ui.h:3 msgid "_Use the system fixed width font" msgstr "Systemowa o stałej s_zerokości" -#: ../data/ui/preferences.ui.h:4 +#: ../meld/resources/ui/preferences.ui.h:4 msgid "_Editor font:" msgstr "Czcionka _edytora:" -#: ../data/ui/preferences.ui.h:5 +#: ../meld/resources/ui/preferences.ui.h:5 msgid "Display" msgstr "Wyświetlanie" -#: ../data/ui/preferences.ui.h:6 +#: ../meld/resources/ui/preferences.ui.h:6 msgid "_Tab width:" msgstr "Szerokość _tabulacji:" -#: ../data/ui/preferences.ui.h:7 +#: ../meld/resources/ui/preferences.ui.h:7 msgid "_Insert spaces instead of tabs" msgstr "_Spacje zamiast tabulacji" -#: ../data/ui/preferences.ui.h:8 +#: ../meld/resources/ui/preferences.ui.h:8 msgid "Enable text _wrapping" msgstr "Zawijanie _wierszy" -#: ../data/ui/preferences.ui.h:9 +#: ../meld/resources/ui/preferences.ui.h:9 msgid "Do not _split words over two lines" msgstr "Bez _dzielenia wyrazów między wierszami" -#: ../data/ui/preferences.ui.h:10 +#: ../meld/resources/ui/preferences.ui.h:10 msgid "Highlight _current line" msgstr "Wyróż_nianie bieżącego wiersza" -#: ../data/ui/preferences.ui.h:11 +#: ../meld/resources/ui/preferences.ui.h:11 msgid "Show _line numbers" msgstr "_Numery wierszy" -#: ../data/ui/preferences.ui.h:12 +#: ../meld/resources/ui/preferences.ui.h:12 msgid "Show w_hitespace" msgstr "_Białe znaki" -#: ../data/ui/preferences.ui.h:13 +#: ../meld/resources/ui/preferences.ui.h:13 msgid "Use s_yntax highlighting" msgstr "Wyróżnianie elementów s_kładni" -#: ../data/ui/preferences.ui.h:14 +#: ../meld/resources/ui/preferences.ui.h:14 msgid "Syntax highlighting color scheme:" msgstr "Schemat kolorów wyróżniania elementów składni:" -#: ../data/ui/preferences.ui.h:15 +#: ../meld/resources/ui/preferences.ui.h:15 msgid "External Editor" msgstr "Zewnętrzny edytor" -#: ../data/ui/preferences.ui.h:16 +#: ../meld/resources/ui/preferences.ui.h:16 msgid "Use _default system editor" msgstr "_Domyślny edytor systemowy" -#: ../data/ui/preferences.ui.h:17 +#: ../meld/resources/ui/preferences.ui.h:17 msgid "Edito_r command:" msgstr "Polecenie uruchamiające edyto_r:" -#: ../data/ui/preferences.ui.h:18 +#: ../meld/resources/ui/preferences.ui.h:18 msgid "Editor" msgstr "Edytor" -#: ../data/ui/preferences.ui.h:19 +#: ../meld/resources/ui/preferences.ui.h:19 msgid "Shallow Comparison" msgstr "Płytkie porównanie" -#: ../data/ui/preferences.ui.h:20 +#: ../meld/resources/ui/preferences.ui.h:20 msgid "C_ompare files based only on size and timestamp" msgstr "P_orównywanie plików tylko na podstawie rozmiaru i czasu modyfikacji" -#: ../data/ui/preferences.ui.h:21 +#: ../meld/resources/ui/preferences.ui.h:21 msgid "_Timestamp resolution:" msgstr "Rozwiązywanie _czasu modyfikacji:" -#: ../data/ui/preferences.ui.h:23 +#: ../meld/resources/ui/preferences.ui.h:23 msgid "Note: enabling text filters may make comparing large files much slower" msgstr "" "Uwaga: włączenie filtrów tekstowych może znacznie spowolnić porównywanie " "dużych plików" -#: ../data/ui/preferences.ui.h:24 -msgid "Symbolic Links" -msgstr "Dowiązania symboliczne" - -#: ../data/ui/preferences.ui.h:26 -msgid "Visible Columns" -msgstr "Widoczne kolumny" - -#: ../data/ui/preferences.ui.h:27 -msgid "Folder Comparisons" -msgstr "Porównywanie katalogów" - -#: ../data/ui/preferences.ui.h:28 -msgid "Version Comparisons" -msgstr "Porównywanie wersji" - -#: ../data/ui/preferences.ui.h:29 -msgid "_Order when comparing file revisions:" -msgstr "_Kolejność podczas porównywania wersji plików:" - -#: ../data/ui/preferences.ui.h:30 -msgid "Order when _merging files:" -msgstr "K_olejność podczas scalania plików:" - -#: ../data/ui/preferences.ui.h:31 -msgid "Commit Messages" -msgstr "Opisy zatwierdzeń" - -#: ../data/ui/preferences.ui.h:32 -msgid "Show _right margin at:" -msgstr "P_rawy margines w kolumnie:" - -#: ../data/ui/preferences.ui.h:33 -msgid "Automatically _break lines at right margin on commit" -msgstr "" -"Automatyczne łamanie _wierszy na prawym marginesie podczas zatwierdzania" - -#: ../data/ui/preferences.ui.h:34 -msgid "Version Control" -msgstr "System kontroli wersji" - -#: ../data/ui/preferences.ui.h:35 -msgid "Filename filters" -msgstr "Filtry nazw plików" - -#: ../data/ui/preferences.ui.h:36 -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 "" -"Podczas porównywania katalogów można wyłączyć wybrane pliki oraz katalogi na " -"podstawie nazwy. Każdy wzorzec jest listą symboli wieloznacznych powłoki " -"rozdzieloną spacjami." - -#: ../data/ui/preferences.ui.h:37 ../meld/meldwindow.py:105 -msgid "File Filters" -msgstr "Filtry plików" - -#: ../data/ui/preferences.ui.h:38 -msgid "Change trimming" -msgstr "Obcinanie zmian" - -#: ../data/ui/preferences.ui.h:39 -msgid "Trim blank line differences from the start and end of changes" -msgstr "Obcinanie różnic pustych wierszy z początku i końca zmian" - -#: ../data/ui/preferences.ui.h:40 -msgid "Text filters" -msgstr "Filtry tekstu" - -#: ../data/ui/preferences.ui.h:41 -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 "" -"Podczas porównywania plików można zignorować pewne rodzaje zmian. Każdy " -"wzorzec jest wyrażeniem regularnym języka Python, które zamienia pasujący " -"tekst na pusty ciąg znaków przed wykonaniem porównania. Jeżeli wyrażenie " -"zawiera grupy, tylko grupy są zamieniane. Więcej informacji dostępne jest " -"w podręczniku użytkownika." - -#: ../data/ui/preferences.ui.h:42 -msgid "Text Filters" -msgstr "Filtry plików tekstowych" - -#: ../data/ui/preferences.ui.h:43 -msgid "Left is remote, right is local" -msgstr "Zdalne po lewej, lokalne po prawej" - -#: ../data/ui/preferences.ui.h:44 -msgid "Left is local, right is remote" -msgstr "Lokalne po lewej, zdalne po prawej" - -#: ../data/ui/preferences.ui.h:45 -msgid "Remote, merge, local" -msgstr "Zdalne, scalanie, lokalne" - -#: ../data/ui/preferences.ui.h:46 -msgid "Local, merge, remote" -msgstr "Lokalne, scalanie, zdalne" - -#: ../data/ui/preferences.ui.h:47 -msgid "1ns (ext4)" -msgstr "1 ns (ext4)" - -#: ../data/ui/preferences.ui.h:48 -msgid "100ns (NTFS)" -msgstr "100 ns (NTFS)" - -#: ../data/ui/preferences.ui.h:49 -msgid "1s (ext2/ext3)" -msgstr "1 s (ext2/ext3)" - -#: ../data/ui/preferences.ui.h:50 -msgid "2s (VFAT)" -msgstr "2 s (VFAT)" - -#: ../data/ui/shortcuts.ui.h:1 -msgctxt "shortcut window" -msgid "General" -msgstr "Ogólne" - -#: ../data/ui/shortcuts.ui.h:2 -msgctxt "shortcut window" -msgid "New comparison" -msgstr "Nowe porównanie" - -#: ../data/ui/shortcuts.ui.h:3 -msgctxt "shortcut window" -msgid "Close a comparison" -msgstr "Zamknięcie porównania" - -#: ../data/ui/shortcuts.ui.h:4 -msgctxt "shortcut window" -msgid "Quit Meld" -msgstr "Zakończenie działania programu Meld" - -#: ../data/ui/shortcuts.ui.h:5 -msgctxt "shortcut window" -msgid "Stop the current action" -msgstr "Przerwanie bieżącego działania" - -#: ../data/ui/shortcuts.ui.h:6 -msgctxt "shortcut window" -msgid "Refresh comparison" -msgstr "Odświeżenie porównania" - -#: ../data/ui/shortcuts.ui.h:7 -msgctxt "shortcut window" -msgid "Fullscreen" -msgstr "Pełny ekran" - -#: ../data/ui/shortcuts.ui.h:8 -msgctxt "shortcut window" -msgid "Tabs" -msgstr "Karty" - -#: ../data/ui/shortcuts.ui.h:9 -msgctxt "shortcut window" -msgid "Go to previous tab" -msgstr "Przejście do poprzedniej karty" - -#: ../data/ui/shortcuts.ui.h:10 -msgctxt "shortcut window" -msgid "Go to next tab" -msgstr "Przejście do następnej karty" - -#: ../data/ui/shortcuts.ui.h:11 -msgctxt "shortcut window" -msgid "Switch to tab" -msgstr "Przełączenie na kartę" - -#: ../data/ui/shortcuts.ui.h:12 -msgctxt "shortcut window" -msgid "Move tab left" -msgstr "Przesunięcie karty w lewo" - -#: ../data/ui/shortcuts.ui.h:13 -msgctxt "shortcut window" -msgid "Move tab right" -msgstr "Przesunięcie karty w prawo" - -#: ../data/ui/shortcuts.ui.h:14 -msgctxt "shortcut window" -msgid "Changes" -msgstr "Zmiany" - -#: ../data/ui/shortcuts.ui.h:15 -msgctxt "shortcut window" -msgid "Go to previous change" -msgstr "Przejście do poprzedniej zmiany" - -#: ../data/ui/shortcuts.ui.h:16 -msgctxt "shortcut window" -msgid "Go to next change" -msgstr "Przejście do następnej zmiany" - -#: ../data/ui/shortcuts.ui.h:17 -msgctxt "shortcut window" -msgid "Editing" -msgstr "Edycja" - -#: ../data/ui/shortcuts.ui.h:18 -msgctxt "shortcut window" -msgid "Undo" -msgstr "Cofnięcie" - -#: ../data/ui/shortcuts.ui.h:19 -msgctxt "shortcut window" -msgid "Redo" -msgstr "Ponowienie" - -#: ../data/ui/shortcuts.ui.h:20 -msgctxt "shortcut window" -msgid "Cut" -msgstr "Wycięcie" - -#: ../data/ui/shortcuts.ui.h:21 -msgctxt "shortcut window" -msgid "Copy" -msgstr "Skopiowanie" - -#: ../data/ui/shortcuts.ui.h:22 -msgctxt "shortcut window" -msgid "Paste" -msgstr "Wklejenie" - -#: ../data/ui/shortcuts.ui.h:23 -msgctxt "shortcut window" -msgid "Find" -msgstr "Wyszukiwanie" - -#: ../data/ui/shortcuts.ui.h:24 -msgctxt "shortcut window" -msgid "Find Next" -msgstr "Wyszukanie następnego" - -#: ../data/ui/shortcuts.ui.h:25 -msgctxt "shortcut window" -msgid "Find Previous" -msgstr "Wyszukanie poprzedniego" - -#: ../data/ui/shortcuts.ui.h:26 -msgctxt "shortcut window" -msgid "Replace" -msgstr "Zamiana" - -#: ../data/ui/shortcuts.ui.h:27 -msgctxt "shortcut window" -msgid "File comparison" -msgstr "Porównanie plików" - -#: ../data/ui/shortcuts.ui.h:28 -msgctxt "shortcut window" -msgid "Save current file" -msgstr "Zapisanie bieżącego pliku" +#: ../meld/resources/ui/preferences.ui.h:24 +msgid "Symbolic Links" +msgstr "Dowiązania symboliczne" -#: ../data/ui/shortcuts.ui.h:29 -msgctxt "shortcut window" -msgid "Save current file to new path" -msgstr "Zapisanie bieżącego pliku w nowej ścieżce" +#: ../meld/resources/ui/preferences.ui.h:26 +msgid "Visible Columns" +msgstr "Widoczne kolumny" -#: ../data/ui/shortcuts.ui.h:30 -msgctxt "shortcut window" -msgid "Save all files in comparison" -msgstr "Zapisanie wszystkich plików w porównaniu" +#: ../meld/resources/ui/preferences.ui.h:27 +msgid "Folder Comparisons" +msgstr "Porównywanie katalogów" -#: ../data/ui/shortcuts.ui.h:31 -msgctxt "shortcut window" -msgid "Previous conflict" -msgstr "Poprzedni konflikt" +#: ../meld/resources/ui/preferences.ui.h:28 +msgid "Version Comparisons" +msgstr "Porównywanie wersji" -#: ../data/ui/shortcuts.ui.h:32 -msgctxt "shortcut window" -msgid "Next conflict" -msgstr "Następny konflikt" +#: ../meld/resources/ui/preferences.ui.h:29 +msgid "_Order when comparing file revisions:" +msgstr "_Kolejność podczas porównywania wersji plików:" -#: ../data/ui/shortcuts.ui.h:33 -msgctxt "shortcut window" -msgid "Push change to left" -msgstr "Przeniesienie zmiany na lewo" +#: ../meld/resources/ui/preferences.ui.h:30 +msgid "Order when _merging files:" +msgstr "K_olejność podczas scalania plików:" -#: ../data/ui/shortcuts.ui.h:34 -msgctxt "shortcut window" -msgid "Push change to right" -msgstr "Przeniesienie zmiany na prawo" +#: ../meld/resources/ui/preferences.ui.h:31 +msgid "Commit Messages" +msgstr "Opisy zatwierdzeń" -#: ../data/ui/shortcuts.ui.h:35 -msgctxt "shortcut window" -msgid "Pull change from left" -msgstr "Wprowadzenie zmiany z lewej" +#: ../meld/resources/ui/preferences.ui.h:32 +msgid "Show _right margin at:" +msgstr "P_rawy margines w kolumnie:" -#: ../data/ui/shortcuts.ui.h:36 -msgctxt "shortcut window" -msgid "Pull change from right" -msgstr "Wprowadzenie zmiany z prawej" +#: ../meld/resources/ui/preferences.ui.h:33 +msgid "Automatically _break lines at right margin on commit" +msgstr "" +"Automatyczne łamanie _wierszy na prawym marginesie podczas zatwierdzania" -#: ../data/ui/shortcuts.ui.h:37 -msgctxt "shortcut window" -msgid "Copy change above left" -msgstr "Skopiowanie zmiany powyżej fragmentu po lewej" +#: ../meld/resources/ui/preferences.ui.h:34 +msgid "Version Control" +msgstr "System kontroli wersji" -#: ../data/ui/shortcuts.ui.h:38 -msgctxt "shortcut window" -msgid "Copy change below left" -msgstr "Skopiowanie zmiany poniżej fragmentu po lewej" +#: ../meld/resources/ui/preferences.ui.h:35 +msgid "Filename filters" +msgstr "Filtry nazw plików" -#: ../data/ui/shortcuts.ui.h:39 -msgctxt "shortcut window" -msgid "Copy change above right" -msgstr "Skopiowanie zmiany powyżej fragmentu po prawej" +#: ../meld/resources/ui/preferences.ui.h:36 +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 "" +"Podczas porównywania katalogów można wyłączyć wybrane pliki oraz katalogi na " +"podstawie nazwy. Każdy wzorzec jest listą symboli wieloznacznych powłoki " +"rozdzieloną spacjami." -#: ../data/ui/shortcuts.ui.h:40 -msgctxt "shortcut window" -msgid "Copy change below right" -msgstr "Skopiowanie zmiany poniżej fragmentu po prawej" +#: ../meld/resources/ui/preferences.ui.h:37 ../meld/meldwindow.py:114 +msgid "File Filters" +msgstr "Filtry plików" -#: ../data/ui/shortcuts.ui.h:41 -msgctxt "shortcut window" -msgid "Delete change" -msgstr "Usunięcie zmiany" +#: ../meld/resources/ui/preferences.ui.h:38 +msgid "Change trimming" +msgstr "Obcinanie zmian" -#: ../data/ui/shortcuts.ui.h:42 -msgctxt "shortcut window" -msgid "Previous comparison pane" -msgstr "Poprzedni panel porównania" +#: ../meld/resources/ui/preferences.ui.h:39 +msgid "Trim blank line differences from the start and end of changes" +msgstr "Obcinanie różnic pustych wierszy z początku i końca zmian" -#: ../data/ui/shortcuts.ui.h:43 -msgctxt "shortcut window" -msgid "Next comparison pane" -msgstr "Następny panel porównania" +#: ../meld/resources/ui/preferences.ui.h:40 +msgid "Text filters" +msgstr "Filtry tekstu" -#: ../data/ui/shortcuts.ui.h:44 -msgctxt "shortcut window" -msgid "Folder comparison" -msgstr "Porównywanie katalogów" +#: ../meld/resources/ui/preferences.ui.h:41 +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 "" +"Podczas porównywania plików można zignorować pewne rodzaje zmian. Każdy " +"wzorzec jest wyrażeniem regularnym języka Python, które zamienia pasujący " +"tekst na pusty ciąg znaków przed wykonaniem porównania. Jeżeli wyrażenie " +"zawiera grupy, tylko grupy są zamieniane. Więcej informacji dostępne jest " +"w podręczniku użytkownika." -#: ../data/ui/shortcuts.ui.h:45 -msgctxt "shortcut window" -msgid "Copy to left" -msgstr "Skopiowanie na lewo" +#: ../meld/resources/ui/preferences.ui.h:42 +msgid "Text Filters" +msgstr "Filtry plików tekstowych" -#: ../data/ui/shortcuts.ui.h:46 -msgctxt "shortcut window" -msgid "Copy to right" -msgstr "Skopiowanie na prawo" +#: ../meld/resources/ui/preferences.ui.h:43 +msgid "Left is remote, right is local" +msgstr "Zdalne po lewej, lokalne po prawej" -#: ../data/ui/shortcuts.ui.h:47 -msgctxt "shortcut window" -msgid "Version control comparison" -msgstr "Porównanie systemu kontroli wersji" +#: ../meld/resources/ui/preferences.ui.h:44 +msgid "Left is local, right is remote" +msgstr "Lokalne po lewej, zdalne po prawej" -#: ../data/ui/shortcuts.ui.h:48 -msgctxt "shortcut window" -msgid "Commit to version control" -msgstr "Zatwierdzenie zmiany w systemie kontroli wersji" +#: ../meld/resources/ui/preferences.ui.h:45 +msgid "Remote, merge, local" +msgstr "Zdalne, scalanie, lokalne" -#: ../data/ui/shortcuts.ui.h:49 -msgctxt "shortcut window" -msgid "Show/hide console output" -msgstr "Wyświetlenie/ukrycie wyjścia konsoli" +#: ../meld/resources/ui/preferences.ui.h:46 +msgid "Local, merge, remote" +msgstr "Lokalne, scalanie, zdalne" -#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:567 -#: ../meld/newdifftab.py:49 -msgid "New comparison" -msgstr "Nowe porównanie" +#: ../meld/resources/ui/preferences.ui.h:47 +msgid "1ns (ext4)" +msgstr "1 ns (ext4)" -#: ../data/ui/tab-placeholder.ui.h:2 -msgid "File comparison" -msgstr "Porównanie plików" +#: ../meld/resources/ui/preferences.ui.h:48 +msgid "100ns (NTFS)" +msgstr "100 ns (NTFS)" -#: ../data/ui/tab-placeholder.ui.h:3 -msgid "Directory comparison" -msgstr "Porównanie katalogów" +#: ../meld/resources/ui/preferences.ui.h:49 +msgid "1s (ext2/ext3)" +msgstr "1 s (ext2/ext3)" -#: ../data/ui/tab-placeholder.ui.h:4 -msgid "Version control view" -msgstr "Widok kontroli wersji" +#: ../meld/resources/ui/preferences.ui.h:50 +msgid "2s (VFAT)" +msgstr "2 s (VFAT)" -#: ../data/ui/tab-placeholder.ui.h:5 -msgid "_3-way comparison" -msgstr "Porównanie _3 plików" +#: ../meld/resources/ui/push-dialog.ui.h:1 +msgid "Push local commits to remote?" +msgstr "Wysyłać lokalne zatwierdzenia do zdalnego repozytorium?" -#: ../data/ui/tab-placeholder.ui.h:6 -msgid "Select Third File" -msgstr "Wybierz trzeci plik" +#: ../meld/resources/ui/push-dialog.ui.h:2 +msgid "The commits to be pushed are determined by your version control system." +msgstr "Zatwierdzenia do wysłania są ustalane przez system kontroli wersji." -#: ../data/ui/tab-placeholder.ui.h:7 -msgid "Select Second File" -msgstr "Wybierz drugi plik" +#: ../meld/resources/ui/push-dialog.ui.h:3 +msgid "_Push commits" +msgstr "_Wyślij zatwierdzenia" -#: ../data/ui/tab-placeholder.ui.h:8 -msgid "Select First File" -msgstr "Wybierz pierwszy plik" +#: ../meld/resources/ui/revert-dialog.ui.h:1 +msgid "Discard unsaved changes to documents?" +msgstr "Odrzucić niezapisane zmiany w dokumentach?" -#: ../data/ui/tab-placeholder.ui.h:9 -msgid "Select First Folder" -msgstr "Wybierz pierwszy katalog" +#: ../meld/resources/ui/revert-dialog.ui.h:2 +msgid "Changes made to the following documents will be permanently lost:" +msgstr "" +"Zmiany naniesione do poniższych dokumentów zostaną bezpowrotnie utracone:" -#: ../data/ui/tab-placeholder.ui.h:10 -msgid "Select Second Folder" -msgstr "Wybierz drugi katalog" +#: ../meld/resources/ui/revert-dialog.ui.h:3 +msgid "_Discard" +msgstr "_Odrzuć" -#: ../data/ui/tab-placeholder.ui.h:11 -msgid "Select Third Folder" -msgstr "Wybierz trzeci katalog" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:1 +msgid "Save changes to documents before closing?" +msgstr "Zapisać zmiany dokumentów przed zamknięciem?" -#: ../data/ui/tab-placeholder.ui.h:12 -msgid "Select A Version-Controlled Folder" -msgstr "Wybierz katalog z kontrolą wersji" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:2 +msgid "If you don’t save, changes will be permanently lost." +msgstr "" +"Jeżeli dokumenty nie zostaną zapisane, zmiany zostaną bezpowrotnie utracone." -#: ../data/ui/tab-placeholder.ui.h:13 -msgid "_Blank comparison" -msgstr "_Puste porównanie" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:3 +msgid "Close _without Saving" +msgstr "Zamknij _bez zapisywania" -#: ../data/ui/tab-placeholder.ui.h:14 -msgid "C_ompare" -msgstr "P_orównaj" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:4 ../meld/dirdiff.py:1039 +#: ../meld/iohelpers.py:52 ../meld/iohelpers.py:106 +msgid "_Cancel" +msgstr "_Anuluj" + +#: ../meld/resources/ui/save-confirm-dialog.ui.h:5 +msgid "_Save" +msgstr "_Zapisz" -#: ../data/ui/vcview.ui.h:3 +#: ../meld/resources/ui/vcview.ui.h:3 msgid "Co_mmit…" msgstr "_Zatwierdź…" -#: ../data/ui/vcview.ui.h:4 +#: ../meld/resources/ui/vcview.ui.h:4 msgid "Commit changes to version control" msgstr "Zatwierdza zmiany w systemie kontroli wersji" -#: ../data/ui/vcview.ui.h:5 +#: ../meld/resources/ui/vcview.ui.h:5 msgid "_Update" msgstr "Zaktualiz_uj" -#: ../data/ui/vcview.ui.h:6 +#: ../meld/resources/ui/vcview.ui.h:6 msgid "Update working copy from version control" msgstr "Aktualizuje kopię roboczą z systemu kontroli wersji" -#: ../data/ui/vcview.ui.h:7 +#: ../meld/resources/ui/vcview.ui.h:7 msgid "_Push" msgstr "_Wyślij" -#: ../data/ui/vcview.ui.h:8 +#: ../meld/resources/ui/vcview.ui.h:8 msgid "Push local changes to remote" msgstr "Wysyła lokalne zmiany do zdalnego repozytorium" -#: ../data/ui/vcview.ui.h:10 +#: ../meld/resources/ui/vcview.ui.h:10 msgid "Add to version control" msgstr "Dodaje do systemu kontroli wersji" -#: ../data/ui/vcview.ui.h:12 +#: ../meld/resources/ui/vcview.ui.h:12 msgid "Remove from version control" msgstr "Usuwa z systemu kontroli wersji" -#: ../data/ui/vcview.ui.h:13 +#: ../meld/resources/ui/vcview.ui.h:13 msgid "Mar_k as Resolved" msgstr "Oznacz jako _rozwiązane" -#: ../data/ui/vcview.ui.h:14 +#: ../meld/resources/ui/vcview.ui.h:14 msgid "Mark as resolved in version control" msgstr "Oznacza konflikt jako rozwiązany w systemie kontroli wersji" -#: ../data/ui/vcview.ui.h:15 +#: ../meld/resources/ui/vcview.ui.h:15 msgid "Re_vert" msgstr "Przy_wróć" -#: ../data/ui/vcview.ui.h:16 +#: ../meld/resources/ui/vcview.ui.h:16 msgid "Revert working copy to original state" msgstr "Przywraca kopię roboczą do pierwotnego stanu" -#: ../data/ui/vcview.ui.h:17 +#: ../meld/resources/ui/vcview.ui.h:17 msgid "Delete from working copy" msgstr "Usuwa z kopii roboczej" -#: ../data/ui/vcview.ui.h:18 +#: ../meld/resources/ui/vcview.ui.h:18 msgid "Console" msgstr "Konsola" -#: ../data/ui/vcview.ui.h:19 +#: ../meld/resources/ui/vcview.ui.h:19 msgid "Show or hide the version control console output pane" msgstr "Wyświetla lub ukrywa panel wyjścia systemu kontroli wersji" -#: ../data/ui/vcview.ui.h:20 +#: ../meld/resources/ui/vcview.ui.h:20 msgid "_Flatten" msgstr "U_prość" -#: ../data/ui/vcview.ui.h:21 +#: ../meld/resources/ui/vcview.ui.h:21 msgid "Flatten directories" msgstr "Upraszcza wyświetlaną strukturę katalogów" -#: ../data/ui/vcview.ui.h:22 +#: ../meld/resources/ui/vcview.ui.h:22 msgid "_Modified" msgstr "Z_modyfikowane" -#: ../data/ui/vcview.ui.h:23 +#: ../meld/resources/ui/vcview.ui.h:23 msgid "Show modified files" msgstr "Wyświetla zmodyfikowane pliki" -#: ../data/ui/vcview.ui.h:24 +#: ../meld/resources/ui/vcview.ui.h:24 msgid "_Normal" msgstr "_Zwykłe" -#: ../data/ui/vcview.ui.h:25 +#: ../meld/resources/ui/vcview.ui.h:25 msgid "Show normal files" msgstr "Wyświetla zwykłe pliki" -#: ../data/ui/vcview.ui.h:26 +#: ../meld/resources/ui/vcview.ui.h:26 msgid "Un_versioned" msgstr "Poza systemem kontroli _wersji" -#: ../data/ui/vcview.ui.h:27 +#: ../meld/resources/ui/vcview.ui.h:27 msgid "Show unversioned files" msgstr "Wyświetla pliki poza systemem kontroli wersji" -#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69 +#: ../meld/resources/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69 msgid "Ignored" msgstr "Zignorowane" -#: ../data/ui/vcview.ui.h:29 +#: ../meld/resources/ui/vcview.ui.h:29 msgid "Show ignored files" msgstr "Wyświetla zignorowane pliki" -#: ../data/ui/vcview.ui.h:30 -msgid "Commit" -msgstr "Zatwierdź" - -#: ../data/ui/vcview.ui.h:31 -msgid "Commit Files" -msgstr "Zatwierdź pliki" - -#: ../data/ui/vcview.ui.h:32 -msgid "Log Message" -msgstr "Opis zmiany" - -#: ../data/ui/vcview.ui.h:33 -msgid "Previous logs:" -msgstr "Wcześniejsze zmiany:" - -#: ../data/ui/vcview.ui.h:34 -msgid "Co_mmit" -msgstr "_Zatwierdź" - -#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:331 +#: ../meld/resources/ui/vcview.ui.h:31 ../meld/vcview.py:366 msgid "Location" msgstr "Położenie" -#: ../data/ui/vcview.ui.h:37 +#: ../meld/resources/ui/vcview.ui.h:32 msgid "Status" msgstr "Stan" -#: ../data/ui/vcview.ui.h:38 +#: ../meld/resources/ui/vcview.ui.h:33 msgid "Extra" msgstr "Dodatkowe" -#: ../data/ui/vcview.ui.h:39 +#: ../meld/resources/ui/vcview.ui.h:34 msgid "Console output" msgstr "Wyjście konsoli" -#: ../data/ui/vcview.ui.h:40 -msgid "Push local commits to remote?" -msgstr "Wysyłać lokalne zatwierdzenia do zdalnego repozytorium?" - -#: ../data/ui/vcview.ui.h:41 -msgid "The commits to be pushed are determined by your version control system." -msgstr "Zatwierdzenia do wysłania są ustalane przez system kontroli wersji." - -#: ../data/ui/vcview.ui.h:42 -msgid "_Push commits" -msgstr "_Wyślij zatwierdzenia" - #: ../meld/const.py:12 msgid "UNIX (LF)" msgstr "UNIX (LF)" @@ -1683,44 +1678,44 @@ msgid "Mac OS (CR)" msgstr "Mac OS (CR)" #. Create file size CellRenderer -#: ../meld/dirdiff.py:437 ../meld/preferences.py:81 +#: ../meld/dirdiff.py:475 ../meld/preferences.py:138 msgid "Size" msgstr "Rozmiar" #. Create date-time CellRenderer -#: ../meld/dirdiff.py:445 ../meld/preferences.py:82 +#: ../meld/dirdiff.py:483 ../meld/preferences.py:139 msgid "Modification time" msgstr "Czas modyfikacji" #. Create permissions CellRenderer -#: ../meld/dirdiff.py:453 ../meld/preferences.py:83 +#: ../meld/dirdiff.py:491 ../meld/preferences.py:140 msgid "Permissions" msgstr "Uprawnienia" -#: ../meld/dirdiff.py:588 +#: ../meld/dirdiff.py:625 #, python-format msgid "Hide %s" msgstr "Ukryj %s" -#: ../meld/dirdiff.py:729 ../meld/dirdiff.py:752 +#: ../meld/dirdiff.py:767 ../meld/dirdiff.py:790 #, python-format msgid "[%s] Scanning %s" msgstr "[%s] Skanowanie %s" -#: ../meld/dirdiff.py:887 +#: ../meld/dirdiff.py:925 #, python-format msgid "[%s] Done" msgstr "[%s] Ukończono" -#: ../meld/dirdiff.py:895 +#: ../meld/dirdiff.py:933 msgid "Folders have no differences" msgstr "Katalogi się nie różnią" -#: ../meld/dirdiff.py:897 +#: ../meld/dirdiff.py:935 msgid "Contents of scanned files in folders are identical." msgstr "Treść zeskanowanych plików w katalogach jest identyczna." -#: ../meld/dirdiff.py:899 +#: ../meld/dirdiff.py:937 msgid "" "Scanned files in folders appear identical, but contents have not been " "scanned." @@ -1728,40 +1723,40 @@ msgstr "" "Zeskanowane pliki wydają się identyczne, ale treść mogła nie zostać " "zeskanowana." -#: ../meld/dirdiff.py:902 +#: ../meld/dirdiff.py:940 msgid "File filters are in use, so not all files have been scanned." msgstr "" "Filtry plików są używane, więc nie wszystkie pliki zostały zeskanowane." -#: ../meld/dirdiff.py:904 +#: ../meld/dirdiff.py:942 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:922 ../meld/filediff.py:1491 ../meld/filediff.py:1521 -#: ../meld/filediff.py:1523 ../meld/ui/msgarea.py:106 ../meld/ui/msgarea.py:119 +#: ../meld/dirdiff.py:960 ../meld/filediff.py:1588 ../meld/filediff.py:1618 +#: ../meld/filediff.py:1620 ../meld/ui/msgarea.py:106 ../meld/ui/msgarea.py:119 msgid "Hi_de" msgstr "_Ukryj" -#: ../meld/dirdiff.py:931 +#: ../meld/dirdiff.py:969 msgid "Multiple errors occurred while scanning this folder" msgstr "Wystąpiło wiele błędów podczas skanowania tego katalogu" -#: ../meld/dirdiff.py:932 +#: ../meld/dirdiff.py:970 msgid "Files with invalid encodings found" msgstr "Odnaleziono pliki z nieprawidłowym kodowaniem znaków" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:934 +#: ../meld/dirdiff.py:972 msgid "Some files were in an incorrect encoding. The names are something like:" msgstr "" "Niektóre pliki mają nieprawidłowe kodowanie znaków. Nazwy tych plików to:" -#: ../meld/dirdiff.py:936 +#: ../meld/dirdiff.py:974 msgid "Files hidden by case insensitive comparison" msgstr "Pliku ukryte przez porównywanie bez uwzględniania wielkości liter" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:938 +#: ../meld/dirdiff.py:976 msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. The following files in this folder are hidden:" @@ -1770,17 +1765,17 @@ msgstr "" "w systemie plików, który rozróżnia wielkość liter. Następujące pliki w tym " "katalogu zostały ukryte:" -#: ../meld/dirdiff.py:949 +#: ../meld/dirdiff.py:987 #, python-format msgid "“%s” hidden by “%s”" msgstr "„%s” ukryty przez „%s”" -#: ../meld/dirdiff.py:1005 +#: ../meld/dirdiff.py:1043 #, python-format msgid "Replace folder “%s”?" msgstr "Zastąpić katalog „%s”?" -#: ../meld/dirdiff.py:1007 +#: ../meld/dirdiff.py:1045 #, python-format msgid "" "Another folder with the same name already exists in “%s”.\n" @@ -1790,11 +1785,11 @@ msgstr "" "Zastąpienie istniejącego katalogu spowoduje utratę wszystkich plików w nim " "zawartych." -#: ../meld/dirdiff.py:1020 +#: ../meld/dirdiff.py:1058 msgid "Error copying file" msgstr "Błąd podczas kopiowania pliku" -#: ../meld/dirdiff.py:1021 +#: ../meld/dirdiff.py:1059 #, python-format msgid "" "Couldn’t copy %s\n" @@ -1807,19 +1802,19 @@ msgstr "" "\n" "%s" -#: ../meld/dirdiff.py:1046 ../meld/vcview.py:703 +#: ../meld/dirdiff.py:1084 ../meld/vcview.py:720 msgid "Error deleting {}" msgstr "Błąd podczas usuwania {}" -#: ../meld/dirdiff.py:1577 +#: ../meld/dirdiff.py:1593 msgid "No folder" msgstr "Brak katalogu" -#: ../meld/filediff.py:834 +#: ../meld/filediff.py:905 msgid "Comparison results will be inaccurate" msgstr "Wyniki porównania będą niepoprawne" -#: ../meld/filediff.py:836 +#: ../meld/filediff.py:907 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1827,66 +1822,66 @@ msgstr "" "Filtr zmienił liczbę wierszy w pliku, co nie jest obsługiwane. Porównanie " "będzie niepoprawne." -#: ../meld/filediff.py:893 +#: ../meld/filediff.py:979 msgid "Mark conflict as resolved?" msgstr "Oznaczyć konflikt jako rozwiązany?" -#: ../meld/filediff.py:895 +#: ../meld/filediff.py:981 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:897 +#: ../meld/filediff.py:983 msgid "Cancel" msgstr "Anuluj" -#: ../meld/filediff.py:898 +#: ../meld/filediff.py:984 msgid "Mark _Resolved" msgstr "Oznacz jako _rozwiązane" -#: ../meld/filediff.py:1206 +#: ../meld/filediff.py:1303 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Wystąpił problem podczas otwierania pliku „%s”." -#: ../meld/filediff.py:1214 +#: ../meld/filediff.py:1311 #, python-format msgid "File %s appears to be a binary file." msgstr "Plik %s wygląda na plik binarny." -#: ../meld/filediff.py:1216 +#: ../meld/filediff.py:1313 msgid "Do you want to open the file using the default application?" msgstr "Otworzyć go w domyślnym programie?" -#: ../meld/filediff.py:1218 +#: ../meld/filediff.py:1315 msgid "Open" msgstr "Otwórz" -#: ../meld/filediff.py:1234 +#: ../meld/filediff.py:1331 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Analizowanie różnic" -#: ../meld/filediff.py:1295 +#: ../meld/filediff.py:1392 #, python-format msgid "File %s has changed on disk" msgstr "Plik %s został zmieniony na dysku" -#: ../meld/filediff.py:1296 +#: ../meld/filediff.py:1393 msgid "Do you want to reload the file?" msgstr "Ponownie wczytać plik?" -#: ../meld/filediff.py:1298 +#: ../meld/filediff.py:1395 msgid "_Reload" msgstr "_Wczytaj ponownie" -#: ../meld/filediff.py:1454 +#: ../meld/filediff.py:1551 msgid "Files are identical" msgstr "Pliki są identyczne" -#: ../meld/filediff.py:1467 +#: ../meld/filediff.py:1564 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1894,11 +1889,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:1472 +#: ../meld/filediff.py:1569 msgid "Files differ in line endings only" msgstr "Pliki różnią się tylko znacznikami końca wierszy" -#: ../meld/filediff.py:1474 +#: ../meld/filediff.py:1571 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1907,15 +1902,15 @@ msgstr "" "Pliki są identyczne, z wyjątkiem różnych znaczników końca wierszy:\n" "%s" -#: ../meld/filediff.py:1494 +#: ../meld/filediff.py:1591 msgid "Show without filters" msgstr "Wyświetl bez filtrów" -#: ../meld/filediff.py:1516 +#: ../meld/filediff.py:1613 msgid "Change highlighting incomplete" msgstr "Wyróżnianie zmian jest niepełne" -#: ../meld/filediff.py:1517 +#: ../meld/filediff.py:1614 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." @@ -1923,19 +1918,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:1525 +#: ../meld/filediff.py:1622 msgid "Keep highlighting" msgstr "Wyróżniaj dalej" -#: ../meld/filediff.py:1527 +#: ../meld/filediff.py:1624 msgid "_Keep highlighting" msgstr "_Wyróżniaj dalej" -#: ../meld/filediff.py:1540 +#: ../meld/filediff.py:1637 msgid "Saving failed" msgstr "Zapisanie się nie powiodło" -#: ../meld/filediff.py:1541 +#: ../meld/filediff.py:1638 msgid "" "Please consider copying any critical changes to another program or file to " "avoid data loss." @@ -1943,38 +1938,38 @@ msgstr "" "Proszę rozważyć skopiowanie wszelkich ważnych zmian w innym programie lub " "pliku, aby uniknąć utraty danych." -#: ../meld/filediff.py:1550 +#: ../meld/filediff.py:1647 msgid "Save Left Pane As" msgstr "Zapis lewego panelu jako" -#: ../meld/filediff.py:1552 +#: ../meld/filediff.py:1649 msgid "Save Middle Pane As" msgstr "Zapis środkowego panelu jako" -#: ../meld/filediff.py:1554 +#: ../meld/filediff.py:1651 msgid "Save Right Pane As" msgstr "Zapis prawego panelu jako" -#: ../meld/filediff.py:1567 +#: ../meld/filediff.py:1664 #, 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:1569 +#: ../meld/filediff.py:1666 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:1572 +#: ../meld/filediff.py:1669 msgid "Save Anyway" msgstr "Zapisz mimo to" -#: ../meld/filediff.py:1573 +#: ../meld/filediff.py:1670 msgid "Don’t Save" msgstr "Nie zapisuj" -#: ../meld/filediff.py:1615 +#: ../meld/filediff.py:1712 msgid "" "File “{}” contains characters that can’t be encoded using its current " "encoding “{}”." @@ -1982,7 +1977,7 @@ msgstr "" "Plik „{}” zawiera znaki, których nie można zakodować za pomocą jego obecnego " "kodowania, „{}”." -#: ../meld/filediff.py:1619 ../meld/patchdialog.py:131 +#: ../meld/filediff.py:1716 ../meld/patchdialog.py:142 #, python-format msgid "" "Couldn’t save file due to:\n" @@ -1991,16 +1986,16 @@ msgstr "" "Nie można zapisać pliku z powodu:\n" "%s" -#: ../meld/filediff.py:1623 ../meld/patchdialog.py:130 +#: ../meld/filediff.py:1720 ../meld/patchdialog.py:141 #, python-format msgid "Could not save file %s." msgstr "Nie można zapisać pliku %s." -#: ../meld/filediff.py:1998 +#: ../meld/filediff.py:2113 msgid "Live comparison updating disabled" msgstr "Wyłączono aktualizowanie porównań na żywo" -#: ../meld/filediff.py:1999 +#: ../meld/filediff.py:2114 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -2015,40 +2010,40 @@ msgstr "" msgid "[%s] Merging files" msgstr "[%s] Scalanie plików" -#: ../meld/gutterrendererchunk.py:216 +#: ../meld/gutterrendererchunk.py:220 msgid "Copy _up" msgstr "Skopiuj w gó_rę" -#: ../meld/gutterrendererchunk.py:217 +#: ../meld/gutterrendererchunk.py:221 msgid "Copy _down" msgstr "Skopiuj w _dół" -#: ../meld/iohelpers.py:35 +#: ../meld/iohelpers.py:37 msgid "Deleting remote folders is not supported" msgstr "Usuwanie zdalnych katalogów jest nieobsługiwane" -#: ../meld/iohelpers.py:37 +#: ../meld/iohelpers.py:39 msgid "Not a file or directory" msgstr "Nie jest plikiem ani katalogiem" -#: ../meld/iohelpers.py:41 +#: ../meld/iohelpers.py:43 msgid "“{}” can’t be put in the trash. Do you want to delete it immediately?" msgstr "Nie można przenieść pliku „{}” do kosza. Usunąć go trwale?" -#: ../meld/iohelpers.py:46 +#: ../meld/iohelpers.py:48 msgid "This remote location does not support sending items to the trash." msgstr "To zdalne położenie nie obsługuje przenoszenia elementów do kosza." -#: ../meld/iohelpers.py:51 +#: ../meld/iohelpers.py:53 msgid "_Delete Permanently" msgstr "_Usuń trwale" -#: ../meld/iohelpers.py:94 +#: ../meld/iohelpers.py:100 #, python-format msgid "Replace file “%s”?" msgstr "Zastąpić plik „%s”?" -#: ../meld/iohelpers.py:96 +#: ../meld/iohelpers.py:102 #, python-format msgid "" "A file with this name already exists in “%s”.\n" @@ -2057,99 +2052,99 @@ msgstr "" "Plik o tej samej nazwie już istnieje w „%s”.\n" "Zastąpienie istniejącego pliku spowoduje utratę jego zawartości." -#: ../meld/meldapp.py:181 +#: ../meld/meldapp.py:169 msgid "wrong number of arguments supplied to --diff" msgstr "błędna liczba parametrów dla opcji --diff" -#: ../meld/meldapp.py:186 +#: ../meld/meldapp.py:174 msgid "Start with an empty window" msgstr "Rozpoczyna z pustym oknem" -#: ../meld/meldapp.py:187 ../meld/meldapp.py:189 +#: ../meld/meldapp.py:175 ../meld/meldapp.py:177 msgid "file" msgstr "plik" -#: ../meld/meldapp.py:187 ../meld/meldapp.py:191 +#: ../meld/meldapp.py:175 ../meld/meldapp.py:179 msgid "folder" msgstr "katalog" -#: ../meld/meldapp.py:188 +#: ../meld/meldapp.py:176 msgid "Start a version control comparison" msgstr "Rozpoczyna porównanie systemu kontroli wersji" -#: ../meld/meldapp.py:190 +#: ../meld/meldapp.py:178 msgid "Start a 2- or 3-way file comparison" msgstr "Rozpoczyna porównanie 2 lub 3 plików" -#: ../meld/meldapp.py:192 +#: ../meld/meldapp.py:180 msgid "Start a 2- or 3-way folder comparison" msgstr "Rozpoczyna porównanie 2 lub 3 katalogów" -#: ../meld/meldapp.py:235 +#: ../meld/meldapp.py:223 #, python-format msgid "Error: %s\n" msgstr "Błąd: %s\n" -#: ../meld/meldapp.py:242 +#: ../meld/meldapp.py:230 msgid "Meld is a file and directory comparison tool." msgstr "Program Meld jest narzędziem do porównywania plików i katalogów." -#: ../meld/meldapp.py:246 +#: ../meld/meldapp.py:234 msgid "Set label to use instead of file name" msgstr "Ustawia etykietę, która ma być użyta zamiast nazwy pliku" -#: ../meld/meldapp.py:249 +#: ../meld/meldapp.py:237 msgid "Open a new tab in an already running instance" msgstr "Otwiera nową kartę w już uruchomionej kopii" -#: ../meld/meldapp.py:252 +#: ../meld/meldapp.py:240 msgid "Automatically compare all differing files on startup" msgstr "" "Automatycznie porównuje wszystkie różniące się pliki podczas uruchamiania" -#: ../meld/meldapp.py:255 +#: ../meld/meldapp.py:243 msgid "Ignored for compatibility" msgstr "Ignorowane — dla zachowania zgodności" -#: ../meld/meldapp.py:259 +#: ../meld/meldapp.py:247 msgid "Set the target file for saving a merge result" msgstr "Ustawia nazwę pliku, w którym zapisany zostanie wynik scalenia" -#: ../meld/meldapp.py:262 +#: ../meld/meldapp.py:250 msgid "Automatically merge files" msgstr "Automatycznie scala pliki" -#: ../meld/meldapp.py:266 +#: ../meld/meldapp.py:254 msgid "Load a saved comparison from a Meld comparison file" msgstr "Wczytuje zapisane porównanie z pliku porównania programu Meld" -#: ../meld/meldapp.py:270 +#: ../meld/meldapp.py:258 msgid "Create a diff tab for the supplied files or folders" msgstr "Tworzy kartę różnicy dla podanych plików lub katalogów" -#: ../meld/meldapp.py:290 +#: ../meld/meldapp.py:278 #, python-format msgid "too many arguments (wanted 0-3, got %d)" msgstr "za dużo parametrów (powinno być 0-3, jest %d)" -#: ../meld/meldapp.py:293 +#: ../meld/meldapp.py:281 msgid "can’t auto-merge less than 3 files" msgstr "nie można automatycznie scalić mniej niż 3 plików" -#: ../meld/meldapp.py:295 +#: ../meld/meldapp.py:283 msgid "can’t auto-merge directories" msgstr "nie można automatycznie scalić katalogów" -#: ../meld/meldapp.py:309 +#: ../meld/meldapp.py:297 msgid "Error reading saved comparison file" msgstr "Błąd podczas odczytywania zapisanego pliku porównania" -#: ../meld/meldapp.py:326 +#: ../meld/meldapp.py:314 #, python-format msgid "invalid path or URI “%s”" msgstr "nieprawidłowa ścieżka lub adres URL „%s”" -#: ../meld/meldapp.py:332 +#: ../meld/meldapp.py:320 msgid "remote folder “{}” not supported" msgstr "zdalny katalog „{}” jest nieobsługiwany" @@ -2158,212 +2153,176 @@ msgstr "zdalny katalog „{}” jest nieobsługiwany" msgid "" msgstr "" -#: ../meld/melddoc.py:68 +#: ../meld/melddoc.py:63 msgid "untitled" msgstr "bez nazwy" -#: ../meld/meldwindow.py:47 +#: ../meld/meldwindow.py:56 msgid "_File" msgstr "_Plik" -#: ../meld/meldwindow.py:48 +#: ../meld/meldwindow.py:57 msgid "_New Comparison…" msgstr "_Nowe porównanie…" -#: ../meld/meldwindow.py:49 +#: ../meld/meldwindow.py:58 msgid "Start a new comparison" msgstr "Rozpoczyna nowe porównanie" -#: ../meld/meldwindow.py:52 +#: ../meld/meldwindow.py:61 msgid "Save the current file" msgstr "Zapisuje bieżący plik" -#: ../meld/meldwindow.py:54 +#: ../meld/meldwindow.py:63 msgid "Save As…" msgstr "Zapisz jako…" -#: ../meld/meldwindow.py:55 +#: ../meld/meldwindow.py:64 msgid "Save the current file with a different name" msgstr "Zapisuje bieżący plik pod inną nazwą" -#: ../meld/meldwindow.py:58 +#: ../meld/meldwindow.py:67 msgid "Close the current file" msgstr "Zamyka bieżący plik" -#: ../meld/meldwindow.py:61 +#: ../meld/meldwindow.py:70 msgid "_Edit" msgstr "_Edycja" -#: ../meld/meldwindow.py:63 +#: ../meld/meldwindow.py:72 msgid "Undo the last action" msgstr "Wycofuje ostatnią czynność" -#: ../meld/meldwindow.py:66 +#: ../meld/meldwindow.py:75 msgid "Redo the last undone action" msgstr "Ponownie wykonuje ostatnio wycofaną czynność" -#: ../meld/meldwindow.py:68 +#: ../meld/meldwindow.py:77 msgid "Cut the selection" msgstr "Wycina zaznaczone" -#: ../meld/meldwindow.py:70 +#: ../meld/meldwindow.py:79 msgid "Copy the selection" msgstr "Kopiuje zaznaczone" -#: ../meld/meldwindow.py:72 +#: ../meld/meldwindow.py:81 msgid "Paste the clipboard" msgstr "Wklej zawartość schowka" -#: ../meld/meldwindow.py:74 +#: ../meld/meldwindow.py:83 msgid "Find…" msgstr "Wyszukiwanie…" -#: ../meld/meldwindow.py:74 +#: ../meld/meldwindow.py:83 msgid "Search for text" msgstr "Znajdź tekst" -#: ../meld/meldwindow.py:76 +#: ../meld/meldwindow.py:85 msgid "Find Ne_xt" msgstr "Znajdź _następny" -#: ../meld/meldwindow.py:77 +#: ../meld/meldwindow.py:86 msgid "Search forwards for the same text" msgstr "Szuka w przód tego samego tekstu" -#: ../meld/meldwindow.py:79 +#: ../meld/meldwindow.py:88 msgid "Find _Previous" msgstr "Znajdź p_oprzedni" -#: ../meld/meldwindow.py:80 +#: ../meld/meldwindow.py:89 msgid "Search backwards for the same text" msgstr "Szuka wstecz tego samego tekstu" -#: ../meld/meldwindow.py:83 +#: ../meld/meldwindow.py:92 msgid "_Replace…" msgstr "Z_amień…" -#: ../meld/meldwindow.py:84 +#: ../meld/meldwindow.py:93 msgid "Find and replace text" msgstr "Wyszukiwanie i zastępowanie testu" -#: ../meld/meldwindow.py:86 +#: ../meld/meldwindow.py:95 msgid "Go to _Line" msgstr "_Przejdź do wiersza" -#: ../meld/meldwindow.py:87 +#: ../meld/meldwindow.py:96 msgid "Go to a specific line" msgstr "Przechodzi do podanego wiersza" -#: ../meld/meldwindow.py:90 +#: ../meld/meldwindow.py:99 msgid "_Changes" msgstr "_Zmiany" -#: ../meld/meldwindow.py:91 +#: ../meld/meldwindow.py:100 msgid "Next Change" msgstr "Następna zmiana" -#: ../meld/meldwindow.py:92 +#: ../meld/meldwindow.py:101 msgid "Go to the next change" msgstr "Przechodzi do następnej zmiany" -#: ../meld/meldwindow.py:94 +#: ../meld/meldwindow.py:103 msgid "Previous Change" msgstr "Poprzednia zmiana" -#: ../meld/meldwindow.py:95 +#: ../meld/meldwindow.py:104 msgid "Go to the previous change" msgstr "Przechodzi do poprzedniej zmiany" -#: ../meld/meldwindow.py:97 +#: ../meld/meldwindow.py:106 msgid "Open Externally" msgstr "Otwórz zewnętrznie" -#: ../meld/meldwindow.py:98 +#: ../meld/meldwindow.py:107 msgid "Open selected file or directory in the default external application" msgstr "Otwiera wybrany plik lub katalog w domyślnym programie" -#: ../meld/meldwindow.py:102 +#: ../meld/meldwindow.py:111 msgid "_View" msgstr "_Widok" -#: ../meld/meldwindow.py:103 +#: ../meld/meldwindow.py:112 msgid "File Status" msgstr "Stan pliku" -#: ../meld/meldwindow.py:104 +#: ../meld/meldwindow.py:113 msgid "Version Status" msgstr "Stan wersji" -#: ../meld/meldwindow.py:107 +#: ../meld/meldwindow.py:116 msgid "Stop the current action" msgstr "Przerywa bieżące działanie" -#: ../meld/meldwindow.py:110 +#: ../meld/meldwindow.py:119 msgid "Refresh the view" msgstr "Odświeża widok" -#: ../meld/meldwindow.py:114 +#: ../meld/meldwindow.py:123 msgid "Fullscreen" msgstr "Pełny ekran" -#: ../meld/meldwindow.py:115 +#: ../meld/meldwindow.py:124 msgid "View the comparison in fullscreen" msgstr "Wyświetla porównanie na pełnym ekranie" -#: ../meld/meldwindow.py:117 -msgid "_Toolbar" -msgstr "Pasek _narzędziowy" - -#: ../meld/meldwindow.py:118 -msgid "Show or hide the toolbar" -msgstr "Wyświetla/ukrywa pasek narzędziowy" - -#: ../meld/meldwindow.py:127 +#: ../meld/meldwindow.py:133 msgid "Open Recent" msgstr "Otwórz ostatnio używane" -#: ../meld/meldwindow.py:128 +#: ../meld/meldwindow.py:134 msgid "Open recent files" msgstr "Otwiera ostatnio używane pliki" -#: ../meld/meldwindow.py:150 -msgid "_Meld" -msgstr "_Meld" - -#: ../meld/meldwindow.py:151 -msgid "Quit the program" -msgstr "Kończy działanie programu" - -#: ../meld/meldwindow.py:153 -msgid "Prefere_nces" -msgstr "Prefere_ncje" - -#: ../meld/meldwindow.py:154 -msgid "Configure the application" -msgstr "Konfiguracja programu" - -#: ../meld/meldwindow.py:156 -msgid "_Contents" -msgstr "_Spis treści" - -#: ../meld/meldwindow.py:157 -msgid "Open the Meld manual" -msgstr "Otwiera podręcznik programu Meld" - -#: ../meld/meldwindow.py:159 -msgid "About this application" -msgstr "Informacje o tym programie" - -#: ../meld/meldwindow.py:602 +#: ../meld/meldwindow.py:567 #, python-format msgid "Need three files to auto-merge, got: %r" msgstr "Automatyczne scalenie wymaga trzech plików, otrzymano: %r" -#: ../meld/meldwindow.py:623 +#: ../meld/meldwindow.py:588 msgid "Cannot compare a mixture of files and directories" msgstr "Jednoczesne porównanie plików i katalogów nie jest możliwe" -#: ../meld/misc.py:135 +#: ../meld/misc.py:155 msgid "" "{}\n" "\n" @@ -2375,42 +2334,38 @@ msgstr "" "Wystąpił krytyczny błąd podczas działania programu:\n" "{}" -#: ../meld/misc.py:254 +#: ../meld/misc.py:237 #, python-format msgid "Couldn’t find colour scheme details for %s-%s; this is a bad install" msgstr "" "Nie można odnaleźć informacji schematu kolorów dla %s-%s; niepoprawna " "instalacja" -#: ../meld/misc.py:325 +#: ../meld/misc.py:311 msgid "[None]" msgstr "[Brak]" -#: ../meld/preferences.py:33 +#: ../meld/preferences.py:42 ../meld/preferences.py:135 msgid "label" msgstr "etykieta" -#: ../meld/preferences.py:33 +#: ../meld/preferences.py:42 ../meld/preferences.py:135 msgid "pattern" msgstr "wzorzec" -#: ../meld/recent.py:105 +#: ../meld/recent.py:106 msgid "Version control:" msgstr "System kontroli wersji:" -#: ../meld/ui/bufferselectors.py:32 +#: ../meld/ui/bufferselectors.py:114 #, python-brace-format msgid "{name} ({charset})" msgstr "{name} ({charset})" -#: ../meld/ui/bufferselectors.py:65 ../meld/ui/bufferselectors.py:73 +#: ../meld/ui/bufferselectors.py:144 ../meld/ui/bufferselectors.py:152 msgid "Plain Text" msgstr "Zwykły tekst" -#: ../meld/ui/notebooklabel.py:63 -msgid "Close tab" -msgstr "Zamknij kartę" - #. Abbreviation for line, column so that it will fit in the status bar #: ../meld/ui/statusbar.py:124 #, python-format @@ -2421,7 +2376,7 @@ msgstr "Wrsz %i, kol %i" msgid "Line you want to move the cursor to" msgstr "Wiersz, do którego przenieść kursor" -#: ../meld/ui/vcdialogs.py:48 +#: ../meld/ui/vcdialogs.py:55 msgid "No files will be committed" msgstr "Żadne pliki nie zostaną zatwierdzone" @@ -2524,92 +2479,92 @@ msgstr "Nieobecny" #. Translators: This error message is shown when a version #. control binary isn't installed. -#: ../meld/vcview.py:248 +#: ../meld/vcview.py:282 #, python-format msgid "%(name)s (%(cmd)s not installed)" msgstr "%(name)s (program %(cmd)s nie jest zainstalowany)" #. Translators: This error message is shown when a version #. controlled repository is invalid. -#: ../meld/vcview.py:252 +#: ../meld/vcview.py:286 #, python-format msgid "%(name)s (Invalid repository)" msgstr "%(name)s (nieprawidłowe repozytorium)" -#: ../meld/vcview.py:273 +#: ../meld/vcview.py:307 msgid "No valid version control system found in this folder" msgstr "" "W tym katalogu nie odnaleziono żadnego prawidłowego systemu kontroli wersji" -#: ../meld/vcview.py:275 +#: ../meld/vcview.py:309 msgid "Only one version control system found in this folder" msgstr "W tym katalogu odnaleziono tylko jeden system kontroli wersji" -#: ../meld/vcview.py:277 +#: ../meld/vcview.py:311 msgid "Choose which version control system to use" msgstr "Proszę wybrać system kontroli wersji do użycia" #. TRANSLATORS: This is the location of the directory being viewed -#: ../meld/vcview.py:331 +#: ../meld/vcview.py:366 #, python-format msgid "%s: %s" msgstr "%s: %s" #. Initial yield so when we add this to our tasks, we don't #. create iterators that may be invalidated. -#: ../meld/vcview.py:338 +#: ../meld/vcview.py:373 msgid "Scanning repository" msgstr "Skanowanie repozytorium" -#: ../meld/vcview.py:367 +#: ../meld/vcview.py:402 #, python-format msgid "Scanning %s" msgstr "Skanowanie %s" -#: ../meld/vcview.py:406 +#: ../meld/vcview.py:441 msgid "(Empty)" msgstr "(Pusty)" -#: ../meld/vcview.py:450 +#: ../meld/vcview.py:487 #, python-format msgid "%s — local" msgstr "%s — lokalne" -#: ../meld/vcview.py:451 +#: ../meld/vcview.py:488 #, python-format msgid "%s — remote" msgstr "%s — zdalne" -#: ../meld/vcview.py:459 +#: ../meld/vcview.py:496 #, python-format msgid "%s (local, merge, remote)" msgstr "%s (lokalne, scalanie, zdalne)" -#: ../meld/vcview.py:464 +#: ../meld/vcview.py:501 #, python-format msgid "%s (remote, merge, local)" msgstr "%s (zdalne, scalanie, lokalne)" -#: ../meld/vcview.py:475 +#: ../meld/vcview.py:512 #, python-format msgid "%s — repository" msgstr "%s — repozytorium" -#: ../meld/vcview.py:481 +#: ../meld/vcview.py:518 #, python-format msgid "%s (working, repository)" msgstr "%s (kopia robocza, repozytorium)" -#: ../meld/vcview.py:485 +#: ../meld/vcview.py:522 #, python-format msgid "%s (repository, working)" msgstr "%s (repozytorium, kopia robocza)" -#: ../meld/vcview.py:674 +#: ../meld/vcview.py:688 msgid "Remove folder and all its files?" msgstr "Usunąć katalog i wszystkie zawarte w nim pliki?" -#: ../meld/vcview.py:676 +#: ../meld/vcview.py:690 msgid "" "This will remove all selected files and folders, and all files within any " "selected folders, from version control." @@ -2617,6 +2572,6 @@ msgstr "" "Spowoduje to usunięcie z systemu kontroli wersji wszystkich zaznaczonych " "plików i katalogów, a także wszystkich plików w zaznaczonych katalogach." -#: ../meld/vcview.py:785 +#: ../meld/vcview.py:804 msgid "Clear" msgstr "Wyczyść" From c095b3be6d515c226495cbc8dc0c89d410102606 Mon Sep 17 00:00:00 2001 From: Marek Cernocky Date: Mon, 7 Jan 2019 10:45:01 +0100 Subject: [PATCH 0772/1316] Updated Czech translation --- po/cs.po | 1944 ++++++++++++++++++++++++++---------------------------- 1 file changed, 944 insertions(+), 1000 deletions(-) diff --git a/po/cs.po b/po/cs.po index 1b5917c5..5399a4a5 100644 --- a/po/cs.po +++ b/po/cs.po @@ -4,14 +4,14 @@ # # Miloslav Trmac , 2003, 2004, 2005. # Petr Kovar , 2008, 2009, 2010, 2011. -# Marek Černocký , 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018. +# Marek Černocký , 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019. # msgid "" msgstr "" "Project-Id-Version: meld\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n" -"POT-Creation-Date: 2018-06-30 21:32+0000\n" -"PO-Revision-Date: 2018-07-08 20:21+0200\n" +"POT-Creation-Date: 2019-01-06 16:54+0000\n" +"PO-Revision-Date: 2019-01-07 10:40+0100\n" "Last-Translator: Marek Černocký \n" "Language-Team: čeština \n" "Language: cs\n" @@ -30,7 +30,7 @@ msgstr "Nelze importovat: " msgid "Meld requires %s or higher." msgstr "Meld vyžaduje %s nebo vyšší." -#: ../bin/meld:239 +#: ../bin/meld:249 #, c-format msgid "" "Couldn’t load Meld-specific CSS (%s)\n" @@ -40,7 +40,8 @@ msgstr "" "%s" #: ../data/org.gnome.meld.desktop.in.h:1 -#: ../data/org.gnome.meld.appdata.xml.in.h:1 ../data/ui/meldapp.ui.h:1 +#: ../data/org.gnome.meld.appdata.xml.in.h:1 +#: ../meld/resources/ui/appwindow.ui.h:1 msgid "Meld" msgstr "Meld" @@ -110,26 +111,10 @@ msgid "Default window fullscreen state" msgstr "Výchozí stav režimu celá obrazovka" #: ../data/org.gnome.meld.gschema.xml.h:5 -msgid "Show toolbar" -msgstr "Zobrazovat nástrojovou lištu" - -#: ../data/org.gnome.meld.gschema.xml.h:6 -msgid "If true, the window toolbar is visible." -msgstr "Když je zapnuto, je nástrojová lišta v okně viditelná." - -#: ../data/org.gnome.meld.gschema.xml.h:7 -msgid "Show statusbar" -msgstr "Zobrazovat stavovou lištu" - -#: ../data/org.gnome.meld.gschema.xml.h:8 -msgid "If true, the window statusbar is visible." -msgstr "Když je zapnuto, je stavová lišta v okně viditelná." - -#: ../data/org.gnome.meld.gschema.xml.h:9 msgid "Additional automatically detected text encodings" msgstr "Doplňková kódování textu pro automatickou detekci" -#: ../data/org.gnome.meld.gschema.xml.h:10 +#: ../data/org.gnome.meld.gschema.xml.h:6 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 " @@ -142,39 +127,39 @@ msgstr "" "V závislosti na národním prostředí mohou být vyzkoušena i některá další " "kódování." -#: ../data/org.gnome.meld.gschema.xml.h:11 +#: ../data/org.gnome.meld.gschema.xml.h:7 msgid "Width of an indentation step" msgstr "Šířka stupně odsazení" -#: ../data/org.gnome.meld.gschema.xml.h:12 +#: ../data/org.gnome.meld.gschema.xml.h:8 msgid "The number of spaces to use for a single indent step" msgstr "Počet mezer použitých pro jeden stupeň odsazení" -#: ../data/org.gnome.meld.gschema.xml.h:13 +#: ../data/org.gnome.meld.gschema.xml.h:9 msgid "Whether to indent using spaces or tabs" msgstr "Zda odsazovat pomocí mezer nebo tabulátorů" -#: ../data/org.gnome.meld.gschema.xml.h:14 +#: ../data/org.gnome.meld.gschema.xml.h:10 msgid "If true, any new indentation will use spaces instead of tabs." msgstr "" "Když je zapnuto, budou se pro nová odsazení používat mezery namísto " "tabulátorů." -#: ../data/org.gnome.meld.gschema.xml.h:15 +#: ../data/org.gnome.meld.gschema.xml.h:11 msgid "Show line numbers" msgstr "Zobrazovat čísla řádků" -#: ../data/org.gnome.meld.gschema.xml.h:16 +#: ../data/org.gnome.meld.gschema.xml.h:12 msgid "If true, line numbers will be shown in the gutter of file comparisons." msgstr "" "Když je zapnuto, budou se po boku porovnávaných souborů zobrazovat čísla " "řádků." -#: ../data/org.gnome.meld.gschema.xml.h:17 +#: ../data/org.gnome.meld.gschema.xml.h:13 msgid "Highlight syntax" msgstr "Zvýrazňovat syntaxe" -#: ../data/org.gnome.meld.gschema.xml.h:18 +#: ../data/org.gnome.meld.gschema.xml.h:14 msgid "" "Whether to highlight syntax in comparisons. Because of Meld’s own color " "highlighting, this is off by default." @@ -182,19 +167,19 @@ msgstr "" "Zda v porovnání zvýrazňovat syntaxe. Vzhledem k tomu, že Meld má vlastní " "barevné zvýrazňování, je ve výchozím stavu vypnuto." -#: ../data/org.gnome.meld.gschema.xml.h:19 +#: ../data/org.gnome.meld.gschema.xml.h:15 msgid "Color scheme to use for syntax highlighting" msgstr "Schéma barev použité ke zvýraznění syntaxe" -#: ../data/org.gnome.meld.gschema.xml.h:20 +#: ../data/org.gnome.meld.gschema.xml.h:16 msgid "Used by GtkSourceView to determine colors for syntax highlighting" msgstr "Používá GtkSourceView k určení barev pro zvýraznění syntaxe" -#: ../data/org.gnome.meld.gschema.xml.h:21 +#: ../data/org.gnome.meld.gschema.xml.h:17 msgid "Displayed whitespace" msgstr "Viditelné bílé znaky" -#: ../data/org.gnome.meld.gschema.xml.h:22 +#: ../data/org.gnome.meld.gschema.xml.h:18 msgid "" "Selector for individual whitespace character types to be shown. Possible " "values are 'space', 'tab', 'newline' and 'nbsp'." @@ -203,11 +188,11 @@ msgstr "" "hodnoty jsou „space“ (mezera), „tab“ (tabulátor), „newline“ (odřádkování) a " "„nbsp“ (nezalomitelná mezera)." -#: ../data/org.gnome.meld.gschema.xml.h:23 +#: ../data/org.gnome.meld.gschema.xml.h:19 msgid "Wrap mode" msgstr "Režim zalamování" -#: ../data/org.gnome.meld.gschema.xml.h:24 +#: ../data/org.gnome.meld.gschema.xml.h:20 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 " @@ -216,32 +201,32 @@ msgstr "" "Řádky v porovnání souborů budou zalamovány podle tohoto nastavení, a to buď " "vůbec („none“), za libovolným znakem („char“) nebo na koncích slov („word“)." -#: ../data/org.gnome.meld.gschema.xml.h:25 +#: ../data/org.gnome.meld.gschema.xml.h:21 msgid "Highlight current line" msgstr "Zvýrazňovat aktuální řádek" -#: ../data/org.gnome.meld.gschema.xml.h:26 +#: ../data/org.gnome.meld.gschema.xml.h:22 msgid "" "If true, the line containing the cursor will be highlighted in file " "comparisons." msgstr "Když je zapnuto, bude řádek s kurzorem v porovnání zvýrazněn." -#: ../data/org.gnome.meld.gschema.xml.h:27 +#: ../data/org.gnome.meld.gschema.xml.h:23 msgid "Use the system default monospace font" msgstr "Používat výchozí systémové písmo s pevnou šířkou" -#: ../data/org.gnome.meld.gschema.xml.h:28 +#: ../data/org.gnome.meld.gschema.xml.h:24 msgid "" "If false, custom-font will be used instead of the system monospace font." msgstr "" "Když je vypnuto, použije se namísto systémového písma s pevnou šířkou " "vlastní písmo." -#: ../data/org.gnome.meld.gschema.xml.h:29 +#: ../data/org.gnome.meld.gschema.xml.h:25 msgid "Custom font" msgstr "Vlastní písmo" -#: ../data/org.gnome.meld.gschema.xml.h:30 +#: ../data/org.gnome.meld.gschema.xml.h:26 msgid "" "The custom font to use, stored as a string and parsed as a Pango font " "description." @@ -249,22 +234,22 @@ msgstr "" "Vlastní písmo, které se má používat; uloženo jako řetězec a zpracováno jako " "popis písma Pango." -#: ../data/org.gnome.meld.gschema.xml.h:31 +#: ../data/org.gnome.meld.gschema.xml.h:27 msgid "Ignore blank lines when comparing files" msgstr "Při porovnávání souborů ignorovat prázdné řádky" -#: ../data/org.gnome.meld.gschema.xml.h:32 +#: ../data/org.gnome.meld.gschema.xml.h:28 msgid "" "If true, blank lines will be trimmed when highlighting changes between files." msgstr "" "Když je zapnuto, budou prázdné řádky ve zvýrazňování změn mezi soubory " "vynechány." -#: ../data/org.gnome.meld.gschema.xml.h:33 +#: ../data/org.gnome.meld.gschema.xml.h:29 msgid "Use the system default editor" msgstr "Používat výchozí editor systému" -#: ../data/org.gnome.meld.gschema.xml.h:34 +#: ../data/org.gnome.meld.gschema.xml.h:30 msgid "" "If false, custom-editor-command will be used instead of the system editor " "when opening files externally." @@ -272,11 +257,11 @@ msgstr "" "Když je zapnuto, použije se při externím otevírání souborů vlastní editor " "namísto systémového editoru." -#: ../data/org.gnome.meld.gschema.xml.h:35 +#: ../data/org.gnome.meld.gschema.xml.h:31 msgid "The custom editor launch command" msgstr "Příkaz pro spuštění vlastního editoru" -#: ../data/org.gnome.meld.gschema.xml.h:36 +#: ../data/org.gnome.meld.gschema.xml.h:32 msgid "" "The command used to launch a custom editor. Some limited templating is " "supported here; at the moment '{file}' and '{line}' are recognised tokens." @@ -285,21 +270,22 @@ msgstr "" "míry šablony – v tuto chvíli jsou rozpoznávány symboly „{file}“ (soubor) a " "„{line}“ (řádek)." -#: ../data/org.gnome.meld.gschema.xml.h:37 +#: ../data/org.gnome.meld.gschema.xml.h:33 msgid "Columns to display" msgstr "Zobrazované sloupce" -#: ../data/org.gnome.meld.gschema.xml.h:38 +#: ../data/org.gnome.meld.gschema.xml.h:34 msgid "" "List of column names in folder comparison and whether they should be " "displayed." msgstr "Seznam názvů sloupců v porovnávání složek a zda by měly být zobrazeny." -#: ../data/org.gnome.meld.gschema.xml.h:39 ../data/ui/preferences.ui.h:25 +#: ../data/org.gnome.meld.gschema.xml.h:35 +#: ../meld/resources/ui/preferences.ui.h:25 msgid "Ignore symbolic links" msgstr "Ignorovat symbolické odkazy" -#: ../data/org.gnome.meld.gschema.xml.h:40 +#: ../data/org.gnome.meld.gschema.xml.h:36 msgid "" "If true, folder comparisons do not follow symbolic links when traversing the " "folder tree." @@ -307,11 +293,11 @@ msgstr "" "Když je zapnuto, nenásledují se při porovnávání složek symbolické odkazy " "během procházení stromu složek." -#: ../data/org.gnome.meld.gschema.xml.h:41 +#: ../data/org.gnome.meld.gschema.xml.h:37 msgid "Use shallow comparison" msgstr "Používat povrchní porovnání" -#: ../data/org.gnome.meld.gschema.xml.h:42 +#: ../data/org.gnome.meld.gschema.xml.h:38 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 " @@ -321,11 +307,11 @@ msgstr "" "a času mtime. Soubory jsou považovány za identické, když mají stejnou " "velikost i čas, v opačném případě za rozdílné." -#: ../data/org.gnome.meld.gschema.xml.h:43 +#: ../data/org.gnome.meld.gschema.xml.h:39 msgid "File timestamp resolution" msgstr "Přesnost časového razítka" -#: ../data/org.gnome.meld.gschema.xml.h:44 +#: ../data/org.gnome.meld.gschema.xml.h:40 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 " @@ -337,11 +323,12 @@ msgstr "" "jejich časy považovány za rozdílné. To je užitečné při porovnávání souborů " "mezi souborovými systémy, které mají různou přesnost časových razítek." -#: ../data/org.gnome.meld.gschema.xml.h:45 ../data/ui/preferences.ui.h:22 +#: ../data/org.gnome.meld.gschema.xml.h:41 +#: ../meld/resources/ui/preferences.ui.h:22 msgid "Apply text filters during folder comparisons" msgstr "Použít textové filtry při porovnávání složek" -#: ../data/org.gnome.meld.gschema.xml.h:46 +#: ../data/org.gnome.meld.gschema.xml.h:42 msgid "" "If true, folder comparisons that compare file contents also apply active " "text filters and the blank line trimming option, and ignore newline " @@ -351,20 +338,20 @@ msgstr "" "použije aktivní textové filtry, volbu ořezávání prázdných řádků a ignorování " "rozdílů v zalomení řádků." -#: ../data/org.gnome.meld.gschema.xml.h:47 +#: ../data/org.gnome.meld.gschema.xml.h:43 msgid "File status filters" msgstr "Filtry stavu souboru" -#: ../data/org.gnome.meld.gschema.xml.h:48 +#: ../data/org.gnome.meld.gschema.xml.h:44 msgid "List of statuses used to filter visible files in folder comparison." msgstr "" "Seznam stavů použitých k filtrování viditelných souborů v porovnávání složek." -#: ../data/org.gnome.meld.gschema.xml.h:49 +#: ../data/org.gnome.meld.gschema.xml.h:45 msgid "Show the version control console output" msgstr "Zobrazovat výstup konzole správy verzí" -#: ../data/org.gnome.meld.gschema.xml.h:50 +#: ../data/org.gnome.meld.gschema.xml.h:46 msgid "" "If true, a console output section will be shown in version control views, " "showing the commands run for version control operations." @@ -372,11 +359,11 @@ msgstr "" "Když je zapnuto, bude v zobrazení správy verzí zobrazen výstup konzole, na " "kterém uvidíte příkazy spouštěné pro jednotlivé operace správy verzí." -#: ../data/org.gnome.meld.gschema.xml.h:51 +#: ../data/org.gnome.meld.gschema.xml.h:47 msgid "Version control pane position" msgstr "Umístění panelu správy verzí" -#: ../data/org.gnome.meld.gschema.xml.h:52 +#: ../data/org.gnome.meld.gschema.xml.h:48 msgid "" "This is the height of the main version control tree when the console pane is " "shown." @@ -384,11 +371,11 @@ msgstr "" "Jde o výšku hlavního stromu správy verzí v případě, že je zobrazen panel " "konzoly." -#: ../data/org.gnome.meld.gschema.xml.h:53 +#: ../data/org.gnome.meld.gschema.xml.h:49 msgid "Present version comparisons as left-local/right-remote" msgstr "Zobrazovat porovnání verzí jako vlevo-místní/vpravo-vzdálené" -#: ../data/org.gnome.meld.gschema.xml.h:54 +#: ../data/org.gnome.meld.gschema.xml.h:50 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, " @@ -398,11 +385,11 @@ msgstr "" "vpravo-vzdálené k určení pořadí, v jakém se mají soubory zobrazovat v " "panelech. V opačném případe je použito schéma vlevo-jejich, vpravo-moje." -#: ../data/org.gnome.meld.gschema.xml.h:55 +#: ../data/org.gnome.meld.gschema.xml.h:51 msgid "Order for files in three-way version control merge comparisons" msgstr "Pořadí pro soubory v trojcestném slučovacím porovnání ve správě verzí" -#: ../data/org.gnome.meld.gschema.xml.h:56 +#: ../data/org.gnome.meld.gschema.xml.h:52 msgid "" "Choices for file order are remote/merged/local and local/merged/remote. This " "preference only affects three-way comparisons launched from the version " @@ -414,11 +401,11 @@ msgstr "" "protože se používá výhradně pro řešení slučování/konfliktů v rámci aplikace " "Meld." -#: ../data/org.gnome.meld.gschema.xml.h:57 +#: ../data/org.gnome.meld.gschema.xml.h:53 msgid "Show margin in commit message editor" msgstr "Zobrazovat okraj v editoru zpráv k zařazení" -#: ../data/org.gnome.meld.gschema.xml.h:58 +#: ../data/org.gnome.meld.gschema.xml.h:54 msgid "" "If true, a guide will be displayed to show what column the margin is at in " "the version control commit message editor." @@ -426,11 +413,11 @@ msgstr "" "Když je zapnuto, bude zobrazeno vodítko, které ukazuje, na kterém sloupci je " "okraj editoru zpráv popisujících zařazení ve správě verzí." -#: ../data/org.gnome.meld.gschema.xml.h:59 +#: ../data/org.gnome.meld.gschema.xml.h:55 msgid "Margin column in commit message editor" msgstr "Sloupec okraje v editoru zpráv k zařazení" -#: ../data/org.gnome.meld.gschema.xml.h:60 +#: ../data/org.gnome.meld.gschema.xml.h:56 msgid "" "The column at which to show the margin in the version control commit message " "editor." @@ -438,11 +425,11 @@ msgstr "" "Sloupec, ve kterém se má zobrazit okraj v editoru zpráv popisujících " "zařazení ve správě verzí." -#: ../data/org.gnome.meld.gschema.xml.h:61 +#: ../data/org.gnome.meld.gschema.xml.h:57 msgid "Automatically hard-wrap commit messages" msgstr "Automaticky natvrdo zalamovat zprávy k zařazení" -#: ../data/org.gnome.meld.gschema.xml.h:62 +#: ../data/org.gnome.meld.gschema.xml.h:58 msgid "" "If true, the version control commit message editor will hard-wrap (i.e., " "insert line breaks) at the commit margin before commit." @@ -451,22 +438,22 @@ msgstr "" "zařazením zprávu natvrdo zalamovat (tj. vkládat zalomení řádku) na " "příslušném sloupci." -#: ../data/org.gnome.meld.gschema.xml.h:63 +#: ../data/org.gnome.meld.gschema.xml.h:59 msgid "Version control status filters" msgstr "Filtry stavu správy verzí" -#: ../data/org.gnome.meld.gschema.xml.h:64 +#: ../data/org.gnome.meld.gschema.xml.h:60 msgid "" "List of statuses used to filter visible files in version control comparison." msgstr "" "Seznam stavů použitých k filtrování viditelných souborů v porovnávání správy " "verzí." -#: ../data/org.gnome.meld.gschema.xml.h:65 +#: ../data/org.gnome.meld.gschema.xml.h:61 msgid "Filename-based filters" msgstr "Filtry názvů souborů" -#: ../data/org.gnome.meld.gschema.xml.h:66 +#: ../data/org.gnome.meld.gschema.xml.h:62 msgid "" "List of predefined filename-based filters that, if active, will remove " "matching files from a folder comparison." @@ -474,11 +461,11 @@ msgstr "" "Seznam předdefinovaných filtrů názvů souborů. Když jsou aktivní, vynechají " "odpovídající soubory z porovnání složek." -#: ../data/org.gnome.meld.gschema.xml.h:67 +#: ../data/org.gnome.meld.gschema.xml.h:63 msgid "Text-based filters" msgstr "Filtry textu" -#: ../data/org.gnome.meld.gschema.xml.h:68 +#: ../data/org.gnome.meld.gschema.xml.h:64 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, " @@ -504,398 +491,623 @@ msgstr "Tmavé schéma Meld" msgid "Dark color scheme for Meld highlighting" msgstr "Tmavé schéma barev ke zvýraznění syntaxe v aplikaci Meld" -#: ../data/ui/application.ui.h:1 -msgid "About Meld" -msgstr "O aplikaci Meld" +#: ../meld/resources/gtk/help-overlay.ui.h:1 +msgctxt "shortcut window" +msgid "General" +msgstr "Obecné" -#: ../data/ui/application.ui.h:2 -msgid "" -"Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2017 Kai Willadsen" -msgstr "" -"Copyright © 2002 – 2009 Stephen Kennedy\n" -"Copyright © 2009 – 2017 Kai Willadsen" +#: ../meld/resources/gtk/help-overlay.ui.h:2 +msgctxt "shortcut window" +msgid "New comparison" +msgstr "Nové porovnání" -#: ../data/ui/application.ui.h:4 -msgid "Website" -msgstr "Webové stránky" +#: ../meld/resources/gtk/help-overlay.ui.h:3 +msgctxt "shortcut window" +msgid "Close a comparison" +msgstr "Zavřít porovnání" -#: ../data/ui/application.ui.h:5 -msgid "translator-credits" -msgstr "" -"Miloslav Trmač \n" -"Petr Kovář \n" -"Marek Černocký " +#: ../meld/resources/gtk/help-overlay.ui.h:4 +msgctxt "shortcut window" +msgid "Quit Meld" +msgstr "Ukončit Meld" -#: ../data/ui/application.ui.h:6 -msgid "_Preferences" -msgstr "_Předvolby" +#: ../meld/resources/gtk/help-overlay.ui.h:5 +msgctxt "shortcut window" +msgid "Stop the current action" +msgstr "Zastavit aktuální činnost" -#: ../data/ui/application.ui.h:7 -msgid "_Help" -msgstr "Nápo_věda" +#: ../meld/resources/gtk/help-overlay.ui.h:6 +msgctxt "shortcut window" +msgid "Refresh comparison" +msgstr "Aktualizovat porovnání" -#: ../data/ui/application.ui.h:8 -msgid "Keyboard Shortcuts" -msgstr "Klávesové zkratky" +#: ../meld/resources/gtk/help-overlay.ui.h:7 +msgctxt "shortcut window" +msgid "Fullscreen" +msgstr "Celá obrazovka" -#: ../data/ui/application.ui.h:9 -msgid "_About" -msgstr "O _aplikaci" +#: ../meld/resources/gtk/help-overlay.ui.h:8 +msgctxt "shortcut window" +msgid "Tabs" +msgstr "Karty" -#: ../data/ui/application.ui.h:10 -msgid "_Quit" -msgstr "U_končit" +#: ../meld/resources/gtk/help-overlay.ui.h:9 +msgctxt "shortcut window" +msgid "Go to previous tab" +msgstr "Přejít na předchozí kartu" -#: ../data/ui/dirdiff.ui.h:1 ../data/ui/vcview.ui.h:1 -msgid "_Compare" -msgstr "_Porovnat" +#: ../meld/resources/gtk/help-overlay.ui.h:10 +msgctxt "shortcut window" +msgid "Go to next tab" +msgstr "Přejít na následující kartu" -#: ../data/ui/dirdiff.ui.h:2 ../data/ui/vcview.ui.h:2 -msgid "Compare selected files" -msgstr "Porovnat vybrané soubory" +#: ../meld/resources/gtk/help-overlay.ui.h:11 +msgctxt "shortcut window" +msgid "Switch to tab" +msgstr "Přepnout na kartu" -#: ../data/ui/dirdiff.ui.h:3 -msgid "Collapse Recursively" -msgstr "Sbalit včetně potomků" +#: ../meld/resources/gtk/help-overlay.ui.h:12 +msgctxt "shortcut window" +msgid "Move tab left" +msgstr "Přesunout kartu doleva" -#: ../data/ui/dirdiff.ui.h:4 -msgid "Collapse selected folder and all subfolders" -msgstr "Sbalit vybranou složku a všechny její podsložky" +#: ../meld/resources/gtk/help-overlay.ui.h:13 +msgctxt "shortcut window" +msgid "Move tab right" +msgstr "Přesunout kartu doprava" -#: ../data/ui/dirdiff.ui.h:5 -msgid "Expand Recursively" -msgstr "Rozbalit včetně potomků" +#: ../meld/resources/gtk/help-overlay.ui.h:14 +msgctxt "shortcut window" +msgid "Changes" +msgstr "Změny" -#: ../data/ui/dirdiff.ui.h:6 -msgid "Expand selected folder and all subfolders" -msgstr "Rozbalit vybranou složku a všechny její podsložky" +#: ../meld/resources/gtk/help-overlay.ui.h:15 +msgctxt "shortcut window" +msgid "Go to previous change" +msgstr "Přejít na předchozí změnu" -#: ../data/ui/dirdiff.ui.h:7 -msgid "Copy to _Left" -msgstr "Kopírovat do_leva" +#: ../meld/resources/gtk/help-overlay.ui.h:16 +msgctxt "shortcut window" +msgid "Go to next change" +msgstr "Přejít na následující změnu" -#: ../data/ui/dirdiff.ui.h:8 -msgid "Copy to left" -msgstr "Kopírovat doleva" +#: ../meld/resources/gtk/help-overlay.ui.h:17 +msgctxt "shortcut window" +msgid "Editing" +msgstr "Úpravy" -#: ../data/ui/dirdiff.ui.h:9 -msgid "Copy to _Right" -msgstr "Kopírovat dop_rava" +#: ../meld/resources/gtk/help-overlay.ui.h:18 +msgctxt "shortcut window" +msgid "Undo" +msgstr "Zpět" -#: ../data/ui/dirdiff.ui.h:10 -msgid "Copy to right" -msgstr "Kopírovat doprava" +#: ../meld/resources/gtk/help-overlay.ui.h:19 +msgctxt "shortcut window" +msgid "Redo" +msgstr "Znovu" -#: ../data/ui/dirdiff.ui.h:11 -msgid "Delete selected" -msgstr "Odstranit vybrané" +#: ../meld/resources/gtk/help-overlay.ui.h:20 +msgctxt "shortcut window" +msgid "Cut" +msgstr "Vyjmout" -#: ../data/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:871 ../meld/filediff.py:1471 -msgid "Hide" -msgstr "Skrýt" +#: ../meld/resources/gtk/help-overlay.ui.h:21 +msgctxt "shortcut window" +msgid "Copy" +msgstr "Kopírovat" -#: ../data/ui/dirdiff.ui.h:13 -msgid "Hide selected" -msgstr "Skrýt vybrané" +#: ../meld/resources/gtk/help-overlay.ui.h:22 +msgctxt "shortcut window" +msgid "Paste" +msgstr "Vložit" -#: ../data/ui/dirdiff.ui.h:14 -msgid "Ignore Filename Case" -msgstr "Ignorovat velikost písmen v názvu souboru" +#: ../meld/resources/gtk/help-overlay.ui.h:23 +msgctxt "shortcut window" +msgid "Find" +msgstr "Hledat" -#: ../data/ui/dirdiff.ui.h:15 -msgid "" -"Consider differently-cased filenames that are otherwise-identical to be the " -"same" -msgstr "" -"Považovat názvy souborů, které se odlišují velikostí písmen, ale jinak jsou " -"stejné, za shodné" +#: ../meld/resources/gtk/help-overlay.ui.h:24 +msgctxt "shortcut window" +msgid "Find Next" +msgstr "Najít následující" -#: ../data/ui/dirdiff.ui.h:16 -msgid "Same" -msgstr "Stejné" +#: ../meld/resources/gtk/help-overlay.ui.h:25 +msgctxt "shortcut window" +msgid "Find Previous" +msgstr "Najít předchozí" -#: ../data/ui/dirdiff.ui.h:17 -msgid "Show identical" -msgstr "Zobrazovat stejné" +#: ../meld/resources/gtk/help-overlay.ui.h:26 +msgctxt "shortcut window" +msgid "Replace" +msgstr "Nahradit" -#: ../data/ui/dirdiff.ui.h:18 -msgid "New" -msgstr "Nové" +#: ../meld/resources/gtk/help-overlay.ui.h:27 +msgctxt "shortcut window" +msgid "File comparison" +msgstr "Porovnávání souborů" -#: ../data/ui/dirdiff.ui.h:19 -msgid "Show new" -msgstr "Zobrazovat nové" +#: ../meld/resources/gtk/help-overlay.ui.h:28 +msgctxt "shortcut window" +msgid "Save current file" +msgstr "Uložit aktuální soubor" -#: ../data/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:76 -msgid "Modified" -msgstr "Změněné" +#: ../meld/resources/gtk/help-overlay.ui.h:29 +msgctxt "shortcut window" +msgid "Save current file to new path" +msgstr "Uložit aktuální soubor do nové cesty" -#: ../data/ui/dirdiff.ui.h:21 -msgid "Show modified" -msgstr "Zobrazovat změněné" +#: ../meld/resources/gtk/help-overlay.ui.h:30 +msgctxt "shortcut window" +msgid "Save all files in comparison" +msgstr "Uložit všechny soubory v porovnání" -#: ../data/ui/dirdiff.ui.h:22 -msgid "Filters" -msgstr "Filtry" +#: ../meld/resources/gtk/help-overlay.ui.h:31 +msgctxt "shortcut window" +msgid "Previous conflict" +msgstr "Předchozí konflikt" -#: ../data/ui/dirdiff.ui.h:23 -msgid "Set active filters" -msgstr "Nastavte aktivní filtry" +#: ../meld/resources/gtk/help-overlay.ui.h:32 +msgctxt "shortcut window" +msgid "Next conflict" +msgstr "Následující konflikt" + +#: ../meld/resources/gtk/help-overlay.ui.h:33 +msgctxt "shortcut window" +msgid "Push change to left" +msgstr "Vnutit aktuální změnu doleva" + +#: ../meld/resources/gtk/help-overlay.ui.h:34 +msgctxt "shortcut window" +msgid "Push change to right" +msgstr "Vnutit aktuální změnu doprava" + +#: ../meld/resources/gtk/help-overlay.ui.h:35 +msgctxt "shortcut window" +msgid "Pull change from left" +msgstr "Vytáhnout změnu zleva" + +#: ../meld/resources/gtk/help-overlay.ui.h:36 +msgctxt "shortcut window" +msgid "Pull change from right" +msgstr "Vytáhnout změnu zprava" + +#: ../meld/resources/gtk/help-overlay.ui.h:37 +msgctxt "shortcut window" +msgid "Copy change above left" +msgstr "Kopírovat změnu nad levým blokem" + +#: ../meld/resources/gtk/help-overlay.ui.h:38 +msgctxt "shortcut window" +msgid "Copy change below left" +msgstr "Kopírovat změnu pod levým blokem" + +#: ../meld/resources/gtk/help-overlay.ui.h:39 +msgctxt "shortcut window" +msgid "Copy change above right" +msgstr "Kopírovat změnu nad pravým blokem" + +#: ../meld/resources/gtk/help-overlay.ui.h:40 +msgctxt "shortcut window" +msgid "Copy change below right" +msgstr "Kopírovat změnu pod pravým blokem" + +#: ../meld/resources/gtk/help-overlay.ui.h:41 +msgctxt "shortcut window" +msgid "Delete change" +msgstr "Smazat změnu" + +#: ../meld/resources/gtk/help-overlay.ui.h:42 +msgctxt "shortcut window" +msgid "Previous comparison pane" +msgstr "Předchozí panel s porovnáním" + +#: ../meld/resources/gtk/help-overlay.ui.h:43 +msgctxt "shortcut window" +msgid "Next comparison pane" +msgstr "Následující panel s porovnáním" + +#: ../meld/resources/gtk/help-overlay.ui.h:44 +msgctxt "shortcut window" +msgid "Folder comparison" +msgstr "Porovnávání složek" + +#: ../meld/resources/gtk/help-overlay.ui.h:45 +msgctxt "shortcut window" +msgid "Copy to left" +msgstr "Kopírovat doleva" + +#: ../meld/resources/gtk/help-overlay.ui.h:46 +msgctxt "shortcut window" +msgid "Copy to right" +msgstr "Kopírovat doprava" + +#: ../meld/resources/gtk/help-overlay.ui.h:47 +msgctxt "shortcut window" +msgid "Version control comparison" +msgstr "Porovnávání správy verzí" + +#: ../meld/resources/gtk/help-overlay.ui.h:48 +msgctxt "shortcut window" +msgid "Commit to version control" +msgstr "Zařadit změny do správy verzí" + +#: ../meld/resources/gtk/help-overlay.ui.h:49 +msgctxt "shortcut window" +msgid "Show/hide console output" +msgstr "Zobrazit/skrýt výstup konzoly" + +#: ../meld/resources/gtk/menus.ui.h:1 +msgid "_Preferences" +msgstr "_Předvolby" + +#: ../meld/resources/gtk/menus.ui.h:2 +msgid "_Help" +msgstr "Nápo_věda" + +#: ../meld/resources/gtk/menus.ui.h:3 +msgid "Keyboard Shortcuts" +msgstr "Klávesové zkratky" + +#: ../meld/resources/gtk/menus.ui.h:4 +msgid "_About" +msgstr "O _aplikaci" + +#: ../meld/resources/gtk/menus.ui.h:5 +msgid "_Quit" +msgstr "U_končit" + +#: ../meld/resources/ui/about-dialog.ui.h:1 +msgid "About Meld" +msgstr "O aplikaci Meld" + +#: ../meld/resources/ui/about-dialog.ui.h:2 +msgid "" +"Copyright © 2002-2009 Stephen Kennedy\n" +"Copyright © 2009-2017 Kai Willadsen" +msgstr "" +"Copyright © 2002 – 2009 Stephen Kennedy\n" +"Copyright © 2009 – 2017 Kai Willadsen" + +#: ../meld/resources/ui/about-dialog.ui.h:4 +msgid "Website" +msgstr "Webové stránky" -#: ../data/ui/EditableList.ui.h:1 -msgid "Editable List" -msgstr "Upravitelný seznam" +#: ../meld/resources/ui/about-dialog.ui.h:5 +msgid "translator-credits" +msgstr "" +"Miloslav Trmač \n" +"Petr Kovář \n" +"Marek Černocký " -#: ../data/ui/EditableList.ui.h:2 +#: ../meld/resources/ui/column-list.ui.h:1 +#: ../meld/resources/ui/filter-list.ui.h:1 msgid "Active" msgstr "Aktivní" -#: ../data/ui/EditableList.ui.h:3 +#: ../meld/resources/ui/column-list.ui.h:2 msgid "Column Name" msgstr "Název sloupce" -#: ../data/ui/EditableList.ui.h:4 ../data/ui/vcview.ui.h:9 -msgid "_Add" -msgstr "_Přidat" - -#: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11 -#: ../meld/vcview.py:680 +#: ../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 msgid "_Remove" msgstr "_Odstranit" -#: ../data/ui/EditableList.ui.h:6 +#: ../meld/resources/ui/column-list.ui.h:4 +#: ../meld/resources/ui/filter-list.ui.h:8 msgid "Move item up" msgstr "Přesunout položku nahoru" -#: ../data/ui/EditableList.ui.h:7 +#: ../meld/resources/ui/column-list.ui.h:5 +#: ../meld/resources/ui/filter-list.ui.h:9 msgid "Move _Up" msgstr "Přes_unout nahoru" -#: ../data/ui/EditableList.ui.h:8 +#: ../meld/resources/ui/column-list.ui.h:6 +#: ../meld/resources/ui/filter-list.ui.h:10 msgid "Move item down" msgstr "Přesunout položku dolů" -#: ../data/ui/EditableList.ui.h:9 +#: ../meld/resources/ui/column-list.ui.h:7 +#: ../meld/resources/ui/filter-list.ui.h:11 msgid "Move _Down" msgstr "Přesunout _dolů" -#. Create icon and filename CellRenderer -#: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35 -#: ../meld/dirdiff.py:371 -msgid "Name" -msgstr "Název" +#: ../meld/resources/ui/commit-dialog.ui.h:1 +msgid "Commit" +msgstr "Commit" -#: ../data/ui/EditableList.ui.h:11 -msgid "Pattern" -msgstr "Vzorek" +#: ../meld/resources/ui/commit-dialog.ui.h:2 +msgid "Commit Files" +msgstr "Commit souborů" -#: ../data/ui/EditableList.ui.h:12 -msgid "Add new filter" -msgstr "Přidat nový filtr" +#: ../meld/resources/ui/commit-dialog.ui.h:3 +msgid "Log Message" +msgstr "Zpráva záznamu" -#: ../data/ui/EditableList.ui.h:13 -msgid "Remove selected filter" -msgstr "Odstranit vybraný filtr" +#: ../meld/resources/ui/commit-dialog.ui.h:4 +msgid "Previous logs:" +msgstr "Předchozí záznamy:" + +#: ../meld/resources/ui/commit-dialog.ui.h:5 +msgid "Co_mmit" +msgstr "Co_mmit" + +#: ../meld/resources/ui/dirdiff.ui.h:1 ../meld/resources/ui/vcview.ui.h:1 +msgid "_Compare" +msgstr "_Porovnat" + +#: ../meld/resources/ui/dirdiff.ui.h:2 ../meld/resources/ui/vcview.ui.h:2 +msgid "Compare selected files" +msgstr "Porovnat vybrané soubory" + +#: ../meld/resources/ui/dirdiff.ui.h:3 +msgid "Collapse Recursively" +msgstr "Sbalit včetně potomků" + +#: ../meld/resources/ui/dirdiff.ui.h:4 +msgid "Collapse selected folder and all subfolders" +msgstr "Sbalit vybranou složku a všechny její podsložky" + +#: ../meld/resources/ui/dirdiff.ui.h:5 +msgid "Expand Recursively" +msgstr "Rozbalit včetně potomků" + +#: ../meld/resources/ui/dirdiff.ui.h:6 +msgid "Expand selected folder and all subfolders" +msgstr "Rozbalit vybranou složku a všechny její podsložky" + +#: ../meld/resources/ui/dirdiff.ui.h:7 +msgid "Copy to _Left" +msgstr "Kopírovat do_leva" + +#: ../meld/resources/ui/dirdiff.ui.h:8 +msgid "Copy to left" +msgstr "Kopírovat doleva" + +#: ../meld/resources/ui/dirdiff.ui.h:9 +msgid "Copy to _Right" +msgstr "Kopírovat dop_rava" + +#: ../meld/resources/ui/dirdiff.ui.h:10 +msgid "Copy to right" +msgstr "Kopírovat doprava" + +#: ../meld/resources/ui/dirdiff.ui.h:11 +msgid "Delete selected" +msgstr "Odstranit vybrané" + +#: ../meld/resources/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:958 +#: ../meld/filediff.py:1586 +msgid "Hide" +msgstr "Skrýt" + +#: ../meld/resources/ui/dirdiff.ui.h:13 +msgid "Hide selected" +msgstr "Skrýt vybrané" + +#: ../meld/resources/ui/dirdiff.ui.h:14 +msgid "Ignore Filename Case" +msgstr "Ignorovat velikost písmen v názvu souboru" + +#: ../meld/resources/ui/dirdiff.ui.h:15 +msgid "" +"Consider differently-cased filenames that are otherwise-identical to be the " +"same" +msgstr "" +"Považovat názvy souborů, které se odlišují velikostí písmen, ale jinak jsou " +"stejné, za shodné" + +#: ../meld/resources/ui/dirdiff.ui.h:16 +msgid "Same" +msgstr "Stejné" + +#: ../meld/resources/ui/dirdiff.ui.h:17 +msgid "Show identical" +msgstr "Zobrazovat stejné" + +#: ../meld/resources/ui/dirdiff.ui.h:18 +msgid "New" +msgstr "Nové" + +#: ../meld/resources/ui/dirdiff.ui.h:19 +msgid "Show new" +msgstr "Zobrazovat nové" + +#: ../meld/resources/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:76 +msgid "Modified" +msgstr "Změněné" + +#: ../meld/resources/ui/dirdiff.ui.h:21 +msgid "Show modified" +msgstr "Zobrazovat změněné" + +#: ../meld/resources/ui/dirdiff.ui.h:22 +msgid "Filters" +msgstr "Filtry" -#: ../data/ui/encoding-selector.ui.h:1 +#: ../meld/resources/ui/dirdiff.ui.h:23 +msgid "Set active filters" +msgstr "Nastavte aktivní filtry" + +#: ../meld/resources/ui/encoding-selector.ui.h:1 msgid "Search text encoding…" msgstr "hledat kódování textu…" -#: ../data/ui/filediff.ui.h:1 +#: ../meld/resources/ui/filediff.ui.h:1 msgid "Format as Patch…" msgstr "Formátovat jako záplatu…" -#: ../data/ui/filediff.ui.h:2 +#: ../meld/resources/ui/filediff.ui.h:2 msgid "Create a patch using differences between files" msgstr "Vytvořit záplatu použitím rozdílů mezi soubory" -#: ../data/ui/filediff.ui.h:3 +#: ../meld/resources/ui/filediff.ui.h:3 msgid "Save A_ll" msgstr "Uložit _vše" -#: ../data/ui/filediff.ui.h:4 +#: ../meld/resources/ui/filediff.ui.h:4 msgid "Save all files in the current comparison" msgstr "Uložit všechny soubory v aktuálním porovnávání" -#: ../data/ui/filediff.ui.h:5 +#: ../meld/resources/ui/filediff.ui.h:5 msgid "Revert files to their saved versions" msgstr "Vrátit soubory k jejich uloženým verzím" -#: ../data/ui/filediff.ui.h:6 +#: ../meld/resources/ui/filediff.ui.h:6 msgid "Add Synchronization Point" msgstr "Přidat synchronizační bod" -#: ../data/ui/filediff.ui.h:7 +#: ../meld/resources/ui/filediff.ui.h:7 msgid "Add a synchronization point for changes between files" msgstr "Přidat bod pro synchronizaci změn mezi soubory" -#: ../data/ui/filediff.ui.h:8 +#: ../meld/resources/ui/filediff.ui.h:8 msgid "Clear Synchronization Points" msgstr "Vymazat synchronizační body" -#: ../data/ui/filediff.ui.h:9 +#: ../meld/resources/ui/filediff.ui.h:9 msgid "Clear sychronization points for changes between files" msgstr "Smazat bod pro synchronizaci změn mezi soubory" -#: ../data/ui/filediff.ui.h:10 +#: ../meld/resources/ui/filediff.ui.h:10 msgid "Previous Conflict" msgstr "Předchozí konflikt" -#: ../data/ui/filediff.ui.h:11 +#: ../meld/resources/ui/filediff.ui.h:11 msgid "Go to the previous conflict" msgstr "Přejít na předchozí konflikt" -#: ../data/ui/filediff.ui.h:12 +#: ../meld/resources/ui/filediff.ui.h:12 msgid "Next Conflict" msgstr "Následující konflikt" -#: ../data/ui/filediff.ui.h:13 +#: ../meld/resources/ui/filediff.ui.h:13 msgid "Go to the next conflict" msgstr "Přejít na následující konflikt" -#: ../data/ui/filediff.ui.h:14 +#: ../meld/resources/ui/filediff.ui.h:14 msgid "Push to Left" msgstr "Vnutit doleva" -#: ../data/ui/filediff.ui.h:15 +#: ../meld/resources/ui/filediff.ui.h:15 msgid "Push current change to the left" msgstr "Vnutit aktuální změnu doleva" -#: ../data/ui/filediff.ui.h:16 +#: ../meld/resources/ui/filediff.ui.h:16 msgid "Push to Right" msgstr "Vnutit doprava" -#: ../data/ui/filediff.ui.h:17 +#: ../meld/resources/ui/filediff.ui.h:17 msgid "Push current change to the right" msgstr "Vnutit aktuální změnu doprava" -#: ../data/ui/filediff.ui.h:18 +#: ../meld/resources/ui/filediff.ui.h:18 msgid "Pull from Left" msgstr "Vytáhnout zleva" -#: ../data/ui/filediff.ui.h:19 +#: ../meld/resources/ui/filediff.ui.h:19 msgid "Pull change from the left" msgstr "Vytáhnout změnu zleva" -#: ../data/ui/filediff.ui.h:20 +#: ../meld/resources/ui/filediff.ui.h:20 msgid "Pull from Right" msgstr "Vytáhnout zprava" -#: ../data/ui/filediff.ui.h:21 +#: ../meld/resources/ui/filediff.ui.h:21 msgid "Pull change from the right" msgstr "Vytáhnout změnu zprava" -#: ../data/ui/filediff.ui.h:22 +#: ../meld/resources/ui/filediff.ui.h:22 msgid "Copy Above Left" msgstr "Kopírovat z levé vrchní části" -#: ../data/ui/filediff.ui.h:23 +#: ../meld/resources/ui/filediff.ui.h:23 msgid "Copy change above the left chunk" msgstr "Kopírovat změnu nad levým blokem" -#: ../data/ui/filediff.ui.h:24 +#: ../meld/resources/ui/filediff.ui.h:24 msgid "Copy Below Left" msgstr "Kopírovat z levé spodní části" -#: ../data/ui/filediff.ui.h:25 +#: ../meld/resources/ui/filediff.ui.h:25 msgid "Copy change below the left chunk" msgstr "Kopírovat změnu pod levým blokem" -#: ../data/ui/filediff.ui.h:26 +#: ../meld/resources/ui/filediff.ui.h:26 msgid "Copy Above Right" msgstr "Kopírovat z pravé vrchní části" -#: ../data/ui/filediff.ui.h:27 +#: ../meld/resources/ui/filediff.ui.h:27 msgid "Copy change above the right chunk" msgstr "Kopírovat změnu nad pravým blokem" -#: ../data/ui/filediff.ui.h:28 +#: ../meld/resources/ui/filediff.ui.h:28 msgid "Copy Below Right" msgstr "Kopírovat z pravé spodní části" -#: ../data/ui/filediff.ui.h:29 +#: ../meld/resources/ui/filediff.ui.h:29 msgid "Copy change below the right chunk" msgstr "Kopírovat změnu pod pravým blokem" -#: ../data/ui/filediff.ui.h:30 +#: ../meld/resources/ui/filediff.ui.h:30 msgid "Delete" msgstr "Smazat" -#: ../data/ui/filediff.ui.h:31 +#: ../meld/resources/ui/filediff.ui.h:31 msgid "Delete change" msgstr "Smazat změnu" -#: ../data/ui/filediff.ui.h:32 +#: ../meld/resources/ui/filediff.ui.h:32 msgid "Merge All from Left" msgstr "Sloučit vše zleva" -#: ../data/ui/filediff.ui.h:33 +#: ../meld/resources/ui/filediff.ui.h:33 msgid "Merge all non-conflicting changes from the left" msgstr "Sloučit veškeré změny bez konfliktů zleva" -#: ../data/ui/filediff.ui.h:34 +#: ../meld/resources/ui/filediff.ui.h:34 msgid "Merge All from Right" msgstr "Sloučit vše zprava" -#: ../data/ui/filediff.ui.h:35 +#: ../meld/resources/ui/filediff.ui.h:35 msgid "Merge all non-conflicting changes from the right" msgstr "Sloučit veškeré změny bez konfliktů zprava" -#: ../data/ui/filediff.ui.h:36 +#: ../meld/resources/ui/filediff.ui.h:36 msgid "Merge All" msgstr "Sloučit vše" -#: ../data/ui/filediff.ui.h:37 +#: ../meld/resources/ui/filediff.ui.h:37 msgid "Merge all non-conflicting changes from left and right panes" msgstr "Sloučit veškeré změny bez konfliktů z levého a pravého panelu" -#: ../data/ui/filediff.ui.h:38 +#: ../meld/resources/ui/filediff.ui.h:38 msgid "Previous Pane" msgstr "Předchozí panel" -#: ../data/ui/filediff.ui.h:39 +#: ../meld/resources/ui/filediff.ui.h:39 msgid "Move keyboard focus to the previous document in this comparison" msgstr "Přepnout zaměření klávesnice na předchozí dokument v tomto porovnání" -#: ../data/ui/filediff.ui.h:40 +#: ../meld/resources/ui/filediff.ui.h:40 msgid "Next Pane" msgstr "Následující panel" -#: ../data/ui/filediff.ui.h:41 +#: ../meld/resources/ui/filediff.ui.h:41 msgid "Move keyboard focus to the next document in this comparison" msgstr "Přepnout zaměření klávesnice na následující dokument v tomto porovnání" -#: ../data/ui/filediff.ui.h:42 +#: ../meld/resources/ui/filediff.ui.h:42 msgid "Lock Scrolling" msgstr "Uzamknout posouvání" -#: ../data/ui/filediff.ui.h:43 +#: ../meld/resources/ui/filediff.ui.h:43 msgid "Lock scrolling of all panes" msgstr "Uzamknout posouvání všech panelů" -#: ../data/ui/filediff.ui.h:44 -msgid "Save changes to documents before closing?" -msgstr "Uložit změny, než dokument zavřete?" - -#: ../data/ui/filediff.ui.h:45 -msgid "If you don’t save, changes will be permanently lost." -msgstr "Pokud se změny neuloží, budou trvale ztraceny." - -#: ../data/ui/filediff.ui.h:46 -msgid "Close _without Saving" -msgstr "Zavřít _bez uložení" - -#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:952 ../meld/filediff.py:1580 -#: ../meld/iohelpers.py:50 ../meld/iohelpers.py:100 -msgid "_Cancel" -msgstr "_Zrušit" - -#: ../data/ui/filediff.ui.h:48 -msgid "_Save" -msgstr "_Uložit" - -#: ../data/ui/filediff.ui.h:49 +#: ../meld/resources/ui/filediff.ui.h:44 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." @@ -904,763 +1116,546 @@ msgstr "" "odemknout a změny v něm provést, ale tyto změny budou muset být uloženy v " "novém souboru." -#: ../data/ui/filediff.ui.h:50 +#: ../meld/resources/ui/filediff.ui.h:45 msgid "File 3" msgstr "Soubor 3" -#: ../data/ui/filediff.ui.h:51 +#: ../meld/resources/ui/filediff.ui.h:46 msgid "File 2" msgstr "Soubor 2" -#: ../data/ui/filediff.ui.h:52 +#: ../meld/resources/ui/filediff.ui.h:47 msgid "File 1" msgstr "Soubor 1" -#: ../data/ui/filediff.ui.h:53 -msgid "Discard unsaved changes to documents?" -msgstr "Zahodit neuložené změny v dokumentu?" +#. Create icon and filename CellRenderer +#: ../meld/resources/ui/filter-list.ui.h:2 ../meld/resources/ui/vcview.ui.h:30 +#: ../meld/dirdiff.py:454 +msgid "Name" +msgstr "Název" -#: ../data/ui/filediff.ui.h:54 -msgid "Changes made to the following documents will be permanently lost:" -msgstr "Změny provedené v následujících dokumentech budou trvale ztraceny:" +#: ../meld/resources/ui/filter-list.ui.h:3 +msgid "Pattern" +msgstr "Vzorek" -#: ../data/ui/filediff.ui.h:55 -msgid "_Discard" -msgstr "Zaho_dit" +#: ../meld/resources/ui/filter-list.ui.h:4 +msgid "Add new filter" +msgstr "Přidat nový filtr" + +#: ../meld/resources/ui/filter-list.ui.h:5 ../meld/resources/ui/vcview.ui.h:9 +msgid "_Add" +msgstr "_Přidat" + +#: ../meld/resources/ui/filter-list.ui.h:6 +msgid "Remove selected filter" +msgstr "Odstranit vybraný filtr" -#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:953 ../meld/iohelpers.py:101 +#: ../meld/resources/ui/findbar.ui.h:1 ../meld/dirdiff.py:1040 +#: ../meld/iohelpers.py:107 msgid "_Replace" msgstr "Nahradi_t" -#: ../data/ui/findbar.ui.h:2 +#: ../meld/resources/ui/findbar.ui.h:2 msgid "Replace _All" msgstr "Nahradit _vše" -#: ../data/ui/findbar.ui.h:3 +#: ../meld/resources/ui/findbar.ui.h:3 msgid "_Previous" msgstr "_Předchozí" -#: ../data/ui/findbar.ui.h:4 +#: ../meld/resources/ui/findbar.ui.h:4 msgid "_Next" msgstr "_Následující" -#: ../data/ui/findbar.ui.h:5 +#: ../meld/resources/ui/findbar.ui.h:5 msgid "Find:" msgstr "Najít:" -#: ../data/ui/findbar.ui.h:6 +#: ../meld/resources/ui/findbar.ui.h:6 msgid "Replace _with:" msgstr "Nahra_dit za:" -#: ../data/ui/findbar.ui.h:7 +#: ../meld/resources/ui/findbar.ui.h:7 msgid "_Match case" msgstr "_Rozlišovat velikost písmen" -#: ../data/ui/findbar.ui.h:8 +#: ../meld/resources/ui/findbar.ui.h:8 msgid "Who_le word" msgstr "Ce_lé slovo" -#: ../data/ui/findbar.ui.h:9 +#: ../meld/resources/ui/findbar.ui.h:9 msgid "Regular e_xpression" msgstr "Re_gulární výraz" -#: ../data/ui/findbar.ui.h:10 +#: ../meld/resources/ui/findbar.ui.h:10 msgid "Wrapped" msgstr "Prošlo přes okraj" -#: ../data/ui/language-selector.ui.h:1 +#: ../meld/resources/ui/language-selector.ui.h:1 msgid "Search highlight mode…" msgstr "hledat režim zvýrazňování…" -#: ../data/ui/patch-dialog.ui.h:1 +#: ../meld/resources/ui/new-diff-tab.ui.h:1 ../meld/meldwindow.py:532 +#: ../meld/newdifftab.py:53 +msgid "New comparison" +msgstr "Nové porovnání" + +#: ../meld/resources/ui/new-diff-tab.ui.h:2 +msgid "File comparison" +msgstr "Porovnávání souborů" + +#: ../meld/resources/ui/new-diff-tab.ui.h:3 +msgid "Directory comparison" +msgstr "Porovnávání složek" + +#: ../meld/resources/ui/new-diff-tab.ui.h:4 +msgid "Version control view" +msgstr "Zobrazení správy verzí" + +#: ../meld/resources/ui/new-diff-tab.ui.h:5 +msgid "_3-way comparison" +msgstr "_Trojcestné porovnání" + +#: ../meld/resources/ui/new-diff-tab.ui.h:6 +msgid "Select Third File" +msgstr "Výběr třetího souboru" + +#: ../meld/resources/ui/new-diff-tab.ui.h:7 +msgid "Select Second File" +msgstr "Výběr druhého souboru" + +#: ../meld/resources/ui/new-diff-tab.ui.h:8 +msgid "Select First File" +msgstr "Výběr prvního souboru" + +#: ../meld/resources/ui/new-diff-tab.ui.h:9 +msgid "Select First Folder" +msgstr "Výběr první složky" + +#: ../meld/resources/ui/new-diff-tab.ui.h:10 +msgid "Select Second Folder" +msgstr "Výběr druhé složky" + +#: ../meld/resources/ui/new-diff-tab.ui.h:11 +msgid "Select Third Folder" +msgstr "Výběr třetí složky" + +#: ../meld/resources/ui/new-diff-tab.ui.h:12 +msgid "Select A Version-Controlled Folder" +msgstr "Výběr složky se správou verzí" + +#: ../meld/resources/ui/new-diff-tab.ui.h:13 +msgid "_Blank comparison" +msgstr "_Prázdné porovnávání" + +#: ../meld/resources/ui/new-diff-tab.ui.h:14 +msgid "C_ompare" +msgstr "P_orovnat" + +#: ../meld/resources/ui/notebook-label.ui.h:1 +msgid "Close Tab" +msgstr "Zavřít kartu" + +#: ../meld/resources/ui/patch-dialog.ui.h:1 msgid "Format as Patch" msgstr "Formátovat jako záplatu" -#: ../data/ui/patch-dialog.ui.h:2 +#: ../meld/resources/ui/patch-dialog.ui.h:2 msgid "Copy to Clipboard" msgstr "Kopírovat do schránky" -#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:152 +#: ../meld/resources/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:163 msgid "Save Patch" msgstr "Uložení záplaty" -#: ../data/ui/patch-dialog.ui.h:4 +#: ../meld/resources/ui/patch-dialog.ui.h:4 msgid "Use differences between:" msgstr "Použít rozdíly mezi:" -#: ../data/ui/patch-dialog.ui.h:5 +#: ../meld/resources/ui/patch-dialog.ui.h:5 msgid "Left and middle panes" msgstr "Levý a prostřední panel" -#: ../data/ui/patch-dialog.ui.h:6 +#: ../meld/resources/ui/patch-dialog.ui.h:6 msgid "Middle and right panes" msgstr "Prostřední a pravý panel" -#: ../data/ui/patch-dialog.ui.h:7 +#: ../meld/resources/ui/patch-dialog.ui.h:7 msgid "_Reverse patch direction" msgstr "_Obrátit směr záplaty" -#: ../data/ui/preferences.ui.h:1 -msgid "Meld Preferences" -msgstr "Předvolby aplikace Meld" +#: ../meld/resources/ui/preferences.ui.h:1 +msgid "Preferences" +msgstr "Předvolby" -#: ../data/ui/preferences.ui.h:2 +#: ../meld/resources/ui/preferences.ui.h:2 msgid "Font" msgstr "Písmo" -#: ../data/ui/preferences.ui.h:3 +#: ../meld/resources/ui/preferences.ui.h:3 msgid "_Use the system fixed width font" msgstr "Po_užívat systémové písmo s pevnou šířkou" -#: ../data/ui/preferences.ui.h:4 +#: ../meld/resources/ui/preferences.ui.h:4 msgid "_Editor font:" msgstr "Písmo _editoru:" -#: ../data/ui/preferences.ui.h:5 +#: ../meld/resources/ui/preferences.ui.h:5 msgid "Display" msgstr "Zobrazení" -#: ../data/ui/preferences.ui.h:6 +#: ../meld/resources/ui/preferences.ui.h:6 msgid "_Tab width:" msgstr "Šířka _tabulátoru:" -#: ../data/ui/preferences.ui.h:7 +#: ../meld/resources/ui/preferences.ui.h:7 msgid "_Insert spaces instead of tabs" msgstr "V_kládat mezery namísto tabulátorů" -#: ../data/ui/preferences.ui.h:8 +#: ../meld/resources/ui/preferences.ui.h:8 msgid "Enable text _wrapping" msgstr "Povolit zalamování _textu" -#: ../data/ui/preferences.ui.h:9 +#: ../meld/resources/ui/preferences.ui.h:9 msgid "Do not _split words over two lines" msgstr "Nerozdělovat _slova na dva řádky" -#: ../data/ui/preferences.ui.h:10 +#: ../meld/resources/ui/preferences.ui.h:10 msgid "Highlight _current line" msgstr "Zvýrazňovat _aktuální řádek" -#: ../data/ui/preferences.ui.h:11 +#: ../meld/resources/ui/preferences.ui.h:11 msgid "Show _line numbers" msgstr "Zobrazovat čís_la řádků" -#: ../data/ui/preferences.ui.h:12 +#: ../meld/resources/ui/preferences.ui.h:12 msgid "Show w_hitespace" msgstr "Zobrazovat _mezery" -#: ../data/ui/preferences.ui.h:13 +#: ../meld/resources/ui/preferences.ui.h:13 msgid "Use s_yntax highlighting" msgstr "Používat zvýrazňování s_yntaxe" -#: ../data/ui/preferences.ui.h:14 +#: ../meld/resources/ui/preferences.ui.h:14 msgid "Syntax highlighting color scheme:" msgstr "Schéma barev pro zvýraznění syntaxe:" -#: ../data/ui/preferences.ui.h:15 +#: ../meld/resources/ui/preferences.ui.h:15 msgid "External Editor" msgstr "Externí editor" -#: ../data/ui/preferences.ui.h:16 +#: ../meld/resources/ui/preferences.ui.h:16 msgid "Use _default system editor" msgstr "Používat výchozí e_ditor systému" -#: ../data/ui/preferences.ui.h:17 +#: ../meld/resources/ui/preferences.ui.h:17 msgid "Edito_r command:" msgstr "Příkaz edito_ru:" -#: ../data/ui/preferences.ui.h:18 +#: ../meld/resources/ui/preferences.ui.h:18 msgid "Editor" msgstr "Editor" -#: ../data/ui/preferences.ui.h:19 +#: ../meld/resources/ui/preferences.ui.h:19 msgid "Shallow Comparison" msgstr "Povrchní porovnání" -#: ../data/ui/preferences.ui.h:20 +#: ../meld/resources/ui/preferences.ui.h:20 msgid "C_ompare files based only on size and timestamp" msgstr "P_orovnávat soubory jen na základě velikosti a časového razítka" -#: ../data/ui/preferences.ui.h:21 +#: ../meld/resources/ui/preferences.ui.h:21 msgid "_Timestamp resolution:" msgstr "Přesnos_t časového razítka:" -#: ../data/ui/preferences.ui.h:23 +#: ../meld/resources/ui/preferences.ui.h:23 msgid "Note: enabling text filters may make comparing large files much slower" msgstr "" "Poznámka: zapnutí textových filtrů může výrazně zpomalit porovnávání velkých " "souborů" -#: ../data/ui/preferences.ui.h:24 +#: ../meld/resources/ui/preferences.ui.h:24 msgid "Symbolic Links" msgstr "Symbolické odkazy" -#: ../data/ui/preferences.ui.h:26 +#: ../meld/resources/ui/preferences.ui.h:26 msgid "Visible Columns" msgstr "Viditelné sloupce" -#: ../data/ui/preferences.ui.h:27 +#: ../meld/resources/ui/preferences.ui.h:27 msgid "Folder Comparisons" msgstr "Porovnávání složek" -#: ../data/ui/preferences.ui.h:28 +#: ../meld/resources/ui/preferences.ui.h:28 msgid "Version Comparisons" msgstr "Porovnávání verzí" -#: ../data/ui/preferences.ui.h:29 -msgid "_Order when comparing file revisions:" -msgstr "P_ořadí při porovnávání revizí souborů:" - -#: ../data/ui/preferences.ui.h:30 -msgid "Order when _merging files:" -msgstr "Pořadí při slučová_ní souborů:" - -#: ../data/ui/preferences.ui.h:31 -msgid "Commit Messages" -msgstr "Zprávy o zařazování" - -#: ../data/ui/preferences.ui.h:32 -msgid "Show _right margin at:" -msgstr "Zobrazit p_ravý okraj na:" - -#: ../data/ui/preferences.ui.h:33 -msgid "Automatically _break lines at right margin on commit" -msgstr "Při zařazování automaticky za_lamovat řádky na pravém okraji" - -#: ../data/ui/preferences.ui.h:34 -msgid "Version Control" -msgstr "Správa verzí" - -#: ../data/ui/preferences.ui.h:35 -msgid "Filename filters" -msgstr "Filtry názvů souborů" - -#: ../data/ui/preferences.ui.h:36 -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 "" -"Při porovnávání složek můžete odfiltrovat soubory a složky podle názvu. " -"Každý vzorek je seznamem zástupných znaků ve stylu shellu oddělovaný " -"mezerami." - -#: ../data/ui/preferences.ui.h:37 ../meld/meldwindow.py:105 -msgid "File Filters" -msgstr "Filtry souborů" - -#: ../data/ui/preferences.ui.h:38 -msgid "Change trimming" -msgstr "Vynechávání změn" - -#: ../data/ui/preferences.ui.h:39 -msgid "Trim blank line differences from the start and end of changes" -msgstr "" -"Vynechat od začátku do konce změn rozdíly spočívající v prázdných řádcích" - -#: ../data/ui/preferences.ui.h:40 -msgid "Text filters" -msgstr "Filtry textu" - -#: ../data/ui/preferences.ui.h:41 -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 "" -"Při porovnávání souborů můžete ignorovat některé typy změn. Každý vzorek je " -"regulární výraz jazyka Python, který nahrazuje odpovídající text prázdným " -"řetězcem před provedením porovnání. Pokud výraz obsahuje skupiny, jsou " -"nahrazeny jen skupiny. Více podrobností viz příručka uživatele." - -#: ../data/ui/preferences.ui.h:42 -msgid "Text Filters" -msgstr "Filtry textu" - -#: ../data/ui/preferences.ui.h:43 -msgid "Left is remote, right is local" -msgstr "Levý je vzdálený, pravý je místní" - -#: ../data/ui/preferences.ui.h:44 -msgid "Left is local, right is remote" -msgstr "Levý je místní, pravý je vzdálený" - -#: ../data/ui/preferences.ui.h:45 -msgid "Remote, merge, local" -msgstr "Vzdálený, sloučený, místní" - -#: ../data/ui/preferences.ui.h:46 -msgid "Local, merge, remote" -msgstr "Místní, sloučený, vzdálený" - -#: ../data/ui/preferences.ui.h:47 -msgid "1ns (ext4)" -msgstr "1 ns (ext4)" - -#: ../data/ui/preferences.ui.h:48 -msgid "100ns (NTFS)" -msgstr "100 ns (NTFS)" - -#: ../data/ui/preferences.ui.h:49 -msgid "1s (ext2/ext3)" -msgstr "1 s (ext2/ext3)" - -#: ../data/ui/preferences.ui.h:50 -msgid "2s (VFAT)" -msgstr "2 s (VFAT)" - -#: ../data/ui/shortcuts.ui.h:1 -msgctxt "shortcut window" -msgid "General" -msgstr "Obecné" - -#: ../data/ui/shortcuts.ui.h:2 -msgctxt "shortcut window" -msgid "New comparison" -msgstr "Nové porovnání" - -#: ../data/ui/shortcuts.ui.h:3 -msgctxt "shortcut window" -msgid "Close a comparison" -msgstr "Zavřít porovnání" - -#: ../data/ui/shortcuts.ui.h:4 -msgctxt "shortcut window" -msgid "Quit Meld" -msgstr "Ukončit Meld" - -#: ../data/ui/shortcuts.ui.h:5 -msgctxt "shortcut window" -msgid "Stop the current action" -msgstr "Zastavit aktuální činnost" - -#: ../data/ui/shortcuts.ui.h:6 -msgctxt "shortcut window" -msgid "Refresh comparison" -msgstr "Aktualizovat porovnání" - -#: ../data/ui/shortcuts.ui.h:7 -msgctxt "shortcut window" -msgid "Fullscreen" -msgstr "Celá obrazovka" - -#: ../data/ui/shortcuts.ui.h:8 -msgctxt "shortcut window" -msgid "Tabs" -msgstr "Karty" - -#: ../data/ui/shortcuts.ui.h:9 -msgctxt "shortcut window" -msgid "Go to previous tab" -msgstr "Přejít na předchozí kartu" - -#: ../data/ui/shortcuts.ui.h:10 -msgctxt "shortcut window" -msgid "Go to next tab" -msgstr "Přejít na následující kartu" - -#: ../data/ui/shortcuts.ui.h:11 -msgctxt "shortcut window" -msgid "Switch to tab" -msgstr "Přepnout na kartu" - -#: ../data/ui/shortcuts.ui.h:12 -msgctxt "shortcut window" -msgid "Move tab left" -msgstr "Přesunout kartu doleva" - -#: ../data/ui/shortcuts.ui.h:13 -msgctxt "shortcut window" -msgid "Move tab right" -msgstr "Přesunout kartu doprava" - -#: ../data/ui/shortcuts.ui.h:14 -msgctxt "shortcut window" -msgid "Changes" -msgstr "Změny" - -#: ../data/ui/shortcuts.ui.h:15 -msgctxt "shortcut window" -msgid "Go to previous change" -msgstr "Přejít na předchozí změnu" - -#: ../data/ui/shortcuts.ui.h:16 -msgctxt "shortcut window" -msgid "Go to next change" -msgstr "Přejít na následující změnu" - -#: ../data/ui/shortcuts.ui.h:17 -msgctxt "shortcut window" -msgid "Editing" -msgstr "Úpravy" - -#: ../data/ui/shortcuts.ui.h:18 -msgctxt "shortcut window" -msgid "Undo" -msgstr "Zpět" - -#: ../data/ui/shortcuts.ui.h:19 -msgctxt "shortcut window" -msgid "Redo" -msgstr "Znovu" - -#: ../data/ui/shortcuts.ui.h:20 -msgctxt "shortcut window" -msgid "Cut" -msgstr "Vyjmout" - -#: ../data/ui/shortcuts.ui.h:21 -msgctxt "shortcut window" -msgid "Copy" -msgstr "Kopírovat" - -#: ../data/ui/shortcuts.ui.h:22 -msgctxt "shortcut window" -msgid "Paste" -msgstr "Vložit" - -#: ../data/ui/shortcuts.ui.h:23 -msgctxt "shortcut window" -msgid "Find" -msgstr "Hledat" - -#: ../data/ui/shortcuts.ui.h:24 -msgctxt "shortcut window" -msgid "Find Next" -msgstr "Najít následující" - -#: ../data/ui/shortcuts.ui.h:25 -msgctxt "shortcut window" -msgid "Find Previous" -msgstr "Najít předchozí" - -#: ../data/ui/shortcuts.ui.h:26 -msgctxt "shortcut window" -msgid "Replace" -msgstr "Nahradit" - -#: ../data/ui/shortcuts.ui.h:27 -msgctxt "shortcut window" -msgid "File comparison" -msgstr "Porovnávání souborů" - -#: ../data/ui/shortcuts.ui.h:28 -msgctxt "shortcut window" -msgid "Save current file" -msgstr "Uložit aktuální soubor" - -#: ../data/ui/shortcuts.ui.h:29 -msgctxt "shortcut window" -msgid "Save current file to new path" -msgstr "Uložit aktuální soubor do nové cesty" - -#: ../data/ui/shortcuts.ui.h:30 -msgctxt "shortcut window" -msgid "Save all files in comparison" -msgstr "Uložit všechny soubory v porovnání" - -#: ../data/ui/shortcuts.ui.h:31 -msgctxt "shortcut window" -msgid "Previous conflict" -msgstr "Předchozí konflikt" +#: ../meld/resources/ui/preferences.ui.h:29 +msgid "_Order when comparing file revisions:" +msgstr "P_ořadí při porovnávání revizí souborů:" -#: ../data/ui/shortcuts.ui.h:32 -msgctxt "shortcut window" -msgid "Next conflict" -msgstr "Následující konflikt" +#: ../meld/resources/ui/preferences.ui.h:30 +msgid "Order when _merging files:" +msgstr "Pořadí při slučová_ní souborů:" -#: ../data/ui/shortcuts.ui.h:33 -msgctxt "shortcut window" -msgid "Push change to left" -msgstr "Vnutit aktuální změnu doleva" +#: ../meld/resources/ui/preferences.ui.h:31 +msgid "Commit Messages" +msgstr "Zprávy o zařazování" -#: ../data/ui/shortcuts.ui.h:34 -msgctxt "shortcut window" -msgid "Push change to right" -msgstr "Vnutit aktuální změnu doprava" +#: ../meld/resources/ui/preferences.ui.h:32 +msgid "Show _right margin at:" +msgstr "Zobrazit p_ravý okraj na:" -#: ../data/ui/shortcuts.ui.h:35 -msgctxt "shortcut window" -msgid "Pull change from left" -msgstr "Vytáhnout změnu zleva" +#: ../meld/resources/ui/preferences.ui.h:33 +msgid "Automatically _break lines at right margin on commit" +msgstr "Při zařazování automaticky za_lamovat řádky na pravém okraji" -#: ../data/ui/shortcuts.ui.h:36 -msgctxt "shortcut window" -msgid "Pull change from right" -msgstr "Vytáhnout změnu zprava" +#: ../meld/resources/ui/preferences.ui.h:34 +msgid "Version Control" +msgstr "Správa verzí" -#: ../data/ui/shortcuts.ui.h:37 -msgctxt "shortcut window" -msgid "Copy change above left" -msgstr "Kopírovat změnu nad levým blokem" +#: ../meld/resources/ui/preferences.ui.h:35 +msgid "Filename filters" +msgstr "Filtry názvů souborů" -#: ../data/ui/shortcuts.ui.h:38 -msgctxt "shortcut window" -msgid "Copy change below left" -msgstr "Kopírovat změnu pod levým blokem" +#: ../meld/resources/ui/preferences.ui.h:36 +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 "" +"Při porovnávání složek můžete odfiltrovat soubory a složky podle názvu. " +"Každý vzorek je seznamem zástupných znaků ve stylu shellu oddělovaný " +"mezerami." -#: ../data/ui/shortcuts.ui.h:39 -msgctxt "shortcut window" -msgid "Copy change above right" -msgstr "Kopírovat změnu nad pravým blokem" +#: ../meld/resources/ui/preferences.ui.h:37 ../meld/meldwindow.py:114 +msgid "File Filters" +msgstr "Filtry souborů" -#: ../data/ui/shortcuts.ui.h:40 -msgctxt "shortcut window" -msgid "Copy change below right" -msgstr "Kopírovat změnu pod pravým blokem" +#: ../meld/resources/ui/preferences.ui.h:38 +msgid "Change trimming" +msgstr "Vynechávání změn" -#: ../data/ui/shortcuts.ui.h:41 -msgctxt "shortcut window" -msgid "Delete change" -msgstr "Smazat změnu" +#: ../meld/resources/ui/preferences.ui.h:39 +msgid "Trim blank line differences from the start and end of changes" +msgstr "" +"Vynechat od začátku do konce změn rozdíly spočívající v prázdných řádcích" -#: ../data/ui/shortcuts.ui.h:42 -msgctxt "shortcut window" -msgid "Previous comparison pane" -msgstr "Předchozí panel s porovnáním" +#: ../meld/resources/ui/preferences.ui.h:40 +msgid "Text filters" +msgstr "Filtry textu" -#: ../data/ui/shortcuts.ui.h:43 -msgctxt "shortcut window" -msgid "Next comparison pane" -msgstr "Následující panel s porovnáním" +#: ../meld/resources/ui/preferences.ui.h:41 +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 "" +"Při porovnávání souborů můžete ignorovat některé typy změn. Každý vzorek je " +"regulární výraz jazyka Python, který nahrazuje odpovídající text prázdným " +"řetězcem před provedením porovnání. Pokud výraz obsahuje skupiny, jsou " +"nahrazeny jen skupiny. Více podrobností viz příručka uživatele." -#: ../data/ui/shortcuts.ui.h:44 -msgctxt "shortcut window" -msgid "Folder comparison" -msgstr "Porovnávání složek" +#: ../meld/resources/ui/preferences.ui.h:42 +msgid "Text Filters" +msgstr "Filtry textu" -#: ../data/ui/shortcuts.ui.h:45 -msgctxt "shortcut window" -msgid "Copy to left" -msgstr "Kopírovat doleva" +#: ../meld/resources/ui/preferences.ui.h:43 +msgid "Left is remote, right is local" +msgstr "Levý je vzdálený, pravý je místní" -#: ../data/ui/shortcuts.ui.h:46 -msgctxt "shortcut window" -msgid "Copy to right" -msgstr "Kopírovat doprava" +#: ../meld/resources/ui/preferences.ui.h:44 +msgid "Left is local, right is remote" +msgstr "Levý je místní, pravý je vzdálený" -#: ../data/ui/shortcuts.ui.h:47 -msgctxt "shortcut window" -msgid "Version control comparison" -msgstr "Porovnávání správy verzí" +#: ../meld/resources/ui/preferences.ui.h:45 +msgid "Remote, merge, local" +msgstr "Vzdálený, sloučený, místní" -#: ../data/ui/shortcuts.ui.h:48 -msgctxt "shortcut window" -msgid "Commit to version control" -msgstr "Zařadit změny do správy verzí" +#: ../meld/resources/ui/preferences.ui.h:46 +msgid "Local, merge, remote" +msgstr "Místní, sloučený, vzdálený" -#: ../data/ui/shortcuts.ui.h:49 -msgctxt "shortcut window" -msgid "Show/hide console output" -msgstr "Zobrazit/skrýt výstup konzoly" +#: ../meld/resources/ui/preferences.ui.h:47 +msgid "1ns (ext4)" +msgstr "1 ns (ext4)" -#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:567 -#: ../meld/newdifftab.py:49 -msgid "New comparison" -msgstr "Nové porovnání" +#: ../meld/resources/ui/preferences.ui.h:48 +msgid "100ns (NTFS)" +msgstr "100 ns (NTFS)" -#: ../data/ui/tab-placeholder.ui.h:2 -msgid "File comparison" -msgstr "Porovnávání souborů" +#: ../meld/resources/ui/preferences.ui.h:49 +msgid "1s (ext2/ext3)" +msgstr "1 s (ext2/ext3)" -#: ../data/ui/tab-placeholder.ui.h:3 -msgid "Directory comparison" -msgstr "Porovnávání složek" +#: ../meld/resources/ui/preferences.ui.h:50 +msgid "2s (VFAT)" +msgstr "2 s (VFAT)" -#: ../data/ui/tab-placeholder.ui.h:4 -msgid "Version control view" -msgstr "Zobrazení správy verzí" +#: ../meld/resources/ui/push-dialog.ui.h:1 +msgid "Push local commits to remote?" +msgstr "Odeslat místně zařazené na server?" -#: ../data/ui/tab-placeholder.ui.h:5 -msgid "_3-way comparison" -msgstr "_Trojcestné porovnání" +#: ../meld/resources/ui/push-dialog.ui.h:2 +msgid "The commits to be pushed are determined by your version control system." +msgstr "" +"Zařazené změny, které se mají odeslat jsou dány vaším systém správy verzí." -#: ../data/ui/tab-placeholder.ui.h:6 -msgid "Select Third File" -msgstr "Výběr třetího souboru" +#: ../meld/resources/ui/push-dialog.ui.h:3 +msgid "_Push commits" +msgstr "_Odeslat zařazené" -#: ../data/ui/tab-placeholder.ui.h:7 -msgid "Select Second File" -msgstr "Výběr druhého souboru" +#: ../meld/resources/ui/revert-dialog.ui.h:1 +msgid "Discard unsaved changes to documents?" +msgstr "Zahodit neuložené změny v dokumentu?" -#: ../data/ui/tab-placeholder.ui.h:8 -msgid "Select First File" -msgstr "Výběr prvního souboru" +#: ../meld/resources/ui/revert-dialog.ui.h:2 +msgid "Changes made to the following documents will be permanently lost:" +msgstr "Změny provedené v následujících dokumentech budou trvale ztraceny:" -#: ../data/ui/tab-placeholder.ui.h:9 -msgid "Select First Folder" -msgstr "Výběr první složky" +#: ../meld/resources/ui/revert-dialog.ui.h:3 +msgid "_Discard" +msgstr "Zaho_dit" -#: ../data/ui/tab-placeholder.ui.h:10 -msgid "Select Second Folder" -msgstr "Výběr druhé složky" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:1 +msgid "Save changes to documents before closing?" +msgstr "Uložit změny, než dokument zavřete?" -#: ../data/ui/tab-placeholder.ui.h:11 -msgid "Select Third Folder" -msgstr "Výběr třetí složky" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:2 +msgid "If you don’t save, changes will be permanently lost." +msgstr "Pokud se změny neuloží, budou trvale ztraceny." -#: ../data/ui/tab-placeholder.ui.h:12 -msgid "Select A Version-Controlled Folder" -msgstr "Výběr složky se správou verzí" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:3 +msgid "Close _without Saving" +msgstr "Zavřít _bez uložení" -#: ../data/ui/tab-placeholder.ui.h:13 -msgid "_Blank comparison" -msgstr "_Prázdné porovnávání" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:4 ../meld/dirdiff.py:1039 +#: ../meld/iohelpers.py:52 ../meld/iohelpers.py:106 +msgid "_Cancel" +msgstr "_Zrušit" -#: ../data/ui/tab-placeholder.ui.h:14 -msgid "C_ompare" -msgstr "P_orovnat" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:5 +msgid "_Save" +msgstr "_Uložit" -#: ../data/ui/vcview.ui.h:3 +#: ../meld/resources/ui/vcview.ui.h:3 msgid "Co_mmit…" msgstr "Zařa_dit…" -#: ../data/ui/vcview.ui.h:4 +#: ../meld/resources/ui/vcview.ui.h:4 msgid "Commit changes to version control" msgstr "Zařadit změny do správy verzí" -#: ../data/ui/vcview.ui.h:5 +#: ../meld/resources/ui/vcview.ui.h:5 msgid "_Update" msgstr "Akt_ualizovat" -#: ../data/ui/vcview.ui.h:6 +#: ../meld/resources/ui/vcview.ui.h:6 msgid "Update working copy from version control" msgstr "Aktualizovat pracovní kopii ze správy verzí" -#: ../data/ui/vcview.ui.h:7 +#: ../meld/resources/ui/vcview.ui.h:7 msgid "_Push" msgstr "_Odeslat" -#: ../data/ui/vcview.ui.h:8 +#: ../meld/resources/ui/vcview.ui.h:8 msgid "Push local changes to remote" msgstr "Odeslat místní změny na server" -#: ../data/ui/vcview.ui.h:10 +#: ../meld/resources/ui/vcview.ui.h:10 msgid "Add to version control" msgstr "Přidat do správy verzí" -#: ../data/ui/vcview.ui.h:12 +#: ../meld/resources/ui/vcview.ui.h:12 msgid "Remove from version control" msgstr "Odebrat ze správy verzí" -#: ../data/ui/vcview.ui.h:13 +#: ../meld/resources/ui/vcview.ui.h:13 msgid "Mar_k as Resolved" msgstr "Označi_t jako vyřešené" -#: ../data/ui/vcview.ui.h:14 +#: ../meld/resources/ui/vcview.ui.h:14 msgid "Mark as resolved in version control" msgstr "Označit jako vyřešené ve vztahu ke správě verzí" -#: ../data/ui/vcview.ui.h:15 +#: ../meld/resources/ui/vcview.ui.h:15 msgid "Re_vert" msgstr "_Vrátit zpět" -#: ../data/ui/vcview.ui.h:16 +#: ../meld/resources/ui/vcview.ui.h:16 msgid "Revert working copy to original state" msgstr "Vrátit pracovní kopii do původního stavu" -#: ../data/ui/vcview.ui.h:17 +#: ../meld/resources/ui/vcview.ui.h:17 msgid "Delete from working copy" msgstr "Smazat z pracovní kopie" -#: ../data/ui/vcview.ui.h:18 +#: ../meld/resources/ui/vcview.ui.h:18 msgid "Console" msgstr "Konzola" -#: ../data/ui/vcview.ui.h:19 +#: ../meld/resources/ui/vcview.ui.h:19 msgid "Show or hide the version control console output pane" msgstr "Zobrazit nebo skrýt panel s výstupem konzoly správy verzí" -#: ../data/ui/vcview.ui.h:20 +#: ../meld/resources/ui/vcview.ui.h:20 msgid "_Flatten" msgstr "Z_ploštit" -#: ../data/ui/vcview.ui.h:21 +#: ../meld/resources/ui/vcview.ui.h:21 msgid "Flatten directories" msgstr "Zploštit složky" -#: ../data/ui/vcview.ui.h:22 +#: ../meld/resources/ui/vcview.ui.h:22 msgid "_Modified" msgstr "_Změněné" -#: ../data/ui/vcview.ui.h:23 +#: ../meld/resources/ui/vcview.ui.h:23 msgid "Show modified files" msgstr "Zobrazovat změněné soubory" -#: ../data/ui/vcview.ui.h:24 +#: ../meld/resources/ui/vcview.ui.h:24 msgid "_Normal" msgstr "_Normální" -#: ../data/ui/vcview.ui.h:25 +#: ../meld/resources/ui/vcview.ui.h:25 msgid "Show normal files" msgstr "Zobrazovat normální soubory" -#: ../data/ui/vcview.ui.h:26 +#: ../meld/resources/ui/vcview.ui.h:26 msgid "Un_versioned" msgstr "Ne_verzované" -#: ../data/ui/vcview.ui.h:27 +#: ../meld/resources/ui/vcview.ui.h:27 msgid "Show unversioned files" msgstr "Zobrazovat soubory bez verzí" -#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69 +#: ../meld/resources/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69 msgid "Ignored" msgstr "Ignorované" -#: ../data/ui/vcview.ui.h:29 +#: ../meld/resources/ui/vcview.ui.h:29 msgid "Show ignored files" msgstr "Zobrazovat ignorované soubory" -#: ../data/ui/vcview.ui.h:30 -msgid "Commit" -msgstr "Commit" - -#: ../data/ui/vcview.ui.h:31 -msgid "Commit Files" -msgstr "Commit souborů" - -#: ../data/ui/vcview.ui.h:32 -msgid "Log Message" -msgstr "Zpráva záznamu" - -#: ../data/ui/vcview.ui.h:33 -msgid "Previous logs:" -msgstr "Předchozí záznamy:" - -#: ../data/ui/vcview.ui.h:34 -msgid "Co_mmit" -msgstr "Co_mmit" - -#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:331 +#: ../meld/resources/ui/vcview.ui.h:31 ../meld/vcview.py:366 msgid "Location" msgstr "Umístění" -#: ../data/ui/vcview.ui.h:37 +#: ../meld/resources/ui/vcview.ui.h:32 msgid "Status" msgstr "Stav" -#: ../data/ui/vcview.ui.h:38 +#: ../meld/resources/ui/vcview.ui.h:33 msgid "Extra" msgstr "Doplnění" -#: ../data/ui/vcview.ui.h:39 +#: ../meld/resources/ui/vcview.ui.h:34 msgid "Console output" msgstr "Výstup konzoly" -#: ../data/ui/vcview.ui.h:40 -msgid "Push local commits to remote?" -msgstr "Odeslat místně zařazené na server?" - -#: ../data/ui/vcview.ui.h:41 -msgid "The commits to be pushed are determined by your version control system." -msgstr "" -"Zařazené změny, které se mají odeslat jsou dány vaším systém správy verzí." - -#: ../data/ui/vcview.ui.h:42 -msgid "_Push commits" -msgstr "_Odeslat zařazené" - #: ../meld/const.py:12 msgid "UNIX (LF)" msgstr "UNIX (LF)" @@ -1674,44 +1669,44 @@ msgid "Mac OS (CR)" msgstr "Mac OS (CR)" #. Create file size CellRenderer -#: ../meld/dirdiff.py:392 ../meld/preferences.py:82 +#: ../meld/dirdiff.py:475 ../meld/preferences.py:138 msgid "Size" msgstr "Velikost" #. Create date-time CellRenderer -#: ../meld/dirdiff.py:400 ../meld/preferences.py:83 +#: ../meld/dirdiff.py:483 ../meld/preferences.py:139 msgid "Modification time" msgstr "Čas změny" #. Create permissions CellRenderer -#: ../meld/dirdiff.py:408 ../meld/preferences.py:84 +#: ../meld/dirdiff.py:491 ../meld/preferences.py:140 msgid "Permissions" msgstr "Oprávnění" -#: ../meld/dirdiff.py:539 +#: ../meld/dirdiff.py:625 #, python-format msgid "Hide %s" msgstr "Skrýt %s" -#: ../meld/dirdiff.py:680 ../meld/dirdiff.py:703 +#: ../meld/dirdiff.py:767 ../meld/dirdiff.py:790 #, python-format msgid "[%s] Scanning %s" msgstr "[%s] Prochází se %s" -#: ../meld/dirdiff.py:838 +#: ../meld/dirdiff.py:925 #, python-format msgid "[%s] Done" msgstr "[%s] Hotovo" -#: ../meld/dirdiff.py:846 +#: ../meld/dirdiff.py:933 msgid "Folders have no differences" msgstr "Mezi složkami není žádný rozdíl" -#: ../meld/dirdiff.py:848 +#: ../meld/dirdiff.py:935 msgid "Contents of scanned files in folders are identical." msgstr "Obsah kontrolovaných souborů ve složkách je stejný." -#: ../meld/dirdiff.py:850 +#: ../meld/dirdiff.py:937 msgid "" "Scanned files in folders appear identical, but contents have not been " "scanned." @@ -1719,42 +1714,42 @@ msgstr "" "Kontrolované soubory ve složkách vypadají stejně, ale nebyl kontrolován " "jejich obsah." -#: ../meld/dirdiff.py:853 +#: ../meld/dirdiff.py:940 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:855 +#: ../meld/dirdiff.py:942 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:873 ../meld/filediff.py:1473 ../meld/filediff.py:1503 -#: ../meld/filediff.py:1505 ../meld/ui/msgarea.py:106 ../meld/ui/msgarea.py:119 +#: ../meld/dirdiff.py:960 ../meld/filediff.py:1588 ../meld/filediff.py:1618 +#: ../meld/filediff.py:1620 ../meld/ui/msgarea.py:106 ../meld/ui/msgarea.py:119 msgid "Hi_de" msgstr "_Skrýt" -#: ../meld/dirdiff.py:882 +#: ../meld/dirdiff.py:969 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:883 +#: ../meld/dirdiff.py:970 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:885 +#: ../meld/dirdiff.py:972 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:887 +#: ../meld/dirdiff.py:974 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:889 +#: ../meld/dirdiff.py:976 msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. The following files in this folder are hidden:" @@ -1762,17 +1757,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:900 +#: ../meld/dirdiff.py:987 #, python-format msgid "“%s” hidden by “%s”" msgstr "„%s“ skryto v „%s“" -#: ../meld/dirdiff.py:956 +#: ../meld/dirdiff.py:1043 #, python-format msgid "Replace folder “%s”?" msgstr "Nahradit složku „%s“?" -#: ../meld/dirdiff.py:958 +#: ../meld/dirdiff.py:1045 #, python-format msgid "" "Another folder with the same name already exists in “%s”.\n" @@ -1781,11 +1776,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:971 +#: ../meld/dirdiff.py:1058 msgid "Error copying file" msgstr "Chyba při kopírování souboru" -#: ../meld/dirdiff.py:972 +#: ../meld/dirdiff.py:1059 #, python-format msgid "" "Couldn’t copy %s\n" @@ -1798,19 +1793,19 @@ msgstr "" "\n" "%s" -#: ../meld/dirdiff.py:997 ../meld/vcview.py:703 +#: ../meld/dirdiff.py:1084 ../meld/vcview.py:720 msgid "Error deleting {}" msgstr "Chyba při mazání {}" -#: ../meld/dirdiff.py:1519 +#: ../meld/dirdiff.py:1593 msgid "No folder" msgstr "Žádná složka" -#: ../meld/filediff.py:816 +#: ../meld/filediff.py:905 msgid "Comparison results will be inaccurate" msgstr "Výsledky porovnávání budou nepřesné" -#: ../meld/filediff.py:818 +#: ../meld/filediff.py:907 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1818,64 +1813,64 @@ msgstr "" "Filtr změnil počet řádků v souboru, což není podporováno. Porovnání nebude " "správné." -#: ../meld/filediff.py:875 +#: ../meld/filediff.py:979 msgid "Mark conflict as resolved?" msgstr "Označit konflikt jako vyřešený?" -#: ../meld/filediff.py:877 +#: ../meld/filediff.py:981 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:879 +#: ../meld/filediff.py:983 msgid "Cancel" msgstr "Zrušit" -#: ../meld/filediff.py:880 +#: ../meld/filediff.py:984 msgid "Mark _Resolved" msgstr "Označi_t za vyřešené" -#: ../meld/filediff.py:1188 +#: ../meld/filediff.py:1303 #, 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:1196 +#: ../meld/filediff.py:1311 #, python-format msgid "File %s appears to be a binary file." msgstr "Soubor %s je zřejmě binární." -#: ../meld/filediff.py:1198 +#: ../meld/filediff.py:1313 msgid "Do you want to open the file using the default application?" msgstr "Chcete soubor otevřít pomocí výchozí aplikace?" -#: ../meld/filediff.py:1200 +#: ../meld/filediff.py:1315 msgid "Open" msgstr "Otevřít" -#: ../meld/filediff.py:1216 +#: ../meld/filediff.py:1331 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Počítají se rozdíly" -#: ../meld/filediff.py:1277 +#: ../meld/filediff.py:1392 #, python-format msgid "File %s has changed on disk" msgstr "Soubor „%s“ byl změněn na disku." -#: ../meld/filediff.py:1278 +#: ../meld/filediff.py:1393 msgid "Do you want to reload the file?" msgstr "Chcete soubor znovu načíst?" -#: ../meld/filediff.py:1280 +#: ../meld/filediff.py:1395 msgid "_Reload" msgstr "Zno_vu načíst" -#: ../meld/filediff.py:1436 +#: ../meld/filediff.py:1551 msgid "Files are identical" msgstr "Soubory jsou stejné" -#: ../meld/filediff.py:1449 +#: ../meld/filediff.py:1564 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1883,11 +1878,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:1454 +#: ../meld/filediff.py:1569 msgid "Files differ in line endings only" msgstr "Soubory se liší pouze zakončením řádků" -#: ../meld/filediff.py:1456 +#: ../meld/filediff.py:1571 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1896,15 +1891,15 @@ msgstr "" "Soubory jsou shodné, vyjma rozdílného zakončení řádků:\n" "%s" -#: ../meld/filediff.py:1476 +#: ../meld/filediff.py:1591 msgid "Show without filters" msgstr "Zobrazit bez filtrů" -#: ../meld/filediff.py:1498 +#: ../meld/filediff.py:1613 msgid "Change highlighting incomplete" msgstr "Změnit zvýraznění neúplných" -#: ../meld/filediff.py:1499 +#: ../meld/filediff.py:1614 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." @@ -1913,19 +1908,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:1507 +#: ../meld/filediff.py:1622 msgid "Keep highlighting" msgstr "Zachovat zvýrazňování" -#: ../meld/filediff.py:1509 +#: ../meld/filediff.py:1624 msgid "_Keep highlighting" msgstr "Z_achovat zvýrazňování" -#: ../meld/filediff.py:1522 +#: ../meld/filediff.py:1637 msgid "Saving failed" msgstr "Ukládání selhalo" -#: ../meld/filediff.py:1523 +#: ../meld/filediff.py:1638 msgid "" "Please consider copying any critical changes to another program or file to " "avoid data loss." @@ -1933,59 +1928,44 @@ 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:1532 +#: ../meld/filediff.py:1647 msgid "Save Left Pane As" msgstr "Uložení levého panelu jako" -#: ../meld/filediff.py:1534 +#: ../meld/filediff.py:1649 msgid "Save Middle Pane As" msgstr "Uložení prostředního panelu jako" -#: ../meld/filediff.py:1536 +#: ../meld/filediff.py:1651 msgid "Save Right Pane As" msgstr "Uložení pravého panelu jako" -#: ../meld/filediff.py:1549 +#: ../meld/filediff.py:1664 #, 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:1551 +#: ../meld/filediff.py:1666 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:1554 +#: ../meld/filediff.py:1669 msgid "Save Anyway" msgstr "Přesto uložit" -#: ../meld/filediff.py:1555 +#: ../meld/filediff.py:1670 msgid "Don’t Save" msgstr "Neukládat" -#: ../meld/filediff.py:1581 -msgid "_Save as UTF-8" -msgstr "_Uložit v UTF-8" - -#: ../meld/filediff.py:1584 -#, python-format -msgid "Couldn’t encode text as “%s”" -msgstr "Text nelze zakódovat jako „%s“" - -#: ../meld/filediff.py:1586 -#, python-format +#: ../meld/filediff.py:1712 msgid "" -"File “%s” contains characters that can’t be encoded using encoding “%s”.\n" -"Would you like to save as UTF-8?" +"File “{}” contains characters that can’t be encoded using its current " +"encoding “{}”." msgstr "" -"Soubor „%s“ obsahuje znaky, které nelze zakódovat pomocí kódování „%s“\n" -"Chcete jej uložit v UTF-8?" - -#: ../meld/filediff.py:1626 ../meld/patchdialog.py:130 -#, python-format -msgid "Could not save file %s." -msgstr "Nelze uložit soubor %s." +"Soubor {} obsahuje znaky, které nelze zakódovat pomocí jeho akuálního " +"kódování „{}“." -#: ../meld/filediff.py:1627 ../meld/patchdialog.py:131 +#: ../meld/filediff.py:1716 ../meld/patchdialog.py:142 #, python-format msgid "" "Couldn’t save file due to:\n" @@ -1994,11 +1974,16 @@ msgstr "" "Nelze uložit soubor z důvodu:\n" "%s" -#: ../meld/filediff.py:2002 +#: ../meld/filediff.py:1720 ../meld/patchdialog.py:141 +#, python-format +msgid "Could not save file %s." +msgstr "Nelze uložit soubor %s." + +#: ../meld/filediff.py:2113 msgid "Live comparison updating disabled" msgstr "Živá aktualizace porovnání zakázána" -#: ../meld/filediff.py:2003 +#: ../meld/filediff.py:2114 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -2013,40 +1998,40 @@ msgstr "" msgid "[%s] Merging files" msgstr "[%s] Slučují se soubory" -#: ../meld/gutterrendererchunk.py:216 +#: ../meld/gutterrendererchunk.py:220 msgid "Copy _up" msgstr "Kopírovat nahor_u" -#: ../meld/gutterrendererchunk.py:217 +#: ../meld/gutterrendererchunk.py:221 msgid "Copy _down" msgstr "Kopírovat _dolů" -#: ../meld/iohelpers.py:35 +#: ../meld/iohelpers.py:37 msgid "Deleting remote folders is not supported" msgstr "Mazání vzdálených složení nen podporované" -#: ../meld/iohelpers.py:37 +#: ../meld/iohelpers.py:39 msgid "Not a file or directory" msgstr "Nejedná se o soubor nebo složku" -#: ../meld/iohelpers.py:41 +#: ../meld/iohelpers.py:43 msgid "“{}” can’t be put in the trash. Do you want to delete it immediately?" msgstr "„{}“ nelze umístit do koše. Chcete smazat trvale?" -#: ../meld/iohelpers.py:46 +#: ../meld/iohelpers.py:48 msgid "This remote location does not support sending items to the trash." msgstr "Vzdálené umístění nepodporuje přesouvání položek do koše." -#: ../meld/iohelpers.py:51 +#: ../meld/iohelpers.py:53 msgid "_Delete Permanently" msgstr "_Smazat trvale" -#: ../meld/iohelpers.py:94 +#: ../meld/iohelpers.py:100 #, python-format msgid "Replace file “%s”?" msgstr "Nahradit soubor „%s“?" -#: ../meld/iohelpers.py:96 +#: ../meld/iohelpers.py:102 #, python-format msgid "" "A file with this name already exists in “%s”.\n" @@ -2055,98 +2040,98 @@ msgstr "" "V „%s“ již existuje soubor se stejným názvem.\n" "Pokud stávající soubor nahradíte, jeho obsah bude ztracen." -#: ../meld/meldapp.py:179 +#: ../meld/meldapp.py:169 msgid "wrong number of arguments supplied to --diff" msgstr "poskytnut nesprávný počet argumentů pro --diff" -#: ../meld/meldapp.py:184 +#: ../meld/meldapp.py:174 msgid "Start with an empty window" msgstr "Spustit s prázdným oknem" -#: ../meld/meldapp.py:185 ../meld/meldapp.py:187 +#: ../meld/meldapp.py:175 ../meld/meldapp.py:177 msgid "file" msgstr "soubor" -#: ../meld/meldapp.py:185 ../meld/meldapp.py:189 +#: ../meld/meldapp.py:175 ../meld/meldapp.py:179 msgid "folder" msgstr "složka" -#: ../meld/meldapp.py:186 +#: ../meld/meldapp.py:176 msgid "Start a version control comparison" msgstr "Spustit nové porovnání správy verzí" -#: ../meld/meldapp.py:188 +#: ../meld/meldapp.py:178 msgid "Start a 2- or 3-way file comparison" msgstr "Spustit dvojcestné nebo trojcestné porovnání souborů" -#: ../meld/meldapp.py:190 +#: ../meld/meldapp.py:180 msgid "Start a 2- or 3-way folder comparison" msgstr "Spustit dvojcestné nebo trojcestné porovnání složek" -#: ../meld/meldapp.py:233 +#: ../meld/meldapp.py:223 #, python-format msgid "Error: %s\n" msgstr "Chyba: %s\n" -#: ../meld/meldapp.py:240 +#: ../meld/meldapp.py:230 msgid "Meld is a file and directory comparison tool." msgstr "Meld je nástroj porovnávající soubory a složky." -#: ../meld/meldapp.py:244 +#: ../meld/meldapp.py:234 msgid "Set label to use instead of file name" msgstr "Nastavit k použití popisek namísto názvu souboru" -#: ../meld/meldapp.py:247 +#: ../meld/meldapp.py:237 msgid "Open a new tab in an already running instance" msgstr "Otevřít novou kartu v již běžící instanci" -#: ../meld/meldapp.py:250 +#: ../meld/meldapp.py:240 msgid "Automatically compare all differing files on startup" msgstr "Automaticky při spuštění porovnat všechny lišící se soubory" -#: ../meld/meldapp.py:253 +#: ../meld/meldapp.py:243 msgid "Ignored for compatibility" msgstr "Ignorováno z důvodu kompatibility" -#: ../meld/meldapp.py:257 +#: ../meld/meldapp.py:247 msgid "Set the target file for saving a merge result" msgstr "Nastavit cílový soubor, do kterého se má uložit výsledek slučování" -#: ../meld/meldapp.py:260 +#: ../meld/meldapp.py:250 msgid "Automatically merge files" msgstr "Automaticky sloučit soubory" -#: ../meld/meldapp.py:264 +#: ../meld/meldapp.py:254 msgid "Load a saved comparison from a Meld comparison file" msgstr "Načíst uložené porovnání ze srovnávacího souboru Meld" -#: ../meld/meldapp.py:268 +#: ../meld/meldapp.py:258 msgid "Create a diff tab for the supplied files or folders" msgstr "Vytvořit kartu s rozdílem pro zadané soubory nebo složky" -#: ../meld/meldapp.py:288 +#: ../meld/meldapp.py:278 #, python-format msgid "too many arguments (wanted 0-3, got %d)" msgstr "příliš mnoho argumentů (požadováno 0 – 3, obdrženo %d)" -#: ../meld/meldapp.py:291 +#: ../meld/meldapp.py:281 msgid "can’t auto-merge less than 3 files" msgstr "nelze automaticky sloučit méně než 3 soubory" -#: ../meld/meldapp.py:293 +#: ../meld/meldapp.py:283 msgid "can’t auto-merge directories" msgstr "nelze automaticky sloučit složky" -#: ../meld/meldapp.py:307 +#: ../meld/meldapp.py:297 msgid "Error reading saved comparison file" msgstr "Chyba při čtení uloženého srovnávacího souboru" -#: ../meld/meldapp.py:324 +#: ../meld/meldapp.py:314 #, python-format msgid "invalid path or URI “%s”" msgstr "neplatná cesta nebo adresa URI „%s“" -#: ../meld/meldapp.py:330 +#: ../meld/meldapp.py:320 msgid "remote folder “{}” not supported" msgstr "vzdálená složka „{}“ není podporovaná" @@ -2155,212 +2140,176 @@ msgstr "vzdálená složka „{}“ není podporovaná" msgid "" msgstr "" -#: ../meld/melddoc.py:68 +#: ../meld/melddoc.py:63 msgid "untitled" msgstr "nepojmenovaný" -#: ../meld/meldwindow.py:47 +#: ../meld/meldwindow.py:56 msgid "_File" msgstr "_Soubor" -#: ../meld/meldwindow.py:48 +#: ../meld/meldwindow.py:57 msgid "_New Comparison…" msgstr "_Nové porovnávání…" -#: ../meld/meldwindow.py:49 +#: ../meld/meldwindow.py:58 msgid "Start a new comparison" msgstr "Spustit nové porovnání" -#: ../meld/meldwindow.py:52 +#: ../meld/meldwindow.py:61 msgid "Save the current file" msgstr "Uložit aktuální soubor" -#: ../meld/meldwindow.py:54 +#: ../meld/meldwindow.py:63 msgid "Save As…" msgstr "Uložit jako…" -#: ../meld/meldwindow.py:55 +#: ../meld/meldwindow.py:64 msgid "Save the current file with a different name" msgstr "Uložit aktuální soubor pod jiným názvem" -#: ../meld/meldwindow.py:58 +#: ../meld/meldwindow.py:67 msgid "Close the current file" msgstr "Zavřít aktuální soubor" -#: ../meld/meldwindow.py:61 +#: ../meld/meldwindow.py:70 msgid "_Edit" msgstr "_Upravit" -#: ../meld/meldwindow.py:63 +#: ../meld/meldwindow.py:72 msgid "Undo the last action" msgstr "Vrátit zpět poslední činnost" -#: ../meld/meldwindow.py:66 +#: ../meld/meldwindow.py:75 msgid "Redo the last undone action" msgstr "Zopakovat poslední činnost vrácenou zpět" -#: ../meld/meldwindow.py:68 +#: ../meld/meldwindow.py:77 msgid "Cut the selection" msgstr "Vyjmout výběr" -#: ../meld/meldwindow.py:70 +#: ../meld/meldwindow.py:79 msgid "Copy the selection" msgstr "Kopírovat výběr" -#: ../meld/meldwindow.py:72 +#: ../meld/meldwindow.py:81 msgid "Paste the clipboard" msgstr "Vložit obsah schránky" -#: ../meld/meldwindow.py:74 +#: ../meld/meldwindow.py:83 msgid "Find…" msgstr "Hledat…" -#: ../meld/meldwindow.py:74 +#: ../meld/meldwindow.py:83 msgid "Search for text" msgstr "Hledat text" -#: ../meld/meldwindow.py:76 +#: ../meld/meldwindow.py:85 msgid "Find Ne_xt" msgstr "_Najít následující" -#: ../meld/meldwindow.py:77 +#: ../meld/meldwindow.py:86 msgid "Search forwards for the same text" msgstr "Hledat tentýž text směrem vpřed" -#: ../meld/meldwindow.py:79 +#: ../meld/meldwindow.py:88 msgid "Find _Previous" msgstr "Najít _předchozí" -#: ../meld/meldwindow.py:80 +#: ../meld/meldwindow.py:89 msgid "Search backwards for the same text" msgstr "Hledat tentýž text směrem zpět" -#: ../meld/meldwindow.py:83 +#: ../meld/meldwindow.py:92 msgid "_Replace…" msgstr "Nah_radit…" -#: ../meld/meldwindow.py:84 +#: ../meld/meldwindow.py:93 msgid "Find and replace text" msgstr "Najít a nahradit text" -#: ../meld/meldwindow.py:86 +#: ../meld/meldwindow.py:95 msgid "Go to _Line" msgstr "Pře_jít na řádek" -#: ../meld/meldwindow.py:87 +#: ../meld/meldwindow.py:96 msgid "Go to a specific line" msgstr "Přejít na konkrétní řádek" -#: ../meld/meldwindow.py:90 +#: ../meld/meldwindow.py:99 msgid "_Changes" msgstr "_Změny" -#: ../meld/meldwindow.py:91 +#: ../meld/meldwindow.py:100 msgid "Next Change" msgstr "Následující změna" -#: ../meld/meldwindow.py:92 +#: ../meld/meldwindow.py:101 msgid "Go to the next change" msgstr "Přejít na následující změnu" -#: ../meld/meldwindow.py:94 +#: ../meld/meldwindow.py:103 msgid "Previous Change" msgstr "Předchozí změna" -#: ../meld/meldwindow.py:95 +#: ../meld/meldwindow.py:104 msgid "Go to the previous change" msgstr "Přejít na předchozí změnu" -#: ../meld/meldwindow.py:97 +#: ../meld/meldwindow.py:106 msgid "Open Externally" msgstr "Otevřít externě" -#: ../meld/meldwindow.py:98 +#: ../meld/meldwindow.py:107 msgid "Open selected file or directory in the default external application" msgstr "Otevřít vybraný soubor nebo složku ve výchozí externí aplikaci" -#: ../meld/meldwindow.py:102 +#: ../meld/meldwindow.py:111 msgid "_View" msgstr "_Zobrazit" -#: ../meld/meldwindow.py:103 +#: ../meld/meldwindow.py:112 msgid "File Status" msgstr "Stav souboru" -#: ../meld/meldwindow.py:104 +#: ../meld/meldwindow.py:113 msgid "Version Status" msgstr "Stav verze" -#: ../meld/meldwindow.py:107 +#: ../meld/meldwindow.py:116 msgid "Stop the current action" msgstr "Zastavit aktuální činnost" -#: ../meld/meldwindow.py:110 +#: ../meld/meldwindow.py:119 msgid "Refresh the view" msgstr "Obnovit zobrazení" -#: ../meld/meldwindow.py:114 +#: ../meld/meldwindow.py:123 msgid "Fullscreen" msgstr "Celá obrazovka" -#: ../meld/meldwindow.py:115 +#: ../meld/meldwindow.py:124 msgid "View the comparison in fullscreen" msgstr "Zobrazit porovnání na celou obrazovku" -#: ../meld/meldwindow.py:117 -msgid "_Toolbar" -msgstr "Nástrojová _lišta" - -#: ../meld/meldwindow.py:118 -msgid "Show or hide the toolbar" -msgstr "Zobrazit nebo skrýt nástrojovou lištu" - -#: ../meld/meldwindow.py:127 +#: ../meld/meldwindow.py:133 msgid "Open Recent" msgstr "Otevřít nedávné" -#: ../meld/meldwindow.py:128 +#: ../meld/meldwindow.py:134 msgid "Open recent files" msgstr "Otevřít nedávné soubory" -#: ../meld/meldwindow.py:150 -msgid "_Meld" -msgstr "_Meld" - -#: ../meld/meldwindow.py:151 -msgid "Quit the program" -msgstr "Ukončit program" - -#: ../meld/meldwindow.py:153 -msgid "Prefere_nces" -msgstr "_Předvolby" - -#: ../meld/meldwindow.py:154 -msgid "Configure the application" -msgstr "Nastavit aplikaci" - -#: ../meld/meldwindow.py:156 -msgid "_Contents" -msgstr "O_bsah" - -#: ../meld/meldwindow.py:157 -msgid "Open the Meld manual" -msgstr "Otevřít příručku aplikace Meld" - -#: ../meld/meldwindow.py:159 -msgid "About this application" -msgstr "O této aplikaci" - -#: ../meld/meldwindow.py:602 +#: ../meld/meldwindow.py:567 #, python-format msgid "Need three files to auto-merge, got: %r" msgstr "Pro automatické sloučení jsou zapotřebí tři soubory, obdržen: %r" -#: ../meld/meldwindow.py:623 +#: ../meld/meldwindow.py:588 msgid "Cannot compare a mixture of files and directories" msgstr "Nelze porovnávat směs souborů a složek" -#: ../meld/misc.py:134 +#: ../meld/misc.py:155 msgid "" "{}\n" "\n" @@ -2372,53 +2321,48 @@ msgstr "" "Meld při běhu narazil na kritickou chybu:\n" "{}" -#: ../meld/misc.py:253 +#: ../meld/misc.py:237 #, python-format msgid "Couldn’t find colour scheme details for %s-%s; this is a bad install" msgstr "" "Ve schématu barev nelze najít údaj pro %s-%s. Jedná se o chybnou instalaci" -#. no common path. empty names get changed to "[None]" -#: ../meld/misc.py:314 +#: ../meld/misc.py:311 msgid "[None]" msgstr "[Žádný]" -#: ../meld/preferences.py:33 +#: ../meld/preferences.py:42 ../meld/preferences.py:135 msgid "label" msgstr "popisek" -#: ../meld/preferences.py:33 +#: ../meld/preferences.py:42 ../meld/preferences.py:135 msgid "pattern" msgstr "vzorek" -#: ../meld/recent.py:105 +#: ../meld/recent.py:106 msgid "Version control:" msgstr "Správa verzí:" -#: ../meld/ui/bufferselectors.py:32 +#: ../meld/ui/bufferselectors.py:114 #, python-brace-format msgid "{name} ({charset})" msgstr "{name} ({charset})" -#: ../meld/ui/bufferselectors.py:65 ../meld/ui/bufferselectors.py:73 +#: ../meld/ui/bufferselectors.py:144 ../meld/ui/bufferselectors.py:152 msgid "Plain Text" msgstr "Prostý text" -#: ../meld/ui/notebooklabel.py:63 -msgid "Close tab" -msgstr "Zavřít kartu" - #. Abbreviation for line, column so that it will fit in the status bar -#: ../meld/ui/statusbar.py:133 +#: ../meld/ui/statusbar.py:124 #, python-format msgid "Ln %i, Col %i" msgstr "Řád %i, sl %i" -#: ../meld/ui/statusbar.py:186 +#: ../meld/ui/statusbar.py:177 msgid "Line you want to move the cursor to" msgstr "Řádek, na který chcete přesunout kurzor" -#: ../meld/ui/vcdialogs.py:48 +#: ../meld/ui/vcdialogs.py:55 msgid "No files will be committed" msgstr "Žádné soubory nebudou zařazeny" @@ -2521,91 +2465,91 @@ msgstr "Není přítomno" #. Translators: This error message is shown when a version #. control binary isn't installed. -#: ../meld/vcview.py:248 +#: ../meld/vcview.py:282 #, python-format msgid "%(name)s (%(cmd)s not installed)" msgstr "%(name)s (%(cmd)s není nainstalováno)" #. Translators: This error message is shown when a version #. controlled repository is invalid. -#: ../meld/vcview.py:252 +#: ../meld/vcview.py:286 #, python-format msgid "%(name)s (Invalid repository)" msgstr "%(name)s (neplatný repozitář)" -#: ../meld/vcview.py:273 +#: ../meld/vcview.py:307 msgid "No valid version control system found in this folder" msgstr "V této složce nebyl nalezen žádný platný systém správy verzí" -#: ../meld/vcview.py:275 +#: ../meld/vcview.py:309 msgid "Only one version control system found in this folder" msgstr "V této složce byl nalezen jen jeden systém správy verzí" -#: ../meld/vcview.py:277 +#: ../meld/vcview.py:311 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:331 +#: ../meld/vcview.py:366 #, python-format msgid "%s: %s" msgstr "%s: %s" #. Initial yield so when we add this to our tasks, we don't #. create iterators that may be invalidated. -#: ../meld/vcview.py:338 +#: ../meld/vcview.py:373 msgid "Scanning repository" msgstr "Prochází se repozitář" -#: ../meld/vcview.py:367 +#: ../meld/vcview.py:402 #, python-format msgid "Scanning %s" msgstr "Prochází se %s" -#: ../meld/vcview.py:406 +#: ../meld/vcview.py:441 msgid "(Empty)" msgstr "(Prázdný)" -#: ../meld/vcview.py:450 +#: ../meld/vcview.py:487 #, python-format msgid "%s — local" msgstr "%s — místní" -#: ../meld/vcview.py:451 +#: ../meld/vcview.py:488 #, python-format msgid "%s — remote" msgstr "%s — vzdálený" -#: ../meld/vcview.py:459 +#: ../meld/vcview.py:496 #, python-format msgid "%s (local, merge, remote)" msgstr "%s (místní, sloučený, vzdálený)" -#: ../meld/vcview.py:464 +#: ../meld/vcview.py:501 #, python-format msgid "%s (remote, merge, local)" msgstr "%s (vzdálený, sloučený, místní)" -#: ../meld/vcview.py:475 +#: ../meld/vcview.py:512 #, python-format msgid "%s — repository" msgstr "%s — repozitář" -#: ../meld/vcview.py:481 +#: ../meld/vcview.py:518 #, python-format msgid "%s (working, repository)" msgstr "%s (pracovní, repozitář)" -#: ../meld/vcview.py:485 +#: ../meld/vcview.py:522 #, python-format msgid "%s (repository, working)" msgstr "%s (repozitář, pracovní)" -#: ../meld/vcview.py:674 +#: ../meld/vcview.py:688 msgid "Remove folder and all its files?" msgstr "Odstranit složku a všechny soubory v ní?" -#: ../meld/vcview.py:676 +#: ../meld/vcview.py:690 msgid "" "This will remove all selected files and folders, and all files within any " "selected folders, from version control." @@ -2613,6 +2557,6 @@ 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:785 +#: ../meld/vcview.py:804 msgid "Clear" msgstr "Vymazat" From b676430fd30341c248e563fffcb207306a0b2398 Mon Sep 17 00:00:00 2001 From: Anders Jonsson Date: Mon, 7 Jan 2019 22:24:46 +0000 Subject: [PATCH 0773/1316] Update Swedish translation (cherry picked from commit 9b3b634fac1f708b3962f4d4c7121bbf40473208) --- po/sv.po | 237 +++++++++++++++++++++++++++---------------------------- 1 file changed, 116 insertions(+), 121 deletions(-) diff --git a/po/sv.po b/po/sv.po index 2c7a5b8b..d23038fe 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,17 +1,17 @@ # Swedish messages for meld. -# Copyright © 2005-2018 Free Software Foundation, Inc. +# Copyright © 2005-2019 Free Software Foundation, Inc. # Christian Rose , 2005. # Daniel Nylander , 2006, 2007, 2008, 2009, 2011. # Sebastian Rasmussen , 2015. -# Anders Jonsson , 2016, 2018. +# Anders Jonsson , 2016, 2018, 2019. # Josef Andersson , 2014, 2015, 2016, 2017. # msgid "" msgstr "" "Project-Id-Version: meld\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n" -"POT-Creation-Date: 2018-06-30 21:32+0000\n" -"PO-Revision-Date: 2018-09-23 21:21+0200\n" +"POT-Creation-Date: 2019-01-07 09:44+0000\n" +"PO-Revision-Date: 2019-01-07 23:23+0100\n" "Last-Translator: Anders Jonsson \n" "Language-Team: Swedish \n" "Language: sv\n" @@ -19,19 +19,19 @@ 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 2.1.1\n" +"X-Generator: Poedit 2.2\n" "X-Project-Style: gnome\n" -#: ../bin/meld:190 +#: ../bin/meld:194 msgid "Cannot import: " msgstr "Kan inte importera: " -#: ../bin/meld:193 +#: ../bin/meld:197 #, c-format msgid "Meld requires %s or higher." msgstr "Meld kräver %s eller högre." -#: ../bin/meld:239 +#: ../bin/meld:243 #, c-format msgid "" "Couldn’t load Meld-specific CSS (%s)\n" @@ -591,7 +591,7 @@ msgstr "Kopiera till höger" msgid "Delete selected" msgstr "Ta bort markerade" -#: ../data/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:871 ../meld/filediff.py:1471 +#: ../data/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:907 ../meld/filediff.py:1497 msgid "Hide" msgstr "Dölj" @@ -681,7 +681,7 @@ msgstr "Flytta _nedåt" #. Create icon and filename CellRenderer #: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35 -#: ../meld/dirdiff.py:371 +#: ../meld/dirdiff.py:407 msgid "Name" msgstr "Namn" @@ -886,8 +886,8 @@ msgstr "Sparar du inte kommer ändringar att gå förlorade för alltid." msgid "Close _without Saving" msgstr "Stäng _utan att spara" -#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:952 ../meld/filediff.py:1580 -#: ../meld/iohelpers.py:50 ../meld/iohelpers.py:100 +#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:988 ../meld/iohelpers.py:50 +#: ../meld/iohelpers.py:100 msgid "_Cancel" msgstr "_Avbryt" @@ -928,7 +928,7 @@ msgstr "" msgid "_Discard" msgstr "_Förkasta" -#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:953 ../meld/iohelpers.py:101 +#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:989 ../meld/iohelpers.py:101 msgid "_Replace" msgstr "_Ersätt" @@ -1673,82 +1673,82 @@ msgid "Mac OS (CR)" msgstr "Mac OS (CR)" #. Create file size CellRenderer -#: ../meld/dirdiff.py:392 ../meld/preferences.py:82 +#: ../meld/dirdiff.py:428 ../meld/preferences.py:81 msgid "Size" msgstr "Storlek" #. Create date-time CellRenderer -#: ../meld/dirdiff.py:400 ../meld/preferences.py:83 +#: ../meld/dirdiff.py:436 ../meld/preferences.py:82 msgid "Modification time" msgstr "Ändringstid" #. Create permissions CellRenderer -#: ../meld/dirdiff.py:408 ../meld/preferences.py:84 +#: ../meld/dirdiff.py:444 ../meld/preferences.py:83 msgid "Permissions" msgstr "Rättigheter" -#: ../meld/dirdiff.py:539 +#: ../meld/dirdiff.py:575 #, python-format msgid "Hide %s" msgstr "Dölj %s" -#: ../meld/dirdiff.py:680 ../meld/dirdiff.py:703 +#: ../meld/dirdiff.py:716 ../meld/dirdiff.py:739 #, python-format msgid "[%s] Scanning %s" msgstr "[%s] Söker igenom %s" -#: ../meld/dirdiff.py:838 +#: ../meld/dirdiff.py:874 #, python-format msgid "[%s] Done" msgstr "[%s] Klar" -#: ../meld/dirdiff.py:846 +#: ../meld/dirdiff.py:882 msgid "Folders have no differences" msgstr "Mapparna skiljer sig inte åt" -#: ../meld/dirdiff.py:848 +#: ../meld/dirdiff.py:884 msgid "Contents of scanned files in folders are identical." msgstr "Innehållet i mapparnas avsökta filer är identiskt." -#: ../meld/dirdiff.py:850 +#: ../meld/dirdiff.py:886 msgid "" "Scanned files in folders appear identical, but contents have not been " "scanned." msgstr "" "Mapparnas avsökta filer verkar identiska, men innehållet har inte genomsökts." -#: ../meld/dirdiff.py:853 +#: ../meld/dirdiff.py:889 msgid "File filters are in use, so not all files have been scanned." msgstr "Filfilter används, och därför har inte alla filer genomsökts." -#: ../meld/dirdiff.py:855 +#: ../meld/dirdiff.py:891 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:873 ../meld/filediff.py:1473 ../meld/filediff.py:1503 -#: ../meld/filediff.py:1505 ../meld/ui/msgarea.py:106 ../meld/ui/msgarea.py:119 +#: ../meld/dirdiff.py:909 ../meld/filediff.py:1499 ../meld/filediff.py:1529 +#: ../meld/filediff.py:1531 ../meld/ui/msgarea.py:106 ../meld/ui/msgarea.py:119 msgid "Hi_de" msgstr "_Dölj" -#: ../meld/dirdiff.py:882 +#: ../meld/dirdiff.py:918 msgid "Multiple errors occurred while scanning this folder" msgstr "Flera fel inträffade vid avsökning av denna mapp" -#: ../meld/dirdiff.py:883 +#: ../meld/dirdiff.py:919 msgid "Files with invalid encodings found" msgstr "Filer med ogiltiga teckenkodningar hittades" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:885 +#: ../meld/dirdiff.py:921 msgid "Some files were in an incorrect encoding. The names are something like:" msgstr "En del filer hade en felaktig kodning. Namnen är ungefär:" -#: ../meld/dirdiff.py:887 +#: ../meld/dirdiff.py:923 msgid "Files hidden by case insensitive comparison" msgstr "Filer dolda av skiftlägeskänslig jämförelse" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:889 +#: ../meld/dirdiff.py:925 msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. The following files in this folder are hidden:" @@ -1756,17 +1756,17 @@ msgstr "" "Du gör en skiftlägesokänslig jämförelse på ett skiftlägeskänsligt filsystem. " "En del filer syns inte:" -#: ../meld/dirdiff.py:900 +#: ../meld/dirdiff.py:936 #, python-format msgid "“%s” hidden by “%s”" msgstr "”%s” dolda av ”%s”" -#: ../meld/dirdiff.py:956 +#: ../meld/dirdiff.py:992 #, python-format msgid "Replace folder “%s”?" msgstr "Ersätt mappen ”%s”?" -#: ../meld/dirdiff.py:958 +#: ../meld/dirdiff.py:994 #, python-format msgid "" "Another folder with the same name already exists in “%s”.\n" @@ -1775,11 +1775,11 @@ msgstr "" "En annan mapp med samma namn existerar redan i ”%s”.\n" "Om du ersätter befintlig mapp kommer alla filer att förloras." -#: ../meld/dirdiff.py:971 +#: ../meld/dirdiff.py:1007 msgid "Error copying file" msgstr "Fel vid filkopiering" -#: ../meld/dirdiff.py:972 +#: ../meld/dirdiff.py:1008 #, python-format msgid "" "Couldn’t copy %s\n" @@ -1792,19 +1792,19 @@ msgstr "" "\n" "%s" -#: ../meld/dirdiff.py:997 ../meld/vcview.py:703 +#: ../meld/dirdiff.py:1033 ../meld/vcview.py:703 msgid "Error deleting {}" msgstr "Fel vid borttagning av {}" -#: ../meld/dirdiff.py:1519 +#: ../meld/dirdiff.py:1546 msgid "No folder" msgstr "Ingen mapp" -#: ../meld/filediff.py:816 +#: ../meld/filediff.py:834 msgid "Comparison results will be inaccurate" msgstr "Jämförelseresultat kommer att bli osäkra" -#: ../meld/filediff.py:818 +#: ../meld/filediff.py:836 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1812,64 +1812,64 @@ msgstr "" "Ett filter ändrade antalet rader i filen vilket inte stöds. Jämförelsen " "kommer att vara osäker." -#: ../meld/filediff.py:875 +#: ../meld/filediff.py:905 msgid "Mark conflict as resolved?" msgstr "Markera konflikten som löst?" -#: ../meld/filediff.py:877 +#: ../meld/filediff.py:907 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:879 +#: ../meld/filediff.py:909 msgid "Cancel" msgstr "Avbryt" -#: ../meld/filediff.py:880 +#: ../meld/filediff.py:910 msgid "Mark _Resolved" msgstr "Markera som _löst" -#: ../meld/filediff.py:1188 +#: ../meld/filediff.py:1214 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Det uppstod ett problem vid öppnandet av filen ”%s”." -#: ../meld/filediff.py:1196 +#: ../meld/filediff.py:1222 #, python-format msgid "File %s appears to be a binary file." msgstr "Filen %s verkar vara en binärfil." -#: ../meld/filediff.py:1198 +#: ../meld/filediff.py:1224 msgid "Do you want to open the file using the default application?" msgstr "Vill du öppna filen med standardprogrammet?" -#: ../meld/filediff.py:1200 +#: ../meld/filediff.py:1226 msgid "Open" msgstr "Öppna" -#: ../meld/filediff.py:1216 +#: ../meld/filediff.py:1242 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Beräknar skillnader" -#: ../meld/filediff.py:1277 +#: ../meld/filediff.py:1303 #, python-format msgid "File %s has changed on disk" msgstr "Filen %s har ändrats på disk" -#: ../meld/filediff.py:1278 +#: ../meld/filediff.py:1304 msgid "Do you want to reload the file?" msgstr "Vill du läsa om filen?" -#: ../meld/filediff.py:1280 +#: ../meld/filediff.py:1306 msgid "_Reload" msgstr "_Läs om" -#: ../meld/filediff.py:1436 +#: ../meld/filediff.py:1462 msgid "Files are identical" msgstr "Filerna är identiska" -#: ../meld/filediff.py:1449 +#: ../meld/filediff.py:1475 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1877,11 +1877,11 @@ msgstr "" "Textfilter används och kan dölja skillnader mellan filer. Vill du jämföra de " "ofiltrerade filerna?" -#: ../meld/filediff.py:1454 +#: ../meld/filediff.py:1480 msgid "Files differ in line endings only" msgstr "Filer skiljer sig endast vad gäller radslut" -#: ../meld/filediff.py:1456 +#: ../meld/filediff.py:1482 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1890,15 +1890,15 @@ msgstr "" "Filerna är identiska förutom radavsluten:\n" "%s" -#: ../meld/filediff.py:1476 +#: ../meld/filediff.py:1502 msgid "Show without filters" msgstr "Visa utan filer" -#: ../meld/filediff.py:1498 +#: ../meld/filediff.py:1524 msgid "Change highlighting incomplete" msgstr "Ändra markering av ofärdiga" -#: ../meld/filediff.py:1499 +#: ../meld/filediff.py:1525 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." @@ -1907,19 +1907,19 @@ msgstr "" "Meld till att längre tid på sig att markera större ändringar, men det kan " "bli långsamt." -#: ../meld/filediff.py:1507 +#: ../meld/filediff.py:1533 msgid "Keep highlighting" msgstr "Använd markering" -#: ../meld/filediff.py:1509 +#: ../meld/filediff.py:1535 msgid "_Keep highlighting" msgstr "_Använd markering" -#: ../meld/filediff.py:1522 +#: ../meld/filediff.py:1548 msgid "Saving failed" msgstr "Misslyckades med att spara" -#: ../meld/filediff.py:1523 +#: ../meld/filediff.py:1549 msgid "" "Please consider copying any critical changes to another program or file to " "avoid data loss." @@ -1927,57 +1927,42 @@ 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:1532 +#: ../meld/filediff.py:1558 msgid "Save Left Pane As" msgstr "Spara vänsterpanel som" -#: ../meld/filediff.py:1534 +#: ../meld/filediff.py:1560 msgid "Save Middle Pane As" msgstr "Spara mittenpanel som" -#: ../meld/filediff.py:1536 +#: ../meld/filediff.py:1562 msgid "Save Right Pane As" msgstr "Spara högerpanel som" -#: ../meld/filediff.py:1549 +#: ../meld/filediff.py:1575 #, 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:1551 +#: ../meld/filediff.py:1577 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:1554 +#: ../meld/filediff.py:1580 msgid "Save Anyway" msgstr "Spara ändå" -#: ../meld/filediff.py:1555 +#: ../meld/filediff.py:1581 msgid "Don’t Save" msgstr "Spara inte" -#: ../meld/filediff.py:1581 -msgid "_Save as UTF-8" -msgstr "_Spara som UTF-8" - -#: ../meld/filediff.py:1584 -#, python-format -msgid "Couldn’t encode text as “%s”" -msgstr "Kunde inte koda text som ”%s”" - -#: ../meld/filediff.py:1586 -#, python-format +#: ../meld/filediff.py:1623 msgid "" -"File “%s” contains characters that can’t be encoded using encoding “%s”.\n" -"Would you like to save as UTF-8?" +"File “{}” contains characters that can’t be encoded using its current " +"encoding “{}”." msgstr "" -"Filen ”%s” innehåller tecken som inte kan kodas med kodningen ”%s”\n" -"Vill du spara som UTF-8?" - -#: ../meld/filediff.py:1626 ../meld/patchdialog.py:130 -#, python-format -msgid "Could not save file %s." -msgstr "Kunde inte spara filen %s." +"Filen ”{}” innehåller tecken som inte kan kodas med dess aktuella kodning " +"”{}”." #: ../meld/filediff.py:1627 ../meld/patchdialog.py:131 #, python-format @@ -1988,11 +1973,16 @@ msgstr "" "Kunde in spara fil beroende på:\n" "%s" -#: ../meld/filediff.py:2002 +#: ../meld/filediff.py:1631 ../meld/patchdialog.py:130 +#, python-format +msgid "Could not save file %s." +msgstr "Kunde inte spara filen %s." + +#: ../meld/filediff.py:2014 msgid "Live comparison updating disabled" msgstr "Inaktivera realtidsuppdateringar av jämförelser" -#: ../meld/filediff.py:2003 +#: ../meld/filediff.py:2015 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -2051,98 +2041,98 @@ msgstr "" "En fil med detta namn existerar redan i ”%s”.\n" "Om du ersätter befintlig fil kommer dess innehåll att gå förlorat." -#: ../meld/meldapp.py:179 +#: ../meld/meldapp.py:181 msgid "wrong number of arguments supplied to --diff" msgstr "felaktigt antal argument angavs för --diff" -#: ../meld/meldapp.py:184 +#: ../meld/meldapp.py:186 msgid "Start with an empty window" msgstr "Starta med ett tomt fönster" -#: ../meld/meldapp.py:185 ../meld/meldapp.py:187 +#: ../meld/meldapp.py:187 ../meld/meldapp.py:189 msgid "file" msgstr "fil" -#: ../meld/meldapp.py:185 ../meld/meldapp.py:189 +#: ../meld/meldapp.py:187 ../meld/meldapp.py:191 msgid "folder" msgstr "mapp" -#: ../meld/meldapp.py:186 +#: ../meld/meldapp.py:188 msgid "Start a version control comparison" msgstr "Starta en versionshanterad jämförelse" -#: ../meld/meldapp.py:188 +#: ../meld/meldapp.py:190 msgid "Start a 2- or 3-way file comparison" msgstr "Starta med en två- eller trevägs filjämförelse" -#: ../meld/meldapp.py:190 +#: ../meld/meldapp.py:192 msgid "Start a 2- or 3-way folder comparison" msgstr "Starta med en två- eller trevägs mappjämförelse" -#: ../meld/meldapp.py:233 +#: ../meld/meldapp.py:235 #, python-format msgid "Error: %s\n" msgstr "Fel: %s\n" -#: ../meld/meldapp.py:240 +#: ../meld/meldapp.py:242 msgid "Meld is a file and directory comparison tool." msgstr "Meld är ett verktyg för att jämföra filer och kataloger." -#: ../meld/meldapp.py:244 +#: ../meld/meldapp.py:246 msgid "Set label to use instead of file name" msgstr "Sätt etikett att använda istället för filnamn" -#: ../meld/meldapp.py:247 +#: ../meld/meldapp.py:249 msgid "Open a new tab in an already running instance" msgstr "Öppna en ny flik i en redan körande instans" -#: ../meld/meldapp.py:250 +#: ../meld/meldapp.py:252 msgid "Automatically compare all differing files on startup" msgstr "Jämför automatiskt alla filer som skiljer sig vid uppstart" -#: ../meld/meldapp.py:253 +#: ../meld/meldapp.py:255 msgid "Ignored for compatibility" msgstr "Ignorerad för kompatibilitet" -#: ../meld/meldapp.py:257 +#: ../meld/meldapp.py:259 msgid "Set the target file for saving a merge result" msgstr "Ställ in målfilen för att spara sammanfogat resultat" -#: ../meld/meldapp.py:260 +#: ../meld/meldapp.py:262 msgid "Automatically merge files" msgstr "Sammanfoga automatiskt filer" -#: ../meld/meldapp.py:264 +#: ../meld/meldapp.py:266 msgid "Load a saved comparison from a Meld comparison file" msgstr "Läs in en sparad jämförelse från en Meld jämförelsefil" -#: ../meld/meldapp.py:268 +#: ../meld/meldapp.py:270 msgid "Create a diff tab for the supplied files or folders" msgstr "Skapar en diff-tabell för angivna filer eller mappar" -#: ../meld/meldapp.py:288 +#: ../meld/meldapp.py:290 #, python-format msgid "too many arguments (wanted 0-3, got %d)" msgstr "för många argument (ville ha 0-3, fick %d)" -#: ../meld/meldapp.py:291 +#: ../meld/meldapp.py:293 msgid "can’t auto-merge less than 3 files" msgstr "kan inte automatiskt sammanfoga mindre är tre filer" -#: ../meld/meldapp.py:293 +#: ../meld/meldapp.py:295 msgid "can’t auto-merge directories" msgstr "kan inte automatiskt sammanfoga kataloger" -#: ../meld/meldapp.py:307 +#: ../meld/meldapp.py:309 msgid "Error reading saved comparison file" msgstr "Fel vid läsning av den sparade konfigurationsfilen" -#: ../meld/meldapp.py:324 +#: ../meld/meldapp.py:326 #, python-format msgid "invalid path or URI “%s”" msgstr "ogiltig sökväg eller URI ”%s”" -#: ../meld/meldapp.py:330 +#: ../meld/meldapp.py:332 msgid "remote folder “{}” not supported" msgstr "fjärrmapp ”{}” stöds ej" @@ -2356,7 +2346,7 @@ msgstr "Behöver tre filer för att sammanfoga automatiskt, fick: %r" msgid "Cannot compare a mixture of files and directories" msgstr "Kan inte jämföra en blandning av filer och kataloger" -#: ../meld/misc.py:134 +#: ../meld/misc.py:135 msgid "" "{}\n" "\n" @@ -2368,15 +2358,14 @@ msgstr "" "Meld stötte på ett kritiskt fel under körning:\n" "{}" -#: ../meld/misc.py:253 +#: ../meld/misc.py:254 #, python-format msgid "Couldn’t find colour scheme details for %s-%s; this is a bad install" msgstr "" "Kunde inte hitta färgschemadetaljer för %s-%s; detta är en felaktig " "installation" -#. no common path. empty names get changed to "[None]" -#: ../meld/misc.py:314 +#: ../meld/misc.py:325 msgid "[None]" msgstr "[Ingen]" @@ -2406,12 +2395,12 @@ msgid "Close tab" msgstr "Stäng flik" #. Abbreviation for line, column so that it will fit in the status bar -#: ../meld/ui/statusbar.py:133 +#: ../meld/ui/statusbar.py:124 #, python-format msgid "Ln %i, Col %i" msgstr "Rad %i, kolumn %i" -#: ../meld/ui/statusbar.py:186 +#: ../meld/ui/statusbar.py:177 msgid "Line you want to move the cursor to" msgstr "Rad du vill flytta markören till" @@ -2612,6 +2601,12 @@ msgstr "" msgid "Clear" msgstr "Töm" +#~ msgid "_Save as UTF-8" +#~ msgstr "_Spara som UTF-8" + +#~ msgid "Couldn’t encode text as “%s”" +#~ msgstr "Kunde inte koda text som ”%s”" + #~ msgid "Error removing %s" #~ msgstr "Fel vid borttagning av %s" From 277bd37c9b4061ee45d179845b05d34e44988542 Mon Sep 17 00:00:00 2001 From: Anders Jonsson Date: Mon, 7 Jan 2019 22:26:35 +0000 Subject: [PATCH 0774/1316] Update Swedish translation --- po/sv.po | 1964 +++++++++++++++++++++++++++--------------------------- 1 file changed, 982 insertions(+), 982 deletions(-) diff --git a/po/sv.po b/po/sv.po index d23038fe..fa53a7f5 100644 --- a/po/sv.po +++ b/po/sv.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: 2019-01-07 09:44+0000\n" -"PO-Revision-Date: 2019-01-07 23:23+0100\n" +"POT-Creation-Date: 2019-01-07 22:25+0000\n" +"PO-Revision-Date: 2019-01-07 23:25+0100\n" "Last-Translator: Anders Jonsson \n" "Language-Team: Swedish \n" "Language: sv\n" @@ -22,16 +22,16 @@ msgstr "" "X-Generator: Poedit 2.2\n" "X-Project-Style: gnome\n" -#: ../bin/meld:194 +#: ../bin/meld:190 msgid "Cannot import: " msgstr "Kan inte importera: " -#: ../bin/meld:197 +#: ../bin/meld:193 #, c-format msgid "Meld requires %s or higher." msgstr "Meld kräver %s eller högre." -#: ../bin/meld:243 +#: ../bin/meld:249 #, c-format msgid "" "Couldn’t load Meld-specific CSS (%s)\n" @@ -41,7 +41,8 @@ msgstr "" "%s" #: ../data/org.gnome.meld.desktop.in.h:1 -#: ../data/org.gnome.meld.appdata.xml.in.h:1 ../data/ui/meldapp.ui.h:1 +#: ../data/org.gnome.meld.appdata.xml.in.h:1 +#: ../meld/resources/ui/appwindow.ui.h:1 msgid "Meld" msgstr "Meld" @@ -109,26 +110,10 @@ msgid "Default window fullscreen state" msgstr "Helskärmstillstånd för standardfönster" #: ../data/org.gnome.meld.gschema.xml.h:5 -msgid "Show toolbar" -msgstr "Visa verktygsfältet" - -#: ../data/org.gnome.meld.gschema.xml.h:6 -msgid "If true, the window toolbar is visible." -msgstr "Om true så är fönsterverktygsfältet synlig." - -#: ../data/org.gnome.meld.gschema.xml.h:7 -msgid "Show statusbar" -msgstr "Visa statusraden" - -#: ../data/org.gnome.meld.gschema.xml.h:8 -msgid "If true, the window statusbar is visible." -msgstr "Om true så är fönsterstatusraden synlig." - -#: ../data/org.gnome.meld.gschema.xml.h:9 msgid "Additional automatically detected text encodings" msgstr "Ytterligare automatiskt upptäckta textkodningar" -#: ../data/org.gnome.meld.gschema.xml.h:10 +#: ../data/org.gnome.meld.gschema.xml.h:6 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 " @@ -140,36 +125,36 @@ msgstr "" "kommer UTF-8 och standardkodningen för aktuell lokal alltid att användas. " "Andra kodningar kan också provas beroende på användarens lokal." -#: ../data/org.gnome.meld.gschema.xml.h:11 +#: ../data/org.gnome.meld.gschema.xml.h:7 msgid "Width of an indentation step" msgstr "Bredden på ett indenteringssteg" -#: ../data/org.gnome.meld.gschema.xml.h:12 +#: ../data/org.gnome.meld.gschema.xml.h:8 msgid "The number of spaces to use for a single indent step" msgstr "Antalet blanksteg att använda för ett ensamt indenteringssteg" -#: ../data/org.gnome.meld.gschema.xml.h:13 +#: ../data/org.gnome.meld.gschema.xml.h:9 msgid "Whether to indent using spaces or tabs" msgstr "Huruvida indentering sker med blanksteg eller tabb" -#: ../data/org.gnome.meld.gschema.xml.h:14 +#: ../data/org.gnome.meld.gschema.xml.h:10 msgid "If true, any new indentation will use spaces instead of tabs." msgstr "" "Om true kommer nya indenteringar att använda blanksteg istället för tabbar." -#: ../data/org.gnome.meld.gschema.xml.h:15 +#: ../data/org.gnome.meld.gschema.xml.h:11 msgid "Show line numbers" msgstr "Visa radnummer" -#: ../data/org.gnome.meld.gschema.xml.h:16 +#: ../data/org.gnome.meld.gschema.xml.h:12 msgid "If true, line numbers will be shown in the gutter of file comparisons." msgstr "Om true visas radnummer i marginalen på filjämförelserna." -#: ../data/org.gnome.meld.gschema.xml.h:17 +#: ../data/org.gnome.meld.gschema.xml.h:13 msgid "Highlight syntax" msgstr "Markera syntax" -#: ../data/org.gnome.meld.gschema.xml.h:18 +#: ../data/org.gnome.meld.gschema.xml.h:14 msgid "" "Whether to highlight syntax in comparisons. Because of Meld’s own color " "highlighting, this is off by default." @@ -177,23 +162,23 @@ msgstr "" "Huruvida syntax ska markeras i jämförelser. På grund av Melds egna " "färgmarkeringar är detta som standard av." -#: ../data/org.gnome.meld.gschema.xml.h:19 +#: ../data/org.gnome.meld.gschema.xml.h:15 msgid "Color scheme to use for syntax highlighting" msgstr "Färgschema att använda för syntaxmarkering" -#: ../data/org.gnome.meld.gschema.xml.h:20 +#: ../data/org.gnome.meld.gschema.xml.h:16 msgid "Used by GtkSourceView to determine colors for syntax highlighting" msgstr "" "Används av GtkSourceView för att bestämma färger för färgmarkering av syntax" -#: ../data/org.gnome.meld.gschema.xml.h:21 +#: ../data/org.gnome.meld.gschema.xml.h:17 msgid "Displayed whitespace" msgstr "Visade tomrum" # # Detta är värden för gschema-nycklar, använd \" runt dem # http://listor.tp-sv.se/pipermail/tp-sv/2014-July/000779.html -#: ../data/org.gnome.meld.gschema.xml.h:22 +#: ../data/org.gnome.meld.gschema.xml.h:18 msgid "" "Selector for individual whitespace character types to be shown. Possible " "values are 'space', 'tab', 'newline' and 'nbsp'." @@ -201,11 +186,11 @@ msgstr "" "Väljare för individuella tomrumsteckentyper att visa. Möjliga värden är " "\"space\", \"tab\", \"newline\" och \"nbsp\"." -#: ../data/org.gnome.meld.gschema.xml.h:23 +#: ../data/org.gnome.meld.gschema.xml.h:19 msgid "Wrap mode" msgstr "Radbrytningsläge" -#: ../data/org.gnome.meld.gschema.xml.h:24 +#: ../data/org.gnome.meld.gschema.xml.h:20 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 " @@ -215,32 +200,32 @@ msgstr "" "antingen inte alls (\"none\"), vid vilket tecken som helst (\"char\") eller " "bara vid slutet av ord (\"word\")." -#: ../data/org.gnome.meld.gschema.xml.h:25 +#: ../data/org.gnome.meld.gschema.xml.h:21 msgid "Highlight current line" msgstr "Markera aktuell rad" -#: ../data/org.gnome.meld.gschema.xml.h:26 +#: ../data/org.gnome.meld.gschema.xml.h:22 msgid "" "If true, the line containing the cursor will be highlighted in file " "comparisons." msgstr "Om true kommer raden med markören att bli markerad i filjämförelser." -#: ../data/org.gnome.meld.gschema.xml.h:27 +#: ../data/org.gnome.meld.gschema.xml.h:23 msgid "Use the system default monospace font" msgstr "Använd systemets standard typsnitt med fast breddsteg" -#: ../data/org.gnome.meld.gschema.xml.h:28 +#: ../data/org.gnome.meld.gschema.xml.h:24 msgid "" "If false, custom-font will be used instead of the system monospace font." msgstr "" "Om false kommer det anpassade typsnittet att användas istället för systemets " "monospace-typsnitt." -#: ../data/org.gnome.meld.gschema.xml.h:29 +#: ../data/org.gnome.meld.gschema.xml.h:25 msgid "Custom font" msgstr "Anpassat typsnitt" -#: ../data/org.gnome.meld.gschema.xml.h:30 +#: ../data/org.gnome.meld.gschema.xml.h:26 msgid "" "The custom font to use, stored as a string and parsed as a Pango font " "description." @@ -248,21 +233,21 @@ msgstr "" "Det anpassade typsnittet att använda, lagrat som en sträng och tolkat som en " "som en Pango typsnittsbeskrivning." -#: ../data/org.gnome.meld.gschema.xml.h:31 +#: ../data/org.gnome.meld.gschema.xml.h:27 msgid "Ignore blank lines when comparing files" msgstr "Ignorera tomma rader vid filjämförelser" -#: ../data/org.gnome.meld.gschema.xml.h:32 +#: ../data/org.gnome.meld.gschema.xml.h:28 msgid "" "If true, blank lines will be trimmed when highlighting changes between files." msgstr "" "Om true kommer tomma rader att tas bort när ändringar markeras mellan filer." -#: ../data/org.gnome.meld.gschema.xml.h:33 +#: ../data/org.gnome.meld.gschema.xml.h:29 msgid "Use the system default editor" msgstr "Använd systemets standardredigerare" -#: ../data/org.gnome.meld.gschema.xml.h:34 +#: ../data/org.gnome.meld.gschema.xml.h:30 msgid "" "If false, custom-editor-command will be used instead of the system editor " "when opening files externally." @@ -270,11 +255,11 @@ msgstr "" "Om false kommer den anpassade redigeraren att användas istället för " "systemredigeraren när filer öppnas externt." -#: ../data/org.gnome.meld.gschema.xml.h:35 +#: ../data/org.gnome.meld.gschema.xml.h:31 msgid "The custom editor launch command" msgstr "Kommandot för att starta anpassad redigerare" -#: ../data/org.gnome.meld.gschema.xml.h:36 +#: ../data/org.gnome.meld.gschema.xml.h:32 msgid "" "The command used to launch a custom editor. Some limited templating is " "supported here; at the moment '{file}' and '{line}' are recognised tokens." @@ -282,21 +267,22 @@ msgstr "" "Kommandot för att starta en anpassad redigerare. Begränsat mallstöd här; för " "tillfället är ”{file}” och ”{line}” igenkända informationsbärare." -#: ../data/org.gnome.meld.gschema.xml.h:37 +#: ../data/org.gnome.meld.gschema.xml.h:33 msgid "Columns to display" msgstr "Kolumner att visa" -#: ../data/org.gnome.meld.gschema.xml.h:38 +#: ../data/org.gnome.meld.gschema.xml.h:34 msgid "" "List of column names in folder comparison and whether they should be " "displayed." msgstr "Lista av kolumnnamn vid mappjämförelse och huruvida de ska visas." -#: ../data/org.gnome.meld.gschema.xml.h:39 ../data/ui/preferences.ui.h:25 +#: ../data/org.gnome.meld.gschema.xml.h:35 +#: ../meld/resources/ui/preferences.ui.h:25 msgid "Ignore symbolic links" msgstr "Ignorera symboliska länkar" -#: ../data/org.gnome.meld.gschema.xml.h:40 +#: ../data/org.gnome.meld.gschema.xml.h:36 msgid "" "If true, folder comparisons do not follow symbolic links when traversing the " "folder tree." @@ -304,11 +290,11 @@ msgstr "" "Om true följer inte mappjämförelser symboliska länkar när mappträdet " "genomsöks." -#: ../data/org.gnome.meld.gschema.xml.h:41 +#: ../data/org.gnome.meld.gschema.xml.h:37 msgid "Use shallow comparison" msgstr "Använd ytlig jämförelse" -#: ../data/org.gnome.meld.gschema.xml.h:42 +#: ../data/org.gnome.meld.gschema.xml.h:38 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 " @@ -317,11 +303,11 @@ msgstr "" "Om true sker mappjämförelser endast baserat på storlek och mtime och bedömer " "filerna identiska om deras storlek och mtime matchar, annars inte." -#: ../data/org.gnome.meld.gschema.xml.h:43 +#: ../data/org.gnome.meld.gschema.xml.h:39 msgid "File timestamp resolution" msgstr "Tidsstämpelupplösning på filen" -#: ../data/org.gnome.meld.gschema.xml.h:44 +#: ../data/org.gnome.meld.gschema.xml.h:40 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 " @@ -333,11 +319,12 @@ msgstr "" "användbart när filer jämförs på olika filsystem med olika " "tidsstämpelupplösningar." -#: ../data/org.gnome.meld.gschema.xml.h:45 ../data/ui/preferences.ui.h:22 +#: ../data/org.gnome.meld.gschema.xml.h:41 +#: ../meld/resources/ui/preferences.ui.h:22 msgid "Apply text filters during folder comparisons" msgstr "Verkställ textfilter vid mappjämförelser" -#: ../data/org.gnome.meld.gschema.xml.h:46 +#: ../data/org.gnome.meld.gschema.xml.h:42 msgid "" "If true, folder comparisons that compare file contents also apply active " "text filters and the blank line trimming option, and ignore newline " @@ -347,21 +334,21 @@ msgstr "" "aktiva textfilter och alternativet att trimma tomma rader samt ignorera " "nyradsskillnader." -#: ../data/org.gnome.meld.gschema.xml.h:47 +#: ../data/org.gnome.meld.gschema.xml.h:43 msgid "File status filters" msgstr "Filstatusfilter" -#: ../data/org.gnome.meld.gschema.xml.h:48 +#: ../data/org.gnome.meld.gschema.xml.h:44 msgid "List of statuses used to filter visible files in folder comparison." msgstr "" "Lista över statusar använda till att filtrera synliga filer vid " "mappjämförelse." -#: ../data/org.gnome.meld.gschema.xml.h:49 +#: ../data/org.gnome.meld.gschema.xml.h:45 msgid "Show the version control console output" msgstr "Visa versionshanterarens konsolutmatning" -#: ../data/org.gnome.meld.gschema.xml.h:50 +#: ../data/org.gnome.meld.gschema.xml.h:46 msgid "" "If true, a console output section will be shown in version control views, " "showing the commands run for version control operations." @@ -369,11 +356,11 @@ msgstr "" "Om true kommer en konsolutmatning att visas i versionshanteringsvyer, " "visandes de kommandon som körs vid versionshanteringsåtgärder." -#: ../data/org.gnome.meld.gschema.xml.h:51 +#: ../data/org.gnome.meld.gschema.xml.h:47 msgid "Version control pane position" msgstr "Position för versionshanteringspanelen" -#: ../data/org.gnome.meld.gschema.xml.h:52 +#: ../data/org.gnome.meld.gschema.xml.h:48 msgid "" "This is the height of the main version control tree when the console pane is " "shown." @@ -381,11 +368,11 @@ msgstr "" "Detta är höjden på huvudträdet för versionshanteringen när konsolpanelen " "visas." -#: ../data/org.gnome.meld.gschema.xml.h:53 +#: ../data/org.gnome.meld.gschema.xml.h:49 msgid "Present version comparisons as left-local/right-remote" msgstr "Visa versionsjämförelser som vänster-lokal/höger-fjärr" -#: ../data/org.gnome.meld.gschema.xml.h:54 +#: ../data/org.gnome.meld.gschema.xml.h:50 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, " @@ -396,11 +383,11 @@ msgstr "" "presenteras i paneler. Annars används ett vänster-är-deras-, höger-är-mitt-" "schema." -#: ../data/org.gnome.meld.gschema.xml.h:55 +#: ../data/org.gnome.meld.gschema.xml.h:51 msgid "Order for files in three-way version control merge comparisons" msgstr "Sortering för filer i trevägsjämförelser med versionshantering" -#: ../data/org.gnome.meld.gschema.xml.h:56 +#: ../data/org.gnome.meld.gschema.xml.h:52 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 +398,11 @@ msgstr "" "versionshanteringsvyn, och används endast för sammanfogning/konfliktlösning " "i Meld." -#: ../data/org.gnome.meld.gschema.xml.h:57 +#: ../data/org.gnome.meld.gschema.xml.h:53 msgid "Show margin in commit message editor" msgstr "Visa marginal i redigeraren för incheckningsmeddelanden" -#: ../data/org.gnome.meld.gschema.xml.h:58 +#: ../data/org.gnome.meld.gschema.xml.h:54 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 +410,11 @@ msgstr "" "Om true så visas en guide för marginalens kolumn i " "versionshanteringsredigeraren för incheckningsmeddelanden." -#: ../data/org.gnome.meld.gschema.xml.h:59 +#: ../data/org.gnome.meld.gschema.xml.h:55 msgid "Margin column in commit message editor" msgstr "Marginalkolumn i redigeraren för incheckningsmeddelanden" -#: ../data/org.gnome.meld.gschema.xml.h:60 +#: ../data/org.gnome.meld.gschema.xml.h:56 msgid "" "The column at which to show the margin in the version control commit message " "editor." @@ -435,11 +422,11 @@ msgstr "" "Kolumnen i vilken marginalen ska visas i versionshanteringsredigeraren för " "incheckningsmeddelanden." -#: ../data/org.gnome.meld.gschema.xml.h:61 +#: ../data/org.gnome.meld.gschema.xml.h:57 msgid "Automatically hard-wrap commit messages" msgstr "Automatisk radbrytning av incheckningsmeddelanden" -#: ../data/org.gnome.meld.gschema.xml.h:62 +#: ../data/org.gnome.meld.gschema.xml.h:58 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 +435,22 @@ msgstr "" "radbrytas (d.v.s. infoga radbrytning) vid incheckningsmarginalen före " "incheckning." -#: ../data/org.gnome.meld.gschema.xml.h:63 +#: ../data/org.gnome.meld.gschema.xml.h:59 msgid "Version control status filters" msgstr "Statusfilter för versionshantering" -#: ../data/org.gnome.meld.gschema.xml.h:64 +#: ../data/org.gnome.meld.gschema.xml.h:60 msgid "" "List of statuses used to filter visible files in version control comparison." msgstr "" "Statuslista använd för att filtrera synliga filer vid " "versionshanteringsjämförelse." -#: ../data/org.gnome.meld.gschema.xml.h:65 +#: ../data/org.gnome.meld.gschema.xml.h:61 msgid "Filename-based filters" msgstr "Filnamnsbaserade filter" -#: ../data/org.gnome.meld.gschema.xml.h:66 +#: ../data/org.gnome.meld.gschema.xml.h:62 msgid "" "List of predefined filename-based filters that, if active, will remove " "matching files from a folder comparison." @@ -471,11 +458,11 @@ msgstr "" "Lista över fördefinierade filnamnsbaserade filter som, om aktiva, kommer att " "ta bort matchande filer vid en mappjämförelse." -#: ../data/org.gnome.meld.gschema.xml.h:67 +#: ../data/org.gnome.meld.gschema.xml.h:63 msgid "Text-based filters" msgstr "Textbaserade filter" -#: ../data/org.gnome.meld.gschema.xml.h:68 +#: ../data/org.gnome.meld.gschema.xml.h:64 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, " @@ -501,401 +488,626 @@ msgstr "Meld mörkt schema" msgid "Dark color scheme for Meld highlighting" msgstr "Mörkt färgschema att använda för syntaxmarkering" -#: ../data/ui/application.ui.h:1 -msgid "About Meld" -msgstr "Om Meld" +#: ../meld/resources/gtk/help-overlay.ui.h:1 +msgctxt "shortcut window" +msgid "General" +msgstr "Allmänt" -#: ../data/ui/application.ui.h:2 -msgid "" -"Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2017 Kai Willadsen" -msgstr "" -"Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2017 Kai Willadsen" +#: ../meld/resources/gtk/help-overlay.ui.h:2 +msgctxt "shortcut window" +msgid "New comparison" +msgstr "Ny jämförelse" -#: ../data/ui/application.ui.h:4 -msgid "Website" -msgstr "Webbplats" +#: ../meld/resources/gtk/help-overlay.ui.h:3 +msgctxt "shortcut window" +msgid "Close a comparison" +msgstr "Stäng en jämförelse" -#: ../data/ui/application.ui.h:5 -msgid "translator-credits" -msgstr "" -"Josef Andersson \n" -"Daniel Nylander \n" -"Christian Rose\n" -"\n" -"Skicka synpunkter på översättningen till\n" -"." +#: ../meld/resources/gtk/help-overlay.ui.h:4 +msgctxt "shortcut window" +msgid "Quit Meld" +msgstr "Avsluta Meld" -#: ../data/ui/application.ui.h:6 -msgid "_Preferences" -msgstr "Inställ_ningar" +#: ../meld/resources/gtk/help-overlay.ui.h:5 +msgctxt "shortcut window" +msgid "Stop the current action" +msgstr "Stoppa den aktuella åtgärden" -#: ../data/ui/application.ui.h:7 -msgid "_Help" -msgstr "_Hjälp" +#: ../meld/resources/gtk/help-overlay.ui.h:6 +msgctxt "shortcut window" +msgid "Refresh comparison" +msgstr "Uppdatera jämförelse" -#: ../data/ui/application.ui.h:8 -msgid "Keyboard Shortcuts" -msgstr "Tangentbordsgenvägar" +#: ../meld/resources/gtk/help-overlay.ui.h:7 +msgctxt "shortcut window" +msgid "Fullscreen" +msgstr "Helskärm" -#: ../data/ui/application.ui.h:9 -msgid "_About" -msgstr "_Om" +#: ../meld/resources/gtk/help-overlay.ui.h:8 +msgctxt "shortcut window" +msgid "Tabs" +msgstr "Flikar" -#: ../data/ui/application.ui.h:10 -msgid "_Quit" -msgstr "_Avsluta" +#: ../meld/resources/gtk/help-overlay.ui.h:9 +msgctxt "shortcut window" +msgid "Go to previous tab" +msgstr "Gå till föregående flik" -#: ../data/ui/dirdiff.ui.h:1 ../data/ui/vcview.ui.h:1 -msgid "_Compare" -msgstr "_Jämför" +#: ../meld/resources/gtk/help-overlay.ui.h:10 +msgctxt "shortcut window" +msgid "Go to next tab" +msgstr "Gå till nästa flik" -#: ../data/ui/dirdiff.ui.h:2 ../data/ui/vcview.ui.h:2 -msgid "Compare selected files" -msgstr "Jämför markerade filer" +#: ../meld/resources/gtk/help-overlay.ui.h:11 +msgctxt "shortcut window" +msgid "Switch to tab" +msgstr "Växla till flik" -#: ../data/ui/dirdiff.ui.h:3 -msgid "Collapse Recursively" -msgstr "Fäll ihop rekursivt" +#: ../meld/resources/gtk/help-overlay.ui.h:12 +msgctxt "shortcut window" +msgid "Move tab left" +msgstr "Flytta flik åt vänster" -#: ../data/ui/dirdiff.ui.h:4 -msgid "Collapse selected folder and all subfolders" -msgstr "Fäll ihop markerad mapp och alla undermappar" +#: ../meld/resources/gtk/help-overlay.ui.h:13 +msgctxt "shortcut window" +msgid "Move tab right" +msgstr "Flytta flik åt höger" -#: ../data/ui/dirdiff.ui.h:5 -msgid "Expand Recursively" -msgstr "Expandera rekursivt" +#: ../meld/resources/gtk/help-overlay.ui.h:14 +msgctxt "shortcut window" +msgid "Changes" +msgstr "Ändringar" -#: ../data/ui/dirdiff.ui.h:6 -msgid "Expand selected folder and all subfolders" -msgstr "Expandera markerad mapp och alla undermappar" +#: ../meld/resources/gtk/help-overlay.ui.h:15 +msgctxt "shortcut window" +msgid "Go to previous change" +msgstr "Gå till föregående ändring" -#: ../data/ui/dirdiff.ui.h:7 -msgid "Copy to _Left" -msgstr "Kopiera till _vänster" +#: ../meld/resources/gtk/help-overlay.ui.h:16 +msgctxt "shortcut window" +msgid "Go to next change" +msgstr "Gå till nästa ändring" -#: ../data/ui/dirdiff.ui.h:8 -msgid "Copy to left" -msgstr "Kopiera till vänster" +#: ../meld/resources/gtk/help-overlay.ui.h:17 +msgctxt "shortcut window" +msgid "Editing" +msgstr "Redigering" -#: ../data/ui/dirdiff.ui.h:9 -msgid "Copy to _Right" -msgstr "Kopiera till _höger" +#: ../meld/resources/gtk/help-overlay.ui.h:18 +msgctxt "shortcut window" +msgid "Undo" +msgstr "Ångra" -#: ../data/ui/dirdiff.ui.h:10 -msgid "Copy to right" -msgstr "Kopiera till höger" +#: ../meld/resources/gtk/help-overlay.ui.h:19 +msgctxt "shortcut window" +msgid "Redo" +msgstr "Gör om" -#: ../data/ui/dirdiff.ui.h:11 -msgid "Delete selected" -msgstr "Ta bort markerade" +#: ../meld/resources/gtk/help-overlay.ui.h:20 +msgctxt "shortcut window" +msgid "Cut" +msgstr "Klipp ut" -#: ../data/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:907 ../meld/filediff.py:1497 -msgid "Hide" -msgstr "Dölj" +#: ../meld/resources/gtk/help-overlay.ui.h:21 +msgctxt "shortcut window" +msgid "Copy" +msgstr "Kopiera" -#: ../data/ui/dirdiff.ui.h:13 -msgid "Hide selected" -msgstr "Dölj markerade" +#: ../meld/resources/gtk/help-overlay.ui.h:22 +msgctxt "shortcut window" +msgid "Paste" +msgstr "Klistra in" -#: ../data/ui/dirdiff.ui.h:14 -msgid "Ignore Filename Case" -msgstr "Ignorera skiftlägeskänslighet för filnamn" +#: ../meld/resources/gtk/help-overlay.ui.h:23 +msgctxt "shortcut window" +msgid "Find" +msgstr "Sök" -#: ../data/ui/dirdiff.ui.h:15 -msgid "" -"Consider differently-cased filenames that are otherwise-identical to be the " -"same" -msgstr "" -"Behandla filnamn som lika om de skiljer i skiftläge men annars är identiska" +#: ../meld/resources/gtk/help-overlay.ui.h:24 +msgctxt "shortcut window" +msgid "Find Next" +msgstr "Sök nästa" -#: ../data/ui/dirdiff.ui.h:16 -msgid "Same" -msgstr "Samma" +#: ../meld/resources/gtk/help-overlay.ui.h:25 +msgctxt "shortcut window" +msgid "Find Previous" +msgstr "Sök föregående" -#: ../data/ui/dirdiff.ui.h:17 -msgid "Show identical" -msgstr "Visa identiska" +#: ../meld/resources/gtk/help-overlay.ui.h:26 +msgctxt "shortcut window" +msgid "Replace" +msgstr "Ersätt" -#: ../data/ui/dirdiff.ui.h:18 -msgid "New" -msgstr "Nya" +#: ../meld/resources/gtk/help-overlay.ui.h:27 +msgctxt "shortcut window" +msgid "File comparison" +msgstr "Filjämförelse" -#: ../data/ui/dirdiff.ui.h:19 -msgid "Show new" -msgstr "Visa nya" +#: ../meld/resources/gtk/help-overlay.ui.h:28 +msgctxt "shortcut window" +msgid "Save current file" +msgstr "Spara den aktuella filen" -#: ../data/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:76 -msgid "Modified" -msgstr "Ändrade" +#: ../meld/resources/gtk/help-overlay.ui.h:29 +msgctxt "shortcut window" +msgid "Save current file to new path" +msgstr "Spara den aktuella filen till ny sökväg" -#: ../data/ui/dirdiff.ui.h:21 -msgid "Show modified" -msgstr "Visa ändrade" +#: ../meld/resources/gtk/help-overlay.ui.h:30 +msgctxt "shortcut window" +msgid "Save all files in comparison" +msgstr "Spara alla filer i jämförelse" -#: ../data/ui/dirdiff.ui.h:22 -msgid "Filters" -msgstr "Filter" +#: ../meld/resources/gtk/help-overlay.ui.h:31 +msgctxt "shortcut window" +msgid "Previous conflict" +msgstr "Föregående konflikt" -#: ../data/ui/dirdiff.ui.h:23 -msgid "Set active filters" -msgstr "Ställ in aktiva filter" +#: ../meld/resources/gtk/help-overlay.ui.h:32 +msgctxt "shortcut window" +msgid "Next conflict" +msgstr "Nästa konflikt" + +#: ../meld/resources/gtk/help-overlay.ui.h:33 +msgctxt "shortcut window" +msgid "Push change to left" +msgstr "Tryck över ändring till vänster" + +#: ../meld/resources/gtk/help-overlay.ui.h:34 +msgctxt "shortcut window" +msgid "Push change to right" +msgstr "Tryck över ändring till höger" + +#: ../meld/resources/gtk/help-overlay.ui.h:35 +msgctxt "shortcut window" +msgid "Pull change from left" +msgstr "Dra ändring från vänster" + +#: ../meld/resources/gtk/help-overlay.ui.h:36 +msgctxt "shortcut window" +msgid "Pull change from right" +msgstr "Dra ändring från höger" + +#: ../meld/resources/gtk/help-overlay.ui.h:37 +msgctxt "shortcut window" +msgid "Copy change above left" +msgstr "Kopiera ändringar ovanför vänster" + +#: ../meld/resources/gtk/help-overlay.ui.h:38 +msgctxt "shortcut window" +msgid "Copy change below left" +msgstr "Kopiera ändringar under vänster" + +#: ../meld/resources/gtk/help-overlay.ui.h:39 +msgctxt "shortcut window" +msgid "Copy change above right" +msgstr "Kopiera ändringar ovanför höger" + +#: ../meld/resources/gtk/help-overlay.ui.h:40 +msgctxt "shortcut window" +msgid "Copy change below right" +msgstr "Kopiera ändringar under höger" + +#: ../meld/resources/gtk/help-overlay.ui.h:41 +msgctxt "shortcut window" +msgid "Delete change" +msgstr "Ta bort ändring" + +#: ../meld/resources/gtk/help-overlay.ui.h:42 +msgctxt "shortcut window" +msgid "Previous comparison pane" +msgstr "Föregående jämförelsepanel" + +#: ../meld/resources/gtk/help-overlay.ui.h:43 +msgctxt "shortcut window" +msgid "Next comparison pane" +msgstr "Nästa jämförelsepanel" + +#: ../meld/resources/gtk/help-overlay.ui.h:44 +msgctxt "shortcut window" +msgid "Folder comparison" +msgstr "Mappjämförelse" + +#: ../meld/resources/gtk/help-overlay.ui.h:45 +msgctxt "shortcut window" +msgid "Copy to left" +msgstr "Kopiera till vänster" + +#: ../meld/resources/gtk/help-overlay.ui.h:46 +msgctxt "shortcut window" +msgid "Copy to right" +msgstr "Kopiera till höger" + +#: ../meld/resources/gtk/help-overlay.ui.h:47 +msgctxt "shortcut window" +msgid "Version control comparison" +msgstr "Versionshanterad jämförelse" + +#: ../meld/resources/gtk/help-overlay.ui.h:48 +msgctxt "shortcut window" +msgid "Commit to version control" +msgstr "Checka in i versionshanteraren" + +#: ../meld/resources/gtk/help-overlay.ui.h:49 +msgctxt "shortcut window" +msgid "Show/hide console output" +msgstr "Visa/dölj konsolutskrift" + +#: ../meld/resources/gtk/menus.ui.h:1 +msgid "_Preferences" +msgstr "Inställ_ningar" + +#: ../meld/resources/gtk/menus.ui.h:2 +msgid "_Help" +msgstr "_Hjälp" + +#: ../meld/resources/gtk/menus.ui.h:3 +msgid "Keyboard Shortcuts" +msgstr "Tangentbordsgenvägar" + +#: ../meld/resources/gtk/menus.ui.h:4 +msgid "_About" +msgstr "_Om" + +#: ../meld/resources/gtk/menus.ui.h:5 +msgid "_Quit" +msgstr "_Avsluta" + +#: ../meld/resources/ui/about-dialog.ui.h:1 +msgid "About Meld" +msgstr "Om Meld" + +#: ../meld/resources/ui/about-dialog.ui.h:2 +msgid "" +"Copyright © 2002-2009 Stephen Kennedy\n" +"Copyright © 2009-2017 Kai Willadsen" +msgstr "" +"Copyright © 2002-2009 Stephen Kennedy\n" +"Copyright © 2009-2017 Kai Willadsen" -#: ../data/ui/EditableList.ui.h:1 -msgid "Editable List" -msgstr "Redigerbar lista" +#: ../meld/resources/ui/about-dialog.ui.h:4 +msgid "Website" +msgstr "Webbplats" + +#: ../meld/resources/ui/about-dialog.ui.h:5 +msgid "translator-credits" +msgstr "" +"Josef Andersson \n" +"Daniel Nylander \n" +"Christian Rose\n" +"\n" +"Skicka synpunkter på översättningen till\n" +"." -#: ../data/ui/EditableList.ui.h:2 +#: ../meld/resources/ui/column-list.ui.h:1 +#: ../meld/resources/ui/filter-list.ui.h:1 msgid "Active" msgstr "Aktiv" -#: ../data/ui/EditableList.ui.h:3 +#: ../meld/resources/ui/column-list.ui.h:2 msgid "Column Name" msgstr "Kolumnnamn" -#: ../data/ui/EditableList.ui.h:4 ../data/ui/vcview.ui.h:9 -msgid "_Add" -msgstr "_Lägg till" - -#: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11 -#: ../meld/vcview.py:680 +#: ../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 msgid "_Remove" msgstr "_Ta bort" -#: ../data/ui/EditableList.ui.h:6 +#: ../meld/resources/ui/column-list.ui.h:4 +#: ../meld/resources/ui/filter-list.ui.h:8 msgid "Move item up" msgstr "Flytta objektet uppåt" -#: ../data/ui/EditableList.ui.h:7 +#: ../meld/resources/ui/column-list.ui.h:5 +#: ../meld/resources/ui/filter-list.ui.h:9 msgid "Move _Up" msgstr "Flytta _uppåt" -#: ../data/ui/EditableList.ui.h:8 +#: ../meld/resources/ui/column-list.ui.h:6 +#: ../meld/resources/ui/filter-list.ui.h:10 msgid "Move item down" msgstr "Flytta objektet nedåt" -#: ../data/ui/EditableList.ui.h:9 +#: ../meld/resources/ui/column-list.ui.h:7 +#: ../meld/resources/ui/filter-list.ui.h:11 msgid "Move _Down" msgstr "Flytta _nedåt" -#. Create icon and filename CellRenderer -#: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35 -#: ../meld/dirdiff.py:407 -msgid "Name" -msgstr "Namn" +#: ../meld/resources/ui/commit-dialog.ui.h:1 +msgid "Commit" +msgstr "Checka in" -#: ../data/ui/EditableList.ui.h:11 -msgid "Pattern" -msgstr "Mönster" +#: ../meld/resources/ui/commit-dialog.ui.h:2 +msgid "Commit Files" +msgstr "Checka in filer" -#: ../data/ui/EditableList.ui.h:12 -msgid "Add new filter" -msgstr "Lägg till nytt filter" +#: ../meld/resources/ui/commit-dialog.ui.h:3 +msgid "Log Message" +msgstr "Loggmeddelande" -#: ../data/ui/EditableList.ui.h:13 -msgid "Remove selected filter" -msgstr "Ta bort markerat filter" +#: ../meld/resources/ui/commit-dialog.ui.h:4 +msgid "Previous logs:" +msgstr "Föregående loggar:" + +#: ../meld/resources/ui/commit-dialog.ui.h:5 +msgid "Co_mmit" +msgstr "Che_cka in" + +#: ../meld/resources/ui/dirdiff.ui.h:1 ../meld/resources/ui/vcview.ui.h:1 +msgid "_Compare" +msgstr "_Jämför" + +#: ../meld/resources/ui/dirdiff.ui.h:2 ../meld/resources/ui/vcview.ui.h:2 +msgid "Compare selected files" +msgstr "Jämför markerade filer" + +#: ../meld/resources/ui/dirdiff.ui.h:3 +msgid "Collapse Recursively" +msgstr "Fäll ihop rekursivt" + +#: ../meld/resources/ui/dirdiff.ui.h:4 +msgid "Collapse selected folder and all subfolders" +msgstr "Fäll ihop markerad mapp och alla undermappar" + +#: ../meld/resources/ui/dirdiff.ui.h:5 +msgid "Expand Recursively" +msgstr "Expandera rekursivt" + +#: ../meld/resources/ui/dirdiff.ui.h:6 +msgid "Expand selected folder and all subfolders" +msgstr "Expandera markerad mapp och alla undermappar" + +#: ../meld/resources/ui/dirdiff.ui.h:7 +msgid "Copy to _Left" +msgstr "Kopiera till _vänster" + +#: ../meld/resources/ui/dirdiff.ui.h:8 +msgid "Copy to left" +msgstr "Kopiera till vänster" + +#: ../meld/resources/ui/dirdiff.ui.h:9 +msgid "Copy to _Right" +msgstr "Kopiera till _höger" + +#: ../meld/resources/ui/dirdiff.ui.h:10 +msgid "Copy to right" +msgstr "Kopiera till höger" -#: ../data/ui/encoding-selector.ui.h:1 +#: ../meld/resources/ui/dirdiff.ui.h:11 +msgid "Delete selected" +msgstr "Ta bort markerade" + +#: ../meld/resources/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:958 +#: ../meld/filediff.py:1586 +msgid "Hide" +msgstr "Dölj" + +#: ../meld/resources/ui/dirdiff.ui.h:13 +msgid "Hide selected" +msgstr "Dölj markerade" + +#: ../meld/resources/ui/dirdiff.ui.h:14 +msgid "Ignore Filename Case" +msgstr "Ignorera skiftlägeskänslighet för filnamn" + +#: ../meld/resources/ui/dirdiff.ui.h:15 +msgid "" +"Consider differently-cased filenames that are otherwise-identical to be the " +"same" +msgstr "" +"Behandla filnamn som lika om de skiljer i skiftläge men annars är identiska" + +#: ../meld/resources/ui/dirdiff.ui.h:16 +msgid "Same" +msgstr "Samma" + +#: ../meld/resources/ui/dirdiff.ui.h:17 +msgid "Show identical" +msgstr "Visa identiska" + +#: ../meld/resources/ui/dirdiff.ui.h:18 +msgid "New" +msgstr "Nya" + +#: ../meld/resources/ui/dirdiff.ui.h:19 +msgid "Show new" +msgstr "Visa nya" + +#: ../meld/resources/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:76 +msgid "Modified" +msgstr "Ändrade" + +#: ../meld/resources/ui/dirdiff.ui.h:21 +msgid "Show modified" +msgstr "Visa ändrade" + +#: ../meld/resources/ui/dirdiff.ui.h:22 +msgid "Filters" +msgstr "Filter" + +#: ../meld/resources/ui/dirdiff.ui.h:23 +msgid "Set active filters" +msgstr "Ställ in aktiva filter" + +#: ../meld/resources/ui/encoding-selector.ui.h:1 msgid "Search text encoding…" msgstr "Sök textkodning…" -#: ../data/ui/filediff.ui.h:1 +#: ../meld/resources/ui/filediff.ui.h:1 msgid "Format as Patch…" msgstr "Formatera som programfix…" -#: ../data/ui/filediff.ui.h:2 +#: ../meld/resources/ui/filediff.ui.h:2 msgid "Create a patch using differences between files" msgstr "Skapa en programfix med skillnaderna mellan filer" -#: ../data/ui/filediff.ui.h:3 +#: ../meld/resources/ui/filediff.ui.h:3 msgid "Save A_ll" msgstr "Spara _alla" -#: ../data/ui/filediff.ui.h:4 +#: ../meld/resources/ui/filediff.ui.h:4 msgid "Save all files in the current comparison" msgstr "Spara alla filer i den aktuella jämförelsen" -#: ../data/ui/filediff.ui.h:5 +#: ../meld/resources/ui/filediff.ui.h:5 msgid "Revert files to their saved versions" msgstr "Återställ filer till deras sparade versioner" -#: ../data/ui/filediff.ui.h:6 +#: ../meld/resources/ui/filediff.ui.h:6 msgid "Add Synchronization Point" msgstr "Lägg till synkroniseringspunkt" -#: ../data/ui/filediff.ui.h:7 +#: ../meld/resources/ui/filediff.ui.h:7 msgid "Add a synchronization point for changes between files" msgstr "Lägg till en synkroniseringspunkt för ändringar mellan filer" -#: ../data/ui/filediff.ui.h:8 +#: ../meld/resources/ui/filediff.ui.h:8 msgid "Clear Synchronization Points" msgstr "Rensa synkroniseringspunkter" -#: ../data/ui/filediff.ui.h:9 +#: ../meld/resources/ui/filediff.ui.h:9 msgid "Clear sychronization points for changes between files" msgstr "Rensa synkroniseringspunkter för ändringar mellan filer" -#: ../data/ui/filediff.ui.h:10 +#: ../meld/resources/ui/filediff.ui.h:10 msgid "Previous Conflict" msgstr "Föregående konflikt" -#: ../data/ui/filediff.ui.h:11 +#: ../meld/resources/ui/filediff.ui.h:11 msgid "Go to the previous conflict" msgstr "Gå till föregående konflikt" -#: ../data/ui/filediff.ui.h:12 +#: ../meld/resources/ui/filediff.ui.h:12 msgid "Next Conflict" msgstr "Nästa konflikt" -#: ../data/ui/filediff.ui.h:13 +#: ../meld/resources/ui/filediff.ui.h:13 msgid "Go to the next conflict" msgstr "Gå till nästa konflikt" -#: ../data/ui/filediff.ui.h:14 +#: ../meld/resources/ui/filediff.ui.h:14 msgid "Push to Left" msgstr "Tryck över åt vänster" -#: ../data/ui/filediff.ui.h:15 +#: ../meld/resources/ui/filediff.ui.h:15 msgid "Push current change to the left" msgstr "Tryck över aktuell ändring till vänster" -#: ../data/ui/filediff.ui.h:16 +#: ../meld/resources/ui/filediff.ui.h:16 msgid "Push to Right" msgstr "Tryck över åt höger" -#: ../data/ui/filediff.ui.h:17 +#: ../meld/resources/ui/filediff.ui.h:17 msgid "Push current change to the right" msgstr "Tryck över aktuell ändring till höger" -#: ../data/ui/filediff.ui.h:18 +#: ../meld/resources/ui/filediff.ui.h:18 msgid "Pull from Left" msgstr "Dra från vänster" -#: ../data/ui/filediff.ui.h:19 +#: ../meld/resources/ui/filediff.ui.h:19 msgid "Pull change from the left" msgstr "Dra ändring från vänster" -#: ../data/ui/filediff.ui.h:20 +#: ../meld/resources/ui/filediff.ui.h:20 msgid "Pull from Right" msgstr "Dra från höger" -#: ../data/ui/filediff.ui.h:21 +#: ../meld/resources/ui/filediff.ui.h:21 msgid "Pull change from the right" msgstr "Dra ändring från höger" -#: ../data/ui/filediff.ui.h:22 +#: ../meld/resources/ui/filediff.ui.h:22 msgid "Copy Above Left" msgstr "Kopiera ovan vänster" -#: ../data/ui/filediff.ui.h:23 +#: ../meld/resources/ui/filediff.ui.h:23 msgid "Copy change above the left chunk" msgstr "Kopiera ändringar ovanför vänstra stycket" -#: ../data/ui/filediff.ui.h:24 +#: ../meld/resources/ui/filediff.ui.h:24 msgid "Copy Below Left" msgstr "Kopiera under vänster" -#: ../data/ui/filediff.ui.h:25 +#: ../meld/resources/ui/filediff.ui.h:25 msgid "Copy change below the left chunk" msgstr "Kopiera ändringar under vänstra stycket" -#: ../data/ui/filediff.ui.h:26 +#: ../meld/resources/ui/filediff.ui.h:26 msgid "Copy Above Right" msgstr "Kopiera ovan höger" -#: ../data/ui/filediff.ui.h:27 +#: ../meld/resources/ui/filediff.ui.h:27 msgid "Copy change above the right chunk" msgstr "Kopiera ändringar ovanför högra stycket" -#: ../data/ui/filediff.ui.h:28 +#: ../meld/resources/ui/filediff.ui.h:28 msgid "Copy Below Right" msgstr "Kopiera under höger" -#: ../data/ui/filediff.ui.h:29 +#: ../meld/resources/ui/filediff.ui.h:29 msgid "Copy change below the right chunk" msgstr "Kopiera ändringar under högra stycket" -#: ../data/ui/filediff.ui.h:30 +#: ../meld/resources/ui/filediff.ui.h:30 msgid "Delete" msgstr "Ta bort" -#: ../data/ui/filediff.ui.h:31 +#: ../meld/resources/ui/filediff.ui.h:31 msgid "Delete change" msgstr "Ta bort ändring" -#: ../data/ui/filediff.ui.h:32 +#: ../meld/resources/ui/filediff.ui.h:32 msgid "Merge All from Left" msgstr "Sammanfoga allt från vänster" -#: ../data/ui/filediff.ui.h:33 +#: ../meld/resources/ui/filediff.ui.h:33 msgid "Merge all non-conflicting changes from the left" msgstr "Sammanfoga alla ändringar utan konflikter från vänster" -#: ../data/ui/filediff.ui.h:34 +#: ../meld/resources/ui/filediff.ui.h:34 msgid "Merge All from Right" msgstr "Sammanfoga allt från höger" -#: ../data/ui/filediff.ui.h:35 +#: ../meld/resources/ui/filediff.ui.h:35 msgid "Merge all non-conflicting changes from the right" msgstr "Sammanfoga alla ändringar utan konflikter från höger" -#: ../data/ui/filediff.ui.h:36 +#: ../meld/resources/ui/filediff.ui.h:36 msgid "Merge All" msgstr "Sammanfoga alla" -#: ../data/ui/filediff.ui.h:37 +#: ../meld/resources/ui/filediff.ui.h:37 msgid "Merge all non-conflicting changes from left and right panes" msgstr "" "Sammanfoga alla ändringar utan konflikter från vänstra och högra panelen" -#: ../data/ui/filediff.ui.h:38 +#: ../meld/resources/ui/filediff.ui.h:38 msgid "Previous Pane" msgstr "Föregående panel" -#: ../data/ui/filediff.ui.h:39 +#: ../meld/resources/ui/filediff.ui.h:39 msgid "Move keyboard focus to the previous document in this comparison" msgstr "Flytta tangentbordsfokus till föregående dokument i denna jämförelse" -#: ../data/ui/filediff.ui.h:40 +#: ../meld/resources/ui/filediff.ui.h:40 msgid "Next Pane" msgstr "Nästa panel" -#: ../data/ui/filediff.ui.h:41 +#: ../meld/resources/ui/filediff.ui.h:41 msgid "Move keyboard focus to the next document in this comparison" msgstr "Flytta tangentbordsfokus till nästa dokument i denna jämförelse" -#: ../data/ui/filediff.ui.h:42 +#: ../meld/resources/ui/filediff.ui.h:42 msgid "Lock Scrolling" msgstr "Lås rullning" -#: ../data/ui/filediff.ui.h:43 +#: ../meld/resources/ui/filediff.ui.h:43 msgid "Lock scrolling of all panes" msgstr "Lås rullning för alla paneler" -#: ../data/ui/filediff.ui.h:44 -msgid "Save changes to documents before closing?" -msgstr "Spara ändringar till dokument innan stängning?" - -#: ../data/ui/filediff.ui.h:45 -msgid "If you don’t save, changes will be permanently lost." -msgstr "Sparar du inte kommer ändringar att gå förlorade för alltid." - -#: ../data/ui/filediff.ui.h:46 -msgid "Close _without Saving" -msgstr "Stäng _utan att spara" - -#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:988 ../meld/iohelpers.py:50 -#: ../meld/iohelpers.py:100 -msgid "_Cancel" -msgstr "_Avbryt" - -#: ../data/ui/filediff.ui.h:48 -msgid "_Save" -msgstr "_Spara" - -#: ../data/ui/filediff.ui.h:49 +#: ../meld/resources/ui/filediff.ui.h:44 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." @@ -903,763 +1115,546 @@ msgstr "" "Kan inte skriva till denna fil. Du kan klicka här för att låsa upp denna fil " "och göra ändringar ändå, men dessa ändringar måste sparas till en ny fil." -#: ../data/ui/filediff.ui.h:50 +#: ../meld/resources/ui/filediff.ui.h:45 msgid "File 3" msgstr "Fil tre" -#: ../data/ui/filediff.ui.h:51 +#: ../meld/resources/ui/filediff.ui.h:46 msgid "File 2" msgstr "Fil två" -#: ../data/ui/filediff.ui.h:52 +#: ../meld/resources/ui/filediff.ui.h:47 msgid "File 1" msgstr "Fil ett" -#: ../data/ui/filediff.ui.h:53 -msgid "Discard unsaved changes to documents?" -msgstr "Förkasta osparade ändringar i dokumenten?" +#. Create icon and filename CellRenderer +#: ../meld/resources/ui/filter-list.ui.h:2 ../meld/resources/ui/vcview.ui.h:30 +#: ../meld/dirdiff.py:454 +msgid "Name" +msgstr "Namn" -#: ../data/ui/filediff.ui.h:54 -msgid "Changes made to the following documents will be permanently lost:" -msgstr "" -"Ändringar utförda i följande dokument kommer att gå förlorade för alltid:" +#: ../meld/resources/ui/filter-list.ui.h:3 +msgid "Pattern" +msgstr "Mönster" -#: ../data/ui/filediff.ui.h:55 -msgid "_Discard" -msgstr "_Förkasta" +#: ../meld/resources/ui/filter-list.ui.h:4 +msgid "Add new filter" +msgstr "Lägg till nytt filter" -#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:989 ../meld/iohelpers.py:101 +#: ../meld/resources/ui/filter-list.ui.h:5 ../meld/resources/ui/vcview.ui.h:9 +msgid "_Add" +msgstr "_Lägg till" + +#: ../meld/resources/ui/filter-list.ui.h:6 +msgid "Remove selected filter" +msgstr "Ta bort markerat filter" + +#: ../meld/resources/ui/findbar.ui.h:1 ../meld/dirdiff.py:1040 +#: ../meld/iohelpers.py:107 msgid "_Replace" msgstr "_Ersätt" -#: ../data/ui/findbar.ui.h:2 +#: ../meld/resources/ui/findbar.ui.h:2 msgid "Replace _All" msgstr "Ersätt _alla" -#: ../data/ui/findbar.ui.h:3 +#: ../meld/resources/ui/findbar.ui.h:3 msgid "_Previous" msgstr "_Föregående" -#: ../data/ui/findbar.ui.h:4 +#: ../meld/resources/ui/findbar.ui.h:4 msgid "_Next" msgstr "_Nästa" -#: ../data/ui/findbar.ui.h:5 +#: ../meld/resources/ui/findbar.ui.h:5 msgid "Find:" msgstr "Sök:" -#: ../data/ui/findbar.ui.h:6 +#: ../meld/resources/ui/findbar.ui.h:6 msgid "Replace _with:" msgstr "Ersätt _med:" -#: ../data/ui/findbar.ui.h:7 +#: ../meld/resources/ui/findbar.ui.h:7 msgid "_Match case" msgstr "_Skiftlägeskänslig" -#: ../data/ui/findbar.ui.h:8 +#: ../meld/resources/ui/findbar.ui.h:8 msgid "Who_le word" msgstr "He_la ord" -#: ../data/ui/findbar.ui.h:9 +#: ../meld/resources/ui/findbar.ui.h:9 msgid "Regular e_xpression" msgstr "Reguljärt _uttryck" -#: ../data/ui/findbar.ui.h:10 +#: ../meld/resources/ui/findbar.ui.h:10 msgid "Wrapped" msgstr "Radbruten" -#: ../data/ui/language-selector.ui.h:1 +#: ../meld/resources/ui/language-selector.ui.h:1 msgid "Search highlight mode…" msgstr "Sök färgmarkeringsläge…" -#: ../data/ui/patch-dialog.ui.h:1 +#: ../meld/resources/ui/new-diff-tab.ui.h:1 ../meld/meldwindow.py:532 +#: ../meld/newdifftab.py:53 +msgid "New comparison" +msgstr "Ny jämförelse" + +#: ../meld/resources/ui/new-diff-tab.ui.h:2 +msgid "File comparison" +msgstr "Filjämförelse" + +#: ../meld/resources/ui/new-diff-tab.ui.h:3 +msgid "Directory comparison" +msgstr "Katalogjämförelse" + +#: ../meld/resources/ui/new-diff-tab.ui.h:4 +msgid "Version control view" +msgstr "Versionshanteringsvy" + +#: ../meld/resources/ui/new-diff-tab.ui.h:5 +msgid "_3-way comparison" +msgstr "_Trevägsjämförelse" + +#: ../meld/resources/ui/new-diff-tab.ui.h:6 +msgid "Select Third File" +msgstr "Välj tredje filen" + +#: ../meld/resources/ui/new-diff-tab.ui.h:7 +msgid "Select Second File" +msgstr "Välj andra filen" + +#: ../meld/resources/ui/new-diff-tab.ui.h:8 +msgid "Select First File" +msgstr "Välj första filen" + +#: ../meld/resources/ui/new-diff-tab.ui.h:9 +msgid "Select First Folder" +msgstr "Välj första mappen" + +#: ../meld/resources/ui/new-diff-tab.ui.h:10 +msgid "Select Second Folder" +msgstr "Välj andra mappen" + +#: ../meld/resources/ui/new-diff-tab.ui.h:11 +msgid "Select Third Folder" +msgstr "Välj tredje filen" + +#: ../meld/resources/ui/new-diff-tab.ui.h:12 +msgid "Select A Version-Controlled Folder" +msgstr "Välj en versionshanterad mapp" + +#: ../meld/resources/ui/new-diff-tab.ui.h:13 +msgid "_Blank comparison" +msgstr "_Tom jämförelse" + +#: ../meld/resources/ui/new-diff-tab.ui.h:14 +msgid "C_ompare" +msgstr "_Jämför" + +#: ../meld/resources/ui/notebook-label.ui.h:1 +msgid "Close Tab" +msgstr "Stäng flik" + +#: ../meld/resources/ui/patch-dialog.ui.h:1 msgid "Format as Patch" msgstr "Formatera som programfix" -#: ../data/ui/patch-dialog.ui.h:2 +#: ../meld/resources/ui/patch-dialog.ui.h:2 msgid "Copy to Clipboard" msgstr "Kopiera till Urklipp" -#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:152 +#: ../meld/resources/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:163 msgid "Save Patch" msgstr "Spara programfix" -#: ../data/ui/patch-dialog.ui.h:4 +#: ../meld/resources/ui/patch-dialog.ui.h:4 msgid "Use differences between:" msgstr "Använd skillnader mellan:" -#: ../data/ui/patch-dialog.ui.h:5 +#: ../meld/resources/ui/patch-dialog.ui.h:5 msgid "Left and middle panes" msgstr "Vänster- och mittenpaneler" -#: ../data/ui/patch-dialog.ui.h:6 +#: ../meld/resources/ui/patch-dialog.ui.h:6 msgid "Middle and right panes" msgstr "Mitten- och högerpaneler" -#: ../data/ui/patch-dialog.ui.h:7 +#: ../meld/resources/ui/patch-dialog.ui.h:7 msgid "_Reverse patch direction" msgstr "_Omvänd programfixriktning" -#: ../data/ui/preferences.ui.h:1 -msgid "Meld Preferences" -msgstr "Inställningar för Meld" +#: ../meld/resources/ui/preferences.ui.h:1 +msgid "Preferences" +msgstr "Inställningar" -#: ../data/ui/preferences.ui.h:2 +#: ../meld/resources/ui/preferences.ui.h:2 msgid "Font" msgstr "Typsnitt" -#: ../data/ui/preferences.ui.h:3 +#: ../meld/resources/ui/preferences.ui.h:3 msgid "_Use the system fixed width font" msgstr "_Använd systemets typsnitt med fast bredd" -#: ../data/ui/preferences.ui.h:4 +#: ../meld/resources/ui/preferences.ui.h:4 msgid "_Editor font:" msgstr "_Typsnitt för redigerare:" -#: ../data/ui/preferences.ui.h:5 +#: ../meld/resources/ui/preferences.ui.h:5 msgid "Display" msgstr "Visa" -#: ../data/ui/preferences.ui.h:6 +#: ../meld/resources/ui/preferences.ui.h:6 msgid "_Tab width:" msgstr "_Tabulatorbredd:" -#: ../data/ui/preferences.ui.h:7 +#: ../meld/resources/ui/preferences.ui.h:7 msgid "_Insert spaces instead of tabs" msgstr "_Infoga blanksteg istället för tabbar" -#: ../data/ui/preferences.ui.h:8 +#: ../meld/resources/ui/preferences.ui.h:8 msgid "Enable text _wrapping" msgstr "Aktivera text_radbrytning" -#: ../data/ui/preferences.ui.h:9 +#: ../meld/resources/ui/preferences.ui.h:9 msgid "Do not _split words over two lines" msgstr "Dela inte _ord över två rader" -#: ../data/ui/preferences.ui.h:10 +#: ../meld/resources/ui/preferences.ui.h:10 msgid "Highlight _current line" msgstr "Markera _aktuell rad" -#: ../data/ui/preferences.ui.h:11 +#: ../meld/resources/ui/preferences.ui.h:11 msgid "Show _line numbers" msgstr "Visa _radnummer" -#: ../data/ui/preferences.ui.h:12 +#: ../meld/resources/ui/preferences.ui.h:12 msgid "Show w_hitespace" msgstr "Visa tom_rum" -#: ../data/ui/preferences.ui.h:13 +#: ../meld/resources/ui/preferences.ui.h:13 msgid "Use s_yntax highlighting" msgstr "Använd _syntaxmarkering" -#: ../data/ui/preferences.ui.h:14 +#: ../meld/resources/ui/preferences.ui.h:14 msgid "Syntax highlighting color scheme:" msgstr "Färgschema för syntaxmarkering:" -#: ../data/ui/preferences.ui.h:15 +#: ../meld/resources/ui/preferences.ui.h:15 msgid "External Editor" msgstr "Extern redigerare" -#: ../data/ui/preferences.ui.h:16 +#: ../meld/resources/ui/preferences.ui.h:16 msgid "Use _default system editor" msgstr "Använd systemets standardred_igerare" -#: ../data/ui/preferences.ui.h:17 +#: ../meld/resources/ui/preferences.ui.h:17 msgid "Edito_r command:" msgstr "Kommando för re_digerare:" -#: ../data/ui/preferences.ui.h:18 +#: ../meld/resources/ui/preferences.ui.h:18 msgid "Editor" msgstr "Redigerare" -#: ../data/ui/preferences.ui.h:19 +#: ../meld/resources/ui/preferences.ui.h:19 msgid "Shallow Comparison" msgstr "Ytlig jämförelse" -#: ../data/ui/preferences.ui.h:20 +#: ../meld/resources/ui/preferences.ui.h:20 msgid "C_ompare files based only on size and timestamp" msgstr "J_ämför filer enbart baserat på storlek och tidsstämpel" -#: ../data/ui/preferences.ui.h:21 +#: ../meld/resources/ui/preferences.ui.h:21 msgid "_Timestamp resolution:" msgstr "_Tidsstämpelupplösning:" -#: ../data/ui/preferences.ui.h:23 +#: ../meld/resources/ui/preferences.ui.h:23 msgid "Note: enabling text filters may make comparing large files much slower" msgstr "" "Observera: att aktivera textfilter kan göra att jämförelse av stora filer " "blir mycket långsammare" -#: ../data/ui/preferences.ui.h:24 +#: ../meld/resources/ui/preferences.ui.h:24 msgid "Symbolic Links" msgstr "Symboliska länkar" -#: ../data/ui/preferences.ui.h:26 +#: ../meld/resources/ui/preferences.ui.h:26 msgid "Visible Columns" msgstr "Synliga kolumner" -#: ../data/ui/preferences.ui.h:27 +#: ../meld/resources/ui/preferences.ui.h:27 msgid "Folder Comparisons" msgstr "Mappjämförelser" -#: ../data/ui/preferences.ui.h:28 +#: ../meld/resources/ui/preferences.ui.h:28 msgid "Version Comparisons" msgstr "Versionsjämförelser" -#: ../data/ui/preferences.ui.h:29 -msgid "_Order when comparing file revisions:" -msgstr "_Sortering vid jämförelse av filrevisioner:" - -#: ../data/ui/preferences.ui.h:30 -msgid "Order when _merging files:" -msgstr "Sortering när filer _sammanfogas:" - -#: ../data/ui/preferences.ui.h:31 -msgid "Commit Messages" -msgstr "Incheckningsmeddelanden" - -#: ../data/ui/preferences.ui.h:32 -msgid "Show _right margin at:" -msgstr "Visa _högermarginal vid:" - -#: ../data/ui/preferences.ui.h:33 -msgid "Automatically _break lines at right margin on commit" -msgstr "_Radbryt automatiskt vid högermarginal under incheckning" - -#: ../data/ui/preferences.ui.h:34 -msgid "Version Control" -msgstr "Versionshantering" - -#: ../data/ui/preferences.ui.h:35 -msgid "Filename filters" -msgstr "Filnamnsfilter" - -#: ../data/ui/preferences.ui.h:36 -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 "" -"När du jämför kataloger kan du filtrera ut filer och kataloger med hjälp av " -"deras namn. Varje mönster är en lista med jokertecken i skalstil, åtskilda " -"med blanksteg." - -#: ../data/ui/preferences.ui.h:37 ../meld/meldwindow.py:105 -msgid "File Filters" -msgstr "Filfilter" - -#: ../data/ui/preferences.ui.h:38 -msgid "Change trimming" -msgstr "Ändra borttagning av blanksteg" - -#: ../data/ui/preferences.ui.h:39 -msgid "Trim blank line differences from the start and end of changes" -msgstr "Ta bort tomma radskillnader från början och slutet av ändringar" - -#: ../data/ui/preferences.ui.h:40 -msgid "Text filters" -msgstr "Textfilter" - -#: ../data/ui/preferences.ui.h:41 -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 "" -"När du jämför filer kan du välja att ignorera vissa typer av ändringar. " -"Varje mönster här är ett reguljärt python-uttryck som ersätter den text som " -"matchar med en tom sträng innan jämförelsen utförs. Om uttrycket innehåller " -"grupper kommer endast grupperna att ersättas. Se användarhandboken för mer " -"information." - -#: ../data/ui/preferences.ui.h:42 -msgid "Text Filters" -msgstr "Textfilter" - -#: ../data/ui/preferences.ui.h:43 -msgid "Left is remote, right is local" -msgstr "Vänster är fjärr, höger är lokal" - -#: ../data/ui/preferences.ui.h:44 -msgid "Left is local, right is remote" -msgstr "Vänster är lokal, höger är fjärr" - -#: ../data/ui/preferences.ui.h:45 -msgid "Remote, merge, local" -msgstr "Fjärr, sammanfoga, lokal" - -#: ../data/ui/preferences.ui.h:46 -msgid "Local, merge, remote" -msgstr "Lokal, sammanfoga, fjärr" - -#: ../data/ui/preferences.ui.h:47 -msgid "1ns (ext4)" -msgstr "1ns (ext4)" - -#: ../data/ui/preferences.ui.h:48 -msgid "100ns (NTFS)" -msgstr "100ns (NTFS)" - -#: ../data/ui/preferences.ui.h:49 -msgid "1s (ext2/ext3)" -msgstr "1s (ext2/ext3)" - -#: ../data/ui/preferences.ui.h:50 -msgid "2s (VFAT)" -msgstr "2s (VFAT)" - -#: ../data/ui/shortcuts.ui.h:1 -msgctxt "shortcut window" -msgid "General" -msgstr "Allmänt" - -#: ../data/ui/shortcuts.ui.h:2 -msgctxt "shortcut window" -msgid "New comparison" -msgstr "Ny jämförelse" - -#: ../data/ui/shortcuts.ui.h:3 -msgctxt "shortcut window" -msgid "Close a comparison" -msgstr "Stäng en jämförelse" - -#: ../data/ui/shortcuts.ui.h:4 -msgctxt "shortcut window" -msgid "Quit Meld" -msgstr "Avsluta Meld" - -#: ../data/ui/shortcuts.ui.h:5 -msgctxt "shortcut window" -msgid "Stop the current action" -msgstr "Stoppa den aktuella åtgärden" - -#: ../data/ui/shortcuts.ui.h:6 -msgctxt "shortcut window" -msgid "Refresh comparison" -msgstr "Uppdatera jämförelse" - -#: ../data/ui/shortcuts.ui.h:7 -msgctxt "shortcut window" -msgid "Fullscreen" -msgstr "Helskärm" - -#: ../data/ui/shortcuts.ui.h:8 -msgctxt "shortcut window" -msgid "Tabs" -msgstr "Flikar" - -#: ../data/ui/shortcuts.ui.h:9 -msgctxt "shortcut window" -msgid "Go to previous tab" -msgstr "Gå till föregående flik" - -#: ../data/ui/shortcuts.ui.h:10 -msgctxt "shortcut window" -msgid "Go to next tab" -msgstr "Gå till nästa flik" - -#: ../data/ui/shortcuts.ui.h:11 -msgctxt "shortcut window" -msgid "Switch to tab" -msgstr "Växla till flik" - -#: ../data/ui/shortcuts.ui.h:12 -msgctxt "shortcut window" -msgid "Move tab left" -msgstr "Flytta flik åt vänster" - -#: ../data/ui/shortcuts.ui.h:13 -msgctxt "shortcut window" -msgid "Move tab right" -msgstr "Flytta flik åt höger" - -#: ../data/ui/shortcuts.ui.h:14 -msgctxt "shortcut window" -msgid "Changes" -msgstr "Ändringar" - -#: ../data/ui/shortcuts.ui.h:15 -msgctxt "shortcut window" -msgid "Go to previous change" -msgstr "Gå till föregående ändring" - -#: ../data/ui/shortcuts.ui.h:16 -msgctxt "shortcut window" -msgid "Go to next change" -msgstr "Gå till nästa ändring" - -#: ../data/ui/shortcuts.ui.h:17 -msgctxt "shortcut window" -msgid "Editing" -msgstr "Redigering" - -#: ../data/ui/shortcuts.ui.h:18 -msgctxt "shortcut window" -msgid "Undo" -msgstr "Ångra" - -#: ../data/ui/shortcuts.ui.h:19 -msgctxt "shortcut window" -msgid "Redo" -msgstr "Gör om" - -#: ../data/ui/shortcuts.ui.h:20 -msgctxt "shortcut window" -msgid "Cut" -msgstr "Klipp ut" - -#: ../data/ui/shortcuts.ui.h:21 -msgctxt "shortcut window" -msgid "Copy" -msgstr "Kopiera" - -#: ../data/ui/shortcuts.ui.h:22 -msgctxt "shortcut window" -msgid "Paste" -msgstr "Klistra in" - -#: ../data/ui/shortcuts.ui.h:23 -msgctxt "shortcut window" -msgid "Find" -msgstr "Sök" - -#: ../data/ui/shortcuts.ui.h:24 -msgctxt "shortcut window" -msgid "Find Next" -msgstr "Sök nästa" - -#: ../data/ui/shortcuts.ui.h:25 -msgctxt "shortcut window" -msgid "Find Previous" -msgstr "Sök föregående" - -#: ../data/ui/shortcuts.ui.h:26 -msgctxt "shortcut window" -msgid "Replace" -msgstr "Ersätt" - -#: ../data/ui/shortcuts.ui.h:27 -msgctxt "shortcut window" -msgid "File comparison" -msgstr "Filjämförelse" - -#: ../data/ui/shortcuts.ui.h:28 -msgctxt "shortcut window" -msgid "Save current file" -msgstr "Spara den aktuella filen" - -#: ../data/ui/shortcuts.ui.h:29 -msgctxt "shortcut window" -msgid "Save current file to new path" -msgstr "Spara den aktuella filen till ny sökväg" - -#: ../data/ui/shortcuts.ui.h:30 -msgctxt "shortcut window" -msgid "Save all files in comparison" -msgstr "Spara alla filer i jämförelse" - -#: ../data/ui/shortcuts.ui.h:31 -msgctxt "shortcut window" -msgid "Previous conflict" -msgstr "Föregående konflikt" +#: ../meld/resources/ui/preferences.ui.h:29 +msgid "_Order when comparing file revisions:" +msgstr "_Sortering vid jämförelse av filrevisioner:" -#: ../data/ui/shortcuts.ui.h:32 -msgctxt "shortcut window" -msgid "Next conflict" -msgstr "Nästa konflikt" +#: ../meld/resources/ui/preferences.ui.h:30 +msgid "Order when _merging files:" +msgstr "Sortering när filer _sammanfogas:" -#: ../data/ui/shortcuts.ui.h:33 -msgctxt "shortcut window" -msgid "Push change to left" -msgstr "Tryck över ändring till vänster" +#: ../meld/resources/ui/preferences.ui.h:31 +msgid "Commit Messages" +msgstr "Incheckningsmeddelanden" -#: ../data/ui/shortcuts.ui.h:34 -msgctxt "shortcut window" -msgid "Push change to right" -msgstr "Tryck över ändring till höger" +#: ../meld/resources/ui/preferences.ui.h:32 +msgid "Show _right margin at:" +msgstr "Visa _högermarginal vid:" -#: ../data/ui/shortcuts.ui.h:35 -msgctxt "shortcut window" -msgid "Pull change from left" -msgstr "Dra ändring från vänster" +#: ../meld/resources/ui/preferences.ui.h:33 +msgid "Automatically _break lines at right margin on commit" +msgstr "_Radbryt automatiskt vid högermarginal under incheckning" -#: ../data/ui/shortcuts.ui.h:36 -msgctxt "shortcut window" -msgid "Pull change from right" -msgstr "Dra ändring från höger" +#: ../meld/resources/ui/preferences.ui.h:34 +msgid "Version Control" +msgstr "Versionshantering" -#: ../data/ui/shortcuts.ui.h:37 -msgctxt "shortcut window" -msgid "Copy change above left" -msgstr "Kopiera ändringar ovanför vänster" +#: ../meld/resources/ui/preferences.ui.h:35 +msgid "Filename filters" +msgstr "Filnamnsfilter" -#: ../data/ui/shortcuts.ui.h:38 -msgctxt "shortcut window" -msgid "Copy change below left" -msgstr "Kopiera ändringar under vänster" +#: ../meld/resources/ui/preferences.ui.h:36 +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 "" +"När du jämför kataloger kan du filtrera ut filer och kataloger med hjälp av " +"deras namn. Varje mönster är en lista med jokertecken i skalstil, åtskilda " +"med blanksteg." -#: ../data/ui/shortcuts.ui.h:39 -msgctxt "shortcut window" -msgid "Copy change above right" -msgstr "Kopiera ändringar ovanför höger" +#: ../meld/resources/ui/preferences.ui.h:37 ../meld/meldwindow.py:114 +msgid "File Filters" +msgstr "Filfilter" -#: ../data/ui/shortcuts.ui.h:40 -msgctxt "shortcut window" -msgid "Copy change below right" -msgstr "Kopiera ändringar under höger" +#: ../meld/resources/ui/preferences.ui.h:38 +msgid "Change trimming" +msgstr "Ändra borttagning av blanksteg" -#: ../data/ui/shortcuts.ui.h:41 -msgctxt "shortcut window" -msgid "Delete change" -msgstr "Ta bort ändring" +#: ../meld/resources/ui/preferences.ui.h:39 +msgid "Trim blank line differences from the start and end of changes" +msgstr "Ta bort tomma radskillnader från början och slutet av ändringar" -#: ../data/ui/shortcuts.ui.h:42 -msgctxt "shortcut window" -msgid "Previous comparison pane" -msgstr "Föregående jämförelsepanel" +#: ../meld/resources/ui/preferences.ui.h:40 +msgid "Text filters" +msgstr "Textfilter" -#: ../data/ui/shortcuts.ui.h:43 -msgctxt "shortcut window" -msgid "Next comparison pane" -msgstr "Nästa jämförelsepanel" +#: ../meld/resources/ui/preferences.ui.h:41 +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 "" +"När du jämför filer kan du välja att ignorera vissa typer av ändringar. " +"Varje mönster här är ett reguljärt python-uttryck som ersätter den text som " +"matchar med en tom sträng innan jämförelsen utförs. Om uttrycket innehåller " +"grupper kommer endast grupperna att ersättas. Se användarhandboken för mer " +"information." -#: ../data/ui/shortcuts.ui.h:44 -msgctxt "shortcut window" -msgid "Folder comparison" -msgstr "Mappjämförelse" +#: ../meld/resources/ui/preferences.ui.h:42 +msgid "Text Filters" +msgstr "Textfilter" -#: ../data/ui/shortcuts.ui.h:45 -msgctxt "shortcut window" -msgid "Copy to left" -msgstr "Kopiera till vänster" +#: ../meld/resources/ui/preferences.ui.h:43 +msgid "Left is remote, right is local" +msgstr "Vänster är fjärr, höger är lokal" -#: ../data/ui/shortcuts.ui.h:46 -msgctxt "shortcut window" -msgid "Copy to right" -msgstr "Kopiera till höger" +#: ../meld/resources/ui/preferences.ui.h:44 +msgid "Left is local, right is remote" +msgstr "Vänster är lokal, höger är fjärr" -#: ../data/ui/shortcuts.ui.h:47 -msgctxt "shortcut window" -msgid "Version control comparison" -msgstr "Versionshanterad jämförelse" +#: ../meld/resources/ui/preferences.ui.h:45 +msgid "Remote, merge, local" +msgstr "Fjärr, sammanfoga, lokal" -#: ../data/ui/shortcuts.ui.h:48 -msgctxt "shortcut window" -msgid "Commit to version control" -msgstr "Checka in i versionshanteraren" +#: ../meld/resources/ui/preferences.ui.h:46 +msgid "Local, merge, remote" +msgstr "Lokal, sammanfoga, fjärr" -#: ../data/ui/shortcuts.ui.h:49 -msgctxt "shortcut window" -msgid "Show/hide console output" -msgstr "Visa/dölj konsolutskrift" +#: ../meld/resources/ui/preferences.ui.h:47 +msgid "1ns (ext4)" +msgstr "1ns (ext4)" -#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:567 -#: ../meld/newdifftab.py:49 -msgid "New comparison" -msgstr "Ny jämförelse" +#: ../meld/resources/ui/preferences.ui.h:48 +msgid "100ns (NTFS)" +msgstr "100ns (NTFS)" -#: ../data/ui/tab-placeholder.ui.h:2 -msgid "File comparison" -msgstr "Filjämförelse" +#: ../meld/resources/ui/preferences.ui.h:49 +msgid "1s (ext2/ext3)" +msgstr "1s (ext2/ext3)" -#: ../data/ui/tab-placeholder.ui.h:3 -msgid "Directory comparison" -msgstr "Katalogjämförelse" +#: ../meld/resources/ui/preferences.ui.h:50 +msgid "2s (VFAT)" +msgstr "2s (VFAT)" -#: ../data/ui/tab-placeholder.ui.h:4 -msgid "Version control view" -msgstr "Versionshanteringsvy" +#: ../meld/resources/ui/push-dialog.ui.h:1 +msgid "Push local commits to remote?" +msgstr "Tryck lokala incheckningar till fjärr?" -#: ../data/ui/tab-placeholder.ui.h:5 -msgid "_3-way comparison" -msgstr "_Trevägsjämförelse" +#: ../meld/resources/ui/push-dialog.ui.h:2 +msgid "The commits to be pushed are determined by your version control system." +msgstr "Incheckningar att trycka bestäms av ditt versionshanteringssystem." -#: ../data/ui/tab-placeholder.ui.h:6 -msgid "Select Third File" -msgstr "Välj tredje filen" +#: ../meld/resources/ui/push-dialog.ui.h:3 +msgid "_Push commits" +msgstr "_Tryck incheckningar" -#: ../data/ui/tab-placeholder.ui.h:7 -msgid "Select Second File" -msgstr "Välj andra filen" +#: ../meld/resources/ui/revert-dialog.ui.h:1 +msgid "Discard unsaved changes to documents?" +msgstr "Förkasta osparade ändringar i dokumenten?" -#: ../data/ui/tab-placeholder.ui.h:8 -msgid "Select First File" -msgstr "Välj första filen" +#: ../meld/resources/ui/revert-dialog.ui.h:2 +msgid "Changes made to the following documents will be permanently lost:" +msgstr "" +"Ändringar utförda i följande dokument kommer att gå förlorade för alltid:" -#: ../data/ui/tab-placeholder.ui.h:9 -msgid "Select First Folder" -msgstr "Välj första mappen" +#: ../meld/resources/ui/revert-dialog.ui.h:3 +msgid "_Discard" +msgstr "_Förkasta" -#: ../data/ui/tab-placeholder.ui.h:10 -msgid "Select Second Folder" -msgstr "Välj andra mappen" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:1 +msgid "Save changes to documents before closing?" +msgstr "Spara ändringar till dokument innan stängning?" -#: ../data/ui/tab-placeholder.ui.h:11 -msgid "Select Third Folder" -msgstr "Välj tredje filen" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:2 +msgid "If you don’t save, changes will be permanently lost." +msgstr "Sparar du inte kommer ändringar att gå förlorade för alltid." -#: ../data/ui/tab-placeholder.ui.h:12 -msgid "Select A Version-Controlled Folder" -msgstr "Välj en versionshanterad mapp" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:3 +msgid "Close _without Saving" +msgstr "Stäng _utan att spara" -#: ../data/ui/tab-placeholder.ui.h:13 -msgid "_Blank comparison" -msgstr "_Tom jämförelse" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:4 ../meld/dirdiff.py:1039 +#: ../meld/iohelpers.py:52 ../meld/iohelpers.py:106 +msgid "_Cancel" +msgstr "_Avbryt" -#: ../data/ui/tab-placeholder.ui.h:14 -msgid "C_ompare" -msgstr "_Jämför" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:5 +msgid "_Save" +msgstr "_Spara" -#: ../data/ui/vcview.ui.h:3 +#: ../meld/resources/ui/vcview.ui.h:3 msgid "Co_mmit…" msgstr "Che_cka in…" -#: ../data/ui/vcview.ui.h:4 +#: ../meld/resources/ui/vcview.ui.h:4 msgid "Commit changes to version control" msgstr "Checka in ändringar till versionshanteraren" -#: ../data/ui/vcview.ui.h:5 +#: ../meld/resources/ui/vcview.ui.h:5 msgid "_Update" msgstr "_Uppdatera" -#: ../data/ui/vcview.ui.h:6 +#: ../meld/resources/ui/vcview.ui.h:6 msgid "Update working copy from version control" msgstr "Uppdatera arbetskopian från versionshanteraren" -#: ../data/ui/vcview.ui.h:7 +#: ../meld/resources/ui/vcview.ui.h:7 msgid "_Push" msgstr "_Tryck" -#: ../data/ui/vcview.ui.h:8 +#: ../meld/resources/ui/vcview.ui.h:8 msgid "Push local changes to remote" msgstr "Tryck lokala ändringar till fjärr" -#: ../data/ui/vcview.ui.h:10 +#: ../meld/resources/ui/vcview.ui.h:10 msgid "Add to version control" msgstr "Lägg till för versionshantering" -#: ../data/ui/vcview.ui.h:12 +#: ../meld/resources/ui/vcview.ui.h:12 msgid "Remove from version control" msgstr "Ta bort från versionshantering" -#: ../data/ui/vcview.ui.h:13 +#: ../meld/resources/ui/vcview.ui.h:13 msgid "Mar_k as Resolved" msgstr "Markera som _löst" -#: ../data/ui/vcview.ui.h:14 +#: ../meld/resources/ui/vcview.ui.h:14 msgid "Mark as resolved in version control" msgstr "Markera som löst i versionshanteraren" -#: ../data/ui/vcview.ui.h:15 +#: ../meld/resources/ui/vcview.ui.h:15 msgid "Re_vert" msgstr "Åter_ställ" -#: ../data/ui/vcview.ui.h:16 +#: ../meld/resources/ui/vcview.ui.h:16 msgid "Revert working copy to original state" msgstr "Återställ arbetskopian till ursprungligt tillstånd" -#: ../data/ui/vcview.ui.h:17 +#: ../meld/resources/ui/vcview.ui.h:17 msgid "Delete from working copy" msgstr "Ta bort från arbetskopia" -#: ../data/ui/vcview.ui.h:18 +#: ../meld/resources/ui/vcview.ui.h:18 msgid "Console" msgstr "Konsol" -#: ../data/ui/vcview.ui.h:19 +#: ../meld/resources/ui/vcview.ui.h:19 msgid "Show or hide the version control console output pane" msgstr "Visa eller dölj konsolutmatningspanelen för versionshanteringen" -#: ../data/ui/vcview.ui.h:20 +#: ../meld/resources/ui/vcview.ui.h:20 msgid "_Flatten" msgstr "_Platta till" -#: ../data/ui/vcview.ui.h:21 +#: ../meld/resources/ui/vcview.ui.h:21 msgid "Flatten directories" msgstr "Platta till kataloger" -#: ../data/ui/vcview.ui.h:22 +#: ../meld/resources/ui/vcview.ui.h:22 msgid "_Modified" msgstr "_Ändrade" -#: ../data/ui/vcview.ui.h:23 +#: ../meld/resources/ui/vcview.ui.h:23 msgid "Show modified files" msgstr "Visa ändrade filer" -#: ../data/ui/vcview.ui.h:24 +#: ../meld/resources/ui/vcview.ui.h:24 msgid "_Normal" msgstr "_Normala" -#: ../data/ui/vcview.ui.h:25 +#: ../meld/resources/ui/vcview.ui.h:25 msgid "Show normal files" msgstr "Visa normala filer" -#: ../data/ui/vcview.ui.h:26 +#: ../meld/resources/ui/vcview.ui.h:26 msgid "Un_versioned" msgstr "O_versionerade" -#: ../data/ui/vcview.ui.h:27 +#: ../meld/resources/ui/vcview.ui.h:27 msgid "Show unversioned files" msgstr "Visa filer som inte versionshanteras" -#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69 +#: ../meld/resources/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69 msgid "Ignored" msgstr "Ignorerade" -#: ../data/ui/vcview.ui.h:29 +#: ../meld/resources/ui/vcview.ui.h:29 msgid "Show ignored files" msgstr "Visa ignorerade filer" -#: ../data/ui/vcview.ui.h:30 -msgid "Commit" -msgstr "Checka in" - -#: ../data/ui/vcview.ui.h:31 -msgid "Commit Files" -msgstr "Checka in filer" - -#: ../data/ui/vcview.ui.h:32 -msgid "Log Message" -msgstr "Loggmeddelande" - -#: ../data/ui/vcview.ui.h:33 -msgid "Previous logs:" -msgstr "Föregående loggar:" - -#: ../data/ui/vcview.ui.h:34 -msgid "Co_mmit" -msgstr "Che_cka in" - -#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:331 +#: ../meld/resources/ui/vcview.ui.h:31 ../meld/vcview.py:366 msgid "Location" msgstr "Plats" -#: ../data/ui/vcview.ui.h:37 +#: ../meld/resources/ui/vcview.ui.h:32 msgid "Status" msgstr "Status" -#: ../data/ui/vcview.ui.h:38 +#: ../meld/resources/ui/vcview.ui.h:33 msgid "Extra" msgstr "Extra" -#: ../data/ui/vcview.ui.h:39 +#: ../meld/resources/ui/vcview.ui.h:34 msgid "Console output" msgstr "Konsolutskrift" -#: ../data/ui/vcview.ui.h:40 -msgid "Push local commits to remote?" -msgstr "Tryck lokala incheckningar till fjärr?" - -#: ../data/ui/vcview.ui.h:41 -msgid "The commits to be pushed are determined by your version control system." -msgstr "Incheckningar att trycka bestäms av ditt versionshanteringssystem." - -#: ../data/ui/vcview.ui.h:42 -msgid "_Push commits" -msgstr "_Tryck incheckningar" - #: ../meld/const.py:12 msgid "UNIX (LF)" msgstr "UNIX (LF)" @@ -1673,82 +1668,82 @@ msgid "Mac OS (CR)" msgstr "Mac OS (CR)" #. Create file size CellRenderer -#: ../meld/dirdiff.py:428 ../meld/preferences.py:81 +#: ../meld/dirdiff.py:475 ../meld/preferences.py:138 msgid "Size" msgstr "Storlek" #. Create date-time CellRenderer -#: ../meld/dirdiff.py:436 ../meld/preferences.py:82 +#: ../meld/dirdiff.py:483 ../meld/preferences.py:139 msgid "Modification time" msgstr "Ändringstid" #. Create permissions CellRenderer -#: ../meld/dirdiff.py:444 ../meld/preferences.py:83 +#: ../meld/dirdiff.py:491 ../meld/preferences.py:140 msgid "Permissions" msgstr "Rättigheter" -#: ../meld/dirdiff.py:575 +#: ../meld/dirdiff.py:625 #, python-format msgid "Hide %s" msgstr "Dölj %s" -#: ../meld/dirdiff.py:716 ../meld/dirdiff.py:739 +#: ../meld/dirdiff.py:767 ../meld/dirdiff.py:790 #, python-format msgid "[%s] Scanning %s" msgstr "[%s] Söker igenom %s" -#: ../meld/dirdiff.py:874 +#: ../meld/dirdiff.py:925 #, python-format msgid "[%s] Done" msgstr "[%s] Klar" -#: ../meld/dirdiff.py:882 +#: ../meld/dirdiff.py:933 msgid "Folders have no differences" msgstr "Mapparna skiljer sig inte åt" -#: ../meld/dirdiff.py:884 +#: ../meld/dirdiff.py:935 msgid "Contents of scanned files in folders are identical." msgstr "Innehållet i mapparnas avsökta filer är identiskt." -#: ../meld/dirdiff.py:886 +#: ../meld/dirdiff.py:937 msgid "" "Scanned files in folders appear identical, but contents have not been " "scanned." msgstr "" "Mapparnas avsökta filer verkar identiska, men innehållet har inte genomsökts." -#: ../meld/dirdiff.py:889 +#: ../meld/dirdiff.py:940 msgid "File filters are in use, so not all files have been scanned." msgstr "Filfilter används, och därför har inte alla filer genomsökts." -#: ../meld/dirdiff.py:891 +#: ../meld/dirdiff.py:942 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:909 ../meld/filediff.py:1499 ../meld/filediff.py:1529 -#: ../meld/filediff.py:1531 ../meld/ui/msgarea.py:106 ../meld/ui/msgarea.py:119 +#: ../meld/dirdiff.py:960 ../meld/filediff.py:1588 ../meld/filediff.py:1618 +#: ../meld/filediff.py:1620 ../meld/ui/msgarea.py:106 ../meld/ui/msgarea.py:119 msgid "Hi_de" msgstr "_Dölj" -#: ../meld/dirdiff.py:918 +#: ../meld/dirdiff.py:969 msgid "Multiple errors occurred while scanning this folder" msgstr "Flera fel inträffade vid avsökning av denna mapp" -#: ../meld/dirdiff.py:919 +#: ../meld/dirdiff.py:970 msgid "Files with invalid encodings found" msgstr "Filer med ogiltiga teckenkodningar hittades" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:921 +#: ../meld/dirdiff.py:972 msgid "Some files were in an incorrect encoding. The names are something like:" msgstr "En del filer hade en felaktig kodning. Namnen är ungefär:" -#: ../meld/dirdiff.py:923 +#: ../meld/dirdiff.py:974 msgid "Files hidden by case insensitive comparison" msgstr "Filer dolda av skiftlägeskänslig jämförelse" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:925 +#: ../meld/dirdiff.py:976 msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. The following files in this folder are hidden:" @@ -1756,17 +1751,17 @@ msgstr "" "Du gör en skiftlägesokänslig jämförelse på ett skiftlägeskänsligt filsystem. " "En del filer syns inte:" -#: ../meld/dirdiff.py:936 +#: ../meld/dirdiff.py:987 #, python-format msgid "“%s” hidden by “%s”" msgstr "”%s” dolda av ”%s”" -#: ../meld/dirdiff.py:992 +#: ../meld/dirdiff.py:1043 #, python-format msgid "Replace folder “%s”?" msgstr "Ersätt mappen ”%s”?" -#: ../meld/dirdiff.py:994 +#: ../meld/dirdiff.py:1045 #, python-format msgid "" "Another folder with the same name already exists in “%s”.\n" @@ -1775,11 +1770,11 @@ msgstr "" "En annan mapp med samma namn existerar redan i ”%s”.\n" "Om du ersätter befintlig mapp kommer alla filer att förloras." -#: ../meld/dirdiff.py:1007 +#: ../meld/dirdiff.py:1058 msgid "Error copying file" msgstr "Fel vid filkopiering" -#: ../meld/dirdiff.py:1008 +#: ../meld/dirdiff.py:1059 #, python-format msgid "" "Couldn’t copy %s\n" @@ -1792,19 +1787,19 @@ msgstr "" "\n" "%s" -#: ../meld/dirdiff.py:1033 ../meld/vcview.py:703 +#: ../meld/dirdiff.py:1084 ../meld/vcview.py:720 msgid "Error deleting {}" msgstr "Fel vid borttagning av {}" -#: ../meld/dirdiff.py:1546 +#: ../meld/dirdiff.py:1593 msgid "No folder" msgstr "Ingen mapp" -#: ../meld/filediff.py:834 +#: ../meld/filediff.py:905 msgid "Comparison results will be inaccurate" msgstr "Jämförelseresultat kommer att bli osäkra" -#: ../meld/filediff.py:836 +#: ../meld/filediff.py:907 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1812,64 +1807,64 @@ msgstr "" "Ett filter ändrade antalet rader i filen vilket inte stöds. Jämförelsen " "kommer att vara osäker." -#: ../meld/filediff.py:905 +#: ../meld/filediff.py:979 msgid "Mark conflict as resolved?" msgstr "Markera konflikten som löst?" -#: ../meld/filediff.py:907 +#: ../meld/filediff.py:981 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:909 +#: ../meld/filediff.py:983 msgid "Cancel" msgstr "Avbryt" -#: ../meld/filediff.py:910 +#: ../meld/filediff.py:984 msgid "Mark _Resolved" msgstr "Markera som _löst" -#: ../meld/filediff.py:1214 +#: ../meld/filediff.py:1303 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Det uppstod ett problem vid öppnandet av filen ”%s”." -#: ../meld/filediff.py:1222 +#: ../meld/filediff.py:1311 #, python-format msgid "File %s appears to be a binary file." msgstr "Filen %s verkar vara en binärfil." -#: ../meld/filediff.py:1224 +#: ../meld/filediff.py:1313 msgid "Do you want to open the file using the default application?" msgstr "Vill du öppna filen med standardprogrammet?" -#: ../meld/filediff.py:1226 +#: ../meld/filediff.py:1315 msgid "Open" msgstr "Öppna" -#: ../meld/filediff.py:1242 +#: ../meld/filediff.py:1331 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Beräknar skillnader" -#: ../meld/filediff.py:1303 +#: ../meld/filediff.py:1392 #, python-format msgid "File %s has changed on disk" msgstr "Filen %s har ändrats på disk" -#: ../meld/filediff.py:1304 +#: ../meld/filediff.py:1393 msgid "Do you want to reload the file?" msgstr "Vill du läsa om filen?" -#: ../meld/filediff.py:1306 +#: ../meld/filediff.py:1395 msgid "_Reload" msgstr "_Läs om" -#: ../meld/filediff.py:1462 +#: ../meld/filediff.py:1551 msgid "Files are identical" msgstr "Filerna är identiska" -#: ../meld/filediff.py:1475 +#: ../meld/filediff.py:1564 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1877,11 +1872,11 @@ msgstr "" "Textfilter används och kan dölja skillnader mellan filer. Vill du jämföra de " "ofiltrerade filerna?" -#: ../meld/filediff.py:1480 +#: ../meld/filediff.py:1569 msgid "Files differ in line endings only" msgstr "Filer skiljer sig endast vad gäller radslut" -#: ../meld/filediff.py:1482 +#: ../meld/filediff.py:1571 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1890,15 +1885,15 @@ msgstr "" "Filerna är identiska förutom radavsluten:\n" "%s" -#: ../meld/filediff.py:1502 +#: ../meld/filediff.py:1591 msgid "Show without filters" msgstr "Visa utan filer" -#: ../meld/filediff.py:1524 +#: ../meld/filediff.py:1613 msgid "Change highlighting incomplete" msgstr "Ändra markering av ofärdiga" -#: ../meld/filediff.py:1525 +#: ../meld/filediff.py:1614 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." @@ -1907,19 +1902,19 @@ msgstr "" "Meld till att längre tid på sig att markera större ändringar, men det kan " "bli långsamt." -#: ../meld/filediff.py:1533 +#: ../meld/filediff.py:1622 msgid "Keep highlighting" msgstr "Använd markering" -#: ../meld/filediff.py:1535 +#: ../meld/filediff.py:1624 msgid "_Keep highlighting" msgstr "_Använd markering" -#: ../meld/filediff.py:1548 +#: ../meld/filediff.py:1637 msgid "Saving failed" msgstr "Misslyckades med att spara" -#: ../meld/filediff.py:1549 +#: ../meld/filediff.py:1638 msgid "" "Please consider copying any critical changes to another program or file to " "avoid data loss." @@ -1927,36 +1922,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:1558 +#: ../meld/filediff.py:1647 msgid "Save Left Pane As" msgstr "Spara vänsterpanel som" -#: ../meld/filediff.py:1560 +#: ../meld/filediff.py:1649 msgid "Save Middle Pane As" msgstr "Spara mittenpanel som" -#: ../meld/filediff.py:1562 +#: ../meld/filediff.py:1651 msgid "Save Right Pane As" msgstr "Spara högerpanel som" -#: ../meld/filediff.py:1575 +#: ../meld/filediff.py:1664 #, 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:1577 +#: ../meld/filediff.py:1666 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:1580 +#: ../meld/filediff.py:1669 msgid "Save Anyway" msgstr "Spara ändå" -#: ../meld/filediff.py:1581 +#: ../meld/filediff.py:1670 msgid "Don’t Save" msgstr "Spara inte" -#: ../meld/filediff.py:1623 +#: ../meld/filediff.py:1712 msgid "" "File “{}” contains characters that can’t be encoded using its current " "encoding “{}”." @@ -1964,7 +1959,7 @@ msgstr "" "Filen ”{}” innehåller tecken som inte kan kodas med dess aktuella kodning " "”{}”." -#: ../meld/filediff.py:1627 ../meld/patchdialog.py:131 +#: ../meld/filediff.py:1716 ../meld/patchdialog.py:142 #, python-format msgid "" "Couldn’t save file due to:\n" @@ -1973,16 +1968,16 @@ msgstr "" "Kunde in spara fil beroende på:\n" "%s" -#: ../meld/filediff.py:1631 ../meld/patchdialog.py:130 +#: ../meld/filediff.py:1720 ../meld/patchdialog.py:141 #, python-format msgid "Could not save file %s." msgstr "Kunde inte spara filen %s." -#: ../meld/filediff.py:2014 +#: ../meld/filediff.py:2113 msgid "Live comparison updating disabled" msgstr "Inaktivera realtidsuppdateringar av jämförelser" -#: ../meld/filediff.py:2015 +#: ../meld/filediff.py:2114 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -1998,41 +1993,41 @@ msgstr "" msgid "[%s] Merging files" msgstr "[%s] Sammanfogar filer" -#: ../meld/gutterrendererchunk.py:216 +#: ../meld/gutterrendererchunk.py:220 msgid "Copy _up" msgstr "Kopiera _upp" -#: ../meld/gutterrendererchunk.py:217 +#: ../meld/gutterrendererchunk.py:221 msgid "Copy _down" msgstr "Kopiera _ned" -#: ../meld/iohelpers.py:35 +#: ../meld/iohelpers.py:37 msgid "Deleting remote folders is not supported" msgstr "Att ta bort fjärrmappar stöds ej" -#: ../meld/iohelpers.py:37 +#: ../meld/iohelpers.py:39 msgid "Not a file or directory" msgstr "Inte en fil eller katalog" -#: ../meld/iohelpers.py:41 +#: ../meld/iohelpers.py:43 msgid "“{}” can’t be put in the trash. Do you want to delete it immediately?" msgstr "" "Kan inte flytta ”{}” till papperskorgen. Vill du ta bort den omedelbart?" -#: ../meld/iohelpers.py:46 +#: ../meld/iohelpers.py:48 msgid "This remote location does not support sending items to the trash." msgstr "Denna fjärrplats stöder inte att lägga objekt i papperskorgen." -#: ../meld/iohelpers.py:51 +#: ../meld/iohelpers.py:53 msgid "_Delete Permanently" msgstr "_Ta bort permanent" -#: ../meld/iohelpers.py:94 +#: ../meld/iohelpers.py:100 #, python-format msgid "Replace file “%s”?" msgstr "Ersätt filen ”%s”?" -#: ../meld/iohelpers.py:96 +#: ../meld/iohelpers.py:102 #, python-format msgid "" "A file with this name already exists in “%s”.\n" @@ -2041,98 +2036,98 @@ msgstr "" "En fil med detta namn existerar redan i ”%s”.\n" "Om du ersätter befintlig fil kommer dess innehåll att gå förlorat." -#: ../meld/meldapp.py:181 +#: ../meld/meldapp.py:169 msgid "wrong number of arguments supplied to --diff" msgstr "felaktigt antal argument angavs för --diff" -#: ../meld/meldapp.py:186 +#: ../meld/meldapp.py:174 msgid "Start with an empty window" msgstr "Starta med ett tomt fönster" -#: ../meld/meldapp.py:187 ../meld/meldapp.py:189 +#: ../meld/meldapp.py:175 ../meld/meldapp.py:177 msgid "file" msgstr "fil" -#: ../meld/meldapp.py:187 ../meld/meldapp.py:191 +#: ../meld/meldapp.py:175 ../meld/meldapp.py:179 msgid "folder" msgstr "mapp" -#: ../meld/meldapp.py:188 +#: ../meld/meldapp.py:176 msgid "Start a version control comparison" msgstr "Starta en versionshanterad jämförelse" -#: ../meld/meldapp.py:190 +#: ../meld/meldapp.py:178 msgid "Start a 2- or 3-way file comparison" msgstr "Starta med en två- eller trevägs filjämförelse" -#: ../meld/meldapp.py:192 +#: ../meld/meldapp.py:180 msgid "Start a 2- or 3-way folder comparison" msgstr "Starta med en två- eller trevägs mappjämförelse" -#: ../meld/meldapp.py:235 +#: ../meld/meldapp.py:223 #, python-format msgid "Error: %s\n" msgstr "Fel: %s\n" -#: ../meld/meldapp.py:242 +#: ../meld/meldapp.py:230 msgid "Meld is a file and directory comparison tool." msgstr "Meld är ett verktyg för att jämföra filer och kataloger." -#: ../meld/meldapp.py:246 +#: ../meld/meldapp.py:234 msgid "Set label to use instead of file name" msgstr "Sätt etikett att använda istället för filnamn" -#: ../meld/meldapp.py:249 +#: ../meld/meldapp.py:237 msgid "Open a new tab in an already running instance" msgstr "Öppna en ny flik i en redan körande instans" -#: ../meld/meldapp.py:252 +#: ../meld/meldapp.py:240 msgid "Automatically compare all differing files on startup" msgstr "Jämför automatiskt alla filer som skiljer sig vid uppstart" -#: ../meld/meldapp.py:255 +#: ../meld/meldapp.py:243 msgid "Ignored for compatibility" msgstr "Ignorerad för kompatibilitet" -#: ../meld/meldapp.py:259 +#: ../meld/meldapp.py:247 msgid "Set the target file for saving a merge result" msgstr "Ställ in målfilen för att spara sammanfogat resultat" -#: ../meld/meldapp.py:262 +#: ../meld/meldapp.py:250 msgid "Automatically merge files" msgstr "Sammanfoga automatiskt filer" -#: ../meld/meldapp.py:266 +#: ../meld/meldapp.py:254 msgid "Load a saved comparison from a Meld comparison file" msgstr "Läs in en sparad jämförelse från en Meld jämförelsefil" -#: ../meld/meldapp.py:270 +#: ../meld/meldapp.py:258 msgid "Create a diff tab for the supplied files or folders" msgstr "Skapar en diff-tabell för angivna filer eller mappar" -#: ../meld/meldapp.py:290 +#: ../meld/meldapp.py:278 #, python-format msgid "too many arguments (wanted 0-3, got %d)" msgstr "för många argument (ville ha 0-3, fick %d)" -#: ../meld/meldapp.py:293 +#: ../meld/meldapp.py:281 msgid "can’t auto-merge less than 3 files" msgstr "kan inte automatiskt sammanfoga mindre är tre filer" -#: ../meld/meldapp.py:295 +#: ../meld/meldapp.py:283 msgid "can’t auto-merge directories" msgstr "kan inte automatiskt sammanfoga kataloger" -#: ../meld/meldapp.py:309 +#: ../meld/meldapp.py:297 msgid "Error reading saved comparison file" msgstr "Fel vid läsning av den sparade konfigurationsfilen" -#: ../meld/meldapp.py:326 +#: ../meld/meldapp.py:314 #, python-format msgid "invalid path or URI “%s”" msgstr "ogiltig sökväg eller URI ”%s”" -#: ../meld/meldapp.py:332 +#: ../meld/meldapp.py:320 msgid "remote folder “{}” not supported" msgstr "fjärrmapp ”{}” stöds ej" @@ -2141,212 +2136,176 @@ msgstr "fjärrmapp ”{}” stöds ej" msgid "" msgstr "" -#: ../meld/melddoc.py:68 +#: ../meld/melddoc.py:63 msgid "untitled" msgstr "namnlös" -#: ../meld/meldwindow.py:47 +#: ../meld/meldwindow.py:56 msgid "_File" msgstr "_Arkiv" -#: ../meld/meldwindow.py:48 +#: ../meld/meldwindow.py:57 msgid "_New Comparison…" msgstr "_Ny jämförelse…" -#: ../meld/meldwindow.py:49 +#: ../meld/meldwindow.py:58 msgid "Start a new comparison" msgstr "Starta en ny jämförelse" -#: ../meld/meldwindow.py:52 +#: ../meld/meldwindow.py:61 msgid "Save the current file" msgstr "Spara den aktuella filen" -#: ../meld/meldwindow.py:54 +#: ../meld/meldwindow.py:63 msgid "Save As…" msgstr "Spara som…" -#: ../meld/meldwindow.py:55 +#: ../meld/meldwindow.py:64 msgid "Save the current file with a different name" msgstr "Spara den aktuella filen med ett annat namn" -#: ../meld/meldwindow.py:58 +#: ../meld/meldwindow.py:67 msgid "Close the current file" msgstr "Stäng den aktuella filen" -#: ../meld/meldwindow.py:61 +#: ../meld/meldwindow.py:70 msgid "_Edit" msgstr "_Redigera" -#: ../meld/meldwindow.py:63 +#: ../meld/meldwindow.py:72 msgid "Undo the last action" msgstr "Ångra den senaste åtgärden" -#: ../meld/meldwindow.py:66 +#: ../meld/meldwindow.py:75 msgid "Redo the last undone action" msgstr "Gör om den senaste ångrade åtgärden" -#: ../meld/meldwindow.py:68 +#: ../meld/meldwindow.py:77 msgid "Cut the selection" msgstr "Klipp ut markering" -#: ../meld/meldwindow.py:70 +#: ../meld/meldwindow.py:79 msgid "Copy the selection" msgstr "Kopiera markering" -#: ../meld/meldwindow.py:72 +#: ../meld/meldwindow.py:81 msgid "Paste the clipboard" msgstr "Klistra in Urklipp" -#: ../meld/meldwindow.py:74 +#: ../meld/meldwindow.py:83 msgid "Find…" msgstr "Sök…" -#: ../meld/meldwindow.py:74 +#: ../meld/meldwindow.py:83 msgid "Search for text" msgstr "Sök efter text" -#: ../meld/meldwindow.py:76 +#: ../meld/meldwindow.py:85 msgid "Find Ne_xt" msgstr "Sök _nästa" -#: ../meld/meldwindow.py:77 +#: ../meld/meldwindow.py:86 msgid "Search forwards for the same text" msgstr "Sök framåt efter samma text" -#: ../meld/meldwindow.py:79 +#: ../meld/meldwindow.py:88 msgid "Find _Previous" msgstr "Sök _Föregående" -#: ../meld/meldwindow.py:80 +#: ../meld/meldwindow.py:89 msgid "Search backwards for the same text" msgstr "Sök bakåt efter samma text" -#: ../meld/meldwindow.py:83 +#: ../meld/meldwindow.py:92 msgid "_Replace…" msgstr "_Ersätt…" -#: ../meld/meldwindow.py:84 +#: ../meld/meldwindow.py:93 msgid "Find and replace text" msgstr "Sök och ersätt text" -#: ../meld/meldwindow.py:86 +#: ../meld/meldwindow.py:95 msgid "Go to _Line" msgstr "Gå till _rad" -#: ../meld/meldwindow.py:87 +#: ../meld/meldwindow.py:96 msgid "Go to a specific line" msgstr "Gå till en specifik rad" -#: ../meld/meldwindow.py:90 +#: ../meld/meldwindow.py:99 msgid "_Changes" msgstr "Än_dringar" -#: ../meld/meldwindow.py:91 +#: ../meld/meldwindow.py:100 msgid "Next Change" msgstr "Nästa ändring" -#: ../meld/meldwindow.py:92 +#: ../meld/meldwindow.py:101 msgid "Go to the next change" msgstr "Gå till nästa ändring" -#: ../meld/meldwindow.py:94 +#: ../meld/meldwindow.py:103 msgid "Previous Change" msgstr "Föregående ändring" -#: ../meld/meldwindow.py:95 +#: ../meld/meldwindow.py:104 msgid "Go to the previous change" msgstr "Gå till föregående ändring" -#: ../meld/meldwindow.py:97 +#: ../meld/meldwindow.py:106 msgid "Open Externally" msgstr "Öppna externt" -#: ../meld/meldwindow.py:98 +#: ../meld/meldwindow.py:107 msgid "Open selected file or directory in the default external application" msgstr "Öppna markerad fil eller katalog i det externa standardprogrammet" -#: ../meld/meldwindow.py:102 +#: ../meld/meldwindow.py:111 msgid "_View" msgstr "_Visa" -#: ../meld/meldwindow.py:103 +#: ../meld/meldwindow.py:112 msgid "File Status" msgstr "Filstatus" -#: ../meld/meldwindow.py:104 +#: ../meld/meldwindow.py:113 msgid "Version Status" msgstr "Versionsstatus" -#: ../meld/meldwindow.py:107 +#: ../meld/meldwindow.py:116 msgid "Stop the current action" msgstr "Stoppa den aktuella åtgärden" -#: ../meld/meldwindow.py:110 +#: ../meld/meldwindow.py:119 msgid "Refresh the view" msgstr "Uppdatera vyn" -#: ../meld/meldwindow.py:114 +#: ../meld/meldwindow.py:123 msgid "Fullscreen" msgstr "Helskärm" -#: ../meld/meldwindow.py:115 +#: ../meld/meldwindow.py:124 msgid "View the comparison in fullscreen" msgstr "Visa jämförelsen i helskärmsläge" -#: ../meld/meldwindow.py:117 -msgid "_Toolbar" -msgstr "Ver_ktygsfält" - -#: ../meld/meldwindow.py:118 -msgid "Show or hide the toolbar" -msgstr "Visa eller dölj verktygsfältet" - -#: ../meld/meldwindow.py:127 +#: ../meld/meldwindow.py:133 msgid "Open Recent" msgstr "Öppna senaste" -#: ../meld/meldwindow.py:128 +#: ../meld/meldwindow.py:134 msgid "Open recent files" msgstr "Öppna senaste filer" -#: ../meld/meldwindow.py:150 -msgid "_Meld" -msgstr "_Meld" - -#: ../meld/meldwindow.py:151 -msgid "Quit the program" -msgstr "Avsluta programmet" - -#: ../meld/meldwindow.py:153 -msgid "Prefere_nces" -msgstr "Inställ_ningar" - -#: ../meld/meldwindow.py:154 -msgid "Configure the application" -msgstr "Konfigurera programmet" - -#: ../meld/meldwindow.py:156 -msgid "_Contents" -msgstr "_Innehåll" - -#: ../meld/meldwindow.py:157 -msgid "Open the Meld manual" -msgstr "Öppna handboken för Meld" - -#: ../meld/meldwindow.py:159 -msgid "About this application" -msgstr "Om detta program" - -#: ../meld/meldwindow.py:602 +#: ../meld/meldwindow.py:567 #, python-format msgid "Need three files to auto-merge, got: %r" msgstr "Behöver tre filer för att sammanfoga automatiskt, fick: %r" -#: ../meld/meldwindow.py:623 +#: ../meld/meldwindow.py:588 msgid "Cannot compare a mixture of files and directories" msgstr "Kan inte jämföra en blandning av filer och kataloger" -#: ../meld/misc.py:135 +#: ../meld/misc.py:155 msgid "" "{}\n" "\n" @@ -2358,42 +2317,38 @@ msgstr "" "Meld stötte på ett kritiskt fel under körning:\n" "{}" -#: ../meld/misc.py:254 +#: ../meld/misc.py:237 #, python-format msgid "Couldn’t find colour scheme details for %s-%s; this is a bad install" msgstr "" "Kunde inte hitta färgschemadetaljer för %s-%s; detta är en felaktig " "installation" -#: ../meld/misc.py:325 +#: ../meld/misc.py:311 msgid "[None]" msgstr "[Ingen]" -#: ../meld/preferences.py:33 +#: ../meld/preferences.py:42 ../meld/preferences.py:135 msgid "label" msgstr "etikett" -#: ../meld/preferences.py:33 +#: ../meld/preferences.py:42 ../meld/preferences.py:135 msgid "pattern" msgstr "mönster" -#: ../meld/recent.py:105 +#: ../meld/recent.py:106 msgid "Version control:" msgstr "Versionshantering:" -#: ../meld/ui/bufferselectors.py:32 +#: ../meld/ui/bufferselectors.py:114 #, python-brace-format msgid "{name} ({charset})" msgstr "{name} ({charset})" -#: ../meld/ui/bufferselectors.py:65 ../meld/ui/bufferselectors.py:73 +#: ../meld/ui/bufferselectors.py:144 ../meld/ui/bufferselectors.py:152 msgid "Plain Text" msgstr "Vanlig text" -#: ../meld/ui/notebooklabel.py:63 -msgid "Close tab" -msgstr "Stäng flik" - #. Abbreviation for line, column so that it will fit in the status bar #: ../meld/ui/statusbar.py:124 #, python-format @@ -2404,7 +2359,7 @@ msgstr "Rad %i, kolumn %i" msgid "Line you want to move the cursor to" msgstr "Rad du vill flytta markören till" -#: ../meld/ui/vcdialogs.py:48 +#: ../meld/ui/vcdialogs.py:55 msgid "No files will be committed" msgstr "Inga filer kommer att checkas in" @@ -2505,91 +2460,91 @@ msgstr "Inte närvarande" #. Translators: This error message is shown when a version #. control binary isn't installed. -#: ../meld/vcview.py:248 +#: ../meld/vcview.py:282 #, python-format msgid "%(name)s (%(cmd)s not installed)" msgstr "%(name)s (%(cmd)s inte installerad)" #. Translators: This error message is shown when a version #. controlled repository is invalid. -#: ../meld/vcview.py:252 +#: ../meld/vcview.py:286 #, python-format msgid "%(name)s (Invalid repository)" msgstr "%(name)s (Ogiltigt förråd)" -#: ../meld/vcview.py:273 +#: ../meld/vcview.py:307 msgid "No valid version control system found in this folder" msgstr "Inget giltigt versionshanteringssystem hittades i denna mapp" -#: ../meld/vcview.py:275 +#: ../meld/vcview.py:309 msgid "Only one version control system found in this folder" msgstr "Endast ett versionshanteringssystem hittades i denna mapp" -#: ../meld/vcview.py:277 +#: ../meld/vcview.py:311 msgid "Choose which version control system to use" msgstr "Välj vilket versionshanteringssystem som ska användas" #. TRANSLATORS: This is the location of the directory being viewed -#: ../meld/vcview.py:331 +#: ../meld/vcview.py:366 #, python-format msgid "%s: %s" msgstr "%s: %s" #. Initial yield so when we add this to our tasks, we don't #. create iterators that may be invalidated. -#: ../meld/vcview.py:338 +#: ../meld/vcview.py:373 msgid "Scanning repository" msgstr "Söker igenom förråd" -#: ../meld/vcview.py:367 +#: ../meld/vcview.py:402 #, python-format msgid "Scanning %s" msgstr "Söker igenom %s" -#: ../meld/vcview.py:406 +#: ../meld/vcview.py:441 msgid "(Empty)" msgstr "(Tom)" -#: ../meld/vcview.py:450 +#: ../meld/vcview.py:487 #, python-format msgid "%s — local" msgstr "%s — lokal" -#: ../meld/vcview.py:451 +#: ../meld/vcview.py:488 #, python-format msgid "%s — remote" msgstr "%s — fjärr" -#: ../meld/vcview.py:459 +#: ../meld/vcview.py:496 #, python-format msgid "%s (local, merge, remote)" msgstr "%s (lokal, sammanfoga, fjärr)" -#: ../meld/vcview.py:464 +#: ../meld/vcview.py:501 #, python-format msgid "%s (remote, merge, local)" msgstr "%s (fjärr, sammanfoga, lokal)" -#: ../meld/vcview.py:475 +#: ../meld/vcview.py:512 #, python-format msgid "%s — repository" msgstr "%s — förråd" -#: ../meld/vcview.py:481 +#: ../meld/vcview.py:518 #, python-format msgid "%s (working, repository)" msgstr "%s (arbetskopia, förråd)" -#: ../meld/vcview.py:485 +#: ../meld/vcview.py:522 #, python-format msgid "%s (repository, working)" msgstr "%s (förråd, arbetskopia)" -#: ../meld/vcview.py:674 +#: ../meld/vcview.py:688 msgid "Remove folder and all its files?" msgstr "Ta bort mapp och dess filer?" -#: ../meld/vcview.py:676 +#: ../meld/vcview.py:690 msgid "" "This will remove all selected files and folders, and all files within any " "selected folders, from version control." @@ -2597,10 +2552,55 @@ msgstr "" "Det här kommer att ta bort alla markerade filer och mappar samt alla filer i " "markerade mappar från versionshantering." -#: ../meld/vcview.py:785 +#: ../meld/vcview.py:804 msgid "Clear" msgstr "Töm" +#~ msgid "Show toolbar" +#~ msgstr "Visa verktygsfältet" + +#~ msgid "If true, the window toolbar is visible." +#~ msgstr "Om true så är fönsterverktygsfältet synlig." + +#~ msgid "Show statusbar" +#~ msgstr "Visa statusraden" + +#~ msgid "If true, the window statusbar is visible." +#~ msgstr "Om true så är fönsterstatusraden synlig." + +#~ msgid "Editable List" +#~ msgstr "Redigerbar lista" + +#~ msgid "Meld Preferences" +#~ msgstr "Inställningar för Meld" + +#~ msgid "_Toolbar" +#~ msgstr "Ver_ktygsfält" + +#~ msgid "Show or hide the toolbar" +#~ msgstr "Visa eller dölj verktygsfältet" + +#~ msgid "_Meld" +#~ msgstr "_Meld" + +#~ msgid "Quit the program" +#~ msgstr "Avsluta programmet" + +#~ msgid "Prefere_nces" +#~ msgstr "Inställ_ningar" + +#~ msgid "Configure the application" +#~ msgstr "Konfigurera programmet" + +#~ msgid "_Contents" +#~ msgstr "_Innehåll" + +#~ msgid "Open the Meld manual" +#~ msgstr "Öppna handboken för Meld" + +#~ msgid "About this application" +#~ msgstr "Om detta program" + #~ msgid "_Save as UTF-8" #~ msgstr "_Spara som UTF-8" From 386e1dcb6d40fe987f6702fd1cd1ced5de238def Mon Sep 17 00:00:00 2001 From: Ryuta Fujii Date: Tue, 8 Jan 2019 12:19:28 +0000 Subject: [PATCH 0775/1316] Update Japanese translation --- po/ja.po | 3184 ++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 2122 insertions(+), 1062 deletions(-) diff --git a/po/ja.po b/po/ja.po index e5c68dfa..bc009446 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1,1519 +1,2579 @@ # meld ja.po. # Copyright (C) 2003-2012 Free Software Foundation, Inc. # Takeshi AIHANA , 2003-2011. -# Toshiharu Kudoh , 2012. +# Toshiharu Kudoh , 2012-2013. +# Shinichirou Yamada , 2017. +# sicklylife , 2019. # msgid "" msgstr "" "Project-Id-Version: meld master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=meld&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-02-04 12:15+0000\n" -"PO-Revision-Date: 2012-02-05 00:23+0900\n" -"Last-Translator: Toshiharu Kudoh \n" +"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n" +"POT-Creation-Date: 2019-01-07 22:26+0000\n" +"PO-Revision-Date: 2019-01-08 21:02+0900\n" +"Last-Translator: sicklylife \n" "Language-Team: Japanese \n" +"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ja\n" "Generated-By: pygettext.py 1.5\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../bin/meld:97 +#: ../bin/meld:190 msgid "Cannot import: " -msgstr "インポートできません:" +msgstr "インポートできません: " -#: ../bin/meld:100 +#: ../bin/meld:193 #, c-format msgid "Meld requires %s or higher." msgstr "Meld には %s 以上が必要です。" -#: ../data/meld.desktop.in.h:1 -msgid "Compare and merge your files" -msgstr "複数のファイルを比較したりマージします" - -#: ../data/meld.desktop.in.h:2 -msgid "Diff Viewer" -msgstr "差分ビューアー" +#: ../bin/meld:249 +#, c-format +msgid "" +"Couldn’t load Meld-specific CSS (%s)\n" +"%s" +msgstr "" -#: ../data/meld.desktop.in.h:3 ../data/ui/meldapp.ui.h:5 +#: ../data/org.gnome.meld.desktop.in.h:1 +#: ../data/org.gnome.meld.appdata.xml.in.h:1 +#: ../meld/resources/ui/appwindow.ui.h:1 msgid "Meld" msgstr "Meld" -#: ../data/meld.desktop.in.h:4 +#: ../data/org.gnome.meld.desktop.in.h:2 +msgid "Diff Viewer" +msgstr "差分ビューアー" + +#: ../data/org.gnome.meld.desktop.in.h:3 msgid "Meld Diff Viewer" msgstr "Meld 差分ビューアー" -#: ../data/ui/EditableList.ui.h:1 -msgid "Active" -msgstr "有効" +#: ../data/org.gnome.meld.desktop.in.h:4 +#: ../data/org.gnome.meld.appdata.xml.in.h:2 +msgid "Compare and merge your files" +msgstr "複数のファイルを比較したりマージしたりします" -#: ../data/ui/EditableList.ui.h:2 -msgid "Add new filter" -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.h:6 +msgid "diff;merge;" +msgstr "diff;merge;比較;マージ;" -#: ../data/ui/EditableList.ui.h:3 -msgid "Editable List" -msgstr "編集可能なリスト" +#: ../data/org.gnome.meld.appdata.xml.in.h:3 +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/ui/EditableList.ui.h:4 -msgid "Move _Down" -msgstr "下へ移動する(_D)" +#: ../data/org.gnome.meld.appdata.xml.in.h:4 +msgid "" +"Meld helps you review code changes, understand patches, and makes enormous " +"merge conflicts slightly less painful." +msgstr "" -#: ../data/ui/EditableList.ui.h:5 -msgid "Move _Up" -msgstr "上へ移動する(_U)" +#: ../data/org.gnome.meld.appdata.xml.in.h:5 +msgid "The GNOME Project" +msgstr "" -#: ../data/ui/EditableList.ui.h:6 -msgid "Move item down" -msgstr "アイテムを下へ移動します" +#: ../data/mime/org.gnome.meld.xml.in.h:1 +msgid "Meld comparison description" +msgstr "" -#: ../data/ui/EditableList.ui.h:7 -msgid "Move item up" -msgstr "アイテムを上へ移動します" +#: ../data/org.gnome.meld.gschema.xml.h:1 +msgid "Default window width" +msgstr "デフォルトのウィンドウの幅" -#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:166 -msgid "Name" -msgstr "名前" +#: ../data/org.gnome.meld.gschema.xml.h:2 +msgid "Default window height" +msgstr "デフォルトのウィンドウの高さ" -#: ../data/ui/EditableList.ui.h:9 -msgid "Pattern" -msgstr "パターン" +#: ../data/org.gnome.meld.gschema.xml.h:3 +msgid "Default window maximised state" +msgstr "デフォルトでウィンドウが最大化されるかどうか" -#: ../data/ui/EditableList.ui.h:10 -msgid "Remove selected filter" -msgstr "選択したフィルターを削除します" +#: ../data/org.gnome.meld.gschema.xml.h:4 +msgid "Default window fullscreen state" +msgstr "デフォルトでウィンドウがフルスクリーン表示されるかどうか" -#: ../data/ui/EditableList.ui.h:11 ../meld/vcview.py:130 -msgid "_Add" -msgstr "追加(_A)" +#: ../data/org.gnome.meld.gschema.xml.h:5 +msgid "Additional automatically detected text encodings" +msgstr "自動検出される追加のテキストエンコーディング" -#: ../data/ui/EditableList.ui.h:12 ../meld/vcview.py:132 -msgid "_Remove" -msgstr "削除(_R)" +#: ../data/org.gnome.meld.gschema.xml.h:6 +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 は他のエンコーディングを試す前に、これらのテキストエンコーディングを使用" +"して、読み込んだテキストファイルのデコードを試みます。このリストのエンコー" +"ディングに加え、UTF-8 と現在のロケールのデフォルトのエンコーディングが常に使" +"用されます。ユーザーのロケールによっては、他のエンコーディングでのデコードも" +"試されるかもしれません。" + +#: ../data/org.gnome.meld.gschema.xml.h:7 +msgid "Width of an indentation step" +msgstr "タブの幅" + +#: ../data/org.gnome.meld.gschema.xml.h:8 +msgid "The number of spaces to use for a single indent step" +msgstr "インデント幅をスペース何個分にするか" + +#: ../data/org.gnome.meld.gschema.xml.h:9 +msgid "Whether to indent using spaces or tabs" +msgstr "スペースとタブのどちらを使ってインデントするか" + +#: ../data/org.gnome.meld.gschema.xml.h:10 +msgid "If true, any new indentation will use spaces instead of tabs." +msgstr "" +"true の場合、新しいインデントではタブの代わりにスペースが使用されます。" + +#: ../data/org.gnome.meld.gschema.xml.h:11 +msgid "Show line numbers" +msgstr "行番号を表示する" -#: ../data/ui/filediff.ui.h:1 -msgid "Save modified files?" -msgstr "変更したファイルを保存しますか？" +#: ../data/org.gnome.meld.gschema.xml.h:12 +msgid "If true, line numbers will be shown in the gutter of file comparisons." +msgstr "true の場合、ファイル比較時のガター部分に行番号を表示します。" -#: ../data/ui/filediff.ui.h:2 +#: ../data/org.gnome.meld.gschema.xml.h:13 +msgid "Highlight syntax" +msgstr "シンタックスハイライト" + +#: ../data/org.gnome.meld.gschema.xml.h:14 msgid "" -"Some files have been modified.\n" -"Which ones would you like to save?" +"Whether to highlight syntax in comparisons. Because of Meld’s own color " +"highlighting, this is off by default." msgstr "" -"いくつかのファイルが変更されています。\n" -"どのファイルを保存しますか？" - -#: ../data/ui/filediff.ui.h:4 -msgid "_Discard Changes" -msgstr "変更を取り消す(_D)" -#: ../data/ui/filediff.ui.h:5 -msgid "_Save Selected" -msgstr "選択範囲を保存する(_S)" +#: ../data/org.gnome.meld.gschema.xml.h:15 +msgid "Color scheme to use for syntax highlighting" +msgstr "シンタックスハイライトに使用するカラースキーマ" -#: ../data/ui/findbar.ui.h:1 -msgid "Regular E_xpression" -msgstr "正規表現(_X)" +#: ../data/org.gnome.meld.gschema.xml.h:16 +msgid "Used by GtkSourceView to determine colors for syntax highlighting" +msgstr "" +"シンタックスハイライトのために決められた色は GtkSourceView によって使用されま" +"す" -#: ../data/ui/findbar.ui.h:2 -msgid "Replace _All" -msgstr "全て置換(_A)" +#: ../data/org.gnome.meld.gschema.xml.h:17 +msgid "Displayed whitespace" +msgstr "ホワイトスペースを表示する" -#: ../data/ui/findbar.ui.h:3 -msgid "Replace _With" -msgstr "次で置き換える(_W):" +#: ../data/org.gnome.meld.gschema.xml.h:18 +msgid "" +"Selector for individual whitespace character types to be shown. Possible " +"values are 'space', 'tab', 'newline' and 'nbsp'." +msgstr "" +"表示する空白類文字の種類の設定です。使用可能な値は " +"'space'、'tab'、'newline'、'nbsp' です。" -#: ../data/ui/findbar.ui.h:4 -msgid "Who_le word" -msgstr "単語全体(_L)" +#: ../data/org.gnome.meld.gschema.xml.h:19 +msgid "Wrap mode" +msgstr "折り返しのモード" -#: ../data/ui/findbar.ui.h:5 -msgid "_Match Case" -msgstr "大/小文字を区別する(_M)" +#: ../data/org.gnome.meld.gschema.xml.h:20 +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 "" +"ファイル比較時の各行は、この設定に従って折り返されます。折り返さない場合は " +"'none'、任意の文字で折り返す場合は 'char'、単語の末尾で折り返す場合は 'word' " +"を指定します。" -#: ../data/ui/findbar.ui.h:6 -msgid "_Next" -msgstr "次の結果(_N)" +#: ../data/org.gnome.meld.gschema.xml.h:21 +msgid "Highlight current line" +msgstr "現在の行のハイライト" -#: ../data/ui/findbar.ui.h:7 -msgid "_Previous" -msgstr "前の結果(_P)" +#: ../data/org.gnome.meld.gschema.xml.h:22 +msgid "" +"If true, the line containing the cursor will be highlighted in file " +"comparisons." +msgstr "true の場合、ファイル比較時にカーソルのある行がハイライトされます。" -#: ../data/ui/findbar.ui.h:8 ../meld/meldwindow.py:141 -msgid "_Replace" -msgstr "置換(_R)" +#: ../data/org.gnome.meld.gschema.xml.h:23 +msgid "Use the system default monospace font" +msgstr "システムデフォルトの等幅フォントを使用する" -#: ../data/ui/findbar.ui.h:9 -msgid "_Search for" -msgstr "検索する文字列(_S):" +#: ../data/org.gnome.meld.gschema.xml.h:24 +msgid "" +"If false, custom-font will be used instead of the system monospace font." +msgstr "" +"false の場合、システムの monospace フォントの代わりにカスタムフォントが使用さ" +"れます。" -#: ../data/ui/meldapp.ui.h:1 -msgid "Choose Files" -msgstr "ファイルの選択" +#: ../data/org.gnome.meld.gschema.xml.h:25 +msgid "Custom font" +msgstr "カスタムフォント" -#: ../data/ui/meldapp.ui.h:2 +#: ../data/org.gnome.meld.gschema.xml.h:26 msgid "" -"Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2011 Kai Willadsen" +"The custom font to use, stored as a string and parsed as a Pango font " +"description." msgstr "" -"Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2011 Kai Willadsen" -#: ../data/ui/meldapp.ui.h:4 -msgid "Directory" -msgstr "フォルダー" +#: ../data/org.gnome.meld.gschema.xml.h:27 +msgid "Ignore blank lines when comparing files" +msgstr "ファイル比較時に空行を無視する" -#. Refers to version of the file being compared -#: ../data/ui/meldapp.ui.h:7 -msgid "Mine" -msgstr "自分のもの" +#: ../data/org.gnome.meld.gschema.xml.h:28 +msgid "" +"If true, blank lines will be trimmed when highlighting changes between files." +msgstr "" +"true の場合、ファイル間の変更点をハイライトする際に、空行の差異をハイライトし" +"ません。" -#. Refers to version of the file being compared -#: ../data/ui/meldapp.ui.h:9 -msgid "Original" -msgstr "オリジナル" +#: ../data/org.gnome.meld.gschema.xml.h:29 +msgid "Use the system default editor" +msgstr "システムデフォルトのエディターを使用する" -#. Refers to version of the file being compared -#: ../data/ui/meldapp.ui.h:11 -msgid "Other" -msgstr "他のもの" +#: ../data/org.gnome.meld.gschema.xml.h:30 +msgid "" +"If false, custom-editor-command will be used instead of the system editor " +"when opening files externally." +msgstr "" +"false の場合、ファイルを別のアプリで開く際に、システムのエディターの代わりに" +"指定したエディターコマンドを使用します。" -#: ../data/ui/meldapp.ui.h:12 -msgid "Select VC Directory" -msgstr "バージョン・コントロール・フォルダーの選択" +#: ../data/org.gnome.meld.gschema.xml.h:31 +msgid "The custom editor launch command" +msgstr "カスタムエディター起動コマンド" -#: ../data/ui/meldapp.ui.h:13 -msgid "_Directory Comparison" -msgstr "フォルダーの比較(_D)" +#: ../data/org.gnome.meld.gschema.xml.h:32 +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/ui/meldapp.ui.h:14 -msgid "_File Comparison" -msgstr "ファイルの比較(_F)" +#: ../data/org.gnome.meld.gschema.xml.h:33 +msgid "Columns to display" +msgstr "表示するカラム" -#: ../data/ui/meldapp.ui.h:15 -msgid "_Three Way Compare" -msgstr "3つの間で比較する(_T)" +#: ../data/org.gnome.meld.gschema.xml.h:34 +msgid "" +"List of column names in folder comparison and whether they should be " +"displayed." +msgstr "" +"フォルダー比較時のカラム名の一覧と、それらを表示するかどうかの設定です。" -#: ../data/ui/meldapp.ui.h:16 -msgid "_Version Control Browser" -msgstr "バージョン・コントロール・ブラウザー(_V)" +#: ../data/org.gnome.meld.gschema.xml.h:35 +#: ../meld/resources/ui/preferences.ui.h:25 +msgid "Ignore symbolic links" +msgstr "シンボリックリンクを無視する" -#: ../data/ui/meldapp.ui.h:17 -msgid "translator-credits" -msgstr "相花 毅 " +#: ../data/org.gnome.meld.gschema.xml.h:36 +msgid "" +"If true, folder comparisons do not follow symbolic links when traversing the " +"folder tree." +msgstr "" +"true の場合、フォルダー比較時のフォルダーツリー走査において、シンボリックリン" +"クのリンク先を走査しません。" -#: ../data/ui/patch-dialog.ui.h:1 -msgid "Copy to Clipboard" -msgstr "クリップボードへコピー" +#: ../data/org.gnome.meld.gschema.xml.h:37 +msgid "Use shallow comparison" +msgstr "浅い比較を使用する" -#: ../data/ui/patch-dialog.ui.h:2 -msgid "Create Patch" -msgstr "パッチの生成" +#: ../data/org.gnome.meld.gschema.xml.h:38 +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 "" +"true の場合、フォルダー比較時にサイズと mtime だけを基準にしてファイルを比較" +"し、それらが一致すれば同一のファイルであると見做します。" -#: ../data/ui/patch-dialog.ui.h:3 -msgid "Create a patch" -msgstr "パッチの生成" +#: ../data/org.gnome.meld.gschema.xml.h:39 +msgid "File timestamp resolution" +msgstr "ファイルのタイムスタンプ分解能" -#: ../data/ui/patch-dialog.ui.h:4 -msgid "Left and middle panes" -msgstr "左側と真ん中のペイン" +#: ../data/org.gnome.meld.gschema.xml.h:40 +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 "" +"mtime に基づいて比較する場合、この値が2つのファイル間において mtime が異なる" +"と見做される最小の差異(ナノ秒)です。これはタイムスタンプ分解能が異なるファイ" +"ルシステム間で、ファイルの比較を行う際に役立ちます。" -#: ../data/ui/patch-dialog.ui.h:5 -msgid "Middle and right panes" -msgstr "真ん中と右側のペイン" +#: ../data/org.gnome.meld.gschema.xml.h:41 +#: ../meld/resources/ui/preferences.ui.h:22 +msgid "Apply text filters during folder comparisons" +msgstr "フォルダーの比較中にテキストフィルターを適用する" -#: ../data/ui/patch-dialog.ui.h:6 -msgid "Use differences between:" -msgstr "次のペインの間の差分をパッチにする:" +#: ../data/org.gnome.meld.gschema.xml.h:42 +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 "" +"true の場合、フォルダー比較時にファイルの内容を比較する際に、有効なテキスト" +"フィルターと空行のトリミングオプションが適用され、改行による差異は無視しま" +"す。" -#: ../data/ui/patch-dialog.ui.h:7 -msgid "_Reverse patch direction" -msgstr "オリジナル・ファイルを逆にする(_R)" +#: ../data/org.gnome.meld.gschema.xml.h:43 +msgid "File status filters" +msgstr "ファイルの状態フィルター" -#: ../data/ui/preferences.ui.h:1 -msgid "Display" -msgstr "表示" +#: ../data/org.gnome.meld.gschema.xml.h:44 +msgid "List of statuses used to filter visible files in folder comparison." +msgstr "" +"フォルダー比較時に、表示するファイルをフィルタリングするために使用されるス" +"テータスのリスト。" -#: ../data/ui/preferences.ui.h:2 -msgid "Do not _split words over two lines" -msgstr "単語が二行にまたがらないようにする(_S)" +#: ../data/org.gnome.meld.gschema.xml.h:45 +msgid "Show the version control console output" +msgstr "" -#: ../data/ui/preferences.ui.h:3 -msgid "Edito_r command:" -msgstr "エディターをコマンドで指定する(_R):" +#: ../data/org.gnome.meld.gschema.xml.h:46 +msgid "" +"If true, a console output section will be shown in version control views, " +"showing the commands run for version control operations." +msgstr "" -#: ../data/ui/preferences.ui.h:4 -msgid "Editor" -msgstr "エディター" +#: ../data/org.gnome.meld.gschema.xml.h:47 +msgid "Version control pane position" +msgstr "" -#: ../data/ui/preferences.ui.h:5 -msgid "Enable text _wrapping" -msgstr "文字列の折り返しを有効にする(_W)" +#: ../data/org.gnome.meld.gschema.xml.h:48 +msgid "" +"This is the height of the main version control tree when the console pane is " +"shown." +msgstr "" -#: ../data/ui/preferences.ui.h:6 -msgid "Encoding" -msgstr "エンコーディング" +#: ../data/org.gnome.meld.gschema.xml.h:49 +msgid "Present version comparisons as left-local/right-remote" +msgstr "" -#: ../data/ui/preferences.ui.h:7 -msgid "External editor" -msgstr "外部エディター" +#: ../data/org.gnome.meld.gschema.xml.h:50 +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/ui/preferences.ui.h:8 -msgid "File Filters" -msgstr "ファイルのフィルター" +#: ../data/org.gnome.meld.gschema.xml.h:51 +msgid "Order for files in three-way version control merge comparisons" +msgstr "" -#: ../data/ui/preferences.ui.h:9 -msgid "Font" -msgstr "フォント" +#: ../data/org.gnome.meld.gschema.xml.h:52 +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/ui/preferences.ui.h:10 -msgid "Ignore changes which insert or delete blank lines" -msgstr "空行の挿入や削除を無視する" +#: ../data/org.gnome.meld.gschema.xml.h:53 +msgid "Show margin in commit message editor" +msgstr "" -#: ../data/ui/preferences.ui.h:11 -msgid "Ignore symbolic links" -msgstr "シンボリック・リンクを無視する" +#: ../data/org.gnome.meld.gschema.xml.h:54 +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/ui/preferences.ui.h:12 -msgid "Loading" -msgstr "読み込み" +#: ../data/org.gnome.meld.gschema.xml.h:55 +msgid "Margin column in commit message editor" +msgstr "" -#: ../data/ui/preferences.ui.h:13 -msgid "Meld Preferences" -msgstr "Meld の設定" +#: ../data/org.gnome.meld.gschema.xml.h:56 +msgid "" +"The column at which to show the margin in the version control commit message " +"editor." +msgstr "" -#: ../data/ui/preferences.ui.h:14 -msgid "Show _line numbers" -msgstr "行番号を表示する(_L)" +#: ../data/org.gnome.meld.gschema.xml.h:57 +msgid "Automatically hard-wrap commit messages" +msgstr "" -#: ../data/ui/preferences.ui.h:15 -msgid "Show w_hitespace" -msgstr "空白や改行を表示する(_H)" +#: ../data/org.gnome.meld.gschema.xml.h:58 +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/ui/preferences.ui.h:16 -msgid "Text Filters" -msgstr "文字列のフィルター" +#: ../data/org.gnome.meld.gschema.xml.h:59 +msgid "Version control status filters" +msgstr "" -#: ../data/ui/preferences.ui.h:17 -msgid "Use _default system editor" -msgstr "システムでデフォルトのエディターを使用する(_D)" +#: ../data/org.gnome.meld.gschema.xml.h:60 +msgid "" +"List of statuses used to filter visible files in version control comparison." +msgstr "" -#: ../data/ui/preferences.ui.h:18 -msgid "Use s_yntax highlighting" -msgstr "シンタックスハイライトを有効にする(_Y)" +#: ../data/org.gnome.meld.gschema.xml.h:61 +msgid "Filename-based filters" +msgstr "ファイル名を対象としたフィルター" -#: ../data/ui/preferences.ui.h:19 -msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)" +#: ../data/org.gnome.meld.gschema.xml.h:62 +msgid "" +"List of predefined filename-based filters that, if active, will remove " +"matching files from a folder comparison." msgstr "" -"ファイルを読み込む際に、次の順番でエンコーディングを試行します (例: utf8, " -"iso8859)" +"ファイル名が対象の定義されたフィルターのリスト。有効な場合、フォルダーの比較" +"から一致するファイルを除外します。" + +#: ../data/org.gnome.meld.gschema.xml.h:63 +msgid "Text-based filters" +msgstr "テキストを対象としたフィルター" -#: ../data/ui/preferences.ui.h:20 +#: ../data/org.gnome.meld.gschema.xml.h:64 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." +"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 "" -"フォルダーの比較を行う時、ファイルとフォルダーを名前でフィルタリングできま" -"す。フィルタリングのパターンはそれぞれ、スペースで区切った SHELL 型式のワイル" -"ドカードの並びです。" +"テキストが対象の定義された正規表現のフィルターのリスト。有効な場合、ファイル" +"の比較から一致するテキストを除外します。一致したテキスト自体は表示されます" +"が、比較には影響しません。" + +#: ../data/styles/meld-base.xml.h:1 +msgid "Meld base scheme" +msgstr "Meld の標準スキーマ" + +#: ../data/styles/meld-base.xml.h:2 +msgid "Base color scheme for Meld highlighting" +msgstr "Meld がハイライトに用いる標準カラースキーマ" + +#: ../data/styles/meld-dark.xml.h:1 +msgid "Meld dark scheme" +msgstr "Meld ダークスキーマ" + +#: ../data/styles/meld-dark.xml.h:2 +msgid "Dark color scheme for Meld highlighting" +msgstr "Meld がハイライトに用いるダークカラースキーマ" + +#: ../meld/resources/gtk/help-overlay.ui.h:1 +msgctxt "shortcut window" +msgid "General" +msgstr "全般" + +#: ../meld/resources/gtk/help-overlay.ui.h:2 +msgctxt "shortcut window" +msgid "New comparison" +msgstr "新しい比較" + +#: ../meld/resources/gtk/help-overlay.ui.h:3 +msgctxt "shortcut window" +msgid "Close a comparison" +msgstr "比較を閉じる" + +#: ../meld/resources/gtk/help-overlay.ui.h:4 +msgctxt "shortcut window" +msgid "Quit Meld" +msgstr "Meld を終了する" + +#: ../meld/resources/gtk/help-overlay.ui.h:5 +msgctxt "shortcut window" +msgid "Stop the current action" +msgstr "現在適用中のアクションを停止する" + +#: ../meld/resources/gtk/help-overlay.ui.h:6 +msgctxt "shortcut window" +msgid "Refresh comparison" +msgstr "比較内容を更新する" + +#: ../meld/resources/gtk/help-overlay.ui.h:7 +msgctxt "shortcut window" +msgid "Fullscreen" +msgstr "フルスクリーンで表示する" + +#: ../meld/resources/gtk/help-overlay.ui.h:8 +msgctxt "shortcut window" +msgid "Tabs" +msgstr "タブ" + +#: ../meld/resources/gtk/help-overlay.ui.h:9 +msgctxt "shortcut window" +msgid "Go to previous tab" +msgstr "前のタブへ移動する" + +#: ../meld/resources/gtk/help-overlay.ui.h:10 +msgctxt "shortcut window" +msgid "Go to next tab" +msgstr "次のタブへ移動する" + +#: ../meld/resources/gtk/help-overlay.ui.h:11 +msgctxt "shortcut window" +msgid "Switch to tab" +msgstr "タブを切り替える" + +#: ../meld/resources/gtk/help-overlay.ui.h:12 +msgctxt "shortcut window" +msgid "Move tab left" +msgstr "タブを左へ移動する" + +#: ../meld/resources/gtk/help-overlay.ui.h:13 +msgctxt "shortcut window" +msgid "Move tab right" +msgstr "タブを右へ移動する" + +#: ../meld/resources/gtk/help-overlay.ui.h:14 +msgctxt "shortcut window" +msgid "Changes" +msgstr "変更点" + +#: ../meld/resources/gtk/help-overlay.ui.h:15 +msgctxt "shortcut window" +msgid "Go to previous change" +msgstr "前の変更点へジャンプする" + +#: ../meld/resources/gtk/help-overlay.ui.h:16 +msgctxt "shortcut window" +msgid "Go to next change" +msgstr "次の変更点へジャンプする" + +#: ../meld/resources/gtk/help-overlay.ui.h:17 +msgctxt "shortcut window" +msgid "Editing" +msgstr "編集" + +#: ../meld/resources/gtk/help-overlay.ui.h:18 +msgctxt "shortcut window" +msgid "Undo" +msgstr "元に戻す" + +#: ../meld/resources/gtk/help-overlay.ui.h:19 +msgctxt "shortcut window" +msgid "Redo" +msgstr "やり直し" + +#: ../meld/resources/gtk/help-overlay.ui.h:20 +msgctxt "shortcut window" +msgid "Cut" +msgstr "切り取り" + +#: ../meld/resources/gtk/help-overlay.ui.h:21 +msgctxt "shortcut window" +msgid "Copy" +msgstr "コピー" + +#: ../meld/resources/gtk/help-overlay.ui.h:22 +msgctxt "shortcut window" +msgid "Paste" +msgstr "貼り付け" + +#: ../meld/resources/gtk/help-overlay.ui.h:23 +msgctxt "shortcut window" +msgid "Find" +msgstr "検索" + +#: ../meld/resources/gtk/help-overlay.ui.h:24 +msgctxt "shortcut window" +msgid "Find Next" +msgstr "次を検索する" + +#: ../meld/resources/gtk/help-overlay.ui.h:25 +msgctxt "shortcut window" +msgid "Find Previous" +msgstr "前を検索する" + +#: ../meld/resources/gtk/help-overlay.ui.h:26 +msgctxt "shortcut window" +msgid "Replace" +msgstr "置換" + +#: ../meld/resources/gtk/help-overlay.ui.h:27 +msgctxt "shortcut window" +msgid "File comparison" +msgstr "ファイルの比較" + +#: ../meld/resources/gtk/help-overlay.ui.h:28 +msgctxt "shortcut window" +msgid "Save current file" +msgstr "このファイルを保存する" + +#: ../meld/resources/gtk/help-overlay.ui.h:29 +msgctxt "shortcut window" +msgid "Save current file to new path" +msgstr "このファイルを新しい名前で保存する" + +#: ../meld/resources/gtk/help-overlay.ui.h:30 +msgctxt "shortcut window" +msgid "Save all files in comparison" +msgstr "比較中のすべてのファイルを保存する" + +#: ../meld/resources/gtk/help-overlay.ui.h:31 +msgctxt "shortcut window" +msgid "Previous conflict" +msgstr "前の衝突箇所" + +#: ../meld/resources/gtk/help-overlay.ui.h:32 +msgctxt "shortcut window" +msgid "Next conflict" +msgstr "次の衝突箇所" + +#: ../meld/resources/gtk/help-overlay.ui.h:33 +msgctxt "shortcut window" +msgid "Push change to left" +msgstr "変更点を左へ適用する" + +#: ../meld/resources/gtk/help-overlay.ui.h:34 +msgctxt "shortcut window" +msgid "Push change to right" +msgstr "変更点を右へ適用する" + +#: ../meld/resources/gtk/help-overlay.ui.h:35 +msgctxt "shortcut window" +msgid "Pull change from left" +msgstr "変更点を左から適用する" + +#: ../meld/resources/gtk/help-overlay.ui.h:36 +msgctxt "shortcut window" +msgid "Pull change from right" +msgstr "変更点を右から適用する" + +#: ../meld/resources/gtk/help-overlay.ui.h:37 +msgctxt "shortcut window" +msgid "Copy change above left" +msgstr "左の変更点の上にコピーする" + +#: ../meld/resources/gtk/help-overlay.ui.h:38 +msgctxt "shortcut window" +msgid "Copy change below left" +msgstr "左の変更点の下にコピーする" + +#: ../meld/resources/gtk/help-overlay.ui.h:39 +msgctxt "shortcut window" +msgid "Copy change above right" +msgstr "右の変更点の上にコピーする" + +#: ../meld/resources/gtk/help-overlay.ui.h:40 +msgctxt "shortcut window" +msgid "Copy change below right" +msgstr "右の変更点の下にコピーする" + +#: ../meld/resources/gtk/help-overlay.ui.h:41 +msgctxt "shortcut window" +msgid "Delete change" +msgstr "変更点を削除する" + +#: ../meld/resources/gtk/help-overlay.ui.h:42 +msgctxt "shortcut window" +msgid "Previous comparison pane" +msgstr "前の比較ペイン" + +#: ../meld/resources/gtk/help-overlay.ui.h:43 +msgctxt "shortcut window" +msgid "Next comparison pane" +msgstr "次の比較ペイン" + +#: ../meld/resources/gtk/help-overlay.ui.h:44 +msgctxt "shortcut window" +msgid "Folder comparison" +msgstr "フォルダーの比較" + +#: ../meld/resources/gtk/help-overlay.ui.h:45 +msgctxt "shortcut window" +msgid "Copy to left" +msgstr "左へコピーする" + +#: ../meld/resources/gtk/help-overlay.ui.h:46 +msgctxt "shortcut window" +msgid "Copy to right" +msgstr "右へコピーする" -#: ../data/ui/preferences.ui.h:21 +#: ../meld/resources/gtk/help-overlay.ui.h:47 +msgctxt "shortcut window" +msgid "Version control comparison" +msgstr "バージョン管理の比較" + +#: ../meld/resources/gtk/help-overlay.ui.h:48 +msgctxt "shortcut window" +msgid "Commit to version control" +msgstr "バージョン管理へコミットする" + +#: ../meld/resources/gtk/help-overlay.ui.h:49 +msgctxt "shortcut window" +msgid "Show/hide console output" +msgstr "コンソール出力の表示/非表示" + +#: ../meld/resources/gtk/menus.ui.h:1 +msgid "_Preferences" +msgstr "設定(_P)" + +#: ../meld/resources/gtk/menus.ui.h:2 +msgid "_Help" +msgstr "ヘルプ(_H)" + +#: ../meld/resources/gtk/menus.ui.h:3 +msgid "Keyboard Shortcuts" +msgstr "キーボードショートカット" + +#: ../meld/resources/gtk/menus.ui.h:4 +msgid "_About" +msgstr "このアプリケーションについて(_A)" + +#: ../meld/resources/gtk/menus.ui.h:5 +msgid "_Quit" +msgstr "終了(_Q)" + +#: ../meld/resources/ui/about-dialog.ui.h:1 +msgid "About Meld" +msgstr "Meld について" + +#: ../meld/resources/ui/about-dialog.ui.h:2 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." +"Copyright © 2002-2009 Stephen Kennedy\n" +"Copyright © 2009-2017 Kai Willadsen" msgstr "" -"ファイルの比較を行う時は、ある種類の変更だけ無視することができます。無視する" -"パターンはそれぞれ Python 形式の正規表現で指定し、その実装は無視する文字列を" -"空の文字列で置き換えるだけです。もし正規表現パターンにグループが含まれていた" -"ら、該当するグループの文字列だけ置き換えます。詳細はユーザーズ・マニュアルを" -"ご覧下さい。" +"Copyright © 2002-2009 Stephen Kennedy\n" +"Copyright © 2009-2017 Kai Willadsen" -#: ../data/ui/preferences.ui.h:22 -msgid "_Editor font:" -msgstr "エディターのフォント(_E):" +#: ../meld/resources/ui/about-dialog.ui.h:4 +msgid "Website" +msgstr "ウェブサイト" -#: ../data/ui/preferences.ui.h:23 -msgid "_Insert spaces instead of tabs" -msgstr "タブの代わりに空白を挿入する(_I)" +#: ../meld/resources/ui/about-dialog.ui.h:5 +msgid "translator-credits" +msgstr "" +"相花 毅 \n" +"Toshiharu Kudoh \n" +"Shinichirou Yamada \n" +"sicklylife " -#: ../data/ui/preferences.ui.h:24 -msgid "_Tab width:" -msgstr "タブの幅(_T):" +#: ../meld/resources/ui/column-list.ui.h:1 +#: ../meld/resources/ui/filter-list.ui.h:1 +msgid "Active" +msgstr "有効" -#: ../data/ui/preferences.ui.h:25 -msgid "_Use the system fixed width font" -msgstr "システムの固定フォントを使う(_U)" +#: ../meld/resources/ui/column-list.ui.h:2 +msgid "Column Name" +msgstr "カラム名" -#: ../data/ui/vcview.ui.h:1 +#: ../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 +msgid "_Remove" +msgstr "削除(_R)" + +#: ../meld/resources/ui/column-list.ui.h:4 +#: ../meld/resources/ui/filter-list.ui.h:8 +msgid "Move item up" +msgstr "アイテムを上へ移動します" + +#: ../meld/resources/ui/column-list.ui.h:5 +#: ../meld/resources/ui/filter-list.ui.h:9 +msgid "Move _Up" +msgstr "上へ移動する(_U)" + +#: ../meld/resources/ui/column-list.ui.h:6 +#: ../meld/resources/ui/filter-list.ui.h:10 +msgid "Move item down" +msgstr "アイテムを下へ移動します" + +#: ../meld/resources/ui/column-list.ui.h:7 +#: ../meld/resources/ui/filter-list.ui.h:11 +msgid "Move _Down" +msgstr "下へ移動する(_D)" + +#: ../meld/resources/ui/commit-dialog.ui.h:1 +msgid "Commit" +msgstr "" + +#: ../meld/resources/ui/commit-dialog.ui.h:2 msgid "Commit Files" -msgstr "ファイルのコミット" +msgstr "" -#: ../data/ui/vcview.ui.h:2 +#: ../meld/resources/ui/commit-dialog.ui.h:3 msgid "Log Message" -msgstr "ログ・メッセージ" +msgstr "" -#: ../data/ui/vcview.ui.h:3 -msgid "Previous Logs" -msgstr "前のログ" +#: ../meld/resources/ui/commit-dialog.ui.h:4 +msgid "Previous logs:" +msgstr "" -#: ../data/ui/vcview.ui.h:4 -msgid "VC Log" -msgstr "バージョン・コントロールのログ" +#: ../meld/resources/ui/commit-dialog.ui.h:5 +msgid "Co_mmit" +msgstr "" -#: ../meld/dirdiff.py:232 ../meld/vcview.py:127 +#: ../meld/resources/ui/dirdiff.ui.h:1 ../meld/resources/ui/vcview.ui.h:1 msgid "_Compare" msgstr "比較(_C)" -#: ../meld/dirdiff.py:232 ../meld/vcview.py:127 -msgid "Compare selected" +#: ../meld/resources/ui/dirdiff.ui.h:2 ../meld/resources/ui/vcview.ui.h:2 +msgid "Compare selected files" msgstr "選択したファイルを比較します" -#: ../meld/dirdiff.py:233 -msgid "Copy _Left" -msgstr "左へコピーする(_L)" +#: ../meld/resources/ui/dirdiff.ui.h:3 +msgid "Collapse Recursively" +msgstr "" + +#: ../meld/resources/ui/dirdiff.ui.h:4 +msgid "Collapse selected folder and all subfolders" +msgstr "" + +#: ../meld/resources/ui/dirdiff.ui.h:5 +msgid "Expand Recursively" +msgstr "" + +#: ../meld/resources/ui/dirdiff.ui.h:6 +msgid "Expand selected folder and all subfolders" +msgstr "" + +#: ../meld/resources/ui/dirdiff.ui.h:7 +msgid "Copy to _Left" +msgstr "左へコピー(_L)" -#: ../meld/dirdiff.py:233 +#: ../meld/resources/ui/dirdiff.ui.h:8 msgid "Copy to left" msgstr "左へコピーします" -#: ../meld/dirdiff.py:234 -msgid "Copy _Right" -msgstr "右へコピーする(_R)" +#: ../meld/resources/ui/dirdiff.ui.h:9 +msgid "Copy to _Right" +msgstr "右へコピー(_R)" -#: ../meld/dirdiff.py:234 +#: ../meld/resources/ui/dirdiff.ui.h:10 msgid "Copy to right" msgstr "右へコピーします" -#: ../meld/dirdiff.py:235 +#: ../meld/resources/ui/dirdiff.ui.h:11 msgid "Delete selected" msgstr "選択したファイルなどを削除します" -#: ../meld/dirdiff.py:236 ../meld/filediff.py:1157 +#: ../meld/resources/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:958 +#: ../meld/filediff.py:1586 msgid "Hide" msgstr "隠す" -#: ../meld/dirdiff.py:236 +#: ../meld/resources/ui/dirdiff.ui.h:13 msgid "Hide selected" msgstr "選択範囲を隠します" -#: ../meld/dirdiff.py:240 -msgid "Case" -msgstr "大/小文字" +#: ../meld/resources/ui/dirdiff.ui.h:14 +msgid "Ignore Filename Case" +msgstr "ファイル名の大/小文字を無視する" -#: ../meld/dirdiff.py:240 -msgid "Ignore case of entries" -msgstr "大/小文字を無視します" +#: ../meld/resources/ui/dirdiff.ui.h:15 +msgid "" +"Consider differently-cased filenames that are otherwise-identical to be the " +"same" +msgstr "" -#: ../meld/dirdiff.py:241 +#: ../meld/resources/ui/dirdiff.ui.h:16 msgid "Same" msgstr "同じ部分" -#: ../meld/dirdiff.py:241 +#: ../meld/resources/ui/dirdiff.ui.h:17 msgid "Show identical" msgstr "一致する部分を表示します" -#: ../meld/dirdiff.py:242 +#: ../meld/resources/ui/dirdiff.ui.h:18 msgid "New" msgstr "新しい部分" -#: ../meld/dirdiff.py:242 +#: ../meld/resources/ui/dirdiff.ui.h:19 msgid "Show new" msgstr "新規の部分を表示します" -#: ../meld/dirdiff.py:243 +#: ../meld/resources/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:76 msgid "Modified" msgstr "変更済" -#: ../meld/dirdiff.py:243 ../meld/vcview.py:140 +#: ../meld/resources/ui/dirdiff.ui.h:21 msgid "Show modified" msgstr "変更のあるファイルを表示します" -#: ../meld/dirdiff.py:245 +#: ../meld/resources/ui/dirdiff.ui.h:22 msgid "Filters" msgstr "フィルター" -#: ../meld/dirdiff.py:245 +#: ../meld/resources/ui/dirdiff.ui.h:23 msgid "Set active filters" msgstr "フィルターを選択します" -#: ../meld/dirdiff.py:362 -#, python-format -msgid "Hide %s" -msgstr "%s の表示を切り替えます" +#: ../meld/resources/ui/encoding-selector.ui.h:1 +msgid "Search text encoding…" +msgstr "" -#: ../meld/dirdiff.py:465 ../meld/dirdiff.py:478 ../meld/vcview.py:322 -#: ../meld/vcview.py:346 -#, python-format -msgid "[%s] Scanning %s" -msgstr "[%s] %s のスキャン中" +#: ../meld/resources/ui/filediff.ui.h:1 +msgid "Format as Patch…" +msgstr "パッチを生成…" -#: ../meld/dirdiff.py:577 -#, python-format -msgid "[%s] Done" -msgstr "[%s] 完了" +#: ../meld/resources/ui/filediff.ui.h:2 +msgid "Create a patch using differences between files" +msgstr "ファイル間の差分からパッチを生成します" -#: ../meld/dirdiff.py:581 -msgid "Multiple errors occurred while scanning this folder" -msgstr "このフォルダーの走査中に複数回のエラーが発生しました" +#: ../meld/resources/ui/filediff.ui.h:3 +msgid "Save A_ll" +msgstr "すべて保存(_L)" -#: ../meld/dirdiff.py:582 -msgid "Files with invalid encodings found" -msgstr "間違ったエンコーディングを持つファイルが見つかりました" +#: ../meld/resources/ui/filediff.ui.h:4 +msgid "Save all files in the current comparison" +msgstr "比較中のすべてのファイルを保存します" -#. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:584 -msgid "Some files were in an incorrect encoding. The names are something like:" +#: ../meld/resources/ui/filediff.ui.h:5 +msgid "Revert files to their saved versions" +msgstr "ファイルを保存されたバージョンに戻します" + +#: ../meld/resources/ui/filediff.ui.h:6 +msgid "Add Synchronization Point" +msgstr "同期点を追加" + +#: ../meld/resources/ui/filediff.ui.h:7 +msgid "Add a synchronization point for changes between files" msgstr "" -"いくつかのファイルが間違ったエンコーディングを持っていました (次のようなファ" -"イル名です):" -#: ../meld/dirdiff.py:586 -msgid "Files hidden by case insensitive comparison" -msgstr "大/小文字を区別せずに比較したファイルの一覧" +#: ../meld/resources/ui/filediff.ui.h:8 +msgid "Clear Synchronization Points" +msgstr "同期点をクリア" -#. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:588 -msgid "" -"You are running a case insensitive comparison on a case sensitive " -"filesystem. The following files in this folder are hidden:" +#: ../meld/resources/ui/filediff.ui.h:9 +msgid "Clear sychronization points for changes between files" msgstr "" -"大/小文字を区別するファイルシステム上で大/小文字を無視した比較を行っていま" -"す。このフォルダーでは次のファイルは表示されません:" -#: ../meld/dirdiff.py:599 -#, python-format -msgid "'%s' hidden by '%s'" -msgstr "'%s' は '%s' によって隠されています" +#: ../meld/resources/ui/filediff.ui.h:10 +msgid "Previous Conflict" +msgstr "前の衝突箇所" -#: ../meld/dirdiff.py:624 ../meld/filediff.py:1008 ../meld/filediff.py:1161 -msgid "Hi_de" -msgstr "隠す(_D)" +#: ../meld/resources/ui/filediff.ui.h:11 +msgid "Go to the previous conflict" +msgstr "前の衝突箇所へジャンプします" -#: ../meld/dirdiff.py:674 -#, python-format -msgid "" -"'%s' exists.\n" -"Overwrite?" +#: ../meld/resources/ui/filediff.ui.h:12 +msgid "Next Conflict" +msgstr "次の衝突箇所" + +#: ../meld/resources/ui/filediff.ui.h:13 +msgid "Go to the next conflict" +msgstr "次の衝突箇所へジャンプします" + +#: ../meld/resources/ui/filediff.ui.h:14 +msgid "Push to Left" +msgstr "左へ適用" + +#: ../meld/resources/ui/filediff.ui.h:15 +msgid "Push current change to the left" +msgstr "現在の変更を左にも適用します" + +#: ../meld/resources/ui/filediff.ui.h:16 +msgid "Push to Right" +msgstr "右へ適用" + +#: ../meld/resources/ui/filediff.ui.h:17 +msgid "Push current change to the right" +msgstr "現在の変更を右にも適用します" + +#: ../meld/resources/ui/filediff.ui.h:18 +msgid "Pull from Left" +msgstr "左から適用" + +#: ../meld/resources/ui/filediff.ui.h:19 +msgid "Pull change from the left" +msgstr "左から変更を適用します" + +#: ../meld/resources/ui/filediff.ui.h:20 +msgid "Pull from Right" +msgstr "右から適用" + +#: ../meld/resources/ui/filediff.ui.h:21 +msgid "Pull change from the right" +msgstr "右から変更を適用します" + +#: ../meld/resources/ui/filediff.ui.h:22 +msgid "Copy Above Left" +msgstr "左の上にコピー" + +#: ../meld/resources/ui/filediff.ui.h:23 +msgid "Copy change above the left chunk" +msgstr "左の変更点の上にコピーします" + +#: ../meld/resources/ui/filediff.ui.h:24 +msgid "Copy Below Left" +msgstr "左の下にコピー" + +#: ../meld/resources/ui/filediff.ui.h:25 +msgid "Copy change below the left chunk" +msgstr "左の変更点の下にコピーします" + +#: ../meld/resources/ui/filediff.ui.h:26 +msgid "Copy Above Right" +msgstr "右の上にコピー" + +#: ../meld/resources/ui/filediff.ui.h:27 +msgid "Copy change above the right chunk" +msgstr "右の変更点の上にコピーします" + +#: ../meld/resources/ui/filediff.ui.h:28 +msgid "Copy Below Right" +msgstr "右の下にコピー" + +#: ../meld/resources/ui/filediff.ui.h:29 +msgid "Copy change below the right chunk" +msgstr "右の変更点の下にコピーします" + +#: ../meld/resources/ui/filediff.ui.h:30 +msgid "Delete" +msgstr "削除" + +#: ../meld/resources/ui/filediff.ui.h:31 +msgid "Delete change" +msgstr "変更点を削除します" + +#: ../meld/resources/ui/filediff.ui.h:32 +msgid "Merge All from Left" +msgstr "左からすべてをマージ" + +#: ../meld/resources/ui/filediff.ui.h:33 +msgid "Merge all non-conflicting changes from the left" msgstr "" -"'%s' は存在します。\n" -"上書きしますか？" -#: ../meld/dirdiff.py:681 -#, python-format +#: ../meld/resources/ui/filediff.ui.h:34 +msgid "Merge All from Right" +msgstr "右からすべてをマージ" + +#: ../meld/resources/ui/filediff.ui.h:35 +msgid "Merge all non-conflicting changes from the right" +msgstr "" + +#: ../meld/resources/ui/filediff.ui.h:36 +msgid "Merge All" +msgstr "すべてをマージ" + +#: ../meld/resources/ui/filediff.ui.h:37 +msgid "Merge all non-conflicting changes from left and right panes" +msgstr "" + +#: ../meld/resources/ui/filediff.ui.h:38 +msgid "Previous Pane" +msgstr "前のペイン" + +#: ../meld/resources/ui/filediff.ui.h:39 +msgid "Move keyboard focus to the previous document in this comparison" +msgstr "この比較のキーボードフォーカスを前のドキュメントに移動します" + +#: ../meld/resources/ui/filediff.ui.h:40 +msgid "Next Pane" +msgstr "次のペイン" + +#: ../meld/resources/ui/filediff.ui.h:41 +msgid "Move keyboard focus to the next document in this comparison" +msgstr "この比較のキーボードフォーカスを次のドキュメントに移動します" + +#: ../meld/resources/ui/filediff.ui.h:42 +msgid "Lock Scrolling" +msgstr "スクロールをロック" + +#: ../meld/resources/ui/filediff.ui.h:43 +msgid "Lock scrolling of all panes" +msgstr "すべてのペインでスクロールを同期します" + +#: ../meld/resources/ui/filediff.ui.h:44 msgid "" -"Error copying '%s' to '%s'\n" -"\n" -"%s." +"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 "" -"'%s' を '%s' へコピーする際にエラー\n" -"\n" -"%s" +"このファイルに書き込むことはできません。ここをクリックすることで、このファイ" +"ルのロックを解除して変更を加えることができますが、これらの変更は新しいファイ" +"ルに保存しなければなりません。" -#: ../meld/dirdiff.py:699 ../meld/vcview.py:526 -#, python-format +#: ../meld/resources/ui/filediff.ui.h:45 +msgid "File 3" +msgstr "ファイル 3" + +#: ../meld/resources/ui/filediff.ui.h:46 +msgid "File 2" +msgstr "ファイル 2" + +#: ../meld/resources/ui/filediff.ui.h:47 +msgid "File 1" +msgstr "ファイル 1" + +#. Create icon and filename CellRenderer +#: ../meld/resources/ui/filter-list.ui.h:2 ../meld/resources/ui/vcview.ui.h:30 +#: ../meld/dirdiff.py:454 +msgid "Name" +msgstr "名前" + +#: ../meld/resources/ui/filter-list.ui.h:3 +msgid "Pattern" +msgstr "パターン" + +#: ../meld/resources/ui/filter-list.ui.h:4 +msgid "Add new filter" +msgstr "新しいフィルターを追加します" + +#: ../meld/resources/ui/filter-list.ui.h:5 ../meld/resources/ui/vcview.ui.h:9 +msgid "_Add" +msgstr "追加(_A)" + +#: ../meld/resources/ui/filter-list.ui.h:6 +msgid "Remove selected filter" +msgstr "選択したフィルターを削除します" + +#: ../meld/resources/ui/findbar.ui.h:1 ../meld/dirdiff.py:1040 +#: ../meld/iohelpers.py:107 +msgid "_Replace" +msgstr "置換(_R)" + +#: ../meld/resources/ui/findbar.ui.h:2 +msgid "Replace _All" +msgstr "すべて置換(_A)" + +#: ../meld/resources/ui/findbar.ui.h:3 +msgid "_Previous" +msgstr "前の結果(_P)" + +#: ../meld/resources/ui/findbar.ui.h:4 +msgid "_Next" +msgstr "次の結果(_N)" + +#: ../meld/resources/ui/findbar.ui.h:5 +msgid "Find:" +msgstr "検索:" + +#: ../meld/resources/ui/findbar.ui.h:6 +msgid "Replace _with:" +msgstr "次で置換(_W):" + +#: ../meld/resources/ui/findbar.ui.h:7 +msgid "_Match case" +msgstr "大/小文字を区別(_M)" + +#: ../meld/resources/ui/findbar.ui.h:8 +msgid "Who_le word" +msgstr "単語全体(_L)" + +#: ../meld/resources/ui/findbar.ui.h:9 +msgid "Regular e_xpression" +msgstr "正規表現(_X)" + +#: ../meld/resources/ui/findbar.ui.h:10 +msgid "Wrapped" +msgstr "" + +#: ../meld/resources/ui/language-selector.ui.h:1 +msgid "Search highlight mode…" +msgstr "" + +#: ../meld/resources/ui/new-diff-tab.ui.h:1 ../meld/meldwindow.py:532 +#: ../meld/newdifftab.py:53 +msgid "New comparison" +msgstr "新しい比較" + +#: ../meld/resources/ui/new-diff-tab.ui.h:2 +msgid "File comparison" +msgstr "ファイルの比較" + +#: ../meld/resources/ui/new-diff-tab.ui.h:3 +msgid "Directory comparison" +msgstr "フォルダーの比較" + +#: ../meld/resources/ui/new-diff-tab.ui.h:4 +msgid "Version control view" +msgstr "" + +#: ../meld/resources/ui/new-diff-tab.ui.h:5 +msgid "_3-way comparison" +msgstr "3つを比較(_3)" + +#: ../meld/resources/ui/new-diff-tab.ui.h:6 +msgid "Select Third File" +msgstr "3番目のファイルを選択" + +#: ../meld/resources/ui/new-diff-tab.ui.h:7 +msgid "Select Second File" +msgstr "2番目のファイルを選択" + +#: ../meld/resources/ui/new-diff-tab.ui.h:8 +msgid "Select First File" +msgstr "1番目のファイルを選択" + +#: ../meld/resources/ui/new-diff-tab.ui.h:9 +msgid "Select First Folder" +msgstr "1番目のフォルダーを選択" + +#: ../meld/resources/ui/new-diff-tab.ui.h:10 +msgid "Select Second Folder" +msgstr "2番目のフォルダーを選択" + +#: ../meld/resources/ui/new-diff-tab.ui.h:11 +msgid "Select Third Folder" +msgstr "3番目のフォルダーを選択" + +#: ../meld/resources/ui/new-diff-tab.ui.h:12 +msgid "Select A Version-Controlled Folder" +msgstr "" + +#: ../meld/resources/ui/new-diff-tab.ui.h:13 +msgid "_Blank comparison" +msgstr "空の比較(_B)" + +#: ../meld/resources/ui/new-diff-tab.ui.h:14 +msgid "C_ompare" +msgstr "比較(_O)" + +#: ../meld/resources/ui/notebook-label.ui.h:1 +msgid "Close Tab" +msgstr "タブを閉じる" + +#: ../meld/resources/ui/patch-dialog.ui.h:1 +msgid "Format as Patch" +msgstr "パッチを生成" + +#: ../meld/resources/ui/patch-dialog.ui.h:2 +msgid "Copy to Clipboard" +msgstr "クリップボードへコピー" + +#: ../meld/resources/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:163 +msgid "Save Patch" +msgstr "パッチを保存" + +#: ../meld/resources/ui/patch-dialog.ui.h:4 +msgid "Use differences between:" +msgstr "次のペイン間の差分を使用する:" + +#: ../meld/resources/ui/patch-dialog.ui.h:5 +msgid "Left and middle panes" +msgstr "左と中央のペイン" + +#: ../meld/resources/ui/patch-dialog.ui.h:6 +msgid "Middle and right panes" +msgstr "中央と右のペイン" + +#: ../meld/resources/ui/patch-dialog.ui.h:7 +msgid "_Reverse patch direction" +msgstr "パッチの対象を逆にする(_R)" + +#: ../meld/resources/ui/preferences.ui.h:1 +msgid "Preferences" +msgstr "設定" + +#: ../meld/resources/ui/preferences.ui.h:2 +msgid "Font" +msgstr "フォント" + +#: ../meld/resources/ui/preferences.ui.h:3 +msgid "_Use the system fixed width font" +msgstr "システムの等幅フォントを使用する(_U)" + +#: ../meld/resources/ui/preferences.ui.h:4 +msgid "_Editor font:" +msgstr "エディターのフォント(_E):" + +#: ../meld/resources/ui/preferences.ui.h:5 +msgid "Display" +msgstr "表示" + +#: ../meld/resources/ui/preferences.ui.h:6 +msgid "_Tab width:" +msgstr "タブの幅(_T):" + +#: ../meld/resources/ui/preferences.ui.h:7 +msgid "_Insert spaces instead of tabs" +msgstr "タブの代わりに空白を挿入する(_I)" + +#: ../meld/resources/ui/preferences.ui.h:8 +msgid "Enable text _wrapping" +msgstr "文字列の折り返しを有効にする(_W)" + +#: ../meld/resources/ui/preferences.ui.h:9 +msgid "Do not _split words over two lines" +msgstr "単語が二行に跨がらないようにする(_S)" + +#: ../meld/resources/ui/preferences.ui.h:10 +msgid "Highlight _current line" +msgstr "現在の行をハイライトする(_C)" + +#: ../meld/resources/ui/preferences.ui.h:11 +msgid "Show _line numbers" +msgstr "行番号を表示する(_L)" + +#: ../meld/resources/ui/preferences.ui.h:12 +msgid "Show w_hitespace" +msgstr "空白や改行を表示する(_H)" + +#: ../meld/resources/ui/preferences.ui.h:13 +msgid "Use s_yntax highlighting" +msgstr "シンタックスハイライトを有効にする(_Y)" + +#: ../meld/resources/ui/preferences.ui.h:14 +msgid "Syntax highlighting color scheme:" +msgstr "シンタックスハイライトのカラースキーマ:" + +#: ../meld/resources/ui/preferences.ui.h:15 +msgid "External Editor" +msgstr "外部エディター" + +#: ../meld/resources/ui/preferences.ui.h:16 +msgid "Use _default system editor" +msgstr "デフォルトのエディターを使用する(_D)" + +#: ../meld/resources/ui/preferences.ui.h:17 +msgid "Edito_r command:" +msgstr "エディターをコマンドで指定する(_R):" + +#: ../meld/resources/ui/preferences.ui.h:18 +msgid "Editor" +msgstr "エディター" + +#: ../meld/resources/ui/preferences.ui.h:19 +msgid "Shallow Comparison" +msgstr "浅い比較" + +#: ../meld/resources/ui/preferences.ui.h:20 +msgid "C_ompare files based only on size and timestamp" +msgstr "サイズとタイムスタンプだけを基準にしてファイルを比較する(_O)" + +#: ../meld/resources/ui/preferences.ui.h:21 +msgid "_Timestamp resolution:" +msgstr "タイムスタンプ分解能(_T):" + +#: ../meld/resources/ui/preferences.ui.h:23 +msgid "Note: enabling text filters may make comparing large files much slower" +msgstr "" +"備考: テキストフィルターを有効にすると、大きなファイルの比較が遅くなる可能性" +"があります" + +#: ../meld/resources/ui/preferences.ui.h:24 +msgid "Symbolic Links" +msgstr "シンボリックリンク" + +#: ../meld/resources/ui/preferences.ui.h:26 +msgid "Visible Columns" +msgstr "表示するカラム" + +#: ../meld/resources/ui/preferences.ui.h:27 +msgid "Folder Comparisons" +msgstr "フォルダーの比較" + +#: ../meld/resources/ui/preferences.ui.h:28 +msgid "Version Comparisons" +msgstr "" + +#: ../meld/resources/ui/preferences.ui.h:29 +msgid "_Order when comparing file revisions:" +msgstr "" + +#: ../meld/resources/ui/preferences.ui.h:30 +msgid "Order when _merging files:" +msgstr "" + +#: ../meld/resources/ui/preferences.ui.h:31 +msgid "Commit Messages" +msgstr "コミットメッセージ" + +#: ../meld/resources/ui/preferences.ui.h:32 +msgid "Show _right margin at:" +msgstr "右マージンを表示する(_R):" + +#: ../meld/resources/ui/preferences.ui.h:33 +msgid "Automatically _break lines at right margin on commit" +msgstr "" + +#: ../meld/resources/ui/preferences.ui.h:34 +msgid "Version Control" +msgstr "バージョン管理" + +#: ../meld/resources/ui/preferences.ui.h:35 +msgid "Filename filters" +msgstr "ファイル名フィルター" + +#: ../meld/resources/ui/preferences.ui.h:36 msgid "" -"'%s' is a directory.\n" -"Remove recursively?" +"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 "" -"'%s' はフォルダーです。\n" -"再帰的に削除しますか？" +"フォルダーの比較を行う際、ファイルとフォルダーを名前でフィルタリングできま" +"す。フィルタリングのパターンはそれぞれ、スペースで区切った SHELL 型式のワイル" +"ドカードの並びです。" -#: ../meld/dirdiff.py:706 ../meld/vcview.py:531 -#, python-format +#: ../meld/resources/ui/preferences.ui.h:37 ../meld/meldwindow.py:114 +msgid "File Filters" +msgstr "ファイルフィルター" + +#: ../meld/resources/ui/preferences.ui.h:38 +msgid "Change trimming" +msgstr "変更のトリミング" + +#: ../meld/resources/ui/preferences.ui.h:39 +msgid "Trim blank line differences from the start and end of changes" +msgstr "" +"変更点の始まりと終わりの部分から、空行の差異をハイライトしないように除外する" + +#: ../meld/resources/ui/preferences.ui.h:40 +msgid "Text filters" +msgstr "テキストフィルター" + +#: ../meld/resources/ui/preferences.ui.h:41 msgid "" -"Error removing %s\n" -"\n" -"%s." +"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 "" -"%s を削除する際にエラー\n" -"\n" -"%s" +"ファイルの比較を行う時は、ある種類の変更だけ無視することができます。無視する" +"パターンはそれぞれ Python 形式の正規表現で指定し、その実装は無視する文字列を" +"空の文字列で置き換えるだけです。もし正規表現パターンにグループが含まれていた" +"ら、該当するグループの文字列だけ置き換えます。詳細はユーザーズ・マニュアルを" +"ご覧下さい。" -#: ../meld/dirdiff.py:731 -#, python-format -msgid "%i second" -msgid_plural "%i seconds" -msgstr[0] "%i秒" -msgstr[1] "%i秒" +#: ../meld/resources/ui/preferences.ui.h:42 +msgid "Text Filters" +msgstr "テキストフィルター" -#: ../meld/dirdiff.py:732 -#, python-format -msgid "%i minute" -msgid_plural "%i minutes" -msgstr[0] "%i分" -msgstr[1] "%i分" +#: ../meld/resources/ui/preferences.ui.h:43 +msgid "Left is remote, right is local" +msgstr "" -#: ../meld/dirdiff.py:733 -#, python-format -msgid "%i hour" -msgid_plural "%i hours" -msgstr[0] "%i時間" -msgstr[1] "%i時間" +#: ../meld/resources/ui/preferences.ui.h:44 +msgid "Left is local, right is remote" +msgstr "" -#: ../meld/dirdiff.py:734 -#, python-format -msgid "%i day" -msgid_plural "%i days" -msgstr[0] "%i日" -msgstr[1] "%i日" +#: ../meld/resources/ui/preferences.ui.h:45 +msgid "Remote, merge, local" +msgstr "" + +#: ../meld/resources/ui/preferences.ui.h:46 +msgid "Local, merge, remote" +msgstr "" + +#: ../meld/resources/ui/preferences.ui.h:47 +msgid "1ns (ext4)" +msgstr "1ナノ秒 (ext4)" + +#: ../meld/resources/ui/preferences.ui.h:48 +msgid "100ns (NTFS)" +msgstr "100ナノ秒 (NTFS)" + +#: ../meld/resources/ui/preferences.ui.h:49 +msgid "1s (ext2/ext3)" +msgstr "1秒 (ext2/ext3)" + +#: ../meld/resources/ui/preferences.ui.h:50 +msgid "2s (VFAT)" +msgstr "2秒 (VFAT)" + +#: ../meld/resources/ui/push-dialog.ui.h:1 +msgid "Push local commits to remote?" +msgstr "" + +#: ../meld/resources/ui/push-dialog.ui.h:2 +msgid "The commits to be pushed are determined by your version control system." +msgstr "" + +#: ../meld/resources/ui/push-dialog.ui.h:3 +msgid "_Push commits" +msgstr "" + +#: ../meld/resources/ui/revert-dialog.ui.h:1 +msgid "Discard unsaved changes to documents?" +msgstr "ドキュメントへの変更を保存せずに破棄しますか?" + +#: ../meld/resources/ui/revert-dialog.ui.h:2 +msgid "Changes made to the following documents will be permanently lost:" +msgstr "次のドキュメントへの変更は永久に失われます:" + +#: ../meld/resources/ui/revert-dialog.ui.h:3 +msgid "_Discard" +msgstr "破棄(_D)" + +#: ../meld/resources/ui/save-confirm-dialog.ui.h:1 +msgid "Save changes to documents before closing?" +msgstr "閉じる前にドキュメントへの変更を保存しますか?" + +#: ../meld/resources/ui/save-confirm-dialog.ui.h:2 +msgid "If you don’t save, changes will be permanently lost." +msgstr "保存しない場合、変更は永久に失われます。" + +#: ../meld/resources/ui/save-confirm-dialog.ui.h:3 +msgid "Close _without Saving" +msgstr "保存せずに閉じる(_W)" + +#: ../meld/resources/ui/save-confirm-dialog.ui.h:4 ../meld/dirdiff.py:1039 +#: ../meld/iohelpers.py:52 ../meld/iohelpers.py:106 +msgid "_Cancel" +msgstr "キャンセル(_C)" + +#: ../meld/resources/ui/save-confirm-dialog.ui.h:5 +msgid "_Save" +msgstr "保存(_S)" + +#: ../meld/resources/ui/vcview.ui.h:3 +msgid "Co_mmit…" +msgstr "コミット(_M)…" + +#: ../meld/resources/ui/vcview.ui.h:4 +msgid "Commit changes to version control" +msgstr "" + +#: ../meld/resources/ui/vcview.ui.h:5 +msgid "_Update" +msgstr "" + +#: ../meld/resources/ui/vcview.ui.h:6 +msgid "Update working copy from version control" +msgstr "" + +#: ../meld/resources/ui/vcview.ui.h:7 +msgid "_Push" +msgstr "" + +#: ../meld/resources/ui/vcview.ui.h:8 +msgid "Push local changes to remote" +msgstr "" + +#: ../meld/resources/ui/vcview.ui.h:10 +msgid "Add to version control" +msgstr "" + +#: ../meld/resources/ui/vcview.ui.h:12 +msgid "Remove from version control" +msgstr "" + +#: ../meld/resources/ui/vcview.ui.h:13 +msgid "Mar_k as Resolved" +msgstr "" -#: ../meld/dirdiff.py:735 +#: ../meld/resources/ui/vcview.ui.h:14 +msgid "Mark as resolved in version control" +msgstr "" + +#: ../meld/resources/ui/vcview.ui.h:15 +msgid "Re_vert" +msgstr "" + +#: ../meld/resources/ui/vcview.ui.h:16 +msgid "Revert working copy to original state" +msgstr "" + +#: ../meld/resources/ui/vcview.ui.h:17 +msgid "Delete from working copy" +msgstr "" + +#: ../meld/resources/ui/vcview.ui.h:18 +msgid "Console" +msgstr "コンソール" + +#: ../meld/resources/ui/vcview.ui.h:19 +msgid "Show or hide the version control console output pane" +msgstr "" + +#: ../meld/resources/ui/vcview.ui.h:20 +msgid "_Flatten" +msgstr "" + +#: ../meld/resources/ui/vcview.ui.h:21 +msgid "Flatten directories" +msgstr "" + +#: ../meld/resources/ui/vcview.ui.h:22 +msgid "_Modified" +msgstr "" + +#: ../meld/resources/ui/vcview.ui.h:23 +msgid "Show modified files" +msgstr "" + +#: ../meld/resources/ui/vcview.ui.h:24 +msgid "_Normal" +msgstr "" + +#: ../meld/resources/ui/vcview.ui.h:25 +msgid "Show normal files" +msgstr "" + +#: ../meld/resources/ui/vcview.ui.h:26 +msgid "Un_versioned" +msgstr "" + +#: ../meld/resources/ui/vcview.ui.h:27 +msgid "Show unversioned files" +msgstr "" + +#: ../meld/resources/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69 +msgid "Ignored" +msgstr "" + +#: ../meld/resources/ui/vcview.ui.h:29 +msgid "Show ignored files" +msgstr "" + +#: ../meld/resources/ui/vcview.ui.h:31 ../meld/vcview.py:366 +msgid "Location" +msgstr "" + +#: ../meld/resources/ui/vcview.ui.h:32 +msgid "Status" +msgstr "" + +#: ../meld/resources/ui/vcview.ui.h:33 +msgid "Extra" +msgstr "" + +#: ../meld/resources/ui/vcview.ui.h:34 +msgid "Console output" +msgstr "コンソール出力" + +#: ../meld/const.py:12 +msgid "UNIX (LF)" +msgstr "" + +#: ../meld/const.py:13 +msgid "DOS/Windows (CR-LF)" +msgstr "" + +#: ../meld/const.py:14 +msgid "Mac OS (CR)" +msgstr "" + +#. Create file size CellRenderer +#: ../meld/dirdiff.py:475 ../meld/preferences.py:138 +msgid "Size" +msgstr "サイズ" + +#. Create date-time CellRenderer +#: ../meld/dirdiff.py:483 ../meld/preferences.py:139 +msgid "Modification time" +msgstr "更新日時" + +#. Create permissions CellRenderer +#: ../meld/dirdiff.py:491 ../meld/preferences.py:140 +msgid "Permissions" +msgstr "アクセス権" + +#: ../meld/dirdiff.py:625 #, python-format -msgid "%i week" -msgid_plural "%i weeks" -msgstr[0] "%i週間" -msgstr[1] "%i週間" +msgid "Hide %s" +msgstr "%s の表示を切り替えます" -#: ../meld/dirdiff.py:736 +#: ../meld/dirdiff.py:767 ../meld/dirdiff.py:790 #, python-format -msgid "%i month" -msgid_plural "%i months" -msgstr[0] "%iヶ月" -msgstr[1] "%iヶ月" +msgid "[%s] Scanning %s" +msgstr "[%s] %s をスキャン中" -#: ../meld/dirdiff.py:737 +#: ../meld/dirdiff.py:925 #, python-format -msgid "%i year" -msgid_plural "%i years" -msgstr[0] "%i年" -msgstr[1] "%i年" +msgid "[%s] Done" +msgstr "[%s] 完了" -#: ../meld/filediff.py:294 -msgid "Format as patch..." -msgstr "パッチの生成..." +#: ../meld/dirdiff.py:933 +msgid "Folders have no differences" +msgstr "フォルダーに差異はありません" -#: ../meld/filediff.py:294 -msgid "Create a patch using differences between files" -msgstr "ファイル間の差分からパッチを生成します" +#: ../meld/dirdiff.py:935 +msgid "Contents of scanned files in folders are identical." +msgstr "フォルダー内のスキャンされたファイルの内容は同一です。" -#: ../meld/filediff.py:295 -msgid "Previous conflict" -msgstr "前の衝突箇所" +#: ../meld/dirdiff.py:937 +msgid "" +"Scanned files in folders appear identical, but contents have not been " +"scanned." +msgstr "" +"フォルダー内のスキャンされたファイルは同一のように見えますが、内容はスキャン" +"されていません。" -#: ../meld/filediff.py:295 -msgid "Go to the previous conflict" -msgstr "前の衝突箇所へジャンプします" +#: ../meld/dirdiff.py:940 +msgid "File filters are in use, so not all files have been scanned." +msgstr "" +"ファイルフィルターが使用されているため、すべてのファイルがスキャンされたわけ" +"ではありません。" -#: ../meld/filediff.py:296 -msgid "Next conflict" -msgstr "次の衝突箇所" +#: ../meld/dirdiff.py:942 +msgid "Text filters are in use and may be masking content differences." +msgstr "" +"テキストフィルターが使用されているため、内容の差異が遮蔽されている可能性があ" +"ります。" -#: ../meld/filediff.py:296 -msgid "Go to the next conflict" -msgstr "次の衝突箇所へジャンプします" +#: ../meld/dirdiff.py:960 ../meld/filediff.py:1588 ../meld/filediff.py:1618 +#: ../meld/filediff.py:1620 ../meld/ui/msgarea.py:106 ../meld/ui/msgarea.py:119 +msgid "Hi_de" +msgstr "隠す(_D)" + +#: ../meld/dirdiff.py:969 +msgid "Multiple errors occurred while scanning this folder" +msgstr "このフォルダーの走査中に複数回のエラーが発生しました" -#: ../meld/filediff.py:297 -msgid "Push to left" -msgstr "左側へ適用する" +#: ../meld/dirdiff.py:970 +msgid "Files with invalid encodings found" +msgstr "間違ったエンコーディングを持つファイルが見つかりました" -#: ../meld/filediff.py:297 -msgid "Push current change to the left" -msgstr "現在の変更を左側へも適用します" +#. TRANSLATORS: This is followed by a list of files +#: ../meld/dirdiff.py:972 +msgid "Some files were in an incorrect encoding. The names are something like:" +msgstr "" +"いくつかのファイルが間違ったエンコーディングを持っていました (次のようなファ" +"イル名です):" -#: ../meld/filediff.py:298 -msgid "Push to right" -msgstr "右側へ適用する" +#: ../meld/dirdiff.py:974 +msgid "Files hidden by case insensitive comparison" +msgstr "大/小文字を区別せずに比較したファイルの一覧" -#: ../meld/filediff.py:298 -msgid "Push current change to the right" -msgstr "現在の変更を右側にも適用します" +#. TRANSLATORS: This is followed by a list of files +#: ../meld/dirdiff.py:976 +msgid "" +"You are running a case insensitive comparison on a case sensitive " +"filesystem. The following files in this folder are hidden:" +msgstr "" +"大/小文字を区別するファイルシステム上で大/小文字を無視した比較を行っていま" +"す。このフォルダーでは次のファイルは表示されません:" -#. FIXME: using LAST and FIRST is terrible and unreliable icon abuse -#: ../meld/filediff.py:300 -msgid "Pull from left" -msgstr "左側のキャンセル" +#: ../meld/dirdiff.py:987 +#, python-format +msgid "“%s” hidden by “%s”" +msgstr "“%s”は“%s”によって隠されています" -#: ../meld/filediff.py:300 -msgid "Pull change from the left" -msgstr "左側の変更点をキャンセルします" +#: ../meld/dirdiff.py:1043 +#, python-format +msgid "Replace folder “%s”?" +msgstr "“%s”を置き換えますか?" -#: ../meld/filediff.py:301 -msgid "Pull from right" -msgstr "右側のキャンセル" +#: ../meld/dirdiff.py:1045 +#, 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 "" +"“%s”に同じ名前の別のフォルダーがすでに存在します。\n" +"フォルダーを置き換えると、既存のファイルはすべて失われます。" -#: ../meld/filediff.py:301 -msgid "Pull change from the right" -msgstr "右側の変更点をキャンセルします" +#: ../meld/dirdiff.py:1058 +msgid "Error copying file" +msgstr "ファイルのコピーエラー" -#: ../meld/filediff.py:302 -msgid "Copy above left" -msgstr "左の上にコピーする" +#: ../meld/dirdiff.py:1059 +#, python-format +msgid "" +"Couldn’t copy %s\n" +"to %s.\n" +"\n" +"%s" +msgstr "" +"コピーできませんでした。\n" +"コピー元: %s\n" +"コピー先: %s\n" +"%s" -#: ../meld/filediff.py:302 -msgid "Copy change above the left chunk" -msgstr "左側にある変更点の上にコピーします" +#: ../meld/dirdiff.py:1084 ../meld/vcview.py:720 +msgid "Error deleting {}" +msgstr "{} の削除中にエラーが発生しました" -#: ../meld/filediff.py:303 -msgid "Copy below left" -msgstr "左の下にコピーする" +#: ../meld/dirdiff.py:1593 +msgid "No folder" +msgstr "" -#: ../meld/filediff.py:303 -msgid "Copy change below the left chunk" -msgstr "左側にある変更点の下にコピーします" +#: ../meld/filediff.py:905 +msgid "Comparison results will be inaccurate" +msgstr "比較結果は不正確です" -#: ../meld/filediff.py:304 -msgid "Copy above right" -msgstr "右の上にコピーする" +#: ../meld/filediff.py:907 +msgid "" +"A filter changed the number of lines in the file, which is unsupported. The " +"comparison will not be accurate." +msgstr "" +"フィルターがファイル内の行数を変更しましたが、サポートされていないため、比較" +"は正確ではありません。" -#: ../meld/filediff.py:304 -msgid "Copy change above the right chunk" -msgstr "右側にある変更点の上にコピーします" +#: ../meld/filediff.py:979 +msgid "Mark conflict as resolved?" +msgstr "衝突箇所を解決済みとしてマークしますか?" -#: ../meld/filediff.py:305 -msgid "Copy below right" -msgstr "右の下にコピーする" +#: ../meld/filediff.py:981 +msgid "" +"If the conflict was resolved successfully, you may mark it as resolved now." +msgstr "" +"衝突箇所の解決に成功した場合は、解決済みとしてマークすることができます。" -#: ../meld/filediff.py:305 -msgid "Copy change below the right chunk" -msgstr "右側にある変更点の下にコピーします" +#: ../meld/filediff.py:983 +msgid "Cancel" +msgstr "キャンセル" -#: ../meld/filediff.py:306 -msgid "Delete" -msgstr "削除" +#: ../meld/filediff.py:984 +msgid "Mark _Resolved" +msgstr "解決済みとしてマーク(_R)" -#: ../meld/filediff.py:306 -msgid "Delete change" -msgstr "変更点を削除します" +#: ../meld/filediff.py:1303 +#, python-format +msgid "There was a problem opening the file “%s”." +msgstr "“%s”を開く際に問題が発生しました。" -#: ../meld/filediff.py:307 -msgid "Merge all changes from left" -msgstr "左側の変更点をマージする" +#: ../meld/filediff.py:1311 +#, python-format +msgid "File %s appears to be a binary file." +msgstr "%s はバイナリファイルのようです。" -#: ../meld/filediff.py:307 -msgid "Merge all non-conflicting changes from the left" -msgstr "左側にある (衝突することのない) 変更点を全てマージします" +#: ../meld/filediff.py:1313 +msgid "Do you want to open the file using the default application?" +msgstr "デフォルトのアプリケーションを使用してファイルを開きますか?" -#: ../meld/filediff.py:308 -msgid "Merge all changes from right" -msgstr "右側の変更点をマージする" +#: ../meld/filediff.py:1315 +msgid "Open" +msgstr "開く" -#: ../meld/filediff.py:308 -msgid "Merge all non-conflicting changes from the right" -msgstr "左側にある (衝突することのない) 変更点を全てマージします" +#: ../meld/filediff.py:1331 +#, python-format +msgid "[%s] Computing differences" +msgstr "[%s] 差分の計算中" -#: ../meld/filediff.py:309 -msgid "Merge all non-conflicting" -msgstr "全ての変更点をマージする" +#: ../meld/filediff.py:1392 +#, python-format +msgid "File %s has changed on disk" +msgstr "%s はディスク上で変更されました" -#: ../meld/filediff.py:309 -msgid "Merge all non-conflicting changes from left and right panes" -msgstr "左側と右側とで衝突することのない全ての変更点を全てマージします" +#: ../meld/filediff.py:1393 +msgid "Do you want to reload the file?" +msgstr "ファイルを再読み込みしますか?" -#: ../meld/filediff.py:310 -msgid "Cycle through documents" -msgstr "ドキュメント間で切替える" +#: ../meld/filediff.py:1395 +msgid "_Reload" +msgstr "再読み込み(_R)" -#: ../meld/filediff.py:310 -msgid "Move keyboard focus to the next document in this comparison" -msgstr "この比較でキーボード・フォーカスを隣のドキュメントに移動します" +#: ../meld/filediff.py:1551 +msgid "Files are identical" +msgstr "同一のファイルです" -#: ../meld/filediff.py:314 -msgid "Lock scrolling" -msgstr "スクロールのロック" +#: ../meld/filediff.py:1564 +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:315 -msgid "Lock scrolling of all panes" -msgstr "全てのペインでスクロールを同期します" +#: ../meld/filediff.py:1569 +msgid "Files differ in line endings only" +msgstr "ファイルは行末のみが異なります" -#. Abbreviations for insert and overwrite that fit in the status bar -#: ../meld/filediff.py:396 -msgid "INS" -msgstr "[挿入]" +#: ../meld/filediff.py:1571 +#, python-format +msgid "" +"Files are identical except for differing line endings:\n" +"%s" +msgstr "" +"改行コード以外のファイルの内容は同一です:\n" +"%s" -#: ../meld/filediff.py:396 -msgid "OVR" -msgstr "[上書き]" +#: ../meld/filediff.py:1591 +msgid "Show without filters" +msgstr "フィルター無しで表示する" -#. Abbreviation for line, column so that it will fit in the status bar -#: ../meld/filediff.py:398 -#, python-format -msgid "Ln %i, Col %i" -msgstr "(%i行、%i列)" +#: ../meld/filediff.py:1613 +msgid "Change highlighting incomplete" +msgstr "変更点のハイライトが不完全です" -#: ../meld/filediff.py:722 -#, python-format +#: ../meld/filediff.py:1614 msgid "" -"Filter '%s' changed the number of lines in the file. Comparison will be " -"incorrect. See the user manual for more details." +"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 "" -"フィルター ('%s') でファイルの行数が変更されました。差分に不整合が生じます。" -"詳細はユーザーズ・マニュアルをご覧下さい。" +"変更点が多すぎるため、一部がハイライトされませんでした。Meld にハイライトを強" +"制することができますが、大きな変更点をハイライトするには時間がかかります。" -#. TRANSLATORS: this is the name of a new file which has not yet been saved -#: ../meld/filediff.py:809 -msgid "" -msgstr "<名前なし>" +#: ../meld/filediff.py:1622 +msgid "Keep highlighting" +msgstr "ハイライトを続ける" -#: ../meld/filediff.py:996 -#, python-format -msgid "[%s] Set num panes" -msgstr "[%s] 番号ペインのセット" +#: ../meld/filediff.py:1624 +msgid "_Keep highlighting" +msgstr "ハイライトを続ける(_K)" -#: ../meld/filediff.py:1002 -#, python-format -msgid "[%s] Opening files" -msgstr "[%s] ファイルのオープン中" +#: ../meld/filediff.py:1637 +msgid "Saving failed" +msgstr "" -#: ../meld/filediff.py:1026 ../meld/filediff.py:1035 ../meld/filediff.py:1047 -#: ../meld/filediff.py:1053 -msgid "Could not read file" -msgstr "ファイルを読み込めませんでした" +#: ../meld/filediff.py:1638 +msgid "" +"Please consider copying any critical changes to another program or file to " +"avoid data loss." +msgstr "" -#: ../meld/filediff.py:1027 -#, python-format -msgid "[%s] Reading files" -msgstr "[%s] ファイルの読み込み中" +#: ../meld/filediff.py:1647 +msgid "Save Left Pane As" +msgstr "左のペインを別名で保存" -#: ../meld/filediff.py:1036 -#, python-format -msgid "%s appears to be a binary file." -msgstr "%s はバイナリ・ファイルのようです" +#: ../meld/filediff.py:1649 +msgid "Save Middle Pane As" +msgstr "中央のペインを別名で保存" -#: ../meld/filediff.py:1048 -#, python-format -msgid "%s is not in encodings: %s" -msgstr "%s は次のエンコーディングではありません: %s" +#: ../meld/filediff.py:1651 +msgid "Save Right Pane As" +msgstr "右のペインを別名で保存" -#: ../meld/filediff.py:1078 ../meld/filemerge.py:67 +#: ../meld/filediff.py:1664 #, python-format -msgid "[%s] Computing differences" -msgstr "[%s] 差分の計算中" +msgid "File %s has changed on disk since it was opened" +msgstr "%s は開かれた後にディスク上で変更されました" -#: ../meld/filediff.py:1148 -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:1666 +msgid "If you save it, any external changes will be lost." +msgstr "保存すると、外部からの変更は失われます。" -#: ../meld/filediff.py:1154 -msgid "Files are identical" -msgstr "同一のファイルです" +#: ../meld/filediff.py:1669 +msgid "Save Anyway" +msgstr "とにかく保存する" -#: ../meld/filediff.py:1164 -msgid "Show without filters" -msgstr "フィルタリング無しで表示する" +#: ../meld/filediff.py:1670 +msgid "Don’t Save" +msgstr "保存しない" -#: ../meld/filediff.py:1354 -#, python-format +#: ../meld/filediff.py:1712 msgid "" -"\"%s\" exists!\n" -"Overwrite?" +"File “{}” contains characters that can’t be encoded using its current " +"encoding “{}”." msgstr "" -"\"%s\" は存在しています！\n" -"上書きしますか？" +"“{}”には現在のエンコーディング“{}”でエンコードできない文字が含まれています。" -#: ../meld/filediff.py:1367 +#: ../meld/filediff.py:1716 ../meld/patchdialog.py:142 #, python-format msgid "" -"Error writing to %s\n" -"\n" -"%s." +"Couldn’t save file due to:\n" +"%s" msgstr "" -"%s へ書き込む際にエラー\n" -"\n" +"次の理由によりファイルを保存できませんでした:\n" "%s" -#: ../meld/filediff.py:1376 +#: ../meld/filediff.py:1720 ../meld/patchdialog.py:141 #, python-format -msgid "Choose a name for buffer %i." -msgstr "バッファー %i の名前の選択" +msgid "Could not save file %s." +msgstr "%s を保存できませんでした。" -#: ../meld/filediff.py:1391 -#, python-format +#: ../meld/filediff.py:2113 +msgid "Live comparison updating disabled" +msgstr "比較のライブアップデートは無効です" + +#: ../meld/filediff.py:2114 msgid "" -"This file '%s' contains a mixture of line endings.\n" -"\n" -"Which format would you like to use?" +"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 "" -"このファイル '%s' には行の終端が混ざっています。\n" -"\n" -"どのフォーマットを使用しますか？" +"同期点が有効な場合、比較のライブアップデートは無効化されます。同期点がクリア" +"されるとライブアップデートが再開されます。また、比較は手動で更新することもで" +"きます。" -#: ../meld/filediff.py:1407 +#: ../meld/filemerge.py:37 #, python-format -msgid "" -"'%s' contains characters not encodable with '%s'\n" -"Would you like to save as UTF-8?" +msgid "[%s] Merging files" +msgstr "[%s] ファイルをマージ中" + +#: ../meld/gutterrendererchunk.py:220 +msgid "Copy _up" +msgstr "上にコピー(_U)" + +#: ../meld/gutterrendererchunk.py:221 +msgid "Copy _down" +msgstr "下にコピー(_D)" + +#: ../meld/iohelpers.py:37 +msgid "Deleting remote folders is not supported" msgstr "" -"'%s' には '%s' でエンコードされていない文字が含まれています。\n" -"UTF-8 エンコーディングとして保存してもよろしいですか？" -#: ../meld/filediff.py:1466 -#, python-format -msgid "" -"Reloading will discard changes in:\n" -"%s\n" -"\n" -"You cannot undo this operation." +#: ../meld/iohelpers.py:39 +msgid "Not a file or directory" msgstr "" -"再読込すると次の変更点が破棄されます:\n" -"%s\n" -"\n" -"この操作を元に戻すことはできません。" -#: ../meld/filemerge.py:82 +#: ../meld/iohelpers.py:43 +msgid "“{}” can’t be put in the trash. Do you want to delete it immediately?" +msgstr "" + +#: ../meld/iohelpers.py:48 +msgid "This remote location does not support sending items to the trash." +msgstr "" + +#: ../meld/iohelpers.py:53 +#, fuzzy +#| msgid "Delete change" +msgid "_Delete Permanently" +msgstr "変更点を削除します" + +#: ../meld/iohelpers.py:100 #, python-format -msgid "[%s] Merging files" -msgstr "[%s] ファイルのマージ中" +msgid "Replace file “%s”?" +msgstr "“%s”を置き換えますか?" + +#: ../meld/iohelpers.py:102 +#, 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 "" +"“%s”に同じ名前のファイルがすでに存在します。\n" +"ファイルを置き換えると、既存の内容は失われます。" -#: ../meld/meldapp.py:152 +#: ../meld/meldapp.py:169 msgid "wrong number of arguments supplied to --diff" msgstr "--diff オプションに対する引数の数が間違っています" -#: ../meld/meldapp.py:156 +#: ../meld/meldapp.py:174 msgid "Start with an empty window" -msgstr "何も開かずに Meld を起動する" +msgstr "空のウィンドウで起動する" -#: ../meld/meldapp.py:157 ../meld/meldapp.py:158 ../meld/meldapp.py:160 +#: ../meld/meldapp.py:175 ../meld/meldapp.py:177 msgid "file" -msgstr "FILE" +msgstr "ファイル" -#: ../meld/meldapp.py:157 ../meld/meldapp.py:159 ../meld/meldapp.py:160 -msgid "dir" -msgstr "DIR" +#: ../meld/meldapp.py:175 ../meld/meldapp.py:179 +msgid "folder" +msgstr "フォルダー" -#: ../meld/meldapp.py:157 +#: ../meld/meldapp.py:176 msgid "Start a version control comparison" msgstr "バージョン管理の比較モードで起動する" -#: ../meld/meldapp.py:158 +#: ../meld/meldapp.py:178 msgid "Start a 2- or 3-way file comparison" -msgstr "2ないし3個のファイルを比較するモードで起動する" +msgstr "2つ、または3つのファイルを比較するモードで起動する" -#: ../meld/meldapp.py:159 -msgid "Start a 2- or 3-way directory comparison" -msgstr "2ないし3個のフォルダーを比較するモードで起動する" +#: ../meld/meldapp.py:180 +msgid "Start a 2- or 3-way folder comparison" +msgstr "2つ、または3つのフォルダーを比較するモードで起動する" -#: ../meld/meldapp.py:160 -msgid "Start a comparison between file and dir/file" -msgstr "ファイルとフォルダーとを比較するモードで起動する" +#: ../meld/meldapp.py:223 +#, python-format +msgid "Error: %s\n" +msgstr "エラー: %s\n" -#: ../meld/meldapp.py:166 +#: ../meld/meldapp.py:230 msgid "Meld is a file and directory comparison tool." -msgstr "Meld はファイルとフォルダーの内容を比較するツールです:" +msgstr "Meld はファイルとフォルダーの内容を比較するツールです。" -#: ../meld/meldapp.py:169 +#: ../meld/meldapp.py:234 msgid "Set label to use instead of file name" msgstr "ファイル名の代わりに使用するラベルを指定する" -#: ../meld/meldapp.py:171 +#: ../meld/meldapp.py:237 +msgid "Open a new tab in an already running instance" +msgstr "すでに実行中のインスタンスで新しいタブを開く" + +#: ../meld/meldapp.py:240 msgid "Automatically compare all differing files on startup" -msgstr "起動時にファイルの中にある全て差分を自動的に検出する" +msgstr "起動時にファイルの中にあるすべての差分を自動的に検出する" -#: ../meld/meldapp.py:173 +#: ../meld/meldapp.py:243 msgid "Ignored for compatibility" -msgstr "互換性を無視する" +msgstr "" -#: ../meld/meldapp.py:176 +#: ../meld/meldapp.py:247 msgid "Set the target file for saving a merge result" -msgstr "マージした結果を保存する際のファイル名を指定する" +msgstr "マージした結果を保存するファイル名を指定する" + +#: ../meld/meldapp.py:250 +msgid "Automatically merge files" +msgstr "自動的にファイルをマージする" + +#: ../meld/meldapp.py:254 +msgid "Load a saved comparison from a Meld comparison file" +msgstr "" -#: ../meld/meldapp.py:179 -msgid "Creates a diff tab for up to 3 supplied files or directories." -msgstr "指定した最大3つのファイルまたはフォルダーに対する差分をタブで表示する" +#: ../meld/meldapp.py:258 +msgid "Create a diff tab for the supplied files or folders" +msgstr "" + +#: ../meld/meldapp.py:278 +#, python-format +msgid "too many arguments (wanted 0-3, got %d)" +msgstr "" +"引数が多すぎます (有効な数は 0 〜 3 ですが %d 個の引数を受け取りました)" -#: ../meld/meldapp.py:182 +#: ../meld/meldapp.py:281 +msgid "can’t auto-merge less than 3 files" +msgstr "3つ未満のファイルはオートマージできません" + +#: ../meld/meldapp.py:283 +msgid "can’t auto-merge directories" +msgstr "ディレクトリはオートマージできません" + +#: ../meld/meldapp.py:297 +msgid "Error reading saved comparison file" +msgstr "保存された比較ファイルの読み込みエラー" + +#: ../meld/meldapp.py:314 #, python-format -msgid "too many arguments (wanted 0-4, got %d)" -msgstr "引数が多すぎます (0〜4個を想定していたが実際は%d個)" +msgid "invalid path or URI “%s”" +msgstr "無効なパスまたは URI “%s”" + +#: ../meld/meldapp.py:320 +msgid "remote folder “{}” not supported" +msgstr "" -#: ../meld/meldapp.py:184 ../meld/meldapp.py:188 -msgid "can't compare more than three directories" -msgstr "3つ以上のフォルダーの間での比較はできません" +#. TRANSLATORS: This is the label of a new, currently-unnamed file. +#: ../meld/meldbuffer.py:124 +msgid "" +msgstr "<名前なし>" -#: ../meld/melddoc.py:56 ../meld/melddoc.py:57 +#: ../meld/melddoc.py:63 msgid "untitled" msgstr "タイトルなし" -#: ../meld/meldwindow.py:125 +#: ../meld/meldwindow.py:56 msgid "_File" msgstr "ファイル(_F)" -#: ../meld/meldwindow.py:126 -msgid "_New..." -msgstr "新規(_N)..." +#: ../meld/meldwindow.py:57 +msgid "_New Comparison…" +msgstr "新しい比較(_N)…" -#: ../meld/meldwindow.py:126 +#: ../meld/meldwindow.py:58 msgid "Start a new comparison" msgstr "新しい比較を開始します" -#: ../meld/meldwindow.py:127 +#: ../meld/meldwindow.py:61 msgid "Save the current file" msgstr "このファイルを保存します" -#: ../meld/meldwindow.py:129 +#: ../meld/meldwindow.py:63 +msgid "Save As…" +msgstr "別名で保存…" + +#: ../meld/meldwindow.py:64 +msgid "Save the current file with a different name" +msgstr "このファイルを別の名前で保存します" + +#: ../meld/meldwindow.py:67 msgid "Close the current file" msgstr "このファイルを閉じます" -#: ../meld/meldwindow.py:130 -msgid "Quit the program" -msgstr "プログラムを終了します" - -#: ../meld/meldwindow.py:132 +#: ../meld/meldwindow.py:70 msgid "_Edit" msgstr "編集(_E)" -#: ../meld/meldwindow.py:133 +#: ../meld/meldwindow.py:72 msgid "Undo the last action" msgstr "最後に適用したアクションに戻します" -#: ../meld/meldwindow.py:134 +#: ../meld/meldwindow.py:75 msgid "Redo the last undone action" msgstr "最後に適用したアクションをやり直します" -#: ../meld/meldwindow.py:135 +#: ../meld/meldwindow.py:77 msgid "Cut the selection" msgstr "選択範囲を切り取ります" -#: ../meld/meldwindow.py:136 +#: ../meld/meldwindow.py:79 msgid "Copy the selection" msgstr "選択範囲をコピーします" -#: ../meld/meldwindow.py:137 +#: ../meld/meldwindow.py:81 msgid "Paste the clipboard" msgstr "クリップボードの内容を貼り付けます" -#: ../meld/meldwindow.py:138 +#: ../meld/meldwindow.py:83 +msgid "Find…" +msgstr "検索…" + +#: ../meld/meldwindow.py:83 msgid "Search for text" -msgstr "検索する文字列:" +msgstr "検索する文字列" -#: ../meld/meldwindow.py:139 +#: ../meld/meldwindow.py:85 msgid "Find Ne_xt" -msgstr "次を検索する(_X)" +msgstr "次を検索(_X)" -#: ../meld/meldwindow.py:139 +#: ../meld/meldwindow.py:86 msgid "Search forwards for the same text" msgstr "同じ文字列を前方検索します" -#: ../meld/meldwindow.py:140 +#: ../meld/meldwindow.py:88 msgid "Find _Previous" -msgstr "前を検索する(_P)" +msgstr "前を検索(_P)" -#: ../meld/meldwindow.py:140 +#: ../meld/meldwindow.py:89 msgid "Search backwards for the same text" msgstr "同じ文字列を後方検索します" -#: ../meld/meldwindow.py:141 +#: ../meld/meldwindow.py:92 +msgid "_Replace…" +msgstr "置換(_R)…" + +#: ../meld/meldwindow.py:93 msgid "Find and replace text" msgstr "文字列を検索して置換します" -#: ../meld/meldwindow.py:142 -msgid "Prefere_nces" -msgstr "設定(_N)" +#: ../meld/meldwindow.py:95 +msgid "Go to _Line" +msgstr "指定行へ移動(_L)" -#: ../meld/meldwindow.py:142 -msgid "Configure the application" -msgstr "Meld を設定します" +#: ../meld/meldwindow.py:96 +msgid "Go to a specific line" +msgstr "指定した行へ移動します" -#: ../meld/meldwindow.py:144 +#: ../meld/meldwindow.py:99 msgid "_Changes" msgstr "変更点(_C)" -#: ../meld/meldwindow.py:145 -msgid "Next change" +#: ../meld/meldwindow.py:100 +msgid "Next Change" msgstr "次の変更点" -#: ../meld/meldwindow.py:145 +#: ../meld/meldwindow.py:101 msgid "Go to the next change" msgstr "次の変更点へジャンプします" -#: ../meld/meldwindow.py:146 -msgid "Previous change" +#: ../meld/meldwindow.py:103 +msgid "Previous Change" msgstr "前の変更点" -#: ../meld/meldwindow.py:146 +#: ../meld/meldwindow.py:104 msgid "Go to the previous change" msgstr "前の変更点へジャンプします" -#: ../meld/meldwindow.py:147 -msgid "Open externally" +#: ../meld/meldwindow.py:106 +msgid "Open Externally" msgstr "別のアプリで開く" -#: ../meld/meldwindow.py:147 +#: ../meld/meldwindow.py:107 msgid "Open selected file or directory in the default external application" msgstr "選択したファイルやフォルダーをデフォルトのアプリケーションで開きます" -#: ../meld/meldwindow.py:149 +#: ../meld/meldwindow.py:111 msgid "_View" msgstr "表示(_V)" -#: ../meld/meldwindow.py:150 -msgid "File status" +#: ../meld/meldwindow.py:112 +msgid "File Status" msgstr "ファイルの状態" -#: ../meld/meldwindow.py:151 -msgid "Version status" -msgstr "バージョン" +#: ../meld/meldwindow.py:113 +msgid "Version Status" +msgstr "バージョンの状態" -#: ../meld/meldwindow.py:152 -msgid "File filters" -msgstr "ファイルのフィルター" - -#: ../meld/meldwindow.py:153 +#: ../meld/meldwindow.py:116 msgid "Stop the current action" msgstr "現在適用中のアクションを停止します" -#: ../meld/meldwindow.py:154 +#: ../meld/meldwindow.py:119 msgid "Refresh the view" msgstr "表示を更新します" -#: ../meld/meldwindow.py:155 -msgid "Reload" -msgstr "再読込み" - -#: ../meld/meldwindow.py:155 -msgid "Reload the comparison" -msgstr "比較内容を更新します" - -#: ../meld/meldwindow.py:157 -msgid "_Tabs" -msgstr "タブ(_T)" - -#: ../meld/meldwindow.py:158 -msgid "_Previous Tab" -msgstr "前のタブ(_P)" - -#: ../meld/meldwindow.py:158 -msgid "Activate previous tab" -msgstr "前のタブに切り替えます" - -#: ../meld/meldwindow.py:159 -msgid "_Next Tab" -msgstr "次のタブ(_N)" +#: ../meld/meldwindow.py:123 +msgid "Fullscreen" +msgstr "フルスクリーン" -#: ../meld/meldwindow.py:159 -msgid "Activate next tab" -msgstr "次のタブに切り替えます" - -#: ../meld/meldwindow.py:160 -msgid "Move Tab _Left" -msgstr "タブを左へ移動する(_L)" - -#: ../meld/meldwindow.py:160 -msgid "Move current tab to left" -msgstr "このタブを左側へ移動します" - -#: ../meld/meldwindow.py:161 -msgid "Move Tab _Right" -msgstr "タブを右へ移動する(_R)" - -#: ../meld/meldwindow.py:161 -msgid "Move current tab to right" -msgstr "このタブを右側へ移動します" - -#: ../meld/meldwindow.py:163 -msgid "_Help" -msgstr "ヘルプ(_H)" - -#: ../meld/meldwindow.py:164 -msgid "_Contents" -msgstr "目次(_C)" - -#: ../meld/meldwindow.py:164 -msgid "Open the Meld manual" -msgstr "Meld のマニュアルを開きます" - -#: ../meld/meldwindow.py:165 -msgid "Report _Bug" -msgstr "バグの報告(_B)" - -#: ../meld/meldwindow.py:165 -msgid "Report a bug in Meld" -msgstr "Meld のバグを報告します" - -#: ../meld/meldwindow.py:166 -msgid "About this program" -msgstr "このプログラムについて" - -#: ../meld/meldwindow.py:169 -msgid "Full Screen" -msgstr "フルスクリーン表示" - -#: ../meld/meldwindow.py:169 -msgid "View the comparison in full screen" +#: ../meld/meldwindow.py:124 +msgid "View the comparison in fullscreen" msgstr "比較状況をフルスクリーンで表示します" -#: ../meld/meldwindow.py:170 -msgid "_Toolbar" -msgstr "ツールバー(_T)" +#: ../meld/meldwindow.py:133 +msgid "Open Recent" +msgstr "最近の比較" -#: ../meld/meldwindow.py:170 -msgid "Show or hide the toolbar" -msgstr "ツールバーの表示を ON/OFF します" +#: ../meld/meldwindow.py:134 +msgid "Open recent files" +msgstr "最近のファイルを開きます" -#: ../meld/meldwindow.py:171 -msgid "_Statusbar" -msgstr "ステータスバー(_S)" +#: ../meld/meldwindow.py:567 +#, python-format +msgid "Need three files to auto-merge, got: %r" +msgstr "オートマージには3つのファイルが必要です: %r" -#: ../meld/meldwindow.py:171 -msgid "Show or hide the statusbar" -msgstr "ステータスバーの表示を ON/OFF します" +#: ../meld/meldwindow.py:588 +msgid "Cannot compare a mixture of files and directories" +msgstr "ファイルとフォルダーの間での比較はできません" -#: ../meld/meldwindow.py:538 -msgid "Switch to this tab" -msgstr "このタブに切り替えます" +#: ../meld/misc.py:155 +msgid "" +"{}\n" +"\n" +"Meld encountered a critical error while running:\n" +"{}" +msgstr "" -#. exit at first non found directory + file -#: ../meld/meldwindow.py:629 -msgid "Cannot compare a mixture of files and directories.\n" -msgstr "ファイルとフォルダーの間での比較はできません。\n" +#: ../meld/misc.py:237 +#, python-format +msgid "Couldn’t find colour scheme details for %s-%s; this is a bad install" +msgstr "" +"%s-%s のカラースキーマの詳細が見つかりませんでした。これはインストールが正常" +"ではありません。" -#. no common path. empty names get changed to "[None]" -#: ../meld/misc.py:174 +#: ../meld/misc.py:311 msgid "[None]" msgstr "[なし]" -#: ../meld/patchdialog.py:122 -msgid "Save Patch As..." -msgstr "名前を付けてパッチを保存..." - -#: ../meld/preferences.py:37 +#: ../meld/preferences.py:42 ../meld/preferences.py:135 msgid "label" msgstr "(新しい名前)" -#: ../meld/preferences.py:37 +#: ../meld/preferences.py:42 ../meld/preferences.py:135 msgid "pattern" msgstr "(新しいパターン)" -#: ../meld/preferences.py:111 -msgid "Only available if you have gnome-python-desktop installed" -msgstr "" -"'gnome-python-desktop' をインストールしている場合にのみ行番号を表示することが" -"できます。" +#: ../meld/recent.py:106 +msgid "Version control:" +msgstr "バージョン管理:" -#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact -#: ../meld/preferences.py:234 -msgid "Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n" -msgstr "バックアップ\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n" +#: ../meld/ui/bufferselectors.py:114 +#, python-brace-format +msgid "{name} ({charset})" +msgstr "" -#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact -#: ../meld/preferences.py:236 -msgid "" -"OS-specific metadata\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db " -"Desktop.ini\n" +#: ../meld/ui/bufferselectors.py:144 ../meld/ui/bufferselectors.py:152 +msgid "Plain Text" msgstr "" -"OS 特有のメタデータ\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db " -"Desktop.ini\n" -#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact -#: ../meld/preferences.py:238 +#. Abbreviation for line, column so that it will fit in the status bar +#: ../meld/ui/statusbar.py:124 #, python-format -msgid "Version Control\t1\t%s\n" -msgstr "Version Control\t1\t%s\n" - -#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact -#: ../meld/preferences.py:240 -msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n" -msgstr "バイナリ\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n" - -#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact -#: ../meld/preferences.py:242 -msgid "Media\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}" -msgstr "メディア\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}" - -#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact -#: ../meld/preferences.py:244 -msgid "CVS keywords\t0\t\\$\\w+(:[^\\n$]+)?\\$\n" -msgstr "CVS のキーワード\t0\t\\$\\w+(:[^\\n$]+)?\\$\n" - -#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact -#: ../meld/preferences.py:246 -msgid "C++ comment\t0\t//.*\n" -msgstr "C++ のコメント\t0\t//.*\n" - -#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact -#: ../meld/preferences.py:248 -msgid "C comment\t0\t/\\*.*?\\*/\n" -msgstr "C のコメント\t0\t/\\*.*?\\*/\n" - -#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact -#: ../meld/preferences.py:250 -msgid "All whitespace\t0\t[ \\t\\r\\f\\v]*\n" -msgstr "空白文字\t0\t[ \\t\\r\\f\\v]*\n" - -#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact -#: ../meld/preferences.py:252 -msgid "Leading whitespace\t0\t^[ \\t\\r\\f\\v]*\n" -msgstr "先頭の空白文字\t0\t^[ \\t\\r\\f\\v]*\n" - -#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact -#: ../meld/preferences.py:254 -msgid "Script comment\t0\t#.*" -msgstr "スクリプトのコメント\t0\t#.*" - -#: ../meld/vcview.py:128 -msgid "Co_mmit" -msgstr "コミット(_M)" +msgid "Ln %i, Col %i" +msgstr "(%i行、%i列)" -#: ../meld/vcview.py:128 -msgid "Commit" -msgstr "コミットします" +#: ../meld/ui/statusbar.py:177 +msgid "Line you want to move the cursor to" +msgstr "" -#: ../meld/vcview.py:129 -msgid "_Update" -msgstr "更新(_U)" +#: ../meld/ui/vcdialogs.py:55 +msgid "No files will be committed" +msgstr "" -#: ../meld/vcview.py:129 -msgid "Update" -msgstr "更新します" +#. 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 "" -#: ../meld/vcview.py:130 -msgid "Add to VC" -msgstr "バージョン・コントロールに追加します" +#. 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 +#, python-format +msgid "%d unpushed commit" +msgid_plural "%d unpushed commits" +msgstr[0] "" -#: ../meld/vcview.py:131 -msgid "Add _Binary" -msgstr "バイナリの追加(_B)" +#: ../meld/vc/git.py:95 +#, python-format +msgid "%d branch" +msgid_plural "%d branches" +msgstr[0] "" -#: ../meld/vcview.py:131 -msgid "Add binary to VC" -msgstr "バイナリをバージョン・コントロールに追加します" +#: ../meld/vc/git.py:334 +#, python-format +msgid "Mode changed from %s to %s" +msgstr "" -#: ../meld/vcview.py:132 -msgid "Remove from VC" -msgstr "バージョン・コントロールから削除します" +#: ../meld/vc/git.py:342 +msgid "Partially staged" +msgstr "" -#: ../meld/vcview.py:133 -msgid "_Resolved" -msgstr "解決済(_R)" +#: ../meld/vc/git.py:342 +msgid "Staged" +msgstr "" -#: ../meld/vcview.py:133 -msgid "Mark as resolved for VC" -msgstr "バージョン管理で解決済みであるとする" +#. Translators: This is the displayed name of a version control system +#. when no version control system is actually found. +#: ../meld/vc/_null.py:37 +msgid "None" +msgstr "なし" -#: ../meld/vcview.py:134 -msgid "Revert to original" -msgstr "元に戻します" +#: ../meld/vc/svn.py:203 +#, python-format +msgid "Rev %s" +msgstr "" -#: ../meld/vcview.py:135 -msgid "Delete locally" -msgstr "ローカル・ファイルを削除します" +#: ../meld/vc/_vc.py:54 +msgid "Merged" +msgstr "" -#: ../meld/vcview.py:139 -msgid "_Flatten" -msgstr "一覧表示(_F)" +#: ../meld/vc/_vc.py:54 +msgid "Base" +msgstr "" -#: ../meld/vcview.py:139 -msgid "Flatten directories" -msgstr "配下のフォルダーを無視します" +#: ../meld/vc/_vc.py:54 +msgid "Local" +msgstr "" -#: ../meld/vcview.py:140 -msgid "_Modified" -msgstr "変更済のもの(_M)" +#: ../meld/vc/_vc.py:54 +msgid "Remote" +msgstr "" -#: ../meld/vcview.py:141 -msgid "_Normal" -msgstr "通常のもの(_N)" +#: ../meld/vc/_vc.py:70 +msgid "Unversioned" +msgstr "" -#: ../meld/vcview.py:141 -msgid "Show normal" -msgstr "通常のファイルを表示します" +#: ../meld/vc/_vc.py:73 +msgid "Error" +msgstr "" -#: ../meld/vcview.py:142 -msgid "Non _VC" -msgstr "VC以外(_V)" +#: ../meld/vc/_vc.py:75 +msgid "Newly added" +msgstr "" -#: ../meld/vcview.py:142 -msgid "Show unversioned files" -msgstr "バージョン管理外のファイルを表示します" +#: ../meld/vc/_vc.py:77 +msgid "Renamed" +msgstr "" -#: ../meld/vcview.py:143 -msgid "Ignored" -msgstr "無視したもの" +#: ../meld/vc/_vc.py:78 +msgid "Conflict" +msgstr "" -#: ../meld/vcview.py:143 -msgid "Show ignored files" -msgstr "無視したファイルを表示します" +#: ../meld/vc/_vc.py:79 +msgid "Removed" +msgstr "" -#: ../meld/vcview.py:186 ../meld/vcview.py:318 -msgid "Location" -msgstr "場所" +#: ../meld/vc/_vc.py:80 +msgid "Missing" +msgstr "" -#: ../meld/vcview.py:187 -msgid "Status" -msgstr "状態" +#: ../meld/vc/_vc.py:81 +msgid "Not present" +msgstr "" -#: ../meld/vcview.py:188 -msgid "Rev" -msgstr "リビジョン" +#. Translators: This error message is shown when a version +#. control binary isn't installed. +#: ../meld/vcview.py:282 +#, python-format +msgid "%(name)s (%(cmd)s not installed)" +msgstr "" -#: ../meld/vcview.py:189 -msgid "Tag" -msgstr "タグ" +#. Translators: This error message is shown when a version +#. controlled repository is invalid. +#: ../meld/vcview.py:286 +#, python-format +msgid "%(name)s (Invalid repository)" +msgstr "" -#: ../meld/vcview.py:190 -msgid "Options" -msgstr "オプション" +#: ../meld/vcview.py:307 +msgid "No valid version control system found in this folder" +msgstr "" -#: ../meld/vcview.py:249 -msgid "Choose one Version Control" -msgstr "1バージョン・コントロールの選択" +#: ../meld/vcview.py:309 +msgid "Only one version control system found in this folder" +msgstr "" -#: ../meld/vcview.py:250 -msgid "Only one Version Control in this directory" -msgstr "このフォルダーの1バージョン・コントロールだけ" +#: ../meld/vcview.py:311 +msgid "Choose which version control system to use" +msgstr "" -#. TRANSLATORS: this is an error message when a version control -#. application isn't installed or can't be found -#: ../meld/vcview.py:263 +#. TRANSLATORS: This is the location of the directory being viewed +#: ../meld/vcview.py:366 #, python-format -msgid "%s Not Installed" -msgstr "%s はインストールされていません" - -#. TRANSLATORS: this is an error message when a version -#. controlled repository is invalid or corrupted -#: ../meld/vcview.py:267 -msgid "Invalid Repository" -msgstr "おかしなリポジトリです" +msgid "%s: %s" +msgstr "" -#: ../meld/vcview.py:276 -#, python-format -msgid "%s (%s)" -msgstr "%s (%s)" +#. Initial yield so when we add this to our tasks, we don't +#. create iterators that may be invalidated. +#: ../meld/vcview.py:373 +msgid "Scanning repository" +msgstr "" -#. TRANSLATORS: This is the location of the directory the user is diffing -#: ../meld/vcview.py:318 +#: ../meld/vcview.py:402 #, python-format -msgid "%s: %s" -msgstr "%s: %s" +msgid "Scanning %s" +msgstr "%s をスキャン中" -#: ../meld/vcview.py:362 +#: ../meld/vcview.py:441 msgid "(Empty)" msgstr "(空)" -#: ../meld/vcview.py:400 +#: ../meld/vcview.py:487 +#, python-format +msgid "%s — local" +msgstr "" + +#: ../meld/vcview.py:488 #, python-format -msgid "[%s] Fetching differences" -msgstr "[%s] 差分の取得中" +msgid "%s — remote" +msgstr "" -#: ../meld/vcview.py:408 +#: ../meld/vcview.py:496 #, python-format -msgid "[%s] Applying patch" -msgstr "[%s] パッチの適用中" +msgid "%s (local, merge, remote)" +msgstr "" #: ../meld/vcview.py:501 -msgid "Select some files first." -msgstr "まず最初にファイルを選択して下さい。" +#, python-format +msgid "%s (remote, merge, local)" +msgstr "" -#: ../meld/vcview.py:574 +#: ../meld/vcview.py:512 #, python-format -msgid "" -"\n" -" Invoking 'patch' failed.\n" -" \n" -" Maybe you don't have 'GNU patch' installed,\n" -" or you use an untested version of %s.\n" -" \n" -" Please send email bug report to:\n" -" meld-list@gnome.org\n" -" \n" -" Containing the following information:\n" -" \n" -" - meld version: '%s'\n" -" - source control software type: '%s'\n" -" - source control software version: 'X.Y.Z'\n" -" - the output of '%s somefile.txt'\n" -" - patch command: '%s'\n" -" (no need to actually run it, just provide\n" -" the command line) \n" -" \n" -" Replace 'X.Y.Z' by the actual version for the\n" -" source control software you use.\n" -" " +msgid "%s — repository" msgstr "" -"\n" -" 'patch' コマンドの適用に失敗しました。\n" -" \n" -" おそらく 'GNU patch' がインストールされていないか\n" -" バージョン%s (開発版) をお使いのどちらかのようです。\n" -" \n" -" バグ報告として次の宛先に情報を提供して下さい:\n" -" meld-list@gnome.org\n" -" \n" -" その際は、次に示す情報を提供して下さい (英文):\n" -" \n" -" - meld version: '%s'\n" -" - source control software type: '%s'\n" -" - source control software version: 'X.Y.Z'\n" -" - the output of '%s somefile.txt'\n" -" - patch command: '%s'\n" -" (実際に実行する必要はありません; 単にコマンドラインの\n" -" 引数を知りたいだけです) \n" -" \n" -" 上の 'X.Y.Z' はお使いのバージョン管理ソフト自身の\n" -" バージョンで置き換えて下さい\n" -" " - -#: ../meld/ui/findbar.py:127 + +#: ../meld/vcview.py:518 +#, python-format +msgid "%s (working, repository)" +msgstr "" + +#: ../meld/vcview.py:522 #, python-format +msgid "%s (repository, working)" +msgstr "" + +#: ../meld/vcview.py:688 +msgid "Remove folder and all its files?" +msgstr "" + +#: ../meld/vcview.py:690 msgid "" -"Regular expression error\n" -"'%s'" +"This will remove all selected files and folders, and all files within any " +"selected folders, from version control." msgstr "" -"正規表現エラー\n" -"'%s'" -#: ../meld/ui/historyentry.py:293 -msgid "_Browse..." -msgstr "参照(_B)..." +#: ../meld/vcview.py:804 +msgid "Clear" +msgstr "" -#: ../meld/ui/historyentry.py:301 -msgid "Path" -msgstr "パス" +#~ msgid "Show toolbar" +#~ msgstr "ツールバーを表示する" -#: ../meld/ui/historyentry.py:302 -msgid "Path to file" -msgstr "ファイルのパスです" +#~ msgid "If true, the window toolbar is visible." +#~ msgstr "true の場合、ウィンドウにツールバーが表示されます。" -#: ../meld/ui/historyentry.py:303 -msgid "Pop up a file selector to choose a file" -msgstr "ファイルを選択します" +#~ msgid "Show statusbar" +#~ msgstr "ステータスバーを表示する" -#: ../meld/ui/historyentry.py:441 -msgid "Select directory" -msgstr "フォルダーの選択" +#~ msgid "If true, the window statusbar is visible." +#~ msgstr "true の場合、ウィンドウにステータスバーが表示されます。" -#: ../meld/ui/historyentry.py:445 -msgid "Select file" -msgstr "ファイルの選択" +#~ msgid "Editable List" +#~ msgstr "編集可能なリスト" -#: ../meld/ui/notebooklabel.py:60 -msgid "Close tab" -msgstr "このタブを閉じます" +#~ msgid "Format as Patch..." +#~ msgstr "パッチを生成..." -#. These are the possible states of files. Be sure to get the colons correct. -#: ../meld/vc/_vc.py:40 -msgid "" -"Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:Missing" -msgstr "" -"Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:Missing" +#~ msgid "Meld Preferences" +#~ msgstr "Meld の設定" -#: ../meld/vc/cvs.py:163 -#, python-format -msgid "" -"Error converting to a regular expression\n" -"The pattern was '%s'\n" -"The error was '%s'" -msgstr "" -"正規表現に変換する際にエラーが発生しました\n" -"パターン: '%s'\n" -"エラー: '%s'" +#~ msgid "INS" +#~ msgstr "[挿入]" + +#~ msgid "OVR" +#~ msgstr "[上書き]" + +#~ msgid "_Save as UTF-8" +#~ msgstr "UTF-8 で保存(_S)" + +#~ msgid "Couldn't encode text as “%s”" +#~ msgstr "テキストを “%s” でエンコードできませんでした" + +#~ msgid "Find..." +#~ msgstr "検索..." + +#~ msgid "_Replace..." +#~ msgstr "置換(_R)..." + +#~ msgid "_Toolbar" +#~ msgstr "ツールバー(_T)" + +#~ msgid "Show or hide the toolbar" +#~ msgstr "ツールバーを表示または非表示にします" + +#~ msgid "_Meld" +#~ msgstr "Meld(_M)" + +#~ msgid "Quit the program" +#~ msgstr "プログラムを終了します" + +#~ msgid "Prefere_nces" +#~ msgstr "設定(_N)" -#~ msgid "Compare Options" -#~ msgstr "比較のオプション" +#~ msgid "Configure the application" +#~ msgstr "Meld を設定します" -#~ msgid "Date" -#~ msgstr "日付" +#~ msgid "_Contents" +#~ msgstr "目次(_C)" -#~ msgid "Local copy against other remote revision" -#~ msgstr "リモートの他のリビジョンをローカルへコピーする" +#~ msgid "Open the Meld manual" +#~ msgstr "Meld のマニュアルを開きます" -#~ msgid "Local copy against same remote revision" -#~ msgstr "リモートの同じリビジョンをローカルへコピーする" +#~ msgid "About this application" +#~ msgstr "このアプリケーションについて" From 1b52d7fd704b30dd138aa4175f1acb503096c289 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20St=C3=B6ggl?= Date: Tue, 8 Jan 2019 18:53:46 +0000 Subject: [PATCH 0776/1316] Update German translation (cherry picked from commit e9a5e81d9920bf1c4a08dee35915d156f0201e9f) --- po/de.po | 240 +++++++++++++++++++++++++++---------------------------- 1 file changed, 118 insertions(+), 122 deletions(-) diff --git a/po/de.po b/po/de.po index ebc4a235..2ed27c0c 100644 --- a/po/de.po +++ b/po/de.po @@ -9,33 +9,34 @@ # Benjamin Steinwender , 2014. # Bernd Homuth , 2015. # Paul Seyfert , 2017. +# Wolfgang Stöggl , 2019. # msgid "" msgstr "" "Project-Id-Version: meld master\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n" -"POT-Creation-Date: 2018-06-30 21:32+0000\n" -"PO-Revision-Date: 2018-08-03 10:53+0200\n" -"Last-Translator: Mario Blättermann \n" +"POT-Creation-Date: 2019-01-07 09:44+0000\n" +"PO-Revision-Date: 2019-01-08 16:49+0100\n" +"Last-Translator: Wolfgang Stoeggl \n" "Language-Team: Deutsch \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 2.0.9\n" +"X-Generator: Poedit 2.2\n" "X-Poedit-Bookmarks: -1,351,-1,-1,-1,-1,-1,-1,-1,-1\n" -#: ../bin/meld:190 +#: ../bin/meld:194 msgid "Cannot import: " msgstr "Import nicht möglich: " -#: ../bin/meld:193 +#: ../bin/meld:197 #, c-format msgid "Meld requires %s or higher." msgstr "Meld benötigt %s oder aktueller." -#: ../bin/meld:239 +#: ../bin/meld:243 #, c-format msgid "" "Couldn’t load Meld-specific CSS (%s)\n" @@ -86,7 +87,7 @@ msgid "" "merge conflicts slightly less painful." msgstr "" "Meld hilft Ihnen Quelltext-Änderungen durchzusehen, Patches zu verstehen und " -"bereitet Ihnen bei großen Zusammenführungskonflikten etwas wenige " +"bereitet Ihnen bei großen Zusammenführungskonflikten etwas weniger " "Kopfschmerzen." #: ../data/org.gnome.meld.appdata.xml.in.h:5 @@ -351,7 +352,7 @@ msgid "" "resolution." msgstr "" "Die minimale Differenz in Nanosekunden zwischen zwei Dateien beim Vergleich " -"basierend auf mtime (Datum der letzen Änderung), bevor die Dateien als " +"basierend auf mtime (Datum der letzten Änderung), bevor die Dateien als " "verschieden gelten. Diese Funktion ist nützlich beim Vergleichen von Dateien " "auf unterschiedlichen Dateisystemen mit verschiedenen Zeitauflösungen." @@ -615,7 +616,7 @@ msgstr "Nach rechts kopieren" msgid "Delete selected" msgstr "Markierte löschen" -#: ../data/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:871 ../meld/filediff.py:1471 +#: ../data/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:907 ../meld/filediff.py:1497 msgid "Hide" msgstr "Verbergen" @@ -706,7 +707,7 @@ msgstr "Hin_unter schieben" #. Create icon and filename CellRenderer #: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35 -#: ../meld/dirdiff.py:371 +#: ../meld/dirdiff.py:407 msgid "Name" msgstr "Name" @@ -911,8 +912,8 @@ msgstr "Wenn Sie nicht speichern, gehen die Änderungen verloren." msgid "Close _without Saving" msgstr "Schließen _ohne zu Speichern" -#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:952 ../meld/filediff.py:1580 -#: ../meld/iohelpers.py:50 ../meld/iohelpers.py:100 +#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:988 ../meld/iohelpers.py:50 +#: ../meld/iohelpers.py:100 msgid "_Cancel" msgstr "A_bbrechen" @@ -953,7 +954,7 @@ msgstr "Änderungen der folgenden Dokumente werden verloren gehen:" msgid "_Discard" msgstr "_Verwerfen" -#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:953 ../meld/iohelpers.py:101 +#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:989 ../meld/iohelpers.py:101 msgid "_Replace" msgstr "E_rsetzen" @@ -1700,44 +1701,44 @@ msgid "Mac OS (CR)" msgstr "Mac OS (CR)" #. Create file size CellRenderer -#: ../meld/dirdiff.py:392 ../meld/preferences.py:82 +#: ../meld/dirdiff.py:428 ../meld/preferences.py:81 msgid "Size" msgstr "Größe" #. Create date-time CellRenderer -#: ../meld/dirdiff.py:400 ../meld/preferences.py:83 +#: ../meld/dirdiff.py:436 ../meld/preferences.py:82 msgid "Modification time" msgstr "Änderungszeit" #. Create permissions CellRenderer -#: ../meld/dirdiff.py:408 ../meld/preferences.py:84 +#: ../meld/dirdiff.py:444 ../meld/preferences.py:83 msgid "Permissions" msgstr "Berechtigungen" -#: ../meld/dirdiff.py:539 +#: ../meld/dirdiff.py:575 #, python-format msgid "Hide %s" msgstr "%s verbergen" -#: ../meld/dirdiff.py:680 ../meld/dirdiff.py:703 +#: ../meld/dirdiff.py:716 ../meld/dirdiff.py:739 #, python-format msgid "[%s] Scanning %s" msgstr "[%s] %s wird durchsucht" -#: ../meld/dirdiff.py:838 +#: ../meld/dirdiff.py:874 #, python-format msgid "[%s] Done" msgstr "[%s] Fertig" -#: ../meld/dirdiff.py:846 +#: ../meld/dirdiff.py:882 msgid "Folders have no differences" msgstr "Keine Unterschiede zwischen Ordnern" -#: ../meld/dirdiff.py:848 +#: ../meld/dirdiff.py:884 msgid "Contents of scanned files in folders are identical." msgstr "Inhalte der untersuchten Dateien in den Ordnern sind identisch." -#: ../meld/dirdiff.py:850 +#: ../meld/dirdiff.py:886 msgid "" "Scanned files in folders appear identical, but contents have not been " "scanned." @@ -1745,43 +1746,43 @@ msgstr "" "Untersuchte Dateien in den Ordner scheinen identisch zu sein, jedoch wurden " "die Dateiinhalte nicht geprüft." -#: ../meld/dirdiff.py:853 +#: ../meld/dirdiff.py:889 msgid "File filters are in use, so not all files have been scanned." msgstr "" "Dateifilter wurden verwendet, deshalb wurden nicht alle Dateien untersucht." -#: ../meld/dirdiff.py:855 +#: ../meld/dirdiff.py:891 msgid "Text filters are in use and may be masking content differences." msgstr "" "Textfilter werden verwendet, welche Unterschiede zwischen Dateien maskieren " "könnten." -#: ../meld/dirdiff.py:873 ../meld/filediff.py:1473 ../meld/filediff.py:1503 -#: ../meld/filediff.py:1505 ../meld/ui/msgarea.py:106 ../meld/ui/msgarea.py:119 +#: ../meld/dirdiff.py:909 ../meld/filediff.py:1499 ../meld/filediff.py:1529 +#: ../meld/filediff.py:1531 ../meld/ui/msgarea.py:106 ../meld/ui/msgarea.py:119 msgid "Hi_de" msgstr "Ver_bergen" -#: ../meld/dirdiff.py:882 +#: ../meld/dirdiff.py:918 msgid "Multiple errors occurred while scanning this folder" msgstr "Beim Einlesen dieses Ordners traten mehrere Fehler auf" -#: ../meld/dirdiff.py:883 +#: ../meld/dirdiff.py:919 msgid "Files with invalid encodings found" msgstr "Dateien mit ungültigen Kodierungen gefunden" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:885 +#: ../meld/dirdiff.py:921 msgid "Some files were in an incorrect encoding. The names are something like:" msgstr "" "Einige Dateien lagen in einer inkorrekten Kodierung vor. Folgende Namen sind " "davon betroffen:" -#: ../meld/dirdiff.py:887 +#: ../meld/dirdiff.py:923 msgid "Files hidden by case insensitive comparison" msgstr "Dateien durch von Schreibweise unabhängigen Vergleich verborgen" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:889 +#: ../meld/dirdiff.py:925 msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. The following files in this folder are hidden:" @@ -1790,17 +1791,17 @@ msgstr "" "auf einem Dateisystem durch, welches zwischen Groß- und Kleinschreibung " "unterscheidet. Die folgenden Dateien in diesem Ordner sind nicht sichtbar:" -#: ../meld/dirdiff.py:900 +#: ../meld/dirdiff.py:936 #, python-format msgid "“%s” hidden by “%s”" msgstr "»%s« verborgen durch »%s«" -#: ../meld/dirdiff.py:956 +#: ../meld/dirdiff.py:992 #, python-format msgid "Replace folder “%s”?" msgstr "Ordner »%s« ersetzen?" -#: ../meld/dirdiff.py:958 +#: ../meld/dirdiff.py:994 #, python-format msgid "" "Another folder with the same name already exists in “%s”.\n" @@ -1809,11 +1810,11 @@ msgstr "" "Ein Ordner mit diesem Namen existiert bereits in »%s«.\n" "Wenn Sie den vorhandenen Ordner ersetzen, gehen alle Dateien darin verloren." -#: ../meld/dirdiff.py:971 +#: ../meld/dirdiff.py:1007 msgid "Error copying file" msgstr "Fehler beim Kopieren der Datei" -#: ../meld/dirdiff.py:972 +#: ../meld/dirdiff.py:1008 #, python-format msgid "" "Couldn’t copy %s\n" @@ -1826,19 +1827,19 @@ msgstr "" "\n" "%s" -#: ../meld/dirdiff.py:997 ../meld/vcview.py:703 +#: ../meld/dirdiff.py:1033 ../meld/vcview.py:703 msgid "Error deleting {}" msgstr "Fehler beim Löschen von {}" -#: ../meld/dirdiff.py:1519 +#: ../meld/dirdiff.py:1546 msgid "No folder" msgstr "Kein Ordner" -#: ../meld/filediff.py:816 +#: ../meld/filediff.py:834 msgid "Comparison results will be inaccurate" msgstr "Ergebnisse werden ungenau sein" -#: ../meld/filediff.py:818 +#: ../meld/filediff.py:836 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1847,66 +1848,66 @@ msgstr "" "nicht unterstützt, deshalb wird ein Vergleich keine korrekten Ergebnisse " "liefern." -#: ../meld/filediff.py:875 +#: ../meld/filediff.py:905 msgid "Mark conflict as resolved?" msgstr "Konflikt als _gelöst markieren?" -#: ../meld/filediff.py:877 +#: ../meld/filediff.py:907 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:879 +#: ../meld/filediff.py:909 msgid "Cancel" msgstr "Abbrechen" -#: ../meld/filediff.py:880 +#: ../meld/filediff.py:910 msgid "Mark _Resolved" msgstr "Als _gelöst markieren" -#: ../meld/filediff.py:1188 +#: ../meld/filediff.py:1214 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Beim Öffnen der Datei »%s« ist ein Fehler aufgetreten." -#: ../meld/filediff.py:1196 +#: ../meld/filediff.py:1222 #, python-format msgid "File %s appears to be a binary file." msgstr "Datei %s scheint eine Binärdatei zu sein." -#: ../meld/filediff.py:1198 +#: ../meld/filediff.py:1224 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:1200 +#: ../meld/filediff.py:1226 msgid "Open" msgstr "Öffnen" -#: ../meld/filediff.py:1216 +#: ../meld/filediff.py:1242 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Unterschiede werden berechnet" -#: ../meld/filediff.py:1277 +#: ../meld/filediff.py:1303 #, python-format msgid "File %s has changed on disk" msgstr "Die Datei %s wurde auf dem Datenträger geändert" -#: ../meld/filediff.py:1278 +#: ../meld/filediff.py:1304 msgid "Do you want to reload the file?" msgstr "Möchten Sie die Datei neu laden?" -#: ../meld/filediff.py:1280 +#: ../meld/filediff.py:1306 msgid "_Reload" msgstr "_Neu laden" -#: ../meld/filediff.py:1436 +#: ../meld/filediff.py:1462 msgid "Files are identical" msgstr "Dateien sind identisch" -#: ../meld/filediff.py:1449 +#: ../meld/filediff.py:1475 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1914,11 +1915,11 @@ msgstr "" "Textfilter werden verwendet, welche Unterschiede zwischen Dateien maskieren " "könnten. Wollen Sie die ungefilterten Dateien vergleichen?" -#: ../meld/filediff.py:1454 +#: ../meld/filediff.py:1480 msgid "Files differ in line endings only" msgstr "Dateien unterscheiden sich nur in den Zeilenendungen" -#: ../meld/filediff.py:1456 +#: ../meld/filediff.py:1482 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1927,15 +1928,15 @@ msgstr "" "Dateien sind identisch, abgesehen von unterschiedlichen Zeilenenden:\n" "%s" -#: ../meld/filediff.py:1476 +#: ../meld/filediff.py:1502 msgid "Show without filters" msgstr "Ungefiltert anzeigen" -#: ../meld/filediff.py:1498 +#: ../meld/filediff.py:1524 msgid "Change highlighting incomplete" msgstr "Änderungsmarkierung unvollständig" -#: ../meld/filediff.py:1499 +#: ../meld/filediff.py:1525 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 +1945,19 @@ msgstr "" "Sie können Meld zur Hervorhebung längerer Änderungen zwingen, was jedoch " "langsam sein könnte." -#: ../meld/filediff.py:1507 +#: ../meld/filediff.py:1533 msgid "Keep highlighting" msgstr "Hervorhebung fortführen" -#: ../meld/filediff.py:1509 +#: ../meld/filediff.py:1535 msgid "_Keep highlighting" msgstr "Hervorhebung _fortführen" -#: ../meld/filediff.py:1522 +#: ../meld/filediff.py:1548 msgid "Saving failed" msgstr "Speichern ist fehlgeschlagen" -#: ../meld/filediff.py:1523 +#: ../meld/filediff.py:1549 msgid "" "Please consider copying any critical changes to another program or file to " "avoid data loss." @@ -1964,58 +1965,43 @@ 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:1532 +#: ../meld/filediff.py:1558 msgid "Save Left Pane As" msgstr "Linke Ansicht speichern unter" -#: ../meld/filediff.py:1534 +#: ../meld/filediff.py:1560 msgid "Save Middle Pane As" msgstr "Mittlere Ansicht speichern unter" -#: ../meld/filediff.py:1536 +#: ../meld/filediff.py:1562 msgid "Save Right Pane As" msgstr "Rechte Ansicht speichern unter" -#: ../meld/filediff.py:1549 +#: ../meld/filediff.py:1575 #, 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:1551 +#: ../meld/filediff.py:1577 msgid "If you save it, any external changes will be lost." msgstr "Wenn Sie speichern, gehen externe Änderungen verloren." -#: ../meld/filediff.py:1554 +#: ../meld/filediff.py:1580 msgid "Save Anyway" msgstr "Dennoch speichern" -#: ../meld/filediff.py:1555 +#: ../meld/filediff.py:1581 msgid "Don’t Save" msgstr "Nicht speichern" -#: ../meld/filediff.py:1581 -msgid "_Save as UTF-8" -msgstr "Als UTF-8 _speichern" - -#: ../meld/filediff.py:1584 -#, python-format -msgid "Couldn’t encode text as “%s”" -msgstr "Text konnte nicht als »%s« kodiert werden." - -#: ../meld/filediff.py:1586 -#, python-format +#: ../meld/filediff.py:1623 msgid "" -"File “%s” contains characters that can’t be encoded using encoding “%s”.\n" -"Would you like to save as UTF-8?" +"File “{}” contains characters that can’t be encoded using its current " +"encoding “{}”." msgstr "" -"Die Datei »%s« enthält Zeichen, die mit »%s« nicht kodierbar sind.\n" -"Möchten Sie im UTF-8-Format speichern?" - -#: ../meld/filediff.py:1626 ../meld/patchdialog.py:130 -#, python-format -msgid "Could not save file %s." -msgstr "Datei %s konnte nicht gespeichert werden." +"Die Datei »{}« enthält Zeichen, die mit der aktuellen Kodierung »{}« nicht " +"kodierbar sind." #: ../meld/filediff.py:1627 ../meld/patchdialog.py:131 #, python-format @@ -2026,11 +2012,16 @@ msgstr "" "Datei konnte nicht gespeichert werden:\n" "%s" -#: ../meld/filediff.py:2002 +#: ../meld/filediff.py:1631 ../meld/patchdialog.py:130 +#, python-format +msgid "Could not save file %s." +msgstr "Datei %s konnte nicht gespeichert werden." + +#: ../meld/filediff.py:2014 msgid "Live comparison updating disabled" msgstr "Direkte Vergleichsaktualisierung deaktiviert" -#: ../meld/filediff.py:2003 +#: ../meld/filediff.py:2015 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -2092,99 +2083,99 @@ msgstr "" "Eine Datei mit diesem Namen existiert bereits in »%s«.\n" "Wenn Sie die vorhandene Datei ersetzen, geht dessen Inhalt verloren." -#: ../meld/meldapp.py:179 +#: ../meld/meldapp.py:181 msgid "wrong number of arguments supplied to --diff" msgstr "Falsche Anzahl an Argumenten für --diff" -#: ../meld/meldapp.py:184 +#: ../meld/meldapp.py:186 msgid "Start with an empty window" msgstr "Beim Start kein Fenster öffnen" -#: ../meld/meldapp.py:185 ../meld/meldapp.py:187 +#: ../meld/meldapp.py:187 ../meld/meldapp.py:189 msgid "file" msgstr "Datei" -#: ../meld/meldapp.py:185 ../meld/meldapp.py:189 +#: ../meld/meldapp.py:187 ../meld/meldapp.py:191 msgid "folder" msgstr "Ordner" -#: ../meld/meldapp.py:186 +#: ../meld/meldapp.py:188 msgid "Start a version control comparison" msgstr "Versionskontrollvergleich starten" -#: ../meld/meldapp.py:188 +#: ../meld/meldapp.py:190 msgid "Start a 2- or 3-way file comparison" msgstr "Im Zwei- oder Dreiwegevergleich starten" -#: ../meld/meldapp.py:190 +#: ../meld/meldapp.py:192 msgid "Start a 2- or 3-way folder comparison" msgstr "Einen Zwei- oder Dreiwegevergleich starten" -#: ../meld/meldapp.py:233 +#: ../meld/meldapp.py:235 #, python-format msgid "Error: %s\n" msgstr "Fehler: %s\n" -#: ../meld/meldapp.py:240 +#: ../meld/meldapp.py:242 msgid "Meld is a file and directory comparison tool." msgstr "Meld ist ein Werkzeug zum Vergleichen von Dateien und Ordnern." -#: ../meld/meldapp.py:244 +#: ../meld/meldapp.py:246 msgid "Set label to use instead of file name" msgstr "Zu verwendende Bezeichnung anstelle Dateinamen angeben" -#: ../meld/meldapp.py:247 +#: ../meld/meldapp.py:249 msgid "Open a new tab in an already running instance" msgstr "Einen neuen Reiter in einer bereits laufenden Instanz öffnen" -#: ../meld/meldapp.py:250 +#: ../meld/meldapp.py:252 msgid "Automatically compare all differing files on startup" msgstr "Automatisch alle sich unterscheidenden Dateien beim Start vergleichen" -#: ../meld/meldapp.py:253 +#: ../meld/meldapp.py:255 msgid "Ignored for compatibility" msgstr "Aus Kompatibilitätsgründen ignoriert" -#: ../meld/meldapp.py:257 +#: ../meld/meldapp.py:259 msgid "Set the target file for saving a merge result" msgstr "Zieldatei zum Speichern einer Zusammenführung festlegen" -#: ../meld/meldapp.py:260 +#: ../meld/meldapp.py:262 msgid "Automatically merge files" msgstr "Dateien automatisch zusammenführen" -#: ../meld/meldapp.py:264 +#: ../meld/meldapp.py:266 msgid "Load a saved comparison from a Meld comparison file" msgstr "Einen abgespeicherten Vergleich aus einer Meld-Vergleichsdatei laden" -#: ../meld/meldapp.py:268 +#: ../meld/meldapp.py:270 msgid "Create a diff tab for the supplied files or folders" msgstr "Erzeugt einen Differenz-Reiter für die angegebenen Dateien oder Ordner" -#: ../meld/meldapp.py:288 +#: ../meld/meldapp.py:290 #, python-format msgid "too many arguments (wanted 0-3, got %d)" msgstr "zu viele Argumente (0-3 erforderlich, %d erhalten)" -#: ../meld/meldapp.py:291 +#: ../meld/meldapp.py:293 msgid "can’t auto-merge less than 3 files" msgstr "" "Mit weniger als 3 Dateien ist keine automatische Zusammenführung möglich" -#: ../meld/meldapp.py:293 +#: ../meld/meldapp.py:295 msgid "can’t auto-merge directories" msgstr "Ordner können nicht automatisch zusammengeführt werden" -#: ../meld/meldapp.py:307 +#: ../meld/meldapp.py:309 msgid "Error reading saved comparison file" msgstr "Fehler beim Lesen der gespeicherten Vergleichsdatei" -#: ../meld/meldapp.py:324 +#: ../meld/meldapp.py:326 #, python-format msgid "invalid path or URI “%s”" msgstr "Ungültiger Pfad oder Adresse »%s«" -#: ../meld/meldapp.py:330 +#: ../meld/meldapp.py:332 msgid "remote folder “{}” not supported" msgstr "Entfernter Ordner »{}« wird nicht unterstützt" @@ -2399,7 +2390,7 @@ msgstr "Drei Dateien zum automatischen Zusammenführen benötigt, %r erhalten." msgid "Cannot compare a mixture of files and directories" msgstr "Es kann keine Mischung aus Dateien und Ordnern verglichen werden" -#: ../meld/misc.py:134 +#: ../meld/misc.py:135 msgid "" "{}\n" "\n" @@ -2411,15 +2402,14 @@ msgstr "" "Meld entdeckte einen kritischen Fehler während der Ausführung:\n" "{}" -#: ../meld/misc.py:253 +#: ../meld/misc.py:254 #, python-format msgid "Couldn’t find colour scheme details for %s-%s; this is a bad install" msgstr "" "Farbschema-Details für %s-%s konnten nicht gefunden werden, die Installation " "ist fehlerhaft" -#. no common path. empty names get changed to "[None]" -#: ../meld/misc.py:314 +#: ../meld/misc.py:325 msgid "[None]" msgstr "[Nichts]" @@ -2449,12 +2439,12 @@ msgid "Close tab" msgstr "Reiter schließen" #. Abbreviation for line, column so that it will fit in the status bar -#: ../meld/ui/statusbar.py:133 +#: ../meld/ui/statusbar.py:124 #, python-format msgid "Ln %i, Col %i" msgstr "Zeile %i, Spalte %i" -#: ../meld/ui/statusbar.py:186 +#: ../meld/ui/statusbar.py:177 msgid "Line you want to move the cursor to" msgstr "Zeile, zu der der Zeiger bewegt werden soll" @@ -2654,3 +2644,9 @@ msgstr "" #: ../meld/vcview.py:785 msgid "Clear" msgstr "Leeren" + +#~ msgid "_Save as UTF-8" +#~ msgstr "Als UTF-8 _speichern" + +#~ msgid "Couldn’t encode text as “%s”" +#~ msgstr "Text konnte nicht als »%s« kodiert werden." From 32d3c48896bc6e16db0144d0a9d5cf01e280ffd0 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Wed, 9 Jan 2019 07:21:55 +1000 Subject: [PATCH 0777/1316] patchdialog: Make the side selection radiobuttons actually work It seems like this hasn't worked for half a decade, but it's entirely possible that some GTK+ change made our mistake here more obvious. --- meld/patchdialog.py | 1 + meld/resources/ui/patch-dialog.ui | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/meld/patchdialog.py b/meld/patchdialog.py index c5c4975a..1e9fdc5c 100644 --- a/meld/patchdialog.py +++ b/meld/patchdialog.py @@ -74,6 +74,7 @@ def on_setting_changed(self, setting, key): if key == "font": self.textview.modify_font(meldsettings.font) + @Template.Callback() def on_buffer_selection_changed(self, radiobutton): if not radiobutton.get_active(): return diff --git a/meld/resources/ui/patch-dialog.ui b/meld/resources/ui/patch-dialog.ui index e8dd3e83..732b2373 100644 --- a/meld/resources/ui/patch-dialog.ui +++ b/meld/resources/ui/patch-dialog.ui @@ -126,8 +126,9 @@ True False 0 - True + False True + left_radiobutton From 6d7c7b7de3668adc83d0f966cf8695b4348ef00a Mon Sep 17 00:00:00 2001 From: Vasily Galkin Date: Tue, 8 Jan 2019 15:36:40 +0300 Subject: [PATCH 0778/1316] gtktemplate: fix prototype tested on debian It looks that when init_template lambda attaching was changed from class to instance in https://gitlab.gnome.org/GNOME/pygobject/commit/05c3b8dc91f5d51bd30bbe58963a4454b447b707 it argument list should change too. I tested with printfs that when if it is called for class attaching it receives self as "s", and for instance attaching - no arguments This change fixes "missing 1 required positional argument: 's'" exception After that meld opens but with empty window. It looks to be related to the fact that MeldWindow tried to call MeldWindow.init_template class method resulting in second-time call of actual method, since only instance method was replaced to empty in first call, not the class one (I think that the first call is from "newer" python-gi 3.30.4-1 and second call from meld itself) Changing this to instance method solves this problem, however I didn't tested on older python-gi Digging a bit more, I found that the "Format as patch" dialog UI - the 3-pane radiobuttons and reversing checkbox doesn't work. The checkbox can be fixed by a simple addition of @Template.Callback() but the radiobuttons don't --- meld/meldwindow.py | 2 +- meld/patchdialog.py | 1 + meld/ui/_gtktemplate.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meld/meldwindow.py b/meld/meldwindow.py index 67b4b39f..87825b7c 100644 --- a/meld/meldwindow.py +++ b/meld/meldwindow.py @@ -50,7 +50,7 @@ class MeldWindow(Gtk.ApplicationWindow): def __init__(self): super().__init__() - MeldWindow.init_template(self) + self.init_template() actions = ( ("FileMenu", None, _("_File")), diff --git a/meld/patchdialog.py b/meld/patchdialog.py index 1e9fdc5c..75e187e9 100644 --- a/meld/patchdialog.py +++ b/meld/patchdialog.py @@ -81,6 +81,7 @@ def on_buffer_selection_changed(self, radiobutton): self.left_patch = radiobutton == self.left_radiobutton self.update_patch() + @Template.Callback() def on_reverse_checkbutton_toggled(self, checkbutton): self.reverse_patch = checkbutton.get_active() self.update_patch() diff --git a/meld/ui/_gtktemplate.py b/meld/ui/_gtktemplate.py index 8067de5c..72e3f36d 100644 --- a/meld/ui/_gtktemplate.py +++ b/meld/ui/_gtktemplate.py @@ -101,7 +101,7 @@ def register_template(cls): def init_template(self, cls, base_init_template): - self.init_template = lambda s: None + self.init_template = lambda: None if self.__class__ is not cls: raise TypeError( From a059e6cf4cb7a9ec8ecc7c7d80b7872108cdb935 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Wed, 9 Jan 2019 07:39:08 +1000 Subject: [PATCH 0779/1316] ui._gtktemplate: Be as lenient as possible in the template signature --- meld/ui/_gtktemplate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meld/ui/_gtktemplate.py b/meld/ui/_gtktemplate.py index 72e3f36d..c1d15628 100644 --- a/meld/ui/_gtktemplate.py +++ b/meld/ui/_gtktemplate.py @@ -101,7 +101,7 @@ def register_template(cls): def init_template(self, cls, base_init_template): - self.init_template = lambda: None + self.init_template = lambda *args: None if self.__class__ is not cls: raise TypeError( From a70290c723a4b2f38a7360163ebb80eb0fc9641c Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Wed, 9 Jan 2019 08:35:30 +1000 Subject: [PATCH 0780/1316] iohelpers: Handle trash-related errors with NFS mounts (#268) NFS gives a different error code to other network mounts for some reason. Annoyingly, it's a generic error code so while I'm hesitant to blanket handle it like this... really we're putting up a confirmation dialog here so it's not the worst thing. --- meld/iohelpers.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/meld/iohelpers.py b/meld/iohelpers.py index e4f74b2e..53006475 100644 --- a/meld/iohelpers.py +++ b/meld/iohelpers.py @@ -25,9 +25,15 @@ def trash_or_confirm(gfile: Gio.File) -> bool: gfile.trash(None) return True except GLib.GError as e: - # Only handle not-supported, as that's due to trashing - # the target mount-point, not an underlying problem. - if e.code != Gio.IOErrorEnum.NOT_SUPPORTED: + # Handle not-supported, as that's due to the trashing target + # being a (probably network) mount-point, not an underlying + # problem. We also have to handle the generic FAILED code + # because that's what we get with NFS mounts. + expected_error = ( + e.code == Gio.IOErrorEnum.NOT_SUPPORTED or + e.code == Gio.IOErrorEnum.FAILED + ) + if not expected_error: raise RuntimeError(str(e)) file_type = gfile.query_file_type( From 4bf1d1b06d823a733817080ba8c7322999d743cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20St=C3=B6ggl?= Date: Thu, 10 Jan 2019 12:52:35 +0000 Subject: [PATCH 0781/1316] Update German translation --- po/de.po | 1995 +++++++++++++++++++++++++++--------------------------- 1 file changed, 998 insertions(+), 997 deletions(-) diff --git a/po/de.po b/po/de.po index 2ed27c0c..781a578a 100644 --- a/po/de.po +++ b/po/de.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: meld master\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n" -"POT-Creation-Date: 2019-01-07 09:44+0000\n" -"PO-Revision-Date: 2019-01-08 16:49+0100\n" +"POT-Creation-Date: 2019-01-08 18:54+0000\n" +"PO-Revision-Date: 2019-01-10 13:49+0100\n" "Last-Translator: Wolfgang Stoeggl \n" "Language-Team: Deutsch \n" "Language: de\n" @@ -27,16 +27,16 @@ msgstr "" "X-Generator: Poedit 2.2\n" "X-Poedit-Bookmarks: -1,351,-1,-1,-1,-1,-1,-1,-1,-1\n" -#: ../bin/meld:194 +#: ../bin/meld:190 msgid "Cannot import: " msgstr "Import nicht möglich: " -#: ../bin/meld:197 +#: ../bin/meld:193 #, c-format msgid "Meld requires %s or higher." msgstr "Meld benötigt %s oder aktueller." -#: ../bin/meld:243 +#: ../bin/meld:249 #, c-format msgid "" "Couldn’t load Meld-specific CSS (%s)\n" @@ -46,7 +46,8 @@ msgstr "" "%s" #: ../data/org.gnome.meld.desktop.in.h:1 -#: ../data/org.gnome.meld.appdata.xml.in.h:1 ../data/ui/meldapp.ui.h:1 +#: ../data/org.gnome.meld.appdata.xml.in.h:1 +#: ../meld/resources/ui/appwindow.ui.h:1 msgid "Meld" msgstr "Meld" @@ -115,28 +116,10 @@ msgid "Default window fullscreen state" msgstr "Voreingestellter Vollbildzustand des Fensters" #: ../data/org.gnome.meld.gschema.xml.h:5 -msgid "Show toolbar" -msgstr "Werkzeugleiste anzeigen" - -#: ../data/org.gnome.meld.gschema.xml.h:6 -msgid "If true, the window toolbar is visible." -msgstr "" -"Wenn dieser Schlüssel wahr ist, so ist die Fenster-Werkzeugleiste sichtbar." - -#: ../data/org.gnome.meld.gschema.xml.h:7 -msgid "Show statusbar" -msgstr "Statusleiste anzeigen" - -#: ../data/org.gnome.meld.gschema.xml.h:8 -msgid "If true, the window statusbar is visible." -msgstr "" -"Wenn dieser Schlüssel wahr ist, so ist die Fenster-Statusleiste sichtbar." - -#: ../data/org.gnome.meld.gschema.xml.h:9 msgid "Additional automatically detected text encodings" msgstr "Zusätzliche automatisch erkannte Textkodierungen" -#: ../data/org.gnome.meld.gschema.xml.h:10 +#: ../data/org.gnome.meld.gschema.xml.h:6 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 " @@ -149,42 +132,42 @@ msgstr "" "aktuellen Spracheinstellung versucht. Andere Kodierungen können ebenfalls " "versucht werden, abhängig von der Spracheinstellung des Benutzers." -#: ../data/org.gnome.meld.gschema.xml.h:11 +#: ../data/org.gnome.meld.gschema.xml.h:7 msgid "Width of an indentation step" msgstr "Breite eines Einrückungsschritts" -#: ../data/org.gnome.meld.gschema.xml.h:12 +#: ../data/org.gnome.meld.gschema.xml.h:8 msgid "The number of spaces to use for a single indent step" msgstr "" "Die Anzahl an zu verwendender Leerzeichen für einen einfachen " "Einrückungsschritt" -#: ../data/org.gnome.meld.gschema.xml.h:13 +#: ../data/org.gnome.meld.gschema.xml.h:9 msgid "Whether to indent using spaces or tabs" msgstr "" "Legt fest, ob mit Leerzeichen oder Tabulatorzeichen eingerückt werden soll" -#: ../data/org.gnome.meld.gschema.xml.h:14 +#: ../data/org.gnome.meld.gschema.xml.h:10 msgid "If true, any new indentation will use spaces instead of tabs." msgstr "" "Wenn dieser Schlüssel wahr ist, werden für neue Einrückungen Leerzeichen " "anstellen von Tabulatoren verwenden." -#: ../data/org.gnome.meld.gschema.xml.h:15 +#: ../data/org.gnome.meld.gschema.xml.h:11 msgid "Show line numbers" msgstr "Zeilennummern anzeigen" -#: ../data/org.gnome.meld.gschema.xml.h:16 +#: ../data/org.gnome.meld.gschema.xml.h:12 msgid "If true, line numbers will be shown in the gutter of file comparisons." msgstr "" "Wenn dieser Schlüssel wahr ist, werden Zeilennummern im Seitenbereich der " "Dateivergleiche angezeigt." -#: ../data/org.gnome.meld.gschema.xml.h:17 +#: ../data/org.gnome.meld.gschema.xml.h:13 msgid "Highlight syntax" msgstr "Quelltext hervorheben" -#: ../data/org.gnome.meld.gschema.xml.h:18 +#: ../data/org.gnome.meld.gschema.xml.h:14 msgid "" "Whether to highlight syntax in comparisons. Because of Meld’s own color " "highlighting, this is off by default." @@ -193,21 +176,21 @@ msgstr "" "Weil Meld bereits eigene Farbhervorhebungen verwendet, ist diese Funktion " "standardmäßig deaktiviert." -#: ../data/org.gnome.meld.gschema.xml.h:19 +#: ../data/org.gnome.meld.gschema.xml.h:15 msgid "Color scheme to use for syntax highlighting" msgstr "Farbschema für Syntaxhervorhebung" -#: ../data/org.gnome.meld.gschema.xml.h:20 +#: ../data/org.gnome.meld.gschema.xml.h:16 msgid "Used by GtkSourceView to determine colors for syntax highlighting" msgstr "" "Wird von GtkSourceView verwendet, um Farben für die Syntaxhervorhebung zu " "bestimmen" -#: ../data/org.gnome.meld.gschema.xml.h:21 +#: ../data/org.gnome.meld.gschema.xml.h:17 msgid "Displayed whitespace" msgstr "Angezeigtes Leerzeichen" -#: ../data/org.gnome.meld.gschema.xml.h:22 +#: ../data/org.gnome.meld.gschema.xml.h:18 msgid "" "Selector for individual whitespace character types to be shown. Possible " "values are 'space', 'tab', 'newline' and 'nbsp'." @@ -216,11 +199,11 @@ msgstr "" "»space« (Leerzeichen), »tab« (Tabulator), »newline« (Zeilenumbruch) und " "»nbsp« (geschütztes Leerzeichen)." -#: ../data/org.gnome.meld.gschema.xml.h:23 +#: ../data/org.gnome.meld.gschema.xml.h:19 msgid "Wrap mode" msgstr "Wortumbruch-Modus" -#: ../data/org.gnome.meld.gschema.xml.h:24 +#: ../data/org.gnome.meld.gschema.xml.h:20 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 " @@ -230,11 +213,11 @@ msgstr "" "Werte sind »none« (kein Umbruch), »char« (Umbruch bei beliebigen Zeichen) " "oder »word« (Umbruch nach Wortende)" -#: ../data/org.gnome.meld.gschema.xml.h:25 +#: ../data/org.gnome.meld.gschema.xml.h:21 msgid "Highlight current line" msgstr "Aktuelle Zeile hervorheben" -#: ../data/org.gnome.meld.gschema.xml.h:26 +#: ../data/org.gnome.meld.gschema.xml.h:22 msgid "" "If true, the line containing the cursor will be highlighted in file " "comparisons." @@ -242,22 +225,22 @@ msgstr "" "Wenn dieser Schlüssel wahr ist, wird in Dateivergleichen die Zeile " "hervorgehoben, in der sich die Textmarke befindet." -#: ../data/org.gnome.meld.gschema.xml.h:27 +#: ../data/org.gnome.meld.gschema.xml.h:23 msgid "Use the system default monospace font" msgstr "Die dicktengleiche Systemschrift verwenden" -#: ../data/org.gnome.meld.gschema.xml.h:28 +#: ../data/org.gnome.meld.gschema.xml.h:24 msgid "" "If false, custom-font will be used instead of the system monospace font." msgstr "" "Falls falsch, wird die angegebene Schriftart anstelle der systemweiten " "dicktengleichen Schriftart verwendet." -#: ../data/org.gnome.meld.gschema.xml.h:29 +#: ../data/org.gnome.meld.gschema.xml.h:25 msgid "Custom font" msgstr "Eigene Schriftart" -#: ../data/org.gnome.meld.gschema.xml.h:30 +#: ../data/org.gnome.meld.gschema.xml.h:26 msgid "" "The custom font to use, stored as a string and parsed as a Pango font " "description." @@ -265,22 +248,22 @@ msgstr "" "Die zu verwendende benutzerdefinierte Schriftart, als Zeichenkette " "gespeichert und von Pango als Schriftbeschreibung eingelesen." -#: ../data/org.gnome.meld.gschema.xml.h:31 +#: ../data/org.gnome.meld.gschema.xml.h:27 msgid "Ignore blank lines when comparing files" msgstr "Leere Zeilen beim Vergleichen ignorieren" -#: ../data/org.gnome.meld.gschema.xml.h:32 +#: ../data/org.gnome.meld.gschema.xml.h:28 msgid "" "If true, blank lines will be trimmed when highlighting changes between files." msgstr "" "Wenn dieser Schlüssel wahr ist, werden leere Zeilen beim Anzeigen der " "Änderungen zwischen Dateien ausgenommen." -#: ../data/org.gnome.meld.gschema.xml.h:33 +#: ../data/org.gnome.meld.gschema.xml.h:29 msgid "Use the system default editor" msgstr "Den vom System vorgegebenen Editor verwenden" -#: ../data/org.gnome.meld.gschema.xml.h:34 +#: ../data/org.gnome.meld.gschema.xml.h:30 msgid "" "If false, custom-editor-command will be used instead of the system editor " "when opening files externally." @@ -289,11 +272,11 @@ msgstr "" "Bearbeitungsprogramm anstelle des voreingestellten Bearbeitungsprogramms " "verwendet." -#: ../data/org.gnome.meld.gschema.xml.h:35 +#: ../data/org.gnome.meld.gschema.xml.h:31 msgid "The custom editor launch command" msgstr "Benutzerdefinierter Startbefehl für das Bearbeitungsprogramm" -#: ../data/org.gnome.meld.gschema.xml.h:36 +#: ../data/org.gnome.meld.gschema.xml.h:32 msgid "" "The command used to launch a custom editor. Some limited templating is " "supported here; at the moment '{file}' and '{line}' are recognised tokens." @@ -302,22 +285,23 @@ msgstr "" "zusätzliche Parameter können »{file}« (Datei) und »{line}« (Zeile) verwendet " "werden." -#: ../data/org.gnome.meld.gschema.xml.h:37 +#: ../data/org.gnome.meld.gschema.xml.h:33 msgid "Columns to display" msgstr "Anzuzeigende Spalten" -#: ../data/org.gnome.meld.gschema.xml.h:38 +#: ../data/org.gnome.meld.gschema.xml.h:34 msgid "" "List of column names in folder comparison and whether they should be " "displayed." msgstr "" "Liste der Spaltennamen im Ordnervergleich und ob sie angezeigt werden sollen." -#: ../data/org.gnome.meld.gschema.xml.h:39 ../data/ui/preferences.ui.h:25 +#: ../data/org.gnome.meld.gschema.xml.h:35 +#: ../meld/resources/ui/preferences.ui.h:25 msgid "Ignore symbolic links" msgstr "Symbolische Verknüpfungen ignorieren" -#: ../data/org.gnome.meld.gschema.xml.h:40 +#: ../data/org.gnome.meld.gschema.xml.h:36 msgid "" "If true, folder comparisons do not follow symbolic links when traversing the " "folder tree." @@ -325,11 +309,11 @@ msgstr "" "Wenn dieser Schlüssel wahr ist, werden Ordnervergleiche symbolischen " "Verknüpfungen nicht folgen." -#: ../data/org.gnome.meld.gschema.xml.h:41 +#: ../data/org.gnome.meld.gschema.xml.h:37 msgid "Use shallow comparison" msgstr "Oberflächlicher Vergleich" -#: ../data/org.gnome.meld.gschema.xml.h:42 +#: ../data/org.gnome.meld.gschema.xml.h:38 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 " @@ -340,11 +324,11 @@ msgstr "" "Dateien identisch sind, wenn deren Größe und Änderungsdatum identisch ist, " "ohne den Inhalt zu prüfen." -#: ../data/org.gnome.meld.gschema.xml.h:43 +#: ../data/org.gnome.meld.gschema.xml.h:39 msgid "File timestamp resolution" msgstr "Auflösung des Zeitstempels" -#: ../data/org.gnome.meld.gschema.xml.h:44 +#: ../data/org.gnome.meld.gschema.xml.h:40 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 " @@ -356,11 +340,12 @@ msgstr "" "verschieden gelten. Diese Funktion ist nützlich beim Vergleichen von Dateien " "auf unterschiedlichen Dateisystemen mit verschiedenen Zeitauflösungen." -#: ../data/org.gnome.meld.gschema.xml.h:45 ../data/ui/preferences.ui.h:22 +#: ../data/org.gnome.meld.gschema.xml.h:41 +#: ../meld/resources/ui/preferences.ui.h:22 msgid "Apply text filters during folder comparisons" msgstr "Textfilter während eines Ordnervergleichs anwenden" -#: ../data/org.gnome.meld.gschema.xml.h:46 +#: ../data/org.gnome.meld.gschema.xml.h:42 msgid "" "If true, folder comparisons that compare file contents also apply active " "text filters and the blank line trimming option, and ignore newline " @@ -370,19 +355,19 @@ msgstr "" "aktive Textfilter und das Leerzeilenabschneiden anwenden sowie Änderungen in " "den Leerzeilen ignorieren." -#: ../data/org.gnome.meld.gschema.xml.h:47 +#: ../data/org.gnome.meld.gschema.xml.h:43 msgid "File status filters" msgstr "Dateistatusfilter" -#: ../data/org.gnome.meld.gschema.xml.h:48 +#: ../data/org.gnome.meld.gschema.xml.h:44 msgid "List of statuses used to filter visible files in folder comparison." msgstr "Liste von Status, um sichtbare Dateien im Ordnervergleich zu filtern." -#: ../data/org.gnome.meld.gschema.xml.h:49 +#: ../data/org.gnome.meld.gschema.xml.h:45 msgid "Show the version control console output" msgstr "Die Ausgabe der Versionskontrolle anzeigen" -#: ../data/org.gnome.meld.gschema.xml.h:50 +#: ../data/org.gnome.meld.gschema.xml.h:46 msgid "" "If true, a console output section will be shown in version control views, " "showing the commands run for version control operations." @@ -391,11 +376,11 @@ msgstr "" "Anzeige der Befehle für die Versionskontrollhandlungen in " "Versionskontrollansichten angezeigt." -#: ../data/org.gnome.meld.gschema.xml.h:51 +#: ../data/org.gnome.meld.gschema.xml.h:47 msgid "Version control pane position" msgstr "Position der Versionskontrollansicht" -#: ../data/org.gnome.meld.gschema.xml.h:52 +#: ../data/org.gnome.meld.gschema.xml.h:48 msgid "" "This is the height of the main version control tree when the console pane is " "shown." @@ -403,11 +388,11 @@ msgstr "" "Die Höhe des Hauptversionskontrollbaumes, wenn der Bereich für die " "Konsolenanzeige geöffnet ist." -#: ../data/org.gnome.meld.gschema.xml.h:53 +#: ../data/org.gnome.meld.gschema.xml.h:49 msgid "Present version comparisons as left-local/right-remote" msgstr "Versionsvergleiche als links-lokal/rechts-entfernt darstellen" -#: ../data/org.gnome.meld.gschema.xml.h:54 +#: ../data/org.gnome.meld.gschema.xml.h:50 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, " @@ -418,12 +403,12 @@ msgstr "" "Reihenfolge Dateien in den Bereichen angezeigt werden sollen. Ansonsten wird " "die Methode links-ist-ihre, rechts-ist-meine verwendet." -#: ../data/org.gnome.meld.gschema.xml.h:55 +#: ../data/org.gnome.meld.gschema.xml.h:51 msgid "Order for files in three-way version control merge comparisons" msgstr "" "Dateireihenfolge in einem Drei-Wege Versionskontroll Zusammenfügevergleich" -#: ../data/org.gnome.meld.gschema.xml.h:56 +#: ../data/org.gnome.meld.gschema.xml.h:52 msgid "" "Choices for file order are remote/merged/local and local/merged/remote. This " "preference only affects three-way comparisons launched from the version " @@ -435,11 +420,11 @@ msgstr "" "Versionskontrollansicht gestartet werden und werden nur für Zusammenfügungen " "und Konfliktlösung in Meld verwendet." -#: ../data/org.gnome.meld.gschema.xml.h:57 +#: ../data/org.gnome.meld.gschema.xml.h:53 msgid "Show margin in commit message editor" msgstr "Den Rand im Einbringungsnachrichten-Editor anzeigen" -#: ../data/org.gnome.meld.gschema.xml.h:58 +#: ../data/org.gnome.meld.gschema.xml.h:54 msgid "" "If true, a guide will be displayed to show what column the margin is at in " "the version control commit message editor." @@ -447,22 +432,22 @@ msgstr "" "Wenn dieser Schlüssel wahr ist, wird eine Hilfslinie angezeigt, um den Rand " "für Einspielnachrichten im Versionskontroll-Editor zu markieren." -#: ../data/org.gnome.meld.gschema.xml.h:59 +#: ../data/org.gnome.meld.gschema.xml.h:55 msgid "Margin column in commit message editor" msgstr "Randspalte im Einspielnachrichteneditor" -#: ../data/org.gnome.meld.gschema.xml.h:60 +#: ../data/org.gnome.meld.gschema.xml.h:56 msgid "" "The column at which to show the margin in the version control commit message " "editor." msgstr "" "Die Randspalte des Einbringungsnachrichten-Editors für Versionskontrolle." -#: ../data/org.gnome.meld.gschema.xml.h:61 +#: ../data/org.gnome.meld.gschema.xml.h:57 msgid "Automatically hard-wrap commit messages" msgstr "Einspielnachrichten automatisch hart umbrechen" -#: ../data/org.gnome.meld.gschema.xml.h:62 +#: ../data/org.gnome.meld.gschema.xml.h:58 msgid "" "If true, the version control commit message editor will hard-wrap (i.e., " "insert line breaks) at the commit margin before commit." @@ -471,21 +456,21 @@ msgstr "" "Versionskontrolle am definierten Rand vor dem Einspielen hart umgebrochen (d." "h. Zeilenumbrüche werden eingefügt)." -#: ../data/org.gnome.meld.gschema.xml.h:63 +#: ../data/org.gnome.meld.gschema.xml.h:59 msgid "Version control status filters" msgstr "Versionskontrollstatus-Filter" -#: ../data/org.gnome.meld.gschema.xml.h:64 +#: ../data/org.gnome.meld.gschema.xml.h:60 msgid "" "List of statuses used to filter visible files in version control comparison." msgstr "" "Liste von Status, um sichtbare Dateien im Versionsvergleich zu filtern." -#: ../data/org.gnome.meld.gschema.xml.h:65 +#: ../data/org.gnome.meld.gschema.xml.h:61 msgid "Filename-based filters" msgstr "Auf Dateinamen basierende Filter" -#: ../data/org.gnome.meld.gschema.xml.h:66 +#: ../data/org.gnome.meld.gschema.xml.h:62 msgid "" "List of predefined filename-based filters that, if active, will remove " "matching files from a folder comparison." @@ -493,11 +478,11 @@ msgstr "" "Liste von vordefinierten, Dateinamen-basierten Filtern. Falls aktiviert, " "werden treffende Dateien aus einem Ordnervergleich entfernt." -#: ../data/org.gnome.meld.gschema.xml.h:67 +#: ../data/org.gnome.meld.gschema.xml.h:63 msgid "Text-based filters" msgstr "Auf Text basierende Filter" -#: ../data/org.gnome.meld.gschema.xml.h:68 +#: ../data/org.gnome.meld.gschema.xml.h:64 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, " @@ -523,1171 +508,1179 @@ msgstr "Dunkles Meld-Schema" msgid "Dark color scheme for Meld highlighting" msgstr "Dunkles Farbschema für Syntaxhervorhebung in Meld" -#: ../data/ui/application.ui.h:1 -msgid "About Meld" -msgstr "Info zu Meld" - -#: ../data/ui/application.ui.h:2 -msgid "" -"Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2017 Kai Willadsen" -msgstr "" -"Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2017 Kai Willadsen" +#: ../meld/resources/gtk/help-overlay.ui.h:1 +msgctxt "shortcut window" +msgid "General" +msgstr "Allgemein" -#: ../data/ui/application.ui.h:4 -msgid "Website" -msgstr "Webseite" +#: ../meld/resources/gtk/help-overlay.ui.h:2 +msgctxt "shortcut window" +msgid "New comparison" +msgstr "Neuer Vergleich" -#: ../data/ui/application.ui.h:5 -msgid "translator-credits" -msgstr "" -"Hendrik Brandt \n" -"Frank Arnold \n" -"Hendrik Richter \n" -"Mario Blättermann \n" -"Holger Wansing \n" -"Benjamin Steinwender \n" -"Christian Kirbach \n" -"Bernd Homuth \n" -"Paul Seyfert " +#: ../meld/resources/gtk/help-overlay.ui.h:3 +msgctxt "shortcut window" +msgid "Close a comparison" +msgstr "Einen Vergleich schließen" -#: ../data/ui/application.ui.h:6 -msgid "_Preferences" -msgstr "_Einstellungen" +#: ../meld/resources/gtk/help-overlay.ui.h:4 +msgctxt "shortcut window" +msgid "Quit Meld" +msgstr "Meld beenden" -#: ../data/ui/application.ui.h:7 -msgid "_Help" -msgstr "_Hilfe" +#: ../meld/resources/gtk/help-overlay.ui.h:5 +msgctxt "shortcut window" +msgid "Stop the current action" +msgstr "Aktuelle Aktion abbrechen" -#: ../data/ui/application.ui.h:8 -msgid "Keyboard Shortcuts" -msgstr "Tastenkombinationen" +#: ../meld/resources/gtk/help-overlay.ui.h:6 +msgctxt "shortcut window" +msgid "Refresh comparison" +msgstr "Vergleich aktualisieren" -#: ../data/ui/application.ui.h:9 -msgid "_About" -msgstr "_Info" +#: ../meld/resources/gtk/help-overlay.ui.h:7 +msgctxt "shortcut window" +msgid "Fullscreen" +msgstr "Vollbild" -#: ../data/ui/application.ui.h:10 -msgid "_Quit" -msgstr "_Beenden" +#: ../meld/resources/gtk/help-overlay.ui.h:8 +msgctxt "shortcut window" +msgid "Tabs" +msgstr "Reiter" -#: ../data/ui/dirdiff.ui.h:1 ../data/ui/vcview.ui.h:1 -msgid "_Compare" -msgstr "_Vergleichen" +#: ../meld/resources/gtk/help-overlay.ui.h:9 +msgctxt "shortcut window" +msgid "Go to previous tab" +msgstr "Zum vorherigen Reiter wechseln" -#: ../data/ui/dirdiff.ui.h:2 ../data/ui/vcview.ui.h:2 -msgid "Compare selected files" -msgstr "Markierte Dateien vergleichen" +#: ../meld/resources/gtk/help-overlay.ui.h:10 +msgctxt "shortcut window" +msgid "Go to next tab" +msgstr "Zum nächsten Reiter wechseln" -#: ../data/ui/dirdiff.ui.h:3 -msgid "Collapse Recursively" -msgstr "Rekursiv einklappen" +#: ../meld/resources/gtk/help-overlay.ui.h:11 +msgctxt "shortcut window" +msgid "Switch to tab" +msgstr "Zum Reiter wechseln" -#: ../data/ui/dirdiff.ui.h:4 -msgid "Collapse selected folder and all subfolders" -msgstr "Ausgewählten Ordner und alle Unterordner einklappen" +#: ../meld/resources/gtk/help-overlay.ui.h:12 +msgctxt "shortcut window" +msgid "Move tab left" +msgstr "Reiter nach links verschieben" -#: ../data/ui/dirdiff.ui.h:5 -msgid "Expand Recursively" -msgstr "Rekursiv ausklappen" +#: ../meld/resources/gtk/help-overlay.ui.h:13 +msgctxt "shortcut window" +msgid "Move tab right" +msgstr "Reiter nach rechts verschieben" -#: ../data/ui/dirdiff.ui.h:6 -msgid "Expand selected folder and all subfolders" -msgstr "Ausgewählten Ordner und alle Unterordner ausklappen" +#: ../meld/resources/gtk/help-overlay.ui.h:14 +msgctxt "shortcut window" +msgid "Changes" +msgstr "Änderungen" -#: ../data/ui/dirdiff.ui.h:7 -msgid "Copy to _Left" -msgstr "Nach _links kopieren" +#: ../meld/resources/gtk/help-overlay.ui.h:15 +msgctxt "shortcut window" +msgid "Go to previous change" +msgstr "Zur vorherigen Änderung gehen" -#: ../data/ui/dirdiff.ui.h:8 -msgid "Copy to left" -msgstr "Nach links kopieren" +#: ../meld/resources/gtk/help-overlay.ui.h:16 +msgctxt "shortcut window" +msgid "Go to next change" +msgstr "Zur nächsten Änderung gehen" -#: ../data/ui/dirdiff.ui.h:9 -msgid "Copy to _Right" -msgstr "Nach _rechts kopieren" +#: ../meld/resources/gtk/help-overlay.ui.h:17 +msgctxt "shortcut window" +msgid "Editing" +msgstr "Bearbeitung" -#: ../data/ui/dirdiff.ui.h:10 -msgid "Copy to right" -msgstr "Nach rechts kopieren" +#: ../meld/resources/gtk/help-overlay.ui.h:18 +msgctxt "shortcut window" +msgid "Undo" +msgstr "Rückgängig" -#: ../data/ui/dirdiff.ui.h:11 -msgid "Delete selected" -msgstr "Markierte löschen" +#: ../meld/resources/gtk/help-overlay.ui.h:19 +msgctxt "shortcut window" +msgid "Redo" +msgstr "Wiederholen" -#: ../data/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:907 ../meld/filediff.py:1497 -msgid "Hide" -msgstr "Verbergen" +#: ../meld/resources/gtk/help-overlay.ui.h:20 +msgctxt "shortcut window" +msgid "Cut" +msgstr "Ausschneiden" -#: ../data/ui/dirdiff.ui.h:13 -msgid "Hide selected" -msgstr "Markierte verbergen" +#: ../meld/resources/gtk/help-overlay.ui.h:21 +msgctxt "shortcut window" +msgid "Copy" +msgstr "Kopieren" -#: ../data/ui/dirdiff.ui.h:14 -msgid "Ignore Filename Case" -msgstr "Groß-/Kleinschreibung in Dateinamen ignorieren" +#: ../meld/resources/gtk/help-overlay.ui.h:22 +msgctxt "shortcut window" +msgid "Paste" +msgstr "Einfügen" -#: ../data/ui/dirdiff.ui.h:15 -msgid "" -"Consider differently-cased filenames that are otherwise-identical to be the " -"same" -msgstr "" -"Dateinamen, die sich nur in Groß- oder Kleinschreibung unterscheiden, als " -"identisch annehmen" +#: ../meld/resources/gtk/help-overlay.ui.h:23 +msgctxt "shortcut window" +msgid "Find" +msgstr "Suchen" -#: ../data/ui/dirdiff.ui.h:16 -msgid "Same" -msgstr "Identisch" +#: ../meld/resources/gtk/help-overlay.ui.h:24 +msgctxt "shortcut window" +msgid "Find Next" +msgstr "Weitersuchen" -#: ../data/ui/dirdiff.ui.h:17 -msgid "Show identical" -msgstr "Identische anzeigen" +#: ../meld/resources/gtk/help-overlay.ui.h:25 +msgctxt "shortcut window" +msgid "Find Previous" +msgstr "Rückwärts suchen" -#: ../data/ui/dirdiff.ui.h:18 -msgid "New" -msgstr "Neu" +#: ../meld/resources/gtk/help-overlay.ui.h:26 +msgctxt "shortcut window" +msgid "Replace" +msgstr "Ersetzen" -#: ../data/ui/dirdiff.ui.h:19 -msgid "Show new" -msgstr "Neue anzeigen" +#: ../meld/resources/gtk/help-overlay.ui.h:27 +msgctxt "shortcut window" +msgid "File comparison" +msgstr "Dateivergleich" -#: ../data/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:76 -msgid "Modified" -msgstr "Geändert" +#: ../meld/resources/gtk/help-overlay.ui.h:28 +msgctxt "shortcut window" +msgid "Save current file" +msgstr "Aktuelle Datei speichern" -#: ../data/ui/dirdiff.ui.h:21 -msgid "Show modified" -msgstr "Geänderte anzeigen" +#: ../meld/resources/gtk/help-overlay.ui.h:29 +msgctxt "shortcut window" +msgid "Save current file to new path" +msgstr "Aktuelle Datei an einem anderen Ort speichern" -#: ../data/ui/dirdiff.ui.h:22 -msgid "Filters" -msgstr "Filter" +#: ../meld/resources/gtk/help-overlay.ui.h:30 +msgctxt "shortcut window" +msgid "Save all files in comparison" +msgstr "Alle Dateien im aktuellen Vergleich speichern" -#: ../data/ui/dirdiff.ui.h:23 -msgid "Set active filters" -msgstr "Aktive Filter festlegen" +#: ../meld/resources/gtk/help-overlay.ui.h:31 +msgctxt "shortcut window" +msgid "Previous conflict" +msgstr "Vorheriger Konflikt" + +#: ../meld/resources/gtk/help-overlay.ui.h:32 +msgctxt "shortcut window" +msgid "Next conflict" +msgstr "Nächster Konflikt" + +#: ../meld/resources/gtk/help-overlay.ui.h:33 +msgctxt "shortcut window" +msgid "Push change to left" +msgstr "Änderung nach links schieben" + +#: ../meld/resources/gtk/help-overlay.ui.h:34 +msgctxt "shortcut window" +msgid "Push change to right" +msgstr "Änderung nach rechts schieben" + +#: ../meld/resources/gtk/help-overlay.ui.h:35 +msgctxt "shortcut window" +msgid "Pull change from left" +msgstr "Änderung von links ziehen" + +#: ../meld/resources/gtk/help-overlay.ui.h:36 +msgctxt "shortcut window" +msgid "Pull change from right" +msgstr "Änderung von rechts ziehen" + +#: ../meld/resources/gtk/help-overlay.ui.h:37 +msgctxt "shortcut window" +msgid "Copy change above left" +msgstr "Änderung über den linken Teil kopieren" + +#: ../meld/resources/gtk/help-overlay.ui.h:38 +msgctxt "shortcut window" +msgid "Copy change below left" +msgstr "Änderung unter den linken Teil kopieren" + +#: ../meld/resources/gtk/help-overlay.ui.h:39 +msgctxt "shortcut window" +msgid "Copy change above right" +msgstr "Änderung über den rechten Teil kopieren" + +#: ../meld/resources/gtk/help-overlay.ui.h:40 +msgctxt "shortcut window" +msgid "Copy change below right" +msgstr "Änderung unter den rechten Teil kopieren" + +#: ../meld/resources/gtk/help-overlay.ui.h:41 +msgctxt "shortcut window" +msgid "Delete change" +msgstr "Änderung löschen" + +#: ../meld/resources/gtk/help-overlay.ui.h:42 +msgctxt "shortcut window" +msgid "Previous comparison pane" +msgstr "Vorheriges Teilfenster" + +#: ../meld/resources/gtk/help-overlay.ui.h:43 +msgctxt "shortcut window" +msgid "Next comparison pane" +msgstr "Nächstes Teilfenster" + +#: ../meld/resources/gtk/help-overlay.ui.h:44 +msgctxt "shortcut window" +msgid "Folder comparison" +msgstr "Ordnervergleiche" + +#: ../meld/resources/gtk/help-overlay.ui.h:45 +msgctxt "shortcut window" +msgid "Copy to left" +msgstr "Nach links kopieren" + +#: ../meld/resources/gtk/help-overlay.ui.h:46 +msgctxt "shortcut window" +msgid "Copy to right" +msgstr "Nach rechts kopieren" + +#: ../meld/resources/gtk/help-overlay.ui.h:47 +msgctxt "shortcut window" +msgid "Version control comparison" +msgstr "Versionskontrollvergleich" + +#: ../meld/resources/gtk/help-overlay.ui.h:48 +msgctxt "shortcut window" +msgid "Commit to version control" +msgstr "Änderungen in die Versionskontrolle einspielen" + +#: ../meld/resources/gtk/help-overlay.ui.h:49 +msgctxt "shortcut window" +msgid "Show/hide console output" +msgstr "Konsolenausgabe anzeigen/verbergen" + +#: ../meld/resources/gtk/menus.ui.h:1 +msgid "_Preferences" +msgstr "_Einstellungen" + +#: ../meld/resources/gtk/menus.ui.h:2 +msgid "_Help" +msgstr "_Hilfe" + +#: ../meld/resources/gtk/menus.ui.h:3 +msgid "Keyboard Shortcuts" +msgstr "Tastenkombinationen" + +#: ../meld/resources/gtk/menus.ui.h:4 +msgid "_About" +msgstr "_Info" + +#: ../meld/resources/gtk/menus.ui.h:5 +msgid "_Quit" +msgstr "_Beenden" + +#: ../meld/resources/ui/about-dialog.ui.h:1 +msgid "About Meld" +msgstr "Info zu Meld" + +#: ../meld/resources/ui/about-dialog.ui.h:2 +msgid "" +"Copyright © 2002-2009 Stephen Kennedy\n" +"Copyright © 2009-2017 Kai Willadsen" +msgstr "" +"Copyright © 2002-2009 Stephen Kennedy\n" +"Copyright © 2009-2017 Kai Willadsen" -#: ../data/ui/EditableList.ui.h:1 -msgid "Editable List" -msgstr "Editierbare Liste" +#: ../meld/resources/ui/about-dialog.ui.h:4 +msgid "Website" +msgstr "Webseite" + +#: ../meld/resources/ui/about-dialog.ui.h:5 +msgid "translator-credits" +msgstr "" +"Hendrik Brandt \n" +"Frank Arnold \n" +"Hendrik Richter \n" +"Mario Blättermann \n" +"Holger Wansing \n" +"Benjamin Steinwender \n" +"Christian Kirbach \n" +"Bernd Homuth \n" +"Paul Seyfert " -#: ../data/ui/EditableList.ui.h:2 +#: ../meld/resources/ui/column-list.ui.h:1 +#: ../meld/resources/ui/filter-list.ui.h:1 msgid "Active" msgstr "Aktiv" -#: ../data/ui/EditableList.ui.h:3 +#: ../meld/resources/ui/column-list.ui.h:2 msgid "Column Name" msgstr "Spaltenname" -#: ../data/ui/EditableList.ui.h:4 ../data/ui/vcview.ui.h:9 -msgid "_Add" -msgstr "_Hinzufügen" - -#: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11 -#: ../meld/vcview.py:680 +#: ../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 msgid "_Remove" msgstr "_Löschen" -#: ../data/ui/EditableList.ui.h:6 +#: ../meld/resources/ui/column-list.ui.h:4 +#: ../meld/resources/ui/filter-list.ui.h:8 msgid "Move item up" msgstr "Objekt nach oben verschieben" -#: ../data/ui/EditableList.ui.h:7 +#: ../meld/resources/ui/column-list.ui.h:5 +#: ../meld/resources/ui/filter-list.ui.h:9 msgid "Move _Up" msgstr "Hin_auf schieben" -#: ../data/ui/EditableList.ui.h:8 +#: ../meld/resources/ui/column-list.ui.h:6 +#: ../meld/resources/ui/filter-list.ui.h:10 msgid "Move item down" msgstr "Objekt nach unten verschieben" -#: ../data/ui/EditableList.ui.h:9 +#: ../meld/resources/ui/column-list.ui.h:7 +#: ../meld/resources/ui/filter-list.ui.h:11 msgid "Move _Down" msgstr "Hin_unter schieben" -#. Create icon and filename CellRenderer -#: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35 -#: ../meld/dirdiff.py:407 -msgid "Name" -msgstr "Name" +#: ../meld/resources/ui/commit-dialog.ui.h:1 +msgid "Commit" +msgstr "Commit" -#: ../data/ui/EditableList.ui.h:11 -msgid "Pattern" -msgstr "Muster" +#: ../meld/resources/ui/commit-dialog.ui.h:2 +msgid "Commit Files" +msgstr "Commit der Dateien" -#: ../data/ui/EditableList.ui.h:12 -msgid "Add new filter" -msgstr "Neuen Filter hinzufügen" +#: ../meld/resources/ui/commit-dialog.ui.h:3 +msgid "Log Message" +msgstr "Änderungsmitteilung" -#: ../data/ui/EditableList.ui.h:13 -msgid "Remove selected filter" -msgstr "Ausgewählten Filter entfernen" +#: ../meld/resources/ui/commit-dialog.ui.h:4 +msgid "Previous logs:" +msgstr "Vorherige Mitteilungen:" + +#: ../meld/resources/ui/commit-dialog.ui.h:5 +msgid "Co_mmit" +msgstr "Co_mmit" + +#: ../meld/resources/ui/dirdiff.ui.h:1 ../meld/resources/ui/vcview.ui.h:1 +msgid "_Compare" +msgstr "_Vergleichen" + +#: ../meld/resources/ui/dirdiff.ui.h:2 ../meld/resources/ui/vcview.ui.h:2 +msgid "Compare selected files" +msgstr "Markierte Dateien vergleichen" + +#: ../meld/resources/ui/dirdiff.ui.h:3 +msgid "Collapse Recursively" +msgstr "Rekursiv einklappen" + +#: ../meld/resources/ui/dirdiff.ui.h:4 +msgid "Collapse selected folder and all subfolders" +msgstr "Ausgewählten Ordner und alle Unterordner einklappen" + +#: ../meld/resources/ui/dirdiff.ui.h:5 +msgid "Expand Recursively" +msgstr "Rekursiv ausklappen" + +#: ../meld/resources/ui/dirdiff.ui.h:6 +msgid "Expand selected folder and all subfolders" +msgstr "Ausgewählten Ordner und alle Unterordner ausklappen" + +#: ../meld/resources/ui/dirdiff.ui.h:7 +msgid "Copy to _Left" +msgstr "Nach _links kopieren" + +#: ../meld/resources/ui/dirdiff.ui.h:8 +msgid "Copy to left" +msgstr "Nach links kopieren" + +#: ../meld/resources/ui/dirdiff.ui.h:9 +msgid "Copy to _Right" +msgstr "Nach _rechts kopieren" + +#: ../meld/resources/ui/dirdiff.ui.h:10 +msgid "Copy to right" +msgstr "Nach rechts kopieren" + +#: ../meld/resources/ui/dirdiff.ui.h:11 +msgid "Delete selected" +msgstr "Markierte löschen" + +#: ../meld/resources/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:958 +#: ../meld/filediff.py:1586 +msgid "Hide" +msgstr "Verbergen" + +#: ../meld/resources/ui/dirdiff.ui.h:13 +msgid "Hide selected" +msgstr "Markierte verbergen" + +#: ../meld/resources/ui/dirdiff.ui.h:14 +msgid "Ignore Filename Case" +msgstr "Groß-/Kleinschreibung in Dateinamen ignorieren" + +#: ../meld/resources/ui/dirdiff.ui.h:15 +msgid "" +"Consider differently-cased filenames that are otherwise-identical to be the " +"same" +msgstr "" +"Dateinamen, die sich nur in Groß- oder Kleinschreibung unterscheiden, als " +"identisch annehmen" + +#: ../meld/resources/ui/dirdiff.ui.h:16 +msgid "Same" +msgstr "Identisch" + +#: ../meld/resources/ui/dirdiff.ui.h:17 +msgid "Show identical" +msgstr "Identische anzeigen" + +#: ../meld/resources/ui/dirdiff.ui.h:18 +msgid "New" +msgstr "Neu" + +#: ../meld/resources/ui/dirdiff.ui.h:19 +msgid "Show new" +msgstr "Neue anzeigen" + +#: ../meld/resources/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:76 +msgid "Modified" +msgstr "Geändert" + +#: ../meld/resources/ui/dirdiff.ui.h:21 +msgid "Show modified" +msgstr "Geänderte anzeigen" -#: ../data/ui/encoding-selector.ui.h:1 +#: ../meld/resources/ui/dirdiff.ui.h:22 +msgid "Filters" +msgstr "Filter" + +#: ../meld/resources/ui/dirdiff.ui.h:23 +msgid "Set active filters" +msgstr "Aktive Filter festlegen" + +#: ../meld/resources/ui/encoding-selector.ui.h:1 msgid "Search text encoding…" msgstr "Zeichenkodierung suchen …" -#: ../data/ui/filediff.ui.h:1 +#: ../meld/resources/ui/filediff.ui.h:1 msgid "Format as Patch…" msgstr "Als Patch formatieren …" -#: ../data/ui/filediff.ui.h:2 +#: ../meld/resources/ui/filediff.ui.h:2 msgid "Create a patch using differences between files" msgstr "Aus der Differenz zwischen Dateien einen Patch erstellen" -#: ../data/ui/filediff.ui.h:3 +#: ../meld/resources/ui/filediff.ui.h:3 msgid "Save A_ll" msgstr "A_lles speichern" -#: ../data/ui/filediff.ui.h:4 +#: ../meld/resources/ui/filediff.ui.h:4 msgid "Save all files in the current comparison" msgstr "Alle Dateien im aktuellen Vergleich speichern" -#: ../data/ui/filediff.ui.h:5 +#: ../meld/resources/ui/filediff.ui.h:5 msgid "Revert files to their saved versions" msgstr "Dateien auf ihre gespeicherte Version zurücksetzen" -#: ../data/ui/filediff.ui.h:6 +#: ../meld/resources/ui/filediff.ui.h:6 msgid "Add Synchronization Point" msgstr "Synchronisationspunkt hinzufügen" -#: ../data/ui/filediff.ui.h:7 +#: ../meld/resources/ui/filediff.ui.h:7 msgid "Add a synchronization point for changes between files" msgstr "" "Einen Punkt für die Synchronisierung von Änderungen der Dateien hinzufügen" -#: ../data/ui/filediff.ui.h:8 +#: ../meld/resources/ui/filediff.ui.h:8 msgid "Clear Synchronization Points" msgstr "Synchronisationspunkte entfernen" -#: ../data/ui/filediff.ui.h:9 +#: ../meld/resources/ui/filediff.ui.h:9 msgid "Clear sychronization points for changes between files" msgstr "Punkte für die Synchronisierung von Änderungen der Dateien entfernen" -#: ../data/ui/filediff.ui.h:10 +#: ../meld/resources/ui/filediff.ui.h:10 msgid "Previous Conflict" msgstr "Vorheriger Konflikt" -#: ../data/ui/filediff.ui.h:11 +#: ../meld/resources/ui/filediff.ui.h:11 msgid "Go to the previous conflict" msgstr "Zum vorherigen Konflikt gehen" -#: ../data/ui/filediff.ui.h:12 +#: ../meld/resources/ui/filediff.ui.h:12 msgid "Next Conflict" msgstr "Nächster Konflikt" -#: ../data/ui/filediff.ui.h:13 +#: ../meld/resources/ui/filediff.ui.h:13 msgid "Go to the next conflict" msgstr "Zum nächsten Konflikt gehen" -#: ../data/ui/filediff.ui.h:14 +#: ../meld/resources/ui/filediff.ui.h:14 msgid "Push to Left" msgstr "Nach links schieben" -#: ../data/ui/filediff.ui.h:15 +#: ../meld/resources/ui/filediff.ui.h:15 msgid "Push current change to the left" msgstr "Aktuelle Änderung nach links schieben" -#: ../data/ui/filediff.ui.h:16 +#: ../meld/resources/ui/filediff.ui.h:16 msgid "Push to Right" msgstr "Nach rechts schieben" -#: ../data/ui/filediff.ui.h:17 +#: ../meld/resources/ui/filediff.ui.h:17 msgid "Push current change to the right" msgstr "Aktuelle Änderung nach rechts schieben" -#: ../data/ui/filediff.ui.h:18 +#: ../meld/resources/ui/filediff.ui.h:18 msgid "Pull from Left" msgstr "Von links ziehen" -#: ../data/ui/filediff.ui.h:19 +#: ../meld/resources/ui/filediff.ui.h:19 msgid "Pull change from the left" msgstr "Änderung von links ziehen" -#: ../data/ui/filediff.ui.h:20 +#: ../meld/resources/ui/filediff.ui.h:20 msgid "Pull from Right" msgstr "Von rechts ziehen" -#: ../data/ui/filediff.ui.h:21 +#: ../meld/resources/ui/filediff.ui.h:21 msgid "Pull change from the right" msgstr "Änderung von rechts ziehen" -#: ../data/ui/filediff.ui.h:22 +#: ../meld/resources/ui/filediff.ui.h:22 msgid "Copy Above Left" msgstr "Oben links kopieren" -#: ../data/ui/filediff.ui.h:23 +#: ../meld/resources/ui/filediff.ui.h:23 msgid "Copy change above the left chunk" msgstr "Änderung über den linken Teil kopieren" -#: ../data/ui/filediff.ui.h:24 +#: ../meld/resources/ui/filediff.ui.h:24 msgid "Copy Below Left" msgstr "Unten links kopieren" -#: ../data/ui/filediff.ui.h:25 +#: ../meld/resources/ui/filediff.ui.h:25 msgid "Copy change below the left chunk" msgstr "Änderung unter den linken Teil kopieren" -#: ../data/ui/filediff.ui.h:26 +#: ../meld/resources/ui/filediff.ui.h:26 msgid "Copy Above Right" msgstr "Oben rechts kopieren" -#: ../data/ui/filediff.ui.h:27 +#: ../meld/resources/ui/filediff.ui.h:27 msgid "Copy change above the right chunk" msgstr "Änderung über den rechten Teil kopieren" -#: ../data/ui/filediff.ui.h:28 +#: ../meld/resources/ui/filediff.ui.h:28 msgid "Copy Below Right" msgstr "Unten rechts kopieren" -#: ../data/ui/filediff.ui.h:29 +#: ../meld/resources/ui/filediff.ui.h:29 msgid "Copy change below the right chunk" msgstr "Änderung unter den rechten Teil kopieren" -#: ../data/ui/filediff.ui.h:30 +#: ../meld/resources/ui/filediff.ui.h:30 msgid "Delete" msgstr "Löschen" -#: ../data/ui/filediff.ui.h:31 +#: ../meld/resources/ui/filediff.ui.h:31 msgid "Delete change" msgstr "Änderung löschen" -#: ../data/ui/filediff.ui.h:32 +#: ../meld/resources/ui/filediff.ui.h:32 msgid "Merge All from Left" msgstr "Alle Änderungen von links zusammenführen" -#: ../data/ui/filediff.ui.h:33 +#: ../meld/resources/ui/filediff.ui.h:33 msgid "Merge all non-conflicting changes from the left" msgstr "Alle konfliktlosen Änderungen von links zusammenführen" -#: ../data/ui/filediff.ui.h:34 +#: ../meld/resources/ui/filediff.ui.h:34 msgid "Merge All from Right" msgstr "Alle Änderungen von rechts zusammenführen" -#: ../data/ui/filediff.ui.h:35 +#: ../meld/resources/ui/filediff.ui.h:35 msgid "Merge all non-conflicting changes from the right" msgstr "Alle konfliktlosen Änderungen von rechts zusammenführen" -#: ../data/ui/filediff.ui.h:36 +#: ../meld/resources/ui/filediff.ui.h:36 msgid "Merge All" msgstr "Alles zusammenfügen" -#: ../data/ui/filediff.ui.h:37 +#: ../meld/resources/ui/filediff.ui.h:37 msgid "Merge all non-conflicting changes from left and right panes" msgstr "Alle konfliktlosen Änderungen von links nach rechts zusammenführen" -#: ../data/ui/filediff.ui.h:38 +#: ../meld/resources/ui/filediff.ui.h:38 msgid "Previous Pane" msgstr "Vorheriges Teilfenster" -#: ../data/ui/filediff.ui.h:39 +#: ../meld/resources/ui/filediff.ui.h:39 msgid "Move keyboard focus to the previous document in this comparison" msgstr "Tastaturfokus an vorheriges Dokument in diesem Vergleich übergeben" -#: ../data/ui/filediff.ui.h:40 +#: ../meld/resources/ui/filediff.ui.h:40 msgid "Next Pane" msgstr "Nächstes Teilfenster" -#: ../data/ui/filediff.ui.h:41 +#: ../meld/resources/ui/filediff.ui.h:41 msgid "Move keyboard focus to the next document in this comparison" msgstr "Tastaturfokus an nächstes Dokument in diesem Vergleich übergeben" -#: ../data/ui/filediff.ui.h:42 +#: ../meld/resources/ui/filediff.ui.h:42 msgid "Lock Scrolling" msgstr "Rollen sperren" -#: ../data/ui/filediff.ui.h:43 +#: ../meld/resources/ui/filediff.ui.h:43 msgid "Lock scrolling of all panes" msgstr "Rollen aller Ansichten sperren" -#: ../data/ui/filediff.ui.h:44 -msgid "Save changes to documents before closing?" -msgstr "Die Änderungen an den Dokumenten vor dem Beenden speichern?" +#: ../meld/resources/ui/filediff.ui.h:44 +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 "" +"Diese Datei kann nicht geschrieben werden. Sie können hier klicken, um die " +"Datei zu entsperren und Ihre Änderungen vorzunehmen, aber Sie müssen diese " +"Änderungen in eine neue Datei speichern." -#: ../data/ui/filediff.ui.h:45 -msgid "If you don’t save, changes will be permanently lost." -msgstr "Wenn Sie nicht speichern, gehen die Änderungen verloren." - -#: ../data/ui/filediff.ui.h:46 -msgid "Close _without Saving" -msgstr "Schließen _ohne zu Speichern" - -#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:988 ../meld/iohelpers.py:50 -#: ../meld/iohelpers.py:100 -msgid "_Cancel" -msgstr "A_bbrechen" - -#: ../data/ui/filediff.ui.h:48 -msgid "_Save" -msgstr "_Speichern" - -#: ../data/ui/filediff.ui.h:49 -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 "" -"Diese Datei kann nicht geschrieben werden. Sie können hier klicken, um die " -"Datei zu entsperren und Ihre Änderungen vorzunehmen, aber Sie müssen diese " -"Änderungen in eine neue Datei speichern." - -#: ../data/ui/filediff.ui.h:50 +#: ../meld/resources/ui/filediff.ui.h:45 msgid "File 3" msgstr "Datei 3" -#: ../data/ui/filediff.ui.h:51 +#: ../meld/resources/ui/filediff.ui.h:46 msgid "File 2" msgstr "Datei 2" -#: ../data/ui/filediff.ui.h:52 +#: ../meld/resources/ui/filediff.ui.h:47 msgid "File 1" msgstr "Datei 1" -#: ../data/ui/filediff.ui.h:53 -msgid "Discard unsaved changes to documents?" -msgstr "Nicht gespeicherte Dokumentenänderungen zurücknehmen?" +#. Create icon and filename CellRenderer +#: ../meld/resources/ui/filter-list.ui.h:2 ../meld/resources/ui/vcview.ui.h:30 +#: ../meld/dirdiff.py:454 +msgid "Name" +msgstr "Name" -#: ../data/ui/filediff.ui.h:54 -msgid "Changes made to the following documents will be permanently lost:" -msgstr "Änderungen der folgenden Dokumente werden verloren gehen:" +#: ../meld/resources/ui/filter-list.ui.h:3 +msgid "Pattern" +msgstr "Muster" -#: ../data/ui/filediff.ui.h:55 -msgid "_Discard" -msgstr "_Verwerfen" +#: ../meld/resources/ui/filter-list.ui.h:4 +msgid "Add new filter" +msgstr "Neuen Filter hinzufügen" -#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:989 ../meld/iohelpers.py:101 +#: ../meld/resources/ui/filter-list.ui.h:5 ../meld/resources/ui/vcview.ui.h:9 +msgid "_Add" +msgstr "_Hinzufügen" + +#: ../meld/resources/ui/filter-list.ui.h:6 +msgid "Remove selected filter" +msgstr "Ausgewählten Filter entfernen" + +#: ../meld/resources/ui/findbar.ui.h:1 ../meld/dirdiff.py:1040 +#: ../meld/iohelpers.py:107 msgid "_Replace" msgstr "E_rsetzen" -#: ../data/ui/findbar.ui.h:2 +#: ../meld/resources/ui/findbar.ui.h:2 msgid "Replace _All" msgstr "_Alle ersetzen" -#: ../data/ui/findbar.ui.h:3 +#: ../meld/resources/ui/findbar.ui.h:3 msgid "_Previous" msgstr "_Vorherige" -#: ../data/ui/findbar.ui.h:4 +#: ../meld/resources/ui/findbar.ui.h:4 msgid "_Next" msgstr "_Nächste" -#: ../data/ui/findbar.ui.h:5 +#: ../meld/resources/ui/findbar.ui.h:5 msgid "Find:" msgstr "Suchen:" -#: ../data/ui/findbar.ui.h:6 +#: ../meld/resources/ui/findbar.ui.h:6 msgid "Replace _with:" msgstr "Ersetzen _mit:" -#: ../data/ui/findbar.ui.h:7 +#: ../meld/resources/ui/findbar.ui.h:7 msgid "_Match case" msgstr "Groß-/_Kleinschreibung beachten" -#: ../data/ui/findbar.ui.h:8 +#: ../meld/resources/ui/findbar.ui.h:8 msgid "Who_le word" msgstr "_Ganzes Wort" -#: ../data/ui/findbar.ui.h:9 +#: ../meld/resources/ui/findbar.ui.h:9 msgid "Regular e_xpression" msgstr "_Regulärer Ausdruck" -#: ../data/ui/findbar.ui.h:10 +#: ../meld/resources/ui/findbar.ui.h:10 msgid "Wrapped" msgstr "Umgebrochen" -#: ../data/ui/language-selector.ui.h:1 +#: ../meld/resources/ui/language-selector.ui.h:1 msgid "Search highlight mode…" msgstr "Hervorhebungsmodus suchen …" -#: ../data/ui/patch-dialog.ui.h:1 +#: ../meld/resources/ui/new-diff-tab.ui.h:1 ../meld/meldwindow.py:532 +#: ../meld/newdifftab.py:53 +msgid "New comparison" +msgstr "Neuer Vergleich" + +#: ../meld/resources/ui/new-diff-tab.ui.h:2 +msgid "File comparison" +msgstr "Dateivergleich" + +#: ../meld/resources/ui/new-diff-tab.ui.h:3 +msgid "Directory comparison" +msgstr "Ordnervergleich" + +#: ../meld/resources/ui/new-diff-tab.ui.h:4 +msgid "Version control view" +msgstr "Versionskontrollansicht" + +#: ../meld/resources/ui/new-diff-tab.ui.h:5 +msgid "_3-way comparison" +msgstr "_3-Wege-Vergleich" + +#: ../meld/resources/ui/new-diff-tab.ui.h:6 +msgid "Select Third File" +msgstr "Die dritte Datei wählen" + +#: ../meld/resources/ui/new-diff-tab.ui.h:7 +msgid "Select Second File" +msgstr "Die zweite Datei wählen" + +#: ../meld/resources/ui/new-diff-tab.ui.h:8 +msgid "Select First File" +msgstr "Die erste Datei wählen" + +#: ../meld/resources/ui/new-diff-tab.ui.h:9 +msgid "Select First Folder" +msgstr "Den ersten Ordner wählen" + +#: ../meld/resources/ui/new-diff-tab.ui.h:10 +msgid "Select Second Folder" +msgstr "Den zweiten Ordner wählen" + +#: ../meld/resources/ui/new-diff-tab.ui.h:11 +msgid "Select Third Folder" +msgstr "Den dritten Ordner wählen" + +#: ../meld/resources/ui/new-diff-tab.ui.h:12 +msgid "Select A Version-Controlled Folder" +msgstr "Wählen Sie einen Ordner mit Versionskontrolle" + +#: ../meld/resources/ui/new-diff-tab.ui.h:13 +msgid "_Blank comparison" +msgstr "_Leerer Vergleich" + +#: ../meld/resources/ui/new-diff-tab.ui.h:14 +msgid "C_ompare" +msgstr "_Vergleichen" + +#: ../meld/resources/ui/notebook-label.ui.h:1 +msgid "Close Tab" +msgstr "Reiter schließen" + +#: ../meld/resources/ui/patch-dialog.ui.h:1 msgid "Format as Patch" msgstr "Als Patch formatieren" -#: ../data/ui/patch-dialog.ui.h:2 +#: ../meld/resources/ui/patch-dialog.ui.h:2 msgid "Copy to Clipboard" msgstr "In die Zwischenablage kopieren" -#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:152 +#: ../meld/resources/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:163 msgid "Save Patch" msgstr "Patch speichern" -#: ../data/ui/patch-dialog.ui.h:4 +#: ../meld/resources/ui/patch-dialog.ui.h:4 msgid "Use differences between:" msgstr "Unterschiede verwenden zwischen:" -#: ../data/ui/patch-dialog.ui.h:5 +#: ../meld/resources/ui/patch-dialog.ui.h:5 msgid "Left and middle panes" msgstr "Linke und mittlere Ansicht" -#: ../data/ui/patch-dialog.ui.h:6 +#: ../meld/resources/ui/patch-dialog.ui.h:6 msgid "Middle and right panes" msgstr "Mittlere und rechte Ansicht" -#: ../data/ui/patch-dialog.ui.h:7 +#: ../meld/resources/ui/patch-dialog.ui.h:7 msgid "_Reverse patch direction" msgstr "Patch-_Richtung umkehren" -#: ../data/ui/preferences.ui.h:1 -msgid "Meld Preferences" -msgstr "Meld - Einstellungen" +#: ../meld/resources/ui/preferences.ui.h:1 +msgid "Preferences" +msgstr "Einstellungen" -#: ../data/ui/preferences.ui.h:2 +#: ../meld/resources/ui/preferences.ui.h:2 msgid "Font" msgstr "Schrift" -#: ../data/ui/preferences.ui.h:3 +#: ../meld/resources/ui/preferences.ui.h:3 msgid "_Use the system fixed width font" msgstr "Die dicktengleiche S_ystemschrift verwenden" -#: ../data/ui/preferences.ui.h:4 +#: ../meld/resources/ui/preferences.ui.h:4 msgid "_Editor font:" msgstr "Editor-_Schrift:" -#: ../data/ui/preferences.ui.h:5 +#: ../meld/resources/ui/preferences.ui.h:5 msgid "Display" msgstr "Darstellung" -#: ../data/ui/preferences.ui.h:6 +#: ../meld/resources/ui/preferences.ui.h:6 msgid "_Tab width:" msgstr "_Tabulatorbreite:" -#: ../data/ui/preferences.ui.h:7 +#: ../meld/resources/ui/preferences.ui.h:7 msgid "_Insert spaces instead of tabs" msgstr "Leerze_ichen anstelle von Tabulatoren verwenden" -#: ../data/ui/preferences.ui.h:8 +#: ../meld/resources/ui/preferences.ui.h:8 msgid "Enable text _wrapping" msgstr "Zeilen_umbruch aktivieren" -#: ../data/ui/preferences.ui.h:9 +#: ../meld/resources/ui/preferences.ui.h:9 msgid "Do not _split words over two lines" msgstr "Nur am _Wortende umbrechen" -#: ../data/ui/preferences.ui.h:10 +#: ../meld/resources/ui/preferences.ui.h:10 msgid "Highlight _current line" msgstr "Aktuelle Zeile _hervorheben" -#: ../data/ui/preferences.ui.h:11 +#: ../meld/resources/ui/preferences.ui.h:11 msgid "Show _line numbers" msgstr "Zei_lennummern anzeigen" -#: ../data/ui/preferences.ui.h:12 +#: ../meld/resources/ui/preferences.ui.h:12 msgid "Show w_hitespace" msgstr "Leerzeic_hen anzeigen" -#: ../data/ui/preferences.ui.h:13 +#: ../meld/resources/ui/preferences.ui.h:13 msgid "Use s_yntax highlighting" msgstr "S_yntaxhervorhebung verwenden" -#: ../data/ui/preferences.ui.h:14 +#: ../meld/resources/ui/preferences.ui.h:14 msgid "Syntax highlighting color scheme:" msgstr "Farbschema der Syntaxhervorhebung:" -#: ../data/ui/preferences.ui.h:15 +#: ../meld/resources/ui/preferences.ui.h:15 msgid "External Editor" msgstr "Externes Bearbeitungsprogramm" -#: ../data/ui/preferences.ui.h:16 +#: ../meld/resources/ui/preferences.ui.h:16 msgid "Use _default system editor" msgstr "_Den vom System vorgegebenen Editor verwenden" -#: ../data/ui/preferences.ui.h:17 +#: ../meld/resources/ui/preferences.ui.h:17 msgid "Edito_r command:" msgstr "Edito_r-Befehl:" -#: ../data/ui/preferences.ui.h:18 +#: ../meld/resources/ui/preferences.ui.h:18 msgid "Editor" msgstr "Editor" -#: ../data/ui/preferences.ui.h:19 +#: ../meld/resources/ui/preferences.ui.h:19 msgid "Shallow Comparison" msgstr "Oberflächlicher Vergleich" -#: ../data/ui/preferences.ui.h:20 +#: ../meld/resources/ui/preferences.ui.h:20 msgid "C_ompare files based only on size and timestamp" msgstr "Dateien nur anhand _Größe und Änderungszeit vergleichen" -#: ../data/ui/preferences.ui.h:21 +#: ../meld/resources/ui/preferences.ui.h:21 msgid "_Timestamp resolution:" msgstr "Genauigkeit des Zeitstempels:" -#: ../data/ui/preferences.ui.h:23 +#: ../meld/resources/ui/preferences.ui.h:23 msgid "Note: enabling text filters may make comparing large files much slower" msgstr "" "Beachten Sie: Textfilter können Vergleiche großer Dateien sehr verlangsamen" -#: ../data/ui/preferences.ui.h:24 +#: ../meld/resources/ui/preferences.ui.h:24 msgid "Symbolic Links" msgstr "Symbolische Verknüpfungen" -#: ../data/ui/preferences.ui.h:26 +#: ../meld/resources/ui/preferences.ui.h:26 msgid "Visible Columns" msgstr "Sichtbare Spalten" -#: ../data/ui/preferences.ui.h:27 +#: ../meld/resources/ui/preferences.ui.h:27 msgid "Folder Comparisons" msgstr "Ordnervergleiche" -#: ../data/ui/preferences.ui.h:28 +#: ../meld/resources/ui/preferences.ui.h:28 msgid "Version Comparisons" msgstr "Versionsvergleiche" -#: ../data/ui/preferences.ui.h:29 +#: ../meld/resources/ui/preferences.ui.h:29 msgid "_Order when comparing file revisions:" msgstr "_Reihenfolge beim Vergleichen von Dateiversionen:" -#: ../data/ui/preferences.ui.h:30 -msgid "Order when _merging files:" -msgstr "Reihenfolge beim _Zusammenführen von Dateien:" - -#: ../data/ui/preferences.ui.h:31 -msgid "Commit Messages" -msgstr "Änderungsmitteilungen" - -#: ../data/ui/preferences.ui.h:32 -msgid "Show _right margin at:" -msgstr "_Rechten Rand anzeigen bei:" - -#: ../data/ui/preferences.ui.h:33 -msgid "Automatically _break lines at right margin on commit" -msgstr "Beim Einspielen die Zeilen am rechten Rand automatisch um_brechen" - -#: ../data/ui/preferences.ui.h:34 -msgid "Version Control" -msgstr "Versionskontrolle" - -#: ../data/ui/preferences.ui.h:35 -msgid "Filename filters" -msgstr "Dateinamenfilter" - -#: ../data/ui/preferences.ui.h:36 -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 "" -"Wenn ein Ordnervergleich durchgeführt wird, haben Sie die Möglichkeit, " -"Dateien und Ordner nach Namen herauszufiltern. Jedes Muster ist dabei eine " -"durch Leerzeichen getrennte Liste von Befehlszeilenplatzhaltern." - -#: ../data/ui/preferences.ui.h:37 ../meld/meldwindow.py:105 -msgid "File Filters" -msgstr "Dateifilter" - -#: ../data/ui/preferences.ui.h:38 -msgid "Change trimming" -msgstr "Abschneiden ändern" - -#: ../data/ui/preferences.ui.h:39 -msgid "Trim blank line differences from the start and end of changes" -msgstr "Unterschiede in Leerzeilen vor und nach Änderungen abschneiden" - -#: ../data/ui/preferences.ui.h:40 -msgid "Text filters" -msgstr "Textfilter" - -#: ../data/ui/preferences.ui.h:41 -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 "" -"Wenn ein Dateivergleich durchgeführt wird, haben Sie die Möglichkeit " -"festzulegen, dass bestimmte Änderungen ignoriert werden. Jedes Muster ist " -"dabei ein regulärer Ausdruck der Sprache Python, welcher zutreffenden Text " -"durch eine leere Zeichenkette ersetzt, bevor ein Vergleich durchgeführt " -"wird. Falls der Ausdruck Gruppen enthält, werden nur die Gruppen ersetzt. " -"Weitere Informationen sind im Benutzerhandbuch zu finden." - -#: ../data/ui/preferences.ui.h:42 -msgid "Text Filters" -msgstr "Textfilter" - -#: ../data/ui/preferences.ui.h:43 -msgid "Left is remote, right is local" -msgstr "Links ist die entfernte Datei, rechts die lokale" - -#: ../data/ui/preferences.ui.h:44 -msgid "Left is local, right is remote" -msgstr "Links is die lokale Datei, rechts die entfernte" - -#: ../data/ui/preferences.ui.h:45 -msgid "Remote, merge, local" -msgstr "Entfernt, zusammengeführt, lokal" - -#: ../data/ui/preferences.ui.h:46 -msgid "Local, merge, remote" -msgstr "Lokal, zusammengeführt, entfernt" - -#: ../data/ui/preferences.ui.h:47 -msgid "1ns (ext4)" -msgstr "1ns (ext4)" - -#: ../data/ui/preferences.ui.h:48 -msgid "100ns (NTFS)" -msgstr "100ns (NTFS)" - -#: ../data/ui/preferences.ui.h:49 -msgid "1s (ext2/ext3)" -msgstr "1s (ext2/ext3)" - -#: ../data/ui/preferences.ui.h:50 -msgid "2s (VFAT)" -msgstr "2s (VFAT)" - -#: ../data/ui/shortcuts.ui.h:1 -msgctxt "shortcut window" -msgid "General" -msgstr "Allgemein" - -#: ../data/ui/shortcuts.ui.h:2 -msgctxt "shortcut window" -msgid "New comparison" -msgstr "Neuer Vergleich" - -#: ../data/ui/shortcuts.ui.h:3 -msgctxt "shortcut window" -msgid "Close a comparison" -msgstr "Einen Vergleich schließen" - -#: ../data/ui/shortcuts.ui.h:4 -msgctxt "shortcut window" -msgid "Quit Meld" -msgstr "Meld beenden" - -#: ../data/ui/shortcuts.ui.h:5 -msgctxt "shortcut window" -msgid "Stop the current action" -msgstr "Aktuelle Aktion abbrechen" - -#: ../data/ui/shortcuts.ui.h:6 -msgctxt "shortcut window" -msgid "Refresh comparison" -msgstr "Vergleich aktualisieren" - -#: ../data/ui/shortcuts.ui.h:7 -msgctxt "shortcut window" -msgid "Fullscreen" -msgstr "Vollbild" - -#: ../data/ui/shortcuts.ui.h:8 -msgctxt "shortcut window" -msgid "Tabs" -msgstr "Reiter" - -#: ../data/ui/shortcuts.ui.h:9 -msgctxt "shortcut window" -msgid "Go to previous tab" -msgstr "Zum vorherigen Reiter wechseln" - -#: ../data/ui/shortcuts.ui.h:10 -msgctxt "shortcut window" -msgid "Go to next tab" -msgstr "Zum nächsten Reiter wechseln" - -#: ../data/ui/shortcuts.ui.h:11 -msgctxt "shortcut window" -msgid "Switch to tab" -msgstr "Zum Reiter wechseln" - -#: ../data/ui/shortcuts.ui.h:12 -msgctxt "shortcut window" -msgid "Move tab left" -msgstr "Reiter nach links verschieben" - -#: ../data/ui/shortcuts.ui.h:13 -msgctxt "shortcut window" -msgid "Move tab right" -msgstr "Reiter nach rechts verschieben" - -#: ../data/ui/shortcuts.ui.h:14 -msgctxt "shortcut window" -msgid "Changes" -msgstr "Änderungen" - -#: ../data/ui/shortcuts.ui.h:15 -msgctxt "shortcut window" -msgid "Go to previous change" -msgstr "Zur vorherigen Änderung gehen" - -#: ../data/ui/shortcuts.ui.h:16 -msgctxt "shortcut window" -msgid "Go to next change" -msgstr "Zur nächsten Änderung gehen" - -#: ../data/ui/shortcuts.ui.h:17 -msgctxt "shortcut window" -msgid "Editing" -msgstr "Bearbeitung" - -#: ../data/ui/shortcuts.ui.h:18 -msgctxt "shortcut window" -msgid "Undo" -msgstr "Rückgängig" - -#: ../data/ui/shortcuts.ui.h:19 -msgctxt "shortcut window" -msgid "Redo" -msgstr "Wiederholen" - -#: ../data/ui/shortcuts.ui.h:20 -msgctxt "shortcut window" -msgid "Cut" -msgstr "Ausschneiden" - -#: ../data/ui/shortcuts.ui.h:21 -msgctxt "shortcut window" -msgid "Copy" -msgstr "Kopieren" - -#: ../data/ui/shortcuts.ui.h:22 -msgctxt "shortcut window" -msgid "Paste" -msgstr "Einfügen" - -#: ../data/ui/shortcuts.ui.h:23 -msgctxt "shortcut window" -msgid "Find" -msgstr "Suchen" - -#: ../data/ui/shortcuts.ui.h:24 -msgctxt "shortcut window" -msgid "Find Next" -msgstr "Weitersuchen" - -#: ../data/ui/shortcuts.ui.h:25 -msgctxt "shortcut window" -msgid "Find Previous" -msgstr "Rückwärts suchen" - -#: ../data/ui/shortcuts.ui.h:26 -msgctxt "shortcut window" -msgid "Replace" -msgstr "Ersetzen" - -#: ../data/ui/shortcuts.ui.h:27 -msgctxt "shortcut window" -msgid "File comparison" -msgstr "Dateivergleich" - -#: ../data/ui/shortcuts.ui.h:28 -msgctxt "shortcut window" -msgid "Save current file" -msgstr "Aktuelle Datei speichern" - -#: ../data/ui/shortcuts.ui.h:29 -msgctxt "shortcut window" -msgid "Save current file to new path" -msgstr "Aktuelle Datei an einem anderen Ort speichern" - -#: ../data/ui/shortcuts.ui.h:30 -msgctxt "shortcut window" -msgid "Save all files in comparison" -msgstr "Alle Dateien im aktuellen Vergleich speichern" - -#: ../data/ui/shortcuts.ui.h:31 -msgctxt "shortcut window" -msgid "Previous conflict" -msgstr "Vorheriger Konflikt" - -#: ../data/ui/shortcuts.ui.h:32 -msgctxt "shortcut window" -msgid "Next conflict" -msgstr "Nächster Konflikt" - -#: ../data/ui/shortcuts.ui.h:33 -msgctxt "shortcut window" -msgid "Push change to left" -msgstr "Änderung nach links schieben" +#: ../meld/resources/ui/preferences.ui.h:30 +msgid "Order when _merging files:" +msgstr "Reihenfolge beim _Zusammenführen von Dateien:" -#: ../data/ui/shortcuts.ui.h:34 -msgctxt "shortcut window" -msgid "Push change to right" -msgstr "Änderung nach rechts schieben" +#: ../meld/resources/ui/preferences.ui.h:31 +msgid "Commit Messages" +msgstr "Änderungsmitteilungen" -#: ../data/ui/shortcuts.ui.h:35 -msgctxt "shortcut window" -msgid "Pull change from left" -msgstr "Änderung von links ziehen" +#: ../meld/resources/ui/preferences.ui.h:32 +msgid "Show _right margin at:" +msgstr "_Rechten Rand anzeigen bei:" -#: ../data/ui/shortcuts.ui.h:36 -msgctxt "shortcut window" -msgid "Pull change from right" -msgstr "Änderung von rechts ziehen" +#: ../meld/resources/ui/preferences.ui.h:33 +msgid "Automatically _break lines at right margin on commit" +msgstr "Beim Einspielen die Zeilen am rechten Rand automatisch um_brechen" -#: ../data/ui/shortcuts.ui.h:37 -msgctxt "shortcut window" -msgid "Copy change above left" -msgstr "Änderung über den linken Teil kopieren" +#: ../meld/resources/ui/preferences.ui.h:34 +msgid "Version Control" +msgstr "Versionskontrolle" -#: ../data/ui/shortcuts.ui.h:38 -msgctxt "shortcut window" -msgid "Copy change below left" -msgstr "Änderung unter den linken Teil kopieren" +#: ../meld/resources/ui/preferences.ui.h:35 +msgid "Filename filters" +msgstr "Dateinamenfilter" -#: ../data/ui/shortcuts.ui.h:39 -msgctxt "shortcut window" -msgid "Copy change above right" -msgstr "Änderung über den rechten Teil kopieren" +#: ../meld/resources/ui/preferences.ui.h:36 +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 "" +"Wenn ein Ordnervergleich durchgeführt wird, haben Sie die Möglichkeit, " +"Dateien und Ordner nach Namen herauszufiltern. Jedes Muster ist dabei eine " +"durch Leerzeichen getrennte Liste von Befehlszeilenplatzhaltern." -#: ../data/ui/shortcuts.ui.h:40 -msgctxt "shortcut window" -msgid "Copy change below right" -msgstr "Änderung unter den rechten Teil kopieren" +#: ../meld/resources/ui/preferences.ui.h:37 ../meld/meldwindow.py:114 +msgid "File Filters" +msgstr "Dateifilter" -#: ../data/ui/shortcuts.ui.h:41 -msgctxt "shortcut window" -msgid "Delete change" -msgstr "Änderung löschen" +#: ../meld/resources/ui/preferences.ui.h:38 +msgid "Change trimming" +msgstr "Abschneiden ändern" -#: ../data/ui/shortcuts.ui.h:42 -msgctxt "shortcut window" -msgid "Previous comparison pane" -msgstr "Vorheriges Teilfenster" +#: ../meld/resources/ui/preferences.ui.h:39 +msgid "Trim blank line differences from the start and end of changes" +msgstr "Unterschiede in Leerzeilen vor und nach Änderungen abschneiden" -#: ../data/ui/shortcuts.ui.h:43 -msgctxt "shortcut window" -msgid "Next comparison pane" -msgstr "Nächstes Teilfenster" +#: ../meld/resources/ui/preferences.ui.h:40 +msgid "Text filters" +msgstr "Textfilter" -#: ../data/ui/shortcuts.ui.h:44 -msgctxt "shortcut window" -msgid "Folder comparison" -msgstr "Ordnervergleiche" +#: ../meld/resources/ui/preferences.ui.h:41 +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 "" +"Wenn ein Dateivergleich durchgeführt wird, haben Sie die Möglichkeit " +"festzulegen, dass bestimmte Änderungen ignoriert werden. Jedes Muster ist " +"dabei ein regulärer Ausdruck der Sprache Python, welcher zutreffenden Text " +"durch eine leere Zeichenkette ersetzt, bevor ein Vergleich durchgeführt " +"wird. Falls der Ausdruck Gruppen enthält, werden nur die Gruppen ersetzt. " +"Weitere Informationen sind im Benutzerhandbuch zu finden." -#: ../data/ui/shortcuts.ui.h:45 -msgctxt "shortcut window" -msgid "Copy to left" -msgstr "Nach links kopieren" +#: ../meld/resources/ui/preferences.ui.h:42 +msgid "Text Filters" +msgstr "Textfilter" -#: ../data/ui/shortcuts.ui.h:46 -msgctxt "shortcut window" -msgid "Copy to right" -msgstr "Nach rechts kopieren" +#: ../meld/resources/ui/preferences.ui.h:43 +msgid "Left is remote, right is local" +msgstr "Links ist die entfernte Datei, rechts die lokale" -#: ../data/ui/shortcuts.ui.h:47 -msgctxt "shortcut window" -msgid "Version control comparison" -msgstr "Versionskontrollvergleich" +#: ../meld/resources/ui/preferences.ui.h:44 +msgid "Left is local, right is remote" +msgstr "Links is die lokale Datei, rechts die entfernte" -#: ../data/ui/shortcuts.ui.h:48 -msgctxt "shortcut window" -msgid "Commit to version control" -msgstr "Änderungen in die Versionskontrolle einspielen" +#: ../meld/resources/ui/preferences.ui.h:45 +msgid "Remote, merge, local" +msgstr "Entfernt, zusammengeführt, lokal" -#: ../data/ui/shortcuts.ui.h:49 -msgctxt "shortcut window" -msgid "Show/hide console output" -msgstr "Konsolenausgabe anzeigen/verbergen" +#: ../meld/resources/ui/preferences.ui.h:46 +msgid "Local, merge, remote" +msgstr "Lokal, zusammengeführt, entfernt" -#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:567 -#: ../meld/newdifftab.py:49 -msgid "New comparison" -msgstr "Neuer Vergleich" +#: ../meld/resources/ui/preferences.ui.h:47 +msgid "1ns (ext4)" +msgstr "1ns (ext4)" -#: ../data/ui/tab-placeholder.ui.h:2 -msgid "File comparison" -msgstr "Dateivergleich" +#: ../meld/resources/ui/preferences.ui.h:48 +msgid "100ns (NTFS)" +msgstr "100ns (NTFS)" -#: ../data/ui/tab-placeholder.ui.h:3 -msgid "Directory comparison" -msgstr "Ordnervergleich" +#: ../meld/resources/ui/preferences.ui.h:49 +msgid "1s (ext2/ext3)" +msgstr "1s (ext2/ext3)" -#: ../data/ui/tab-placeholder.ui.h:4 -msgid "Version control view" -msgstr "Versionskontrollansicht" +#: ../meld/resources/ui/preferences.ui.h:50 +msgid "2s (VFAT)" +msgstr "2s (VFAT)" -#: ../data/ui/tab-placeholder.ui.h:5 -msgid "_3-way comparison" -msgstr "_3-Wege-Vergleich" +#: ../meld/resources/ui/push-dialog.ui.h:1 +msgid "Push local commits to remote?" +msgstr "Lokale Einbringungen in einen entfernten Ort einspielen?" -#: ../data/ui/tab-placeholder.ui.h:6 -msgid "Select Third File" -msgstr "Die dritte Datei wählen" +#: ../meld/resources/ui/push-dialog.ui.h:2 +msgid "The commits to be pushed are determined by your version control system." +msgstr "" +"Die einzuspielenden Einbringungen werden durch Ihr Versionskontrollsystem " +"bestimmt." -#: ../data/ui/tab-placeholder.ui.h:7 -msgid "Select Second File" -msgstr "Die zweite Datei wählen" +#: ../meld/resources/ui/push-dialog.ui.h:3 +msgid "_Push commits" +msgstr "Einbringungen _einspielen" -#: ../data/ui/tab-placeholder.ui.h:8 -msgid "Select First File" -msgstr "Die erste Datei wählen" +#: ../meld/resources/ui/revert-dialog.ui.h:1 +msgid "Discard unsaved changes to documents?" +msgstr "Nicht gespeicherte Dokumentenänderungen zurücknehmen?" -#: ../data/ui/tab-placeholder.ui.h:9 -msgid "Select First Folder" -msgstr "Den ersten Ordner wählen" +#: ../meld/resources/ui/revert-dialog.ui.h:2 +msgid "Changes made to the following documents will be permanently lost:" +msgstr "Änderungen der folgenden Dokumente werden verloren gehen:" -#: ../data/ui/tab-placeholder.ui.h:10 -msgid "Select Second Folder" -msgstr "Den zweiten Ordner wählen" +#: ../meld/resources/ui/revert-dialog.ui.h:3 +msgid "_Discard" +msgstr "_Verwerfen" -#: ../data/ui/tab-placeholder.ui.h:11 -msgid "Select Third Folder" -msgstr "Den dritten Ordner wählen" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:1 +msgid "Save changes to documents before closing?" +msgstr "Die Änderungen an den Dokumenten vor dem Beenden speichern?" -#: ../data/ui/tab-placeholder.ui.h:12 -msgid "Select A Version-Controlled Folder" -msgstr "Wählen Sie einen Ordner mit Versionskontrolle" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:2 +msgid "If you don’t save, changes will be permanently lost." +msgstr "Wenn Sie nicht speichern, gehen die Änderungen verloren." -#: ../data/ui/tab-placeholder.ui.h:13 -msgid "_Blank comparison" -msgstr "_Leerer Vergleich" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:3 +msgid "Close _without Saving" +msgstr "Schließen _ohne zu Speichern" -#: ../data/ui/tab-placeholder.ui.h:14 -msgid "C_ompare" -msgstr "_Vergleichen" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:4 ../meld/dirdiff.py:1039 +#: ../meld/iohelpers.py:52 ../meld/iohelpers.py:106 +msgid "_Cancel" +msgstr "A_bbrechen" -#: ../data/ui/vcview.ui.h:3 +#: ../meld/resources/ui/save-confirm-dialog.ui.h:5 +msgid "_Save" +msgstr "_Speichern" + +#: ../meld/resources/ui/vcview.ui.h:3 msgid "Co_mmit…" msgstr "Co_mmit …" -#: ../data/ui/vcview.ui.h:4 +#: ../meld/resources/ui/vcview.ui.h:4 msgid "Commit changes to version control" msgstr "Änderungen in die Versionskontrolle einspielen" -#: ../data/ui/vcview.ui.h:5 +#: ../meld/resources/ui/vcview.ui.h:5 msgid "_Update" msgstr "_Aktualisieren" -#: ../data/ui/vcview.ui.h:6 +#: ../meld/resources/ui/vcview.ui.h:6 msgid "Update working copy from version control" msgstr "Arbeitsverzeichnis aus der Versionskontrolle aktualisieren" -#: ../data/ui/vcview.ui.h:7 +#: ../meld/resources/ui/vcview.ui.h:7 msgid "_Push" msgstr "_Schieben" -#: ../data/ui/vcview.ui.h:8 +#: ../meld/resources/ui/vcview.ui.h:8 msgid "Push local changes to remote" msgstr "Lokale Änderungen nach entfernt schieben" -#: ../data/ui/vcview.ui.h:10 +#: ../meld/resources/ui/vcview.ui.h:10 msgid "Add to version control" msgstr "Zur Versionskontrolle hinzufügen" -#: ../data/ui/vcview.ui.h:12 +#: ../meld/resources/ui/vcview.ui.h:12 msgid "Remove from version control" msgstr "Von der Versionskontrolle entfernen" -#: ../data/ui/vcview.ui.h:13 +#: ../meld/resources/ui/vcview.ui.h:13 msgid "Mar_k as Resolved" msgstr "Als _gelöst markieren" -#: ../data/ui/vcview.ui.h:14 +#: ../meld/resources/ui/vcview.ui.h:14 msgid "Mark as resolved in version control" msgstr "Für die Versionskontrolle als gelöst markieren" -#: ../data/ui/vcview.ui.h:15 +#: ../meld/resources/ui/vcview.ui.h:15 msgid "Re_vert" msgstr "Zu_rücksetzen" -#: ../data/ui/vcview.ui.h:16 +#: ../meld/resources/ui/vcview.ui.h:16 msgid "Revert working copy to original state" msgstr "Die Arbeitskopie auf Original zurücksetzen" -#: ../data/ui/vcview.ui.h:17 +#: ../meld/resources/ui/vcview.ui.h:17 msgid "Delete from working copy" msgstr "Aus der Arbeitskopie löschen" -#: ../data/ui/vcview.ui.h:18 +#: ../meld/resources/ui/vcview.ui.h:18 msgid "Console" msgstr "Konsole" -#: ../data/ui/vcview.ui.h:19 +#: ../meld/resources/ui/vcview.ui.h:19 msgid "Show or hide the version control console output pane" msgstr "Die Ausgabe der Versionskontrolle anzeigen oder verstecken" -#: ../data/ui/vcview.ui.h:20 +#: ../meld/resources/ui/vcview.ui.h:20 msgid "_Flatten" msgstr "_Einklappen" -#: ../data/ui/vcview.ui.h:21 +#: ../meld/resources/ui/vcview.ui.h:21 msgid "Flatten directories" msgstr "Ordner reduzieren" -#: ../data/ui/vcview.ui.h:22 +#: ../meld/resources/ui/vcview.ui.h:22 msgid "_Modified" msgstr "_Geändert" -#: ../data/ui/vcview.ui.h:23 +#: ../meld/resources/ui/vcview.ui.h:23 msgid "Show modified files" msgstr "Geänderte Dateien anzeigen" -#: ../data/ui/vcview.ui.h:24 +#: ../meld/resources/ui/vcview.ui.h:24 msgid "_Normal" msgstr "_Normal" -#: ../data/ui/vcview.ui.h:25 +#: ../meld/resources/ui/vcview.ui.h:25 msgid "Show normal files" msgstr "Normale Dateien anzeigen" -#: ../data/ui/vcview.ui.h:26 +#: ../meld/resources/ui/vcview.ui.h:26 msgid "Un_versioned" msgstr "Nicht _versioniert" -#: ../data/ui/vcview.ui.h:27 +#: ../meld/resources/ui/vcview.ui.h:27 msgid "Show unversioned files" msgstr "Nicht versionierte Dateien anzeigen" -#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69 +#: ../meld/resources/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69 msgid "Ignored" msgstr "Ignoriert" -#: ../data/ui/vcview.ui.h:29 +#: ../meld/resources/ui/vcview.ui.h:29 msgid "Show ignored files" msgstr "Ignorierte Dateien anzeigen" -#: ../data/ui/vcview.ui.h:30 -msgid "Commit" -msgstr "Commit" - -#: ../data/ui/vcview.ui.h:31 -msgid "Commit Files" -msgstr "Commit der Dateien" - -#: ../data/ui/vcview.ui.h:32 -msgid "Log Message" -msgstr "Änderungsmitteilung" - -#: ../data/ui/vcview.ui.h:33 -msgid "Previous logs:" -msgstr "Vorherige Mitteilungen:" - -#: ../data/ui/vcview.ui.h:34 -msgid "Co_mmit" -msgstr "Co_mmit" - -#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:331 +#: ../meld/resources/ui/vcview.ui.h:31 ../meld/vcview.py:366 msgid "Location" msgstr "Ort" -#: ../data/ui/vcview.ui.h:37 +#: ../meld/resources/ui/vcview.ui.h:32 msgid "Status" msgstr "Status" -#: ../data/ui/vcview.ui.h:38 +#: ../meld/resources/ui/vcview.ui.h:33 msgid "Extra" msgstr "Extra" -#: ../data/ui/vcview.ui.h:39 +#: ../meld/resources/ui/vcview.ui.h:34 msgid "Console output" msgstr "Konsolenausgabe" -#: ../data/ui/vcview.ui.h:40 -msgid "Push local commits to remote?" -msgstr "Lokale Einbringungen in einen entfernten Ort einspielen?" - -#: ../data/ui/vcview.ui.h:41 -msgid "The commits to be pushed are determined by your version control system." -msgstr "" -"Die einzuspielenden Einbringungen werden durch Ihr Versionskontrollsystem " -"bestimmt." - -#: ../data/ui/vcview.ui.h:42 -msgid "_Push commits" -msgstr "Einbringungen _einspielen" - #: ../meld/const.py:12 msgid "UNIX (LF)" msgstr "UNIX (LF)" @@ -1701,44 +1694,44 @@ msgid "Mac OS (CR)" msgstr "Mac OS (CR)" #. Create file size CellRenderer -#: ../meld/dirdiff.py:428 ../meld/preferences.py:81 +#: ../meld/dirdiff.py:475 ../meld/preferences.py:138 msgid "Size" msgstr "Größe" #. Create date-time CellRenderer -#: ../meld/dirdiff.py:436 ../meld/preferences.py:82 +#: ../meld/dirdiff.py:483 ../meld/preferences.py:139 msgid "Modification time" msgstr "Änderungszeit" #. Create permissions CellRenderer -#: ../meld/dirdiff.py:444 ../meld/preferences.py:83 +#: ../meld/dirdiff.py:491 ../meld/preferences.py:140 msgid "Permissions" msgstr "Berechtigungen" -#: ../meld/dirdiff.py:575 +#: ../meld/dirdiff.py:625 #, python-format msgid "Hide %s" msgstr "%s verbergen" -#: ../meld/dirdiff.py:716 ../meld/dirdiff.py:739 +#: ../meld/dirdiff.py:767 ../meld/dirdiff.py:790 #, python-format msgid "[%s] Scanning %s" msgstr "[%s] %s wird durchsucht" -#: ../meld/dirdiff.py:874 +#: ../meld/dirdiff.py:925 #, python-format msgid "[%s] Done" msgstr "[%s] Fertig" -#: ../meld/dirdiff.py:882 +#: ../meld/dirdiff.py:933 msgid "Folders have no differences" msgstr "Keine Unterschiede zwischen Ordnern" -#: ../meld/dirdiff.py:884 +#: ../meld/dirdiff.py:935 msgid "Contents of scanned files in folders are identical." msgstr "Inhalte der untersuchten Dateien in den Ordnern sind identisch." -#: ../meld/dirdiff.py:886 +#: ../meld/dirdiff.py:937 msgid "" "Scanned files in folders appear identical, but contents have not been " "scanned." @@ -1746,43 +1739,43 @@ msgstr "" "Untersuchte Dateien in den Ordner scheinen identisch zu sein, jedoch wurden " "die Dateiinhalte nicht geprüft." -#: ../meld/dirdiff.py:889 +#: ../meld/dirdiff.py:940 msgid "File filters are in use, so not all files have been scanned." msgstr "" "Dateifilter wurden verwendet, deshalb wurden nicht alle Dateien untersucht." -#: ../meld/dirdiff.py:891 +#: ../meld/dirdiff.py:942 msgid "Text filters are in use and may be masking content differences." msgstr "" "Textfilter werden verwendet, welche Unterschiede zwischen Dateien maskieren " "könnten." -#: ../meld/dirdiff.py:909 ../meld/filediff.py:1499 ../meld/filediff.py:1529 -#: ../meld/filediff.py:1531 ../meld/ui/msgarea.py:106 ../meld/ui/msgarea.py:119 +#: ../meld/dirdiff.py:960 ../meld/filediff.py:1588 ../meld/filediff.py:1618 +#: ../meld/filediff.py:1620 ../meld/ui/msgarea.py:106 ../meld/ui/msgarea.py:119 msgid "Hi_de" msgstr "Ver_bergen" -#: ../meld/dirdiff.py:918 +#: ../meld/dirdiff.py:969 msgid "Multiple errors occurred while scanning this folder" msgstr "Beim Einlesen dieses Ordners traten mehrere Fehler auf" -#: ../meld/dirdiff.py:919 +#: ../meld/dirdiff.py:970 msgid "Files with invalid encodings found" msgstr "Dateien mit ungültigen Kodierungen gefunden" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:921 +#: ../meld/dirdiff.py:972 msgid "Some files were in an incorrect encoding. The names are something like:" msgstr "" "Einige Dateien lagen in einer inkorrekten Kodierung vor. Folgende Namen sind " "davon betroffen:" -#: ../meld/dirdiff.py:923 +#: ../meld/dirdiff.py:974 msgid "Files hidden by case insensitive comparison" msgstr "Dateien durch von Schreibweise unabhängigen Vergleich verborgen" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:925 +#: ../meld/dirdiff.py:976 msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. The following files in this folder are hidden:" @@ -1791,17 +1784,17 @@ msgstr "" "auf einem Dateisystem durch, welches zwischen Groß- und Kleinschreibung " "unterscheidet. Die folgenden Dateien in diesem Ordner sind nicht sichtbar:" -#: ../meld/dirdiff.py:936 +#: ../meld/dirdiff.py:987 #, python-format msgid "“%s” hidden by “%s”" msgstr "»%s« verborgen durch »%s«" -#: ../meld/dirdiff.py:992 +#: ../meld/dirdiff.py:1043 #, python-format msgid "Replace folder “%s”?" msgstr "Ordner »%s« ersetzen?" -#: ../meld/dirdiff.py:994 +#: ../meld/dirdiff.py:1045 #, python-format msgid "" "Another folder with the same name already exists in “%s”.\n" @@ -1810,11 +1803,11 @@ msgstr "" "Ein Ordner mit diesem Namen existiert bereits in »%s«.\n" "Wenn Sie den vorhandenen Ordner ersetzen, gehen alle Dateien darin verloren." -#: ../meld/dirdiff.py:1007 +#: ../meld/dirdiff.py:1058 msgid "Error copying file" msgstr "Fehler beim Kopieren der Datei" -#: ../meld/dirdiff.py:1008 +#: ../meld/dirdiff.py:1059 #, python-format msgid "" "Couldn’t copy %s\n" @@ -1827,19 +1820,19 @@ msgstr "" "\n" "%s" -#: ../meld/dirdiff.py:1033 ../meld/vcview.py:703 +#: ../meld/dirdiff.py:1084 ../meld/vcview.py:720 msgid "Error deleting {}" msgstr "Fehler beim Löschen von {}" -#: ../meld/dirdiff.py:1546 +#: ../meld/dirdiff.py:1593 msgid "No folder" msgstr "Kein Ordner" -#: ../meld/filediff.py:834 +#: ../meld/filediff.py:905 msgid "Comparison results will be inaccurate" msgstr "Ergebnisse werden ungenau sein" -#: ../meld/filediff.py:836 +#: ../meld/filediff.py:907 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1848,66 +1841,66 @@ msgstr "" "nicht unterstützt, deshalb wird ein Vergleich keine korrekten Ergebnisse " "liefern." -#: ../meld/filediff.py:905 +#: ../meld/filediff.py:979 msgid "Mark conflict as resolved?" msgstr "Konflikt als _gelöst markieren?" -#: ../meld/filediff.py:907 +#: ../meld/filediff.py:981 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:909 +#: ../meld/filediff.py:983 msgid "Cancel" msgstr "Abbrechen" -#: ../meld/filediff.py:910 +#: ../meld/filediff.py:984 msgid "Mark _Resolved" msgstr "Als _gelöst markieren" -#: ../meld/filediff.py:1214 +#: ../meld/filediff.py:1303 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Beim Öffnen der Datei »%s« ist ein Fehler aufgetreten." -#: ../meld/filediff.py:1222 +#: ../meld/filediff.py:1311 #, python-format msgid "File %s appears to be a binary file." msgstr "Datei %s scheint eine Binärdatei zu sein." -#: ../meld/filediff.py:1224 +#: ../meld/filediff.py:1313 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:1226 +#: ../meld/filediff.py:1315 msgid "Open" msgstr "Öffnen" -#: ../meld/filediff.py:1242 +#: ../meld/filediff.py:1331 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Unterschiede werden berechnet" -#: ../meld/filediff.py:1303 +#: ../meld/filediff.py:1392 #, python-format msgid "File %s has changed on disk" msgstr "Die Datei %s wurde auf dem Datenträger geändert" -#: ../meld/filediff.py:1304 +#: ../meld/filediff.py:1393 msgid "Do you want to reload the file?" msgstr "Möchten Sie die Datei neu laden?" -#: ../meld/filediff.py:1306 +#: ../meld/filediff.py:1395 msgid "_Reload" msgstr "_Neu laden" -#: ../meld/filediff.py:1462 +#: ../meld/filediff.py:1551 msgid "Files are identical" msgstr "Dateien sind identisch" -#: ../meld/filediff.py:1475 +#: ../meld/filediff.py:1564 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1915,11 +1908,11 @@ msgstr "" "Textfilter werden verwendet, welche Unterschiede zwischen Dateien maskieren " "könnten. Wollen Sie die ungefilterten Dateien vergleichen?" -#: ../meld/filediff.py:1480 +#: ../meld/filediff.py:1569 msgid "Files differ in line endings only" msgstr "Dateien unterscheiden sich nur in den Zeilenendungen" -#: ../meld/filediff.py:1482 +#: ../meld/filediff.py:1571 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1928,15 +1921,15 @@ msgstr "" "Dateien sind identisch, abgesehen von unterschiedlichen Zeilenenden:\n" "%s" -#: ../meld/filediff.py:1502 +#: ../meld/filediff.py:1591 msgid "Show without filters" msgstr "Ungefiltert anzeigen" -#: ../meld/filediff.py:1524 +#: ../meld/filediff.py:1613 msgid "Change highlighting incomplete" msgstr "Änderungsmarkierung unvollständig" -#: ../meld/filediff.py:1525 +#: ../meld/filediff.py:1614 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." @@ -1945,19 +1938,19 @@ msgstr "" "Sie können Meld zur Hervorhebung längerer Änderungen zwingen, was jedoch " "langsam sein könnte." -#: ../meld/filediff.py:1533 +#: ../meld/filediff.py:1622 msgid "Keep highlighting" msgstr "Hervorhebung fortführen" -#: ../meld/filediff.py:1535 +#: ../meld/filediff.py:1624 msgid "_Keep highlighting" msgstr "Hervorhebung _fortführen" -#: ../meld/filediff.py:1548 +#: ../meld/filediff.py:1637 msgid "Saving failed" msgstr "Speichern ist fehlgeschlagen" -#: ../meld/filediff.py:1549 +#: ../meld/filediff.py:1638 msgid "" "Please consider copying any critical changes to another program or file to " "avoid data loss." @@ -1965,37 +1958,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:1558 +#: ../meld/filediff.py:1647 msgid "Save Left Pane As" msgstr "Linke Ansicht speichern unter" -#: ../meld/filediff.py:1560 +#: ../meld/filediff.py:1649 msgid "Save Middle Pane As" msgstr "Mittlere Ansicht speichern unter" -#: ../meld/filediff.py:1562 +#: ../meld/filediff.py:1651 msgid "Save Right Pane As" msgstr "Rechte Ansicht speichern unter" -#: ../meld/filediff.py:1575 +#: ../meld/filediff.py:1664 #, 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:1577 +#: ../meld/filediff.py:1666 msgid "If you save it, any external changes will be lost." msgstr "Wenn Sie speichern, gehen externe Änderungen verloren." -#: ../meld/filediff.py:1580 +#: ../meld/filediff.py:1669 msgid "Save Anyway" msgstr "Dennoch speichern" -#: ../meld/filediff.py:1581 +#: ../meld/filediff.py:1670 msgid "Don’t Save" msgstr "Nicht speichern" -#: ../meld/filediff.py:1623 +#: ../meld/filediff.py:1712 msgid "" "File “{}” contains characters that can’t be encoded using its current " "encoding “{}”." @@ -2003,7 +1996,7 @@ msgstr "" "Die Datei »{}« enthält Zeichen, die mit der aktuellen Kodierung »{}« nicht " "kodierbar sind." -#: ../meld/filediff.py:1627 ../meld/patchdialog.py:131 +#: ../meld/filediff.py:1716 ../meld/patchdialog.py:142 #, python-format msgid "" "Couldn’t save file due to:\n" @@ -2012,16 +2005,16 @@ msgstr "" "Datei konnte nicht gespeichert werden:\n" "%s" -#: ../meld/filediff.py:1631 ../meld/patchdialog.py:130 +#: ../meld/filediff.py:1720 ../meld/patchdialog.py:141 #, python-format msgid "Could not save file %s." msgstr "Datei %s konnte nicht gespeichert werden." -#: ../meld/filediff.py:2014 +#: ../meld/filediff.py:2113 msgid "Live comparison updating disabled" msgstr "Direkte Vergleichsaktualisierung deaktiviert" -#: ../meld/filediff.py:2015 +#: ../meld/filediff.py:2114 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -2037,44 +2030,44 @@ msgstr "" msgid "[%s] Merging files" msgstr "[%s] Dateien werden zusammengeführt" -#: ../meld/gutterrendererchunk.py:216 +#: ../meld/gutterrendererchunk.py:220 msgid "Copy _up" msgstr "Nach _oben kopieren" -#: ../meld/gutterrendererchunk.py:217 +#: ../meld/gutterrendererchunk.py:221 msgid "Copy _down" msgstr "Nach _unten kopieren" -#: ../meld/iohelpers.py:35 +#: ../meld/iohelpers.py:37 msgid "Deleting remote folders is not supported" msgstr "Lösche entfernter Ordner wird nicht unterstützt" -#: ../meld/iohelpers.py:37 +#: ../meld/iohelpers.py:39 msgid "Not a file or directory" msgstr "Weder eine Datei noch ein Ordner" -#: ../meld/iohelpers.py:41 +#: ../meld/iohelpers.py:43 msgid "“{}” can’t be put in the trash. Do you want to delete it immediately?" msgstr "" "»{}« kann nicht in den Papierkorb verschoben werden. Wollen Sie es dauerhaft " "löschen?" -#: ../meld/iohelpers.py:46 +#: ../meld/iohelpers.py:48 msgid "This remote location does not support sending items to the trash." msgstr "" "Dieser entfernte Ort unterstützt kein Verschieben von Objekten in den " "Papierkorb." -#: ../meld/iohelpers.py:51 +#: ../meld/iohelpers.py:53 msgid "_Delete Permanently" msgstr "_Dauerhaft löschen" -#: ../meld/iohelpers.py:94 +#: ../meld/iohelpers.py:100 #, python-format msgid "Replace file “%s”?" msgstr "Datei »%s« ersetzen?" -#: ../meld/iohelpers.py:96 +#: ../meld/iohelpers.py:102 #, python-format msgid "" "A file with this name already exists in “%s”.\n" @@ -2083,99 +2076,99 @@ msgstr "" "Eine Datei mit diesem Namen existiert bereits in »%s«.\n" "Wenn Sie die vorhandene Datei ersetzen, geht dessen Inhalt verloren." -#: ../meld/meldapp.py:181 +#: ../meld/meldapp.py:169 msgid "wrong number of arguments supplied to --diff" msgstr "Falsche Anzahl an Argumenten für --diff" -#: ../meld/meldapp.py:186 +#: ../meld/meldapp.py:174 msgid "Start with an empty window" msgstr "Beim Start kein Fenster öffnen" -#: ../meld/meldapp.py:187 ../meld/meldapp.py:189 +#: ../meld/meldapp.py:175 ../meld/meldapp.py:177 msgid "file" msgstr "Datei" -#: ../meld/meldapp.py:187 ../meld/meldapp.py:191 +#: ../meld/meldapp.py:175 ../meld/meldapp.py:179 msgid "folder" msgstr "Ordner" -#: ../meld/meldapp.py:188 +#: ../meld/meldapp.py:176 msgid "Start a version control comparison" msgstr "Versionskontrollvergleich starten" -#: ../meld/meldapp.py:190 +#: ../meld/meldapp.py:178 msgid "Start a 2- or 3-way file comparison" msgstr "Im Zwei- oder Dreiwegevergleich starten" -#: ../meld/meldapp.py:192 +#: ../meld/meldapp.py:180 msgid "Start a 2- or 3-way folder comparison" msgstr "Einen Zwei- oder Dreiwegevergleich starten" -#: ../meld/meldapp.py:235 +#: ../meld/meldapp.py:223 #, python-format msgid "Error: %s\n" msgstr "Fehler: %s\n" -#: ../meld/meldapp.py:242 +#: ../meld/meldapp.py:230 msgid "Meld is a file and directory comparison tool." msgstr "Meld ist ein Werkzeug zum Vergleichen von Dateien und Ordnern." -#: ../meld/meldapp.py:246 +#: ../meld/meldapp.py:234 msgid "Set label to use instead of file name" msgstr "Zu verwendende Bezeichnung anstelle Dateinamen angeben" -#: ../meld/meldapp.py:249 +#: ../meld/meldapp.py:237 msgid "Open a new tab in an already running instance" msgstr "Einen neuen Reiter in einer bereits laufenden Instanz öffnen" -#: ../meld/meldapp.py:252 +#: ../meld/meldapp.py:240 msgid "Automatically compare all differing files on startup" msgstr "Automatisch alle sich unterscheidenden Dateien beim Start vergleichen" -#: ../meld/meldapp.py:255 +#: ../meld/meldapp.py:243 msgid "Ignored for compatibility" msgstr "Aus Kompatibilitätsgründen ignoriert" -#: ../meld/meldapp.py:259 +#: ../meld/meldapp.py:247 msgid "Set the target file for saving a merge result" msgstr "Zieldatei zum Speichern einer Zusammenführung festlegen" -#: ../meld/meldapp.py:262 +#: ../meld/meldapp.py:250 msgid "Automatically merge files" msgstr "Dateien automatisch zusammenführen" -#: ../meld/meldapp.py:266 +#: ../meld/meldapp.py:254 msgid "Load a saved comparison from a Meld comparison file" msgstr "Einen abgespeicherten Vergleich aus einer Meld-Vergleichsdatei laden" -#: ../meld/meldapp.py:270 +#: ../meld/meldapp.py:258 msgid "Create a diff tab for the supplied files or folders" msgstr "Erzeugt einen Differenz-Reiter für die angegebenen Dateien oder Ordner" -#: ../meld/meldapp.py:290 +#: ../meld/meldapp.py:278 #, python-format msgid "too many arguments (wanted 0-3, got %d)" msgstr "zu viele Argumente (0-3 erforderlich, %d erhalten)" -#: ../meld/meldapp.py:293 +#: ../meld/meldapp.py:281 msgid "can’t auto-merge less than 3 files" msgstr "" "Mit weniger als 3 Dateien ist keine automatische Zusammenführung möglich" -#: ../meld/meldapp.py:295 +#: ../meld/meldapp.py:283 msgid "can’t auto-merge directories" msgstr "Ordner können nicht automatisch zusammengeführt werden" -#: ../meld/meldapp.py:309 +#: ../meld/meldapp.py:297 msgid "Error reading saved comparison file" msgstr "Fehler beim Lesen der gespeicherten Vergleichsdatei" -#: ../meld/meldapp.py:326 +#: ../meld/meldapp.py:314 #, python-format msgid "invalid path or URI “%s”" msgstr "Ungültiger Pfad oder Adresse »%s«" -#: ../meld/meldapp.py:332 +#: ../meld/meldapp.py:320 msgid "remote folder “{}” not supported" msgstr "Entfernter Ordner »{}« wird nicht unterstützt" @@ -2184,213 +2177,177 @@ msgstr "Entfernter Ordner »{}« wird nicht unterstützt" msgid "" msgstr "" -#: ../meld/melddoc.py:68 +#: ../meld/melddoc.py:63 msgid "untitled" msgstr "unbenannt" -#: ../meld/meldwindow.py:47 +#: ../meld/meldwindow.py:56 msgid "_File" msgstr "_Datei" -#: ../meld/meldwindow.py:48 +#: ../meld/meldwindow.py:57 msgid "_New Comparison…" msgstr "Neuer _Vergleich …" -#: ../meld/meldwindow.py:49 +#: ../meld/meldwindow.py:58 msgid "Start a new comparison" msgstr "Neuen Vergleich starten" -#: ../meld/meldwindow.py:52 +#: ../meld/meldwindow.py:61 msgid "Save the current file" msgstr "Aktuelle Datei speichern" -#: ../meld/meldwindow.py:54 +#: ../meld/meldwindow.py:63 msgid "Save As…" msgstr "Speichern unter …" -#: ../meld/meldwindow.py:55 +#: ../meld/meldwindow.py:64 msgid "Save the current file with a different name" msgstr "Aktuelle Datei unter einem anderen Namen speichern" -#: ../meld/meldwindow.py:58 +#: ../meld/meldwindow.py:67 msgid "Close the current file" msgstr "Aktuelle Datei schließen" -#: ../meld/meldwindow.py:61 +#: ../meld/meldwindow.py:70 msgid "_Edit" msgstr "_Bearbeiten" -#: ../meld/meldwindow.py:63 +#: ../meld/meldwindow.py:72 msgid "Undo the last action" msgstr "Letzte Aktion rückgängig machen" -#: ../meld/meldwindow.py:66 +#: ../meld/meldwindow.py:75 msgid "Redo the last undone action" msgstr "Letzte Aktion wiederholen" -#: ../meld/meldwindow.py:68 +#: ../meld/meldwindow.py:77 msgid "Cut the selection" msgstr "Auswahl ausschneiden" -#: ../meld/meldwindow.py:70 +#: ../meld/meldwindow.py:79 msgid "Copy the selection" msgstr "Auswahl kopieren" -#: ../meld/meldwindow.py:72 +#: ../meld/meldwindow.py:81 msgid "Paste the clipboard" msgstr "Aus der Zwischenablage einfügen" -#: ../meld/meldwindow.py:74 +#: ../meld/meldwindow.py:83 msgid "Find…" msgstr "Suchen …" -#: ../meld/meldwindow.py:74 +#: ../meld/meldwindow.py:83 msgid "Search for text" msgstr "Nach Text suchen" -#: ../meld/meldwindow.py:76 +#: ../meld/meldwindow.py:85 msgid "Find Ne_xt" msgstr "Nä_chste" -#: ../meld/meldwindow.py:77 +#: ../meld/meldwindow.py:86 msgid "Search forwards for the same text" msgstr "Vorwärts nach dem gleichen Text suchen" -#: ../meld/meldwindow.py:79 +#: ../meld/meldwindow.py:88 msgid "Find _Previous" msgstr "_Rückwärts suchen" -#: ../meld/meldwindow.py:80 +#: ../meld/meldwindow.py:89 msgid "Search backwards for the same text" msgstr "Rückwärts nach dem gleichen Text suchen" -#: ../meld/meldwindow.py:83 +#: ../meld/meldwindow.py:92 msgid "_Replace…" msgstr "E_rsetzen …" -#: ../meld/meldwindow.py:84 +#: ../meld/meldwindow.py:93 msgid "Find and replace text" msgstr "Text suchen und ersetzen" -#: ../meld/meldwindow.py:86 +#: ../meld/meldwindow.py:95 msgid "Go to _Line" msgstr "_Gehe zu Zeile" -#: ../meld/meldwindow.py:87 +#: ../meld/meldwindow.py:96 msgid "Go to a specific line" msgstr "Zu einer bestimmten Zeile springen" -#: ../meld/meldwindow.py:90 +#: ../meld/meldwindow.py:99 msgid "_Changes" msgstr "Än_derungen" -#: ../meld/meldwindow.py:91 +#: ../meld/meldwindow.py:100 msgid "Next Change" msgstr "Nächste Änderung" -#: ../meld/meldwindow.py:92 +#: ../meld/meldwindow.py:101 msgid "Go to the next change" msgstr "Zur nächsten Änderung gehen" -#: ../meld/meldwindow.py:94 +#: ../meld/meldwindow.py:103 msgid "Previous Change" msgstr "Vorherige Änderung" -#: ../meld/meldwindow.py:95 +#: ../meld/meldwindow.py:104 msgid "Go to the previous change" msgstr "Zur vorherigen Änderung gehen" -#: ../meld/meldwindow.py:97 +#: ../meld/meldwindow.py:106 msgid "Open Externally" msgstr "Extern öffnen" -#: ../meld/meldwindow.py:98 +#: ../meld/meldwindow.py:107 msgid "Open selected file or directory in the default external application" msgstr "" "Gewählte Datei oder Ordner in der vorgegebenen externen Anwendung öffnen" -#: ../meld/meldwindow.py:102 +#: ../meld/meldwindow.py:111 msgid "_View" msgstr "_Ansicht" -#: ../meld/meldwindow.py:103 +#: ../meld/meldwindow.py:112 msgid "File Status" msgstr "Dateistatus" -#: ../meld/meldwindow.py:104 +#: ../meld/meldwindow.py:113 msgid "Version Status" msgstr "Versionsstatus" -#: ../meld/meldwindow.py:107 +#: ../meld/meldwindow.py:116 msgid "Stop the current action" msgstr "Aktuelle Aktion abbrechen" -#: ../meld/meldwindow.py:110 +#: ../meld/meldwindow.py:119 msgid "Refresh the view" msgstr "Ansicht aktualisieren" -#: ../meld/meldwindow.py:114 +#: ../meld/meldwindow.py:123 msgid "Fullscreen" msgstr "Vollbild" -#: ../meld/meldwindow.py:115 +#: ../meld/meldwindow.py:124 msgid "View the comparison in fullscreen" msgstr "Den Vergleich im Vollbildmodus anzeigen" -#: ../meld/meldwindow.py:117 -msgid "_Toolbar" -msgstr "_Werkzeugleiste" - -#: ../meld/meldwindow.py:118 -msgid "Show or hide the toolbar" -msgstr "Werkzeugleiste anzeigen oder verbergen" - -#: ../meld/meldwindow.py:127 +#: ../meld/meldwindow.py:133 msgid "Open Recent" msgstr "Zuletzt verwendete Dateien öffnen" -#: ../meld/meldwindow.py:128 +#: ../meld/meldwindow.py:134 msgid "Open recent files" msgstr "Zuletzt verwendete Dateien öffnen" -#: ../meld/meldwindow.py:150 -msgid "_Meld" -msgstr "_Meld" - -#: ../meld/meldwindow.py:151 -msgid "Quit the program" -msgstr "Anwendung beenden" - -#: ../meld/meldwindow.py:153 -msgid "Prefere_nces" -msgstr "_Einstellungen" - -#: ../meld/meldwindow.py:154 -msgid "Configure the application" -msgstr "Anwendung konfigurieren" - -#: ../meld/meldwindow.py:156 -msgid "_Contents" -msgstr "I_nhalt" - -#: ../meld/meldwindow.py:157 -msgid "Open the Meld manual" -msgstr "Handbuch öffnen" - -#: ../meld/meldwindow.py:159 -msgid "About this application" -msgstr "Info zu dieser Anwendung" - -#: ../meld/meldwindow.py:602 +#: ../meld/meldwindow.py:567 #, python-format msgid "Need three files to auto-merge, got: %r" msgstr "Drei Dateien zum automatischen Zusammenführen benötigt, %r erhalten." -#: ../meld/meldwindow.py:623 +#: ../meld/meldwindow.py:588 msgid "Cannot compare a mixture of files and directories" msgstr "Es kann keine Mischung aus Dateien und Ordnern verglichen werden" -#: ../meld/misc.py:135 +#: ../meld/misc.py:155 msgid "" "{}\n" "\n" @@ -2402,42 +2359,38 @@ msgstr "" "Meld entdeckte einen kritischen Fehler während der Ausführung:\n" "{}" -#: ../meld/misc.py:254 +#: ../meld/misc.py:237 #, python-format msgid "Couldn’t find colour scheme details for %s-%s; this is a bad install" msgstr "" "Farbschema-Details für %s-%s konnten nicht gefunden werden, die Installation " "ist fehlerhaft" -#: ../meld/misc.py:325 +#: ../meld/misc.py:311 msgid "[None]" msgstr "[Nichts]" -#: ../meld/preferences.py:33 +#: ../meld/preferences.py:42 ../meld/preferences.py:135 msgid "label" msgstr "Bezeichnung" -#: ../meld/preferences.py:33 +#: ../meld/preferences.py:42 ../meld/preferences.py:135 msgid "pattern" msgstr "Muster" -#: ../meld/recent.py:105 +#: ../meld/recent.py:106 msgid "Version control:" msgstr "Versionskontrolle:" -#: ../meld/ui/bufferselectors.py:32 +#: ../meld/ui/bufferselectors.py:114 #, python-brace-format msgid "{name} ({charset})" msgstr "{name} ({charset})" -#: ../meld/ui/bufferselectors.py:65 ../meld/ui/bufferselectors.py:73 +#: ../meld/ui/bufferselectors.py:144 ../meld/ui/bufferselectors.py:152 msgid "Plain Text" msgstr "Einfacher Text" -#: ../meld/ui/notebooklabel.py:63 -msgid "Close tab" -msgstr "Reiter schließen" - #. Abbreviation for line, column so that it will fit in the status bar #: ../meld/ui/statusbar.py:124 #, python-format @@ -2448,7 +2401,7 @@ msgstr "Zeile %i, Spalte %i" msgid "Line you want to move the cursor to" msgstr "Zeile, zu der der Zeiger bewegt werden soll" -#: ../meld/ui/vcdialogs.py:48 +#: ../meld/ui/vcdialogs.py:55 msgid "No files will be committed" msgstr "Keine Dateien zum Einspielen" @@ -2549,91 +2502,91 @@ msgstr "Nicht vorhanden" #. Translators: This error message is shown when a version #. control binary isn't installed. -#: ../meld/vcview.py:248 +#: ../meld/vcview.py:282 #, python-format msgid "%(name)s (%(cmd)s not installed)" msgstr "%(name)s (%(cmd)s ist nicht installiert" #. Translators: This error message is shown when a version #. controlled repository is invalid. -#: ../meld/vcview.py:252 +#: ../meld/vcview.py:286 #, python-format msgid "%(name)s (Invalid repository)" msgstr "%(name)s (ungültiger Softwarebestand)" -#: ../meld/vcview.py:273 +#: ../meld/vcview.py:307 msgid "No valid version control system found in this folder" msgstr "Kein gültiges Versionskontrollsystem in diesem Verzeichnis gefunden" -#: ../meld/vcview.py:275 +#: ../meld/vcview.py:309 msgid "Only one version control system found in this folder" msgstr "Nur eine Versionskontrolle in diesem Ordner gefunden" -#: ../meld/vcview.py:277 +#: ../meld/vcview.py:311 msgid "Choose which version control system to use" msgstr "Wählen Sie die zu verwendende Versionskontrolle" #. TRANSLATORS: This is the location of the directory being viewed -#: ../meld/vcview.py:331 +#: ../meld/vcview.py:366 #, python-format msgid "%s: %s" msgstr "%s: %s" #. Initial yield so when we add this to our tasks, we don't #. create iterators that may be invalidated. -#: ../meld/vcview.py:338 +#: ../meld/vcview.py:373 msgid "Scanning repository" msgstr "Softwarebestand wird durchsucht" -#: ../meld/vcview.py:367 +#: ../meld/vcview.py:402 #, python-format msgid "Scanning %s" msgstr "%s wird durchsucht" -#: ../meld/vcview.py:406 +#: ../meld/vcview.py:441 msgid "(Empty)" msgstr "(Leer)" -#: ../meld/vcview.py:450 +#: ../meld/vcview.py:487 #, python-format msgid "%s — local" msgstr "%s — lokal" -#: ../meld/vcview.py:451 +#: ../meld/vcview.py:488 #, python-format msgid "%s — remote" msgstr "%s — entfernt" -#: ../meld/vcview.py:459 +#: ../meld/vcview.py:496 #, python-format msgid "%s (local, merge, remote)" msgstr "%s (lokal, zusammengeführt, entfernt)" -#: ../meld/vcview.py:464 +#: ../meld/vcview.py:501 #, python-format msgid "%s (remote, merge, local)" msgstr "%s (entfernt, zusammengeführt, lokal)" -#: ../meld/vcview.py:475 +#: ../meld/vcview.py:512 #, python-format msgid "%s — repository" msgstr "%s — Softwarebestand" -#: ../meld/vcview.py:481 +#: ../meld/vcview.py:518 #, python-format msgid "%s (working, repository)" msgstr "%s (Arbeitskopie, Softwarebestand)" -#: ../meld/vcview.py:485 +#: ../meld/vcview.py:522 #, python-format msgid "%s (repository, working)" msgstr "%s (Softwarebestand, Arbeitskopie)" -#: ../meld/vcview.py:674 +#: ../meld/vcview.py:688 msgid "Remove folder and all its files?" msgstr "Den Ordner und alle Dateien entfernen?" -#: ../meld/vcview.py:676 +#: ../meld/vcview.py:690 msgid "" "This will remove all selected files and folders, and all files within any " "selected folders, from version control." @@ -2641,10 +2594,58 @@ msgstr "" "Dadurch werden alle gewählten Dateien, Ordner und deren Inhalte aus der " "Versionskontrolle entfernt." -#: ../meld/vcview.py:785 +#: ../meld/vcview.py:804 msgid "Clear" msgstr "Leeren" +#~ msgid "Show toolbar" +#~ msgstr "Werkzeugleiste anzeigen" + +#~ msgid "If true, the window toolbar is visible." +#~ msgstr "" +#~ "Wenn dieser Schlüssel wahr ist, so ist die Fenster-Werkzeugleiste " +#~ "sichtbar." + +#~ msgid "Show statusbar" +#~ msgstr "Statusleiste anzeigen" + +#~ msgid "If true, the window statusbar is visible." +#~ msgstr "" +#~ "Wenn dieser Schlüssel wahr ist, so ist die Fenster-Statusleiste sichtbar." + +#~ msgid "Editable List" +#~ msgstr "Editierbare Liste" + +#~ msgid "Meld Preferences" +#~ msgstr "Meld - Einstellungen" + +#~ msgid "_Toolbar" +#~ msgstr "_Werkzeugleiste" + +#~ msgid "Show or hide the toolbar" +#~ msgstr "Werkzeugleiste anzeigen oder verbergen" + +#~ msgid "_Meld" +#~ msgstr "_Meld" + +#~ msgid "Quit the program" +#~ msgstr "Anwendung beenden" + +#~ msgid "Prefere_nces" +#~ msgstr "_Einstellungen" + +#~ msgid "Configure the application" +#~ msgstr "Anwendung konfigurieren" + +#~ msgid "_Contents" +#~ msgstr "I_nhalt" + +#~ msgid "Open the Meld manual" +#~ msgstr "Handbuch öffnen" + +#~ msgid "About this application" +#~ msgstr "Info zu dieser Anwendung" + #~ msgid "_Save as UTF-8" #~ msgstr "Als UTF-8 _speichern" From 1be76337a17b41d71b712ecc9765e0ded1680449 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Wed, 28 Nov 2018 06:13:26 +1000 Subject: [PATCH 0782/1316] meldbuffer: Move BufferLines to just use GTK+ line logic (#240) Over the years we've had many, many issues with GTK+ and Python disagreeing about what constitutes a line break. The actual bug that has prompted this rewrite is just another one in the long series of wild issues, but it's *so annoying* that rather than work through the insane logic I wrote before, I've just changed the whole approach and made our treat-my-textbuffer-as-a-list-of-lines shim use GTK+ APIs to do its line calculation logic. I'm was worried that this will be slow - it is after all a _lot_ more function calls and we're crossing through GObject introspection a bunch, but it... seems okay? One of the minor weird side-effects here is that this accessor absolutely enforces that regex filters only apply to a single line. I considered options for maintaining our very-broken status quo, but they were very, very difficult by comparison, and any multi-line filters are completely unsupported. --- meld/meldbuffer.py | 56 ++++++++------------------------------- test/test_buffer_lines.py | 49 ++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 45 deletions(-) create mode 100644 test/test_buffer_lines.py diff --git a/meld/meldbuffer.py b/meld/meldbuffer.py index fd95aa14..a27b20f6 100644 --- a/meld/meldbuffer.py +++ b/meld/meldbuffer.py @@ -224,10 +224,6 @@ class BufferLines: This class allows a Gtk.TextBuffer to be treated as a list of lines of possibly-filtered text. If no filter is given, the raw output from the Gtk.TextBuffer is used. - - The logic here (and in places in FileDiff) requires that Python's - unicode splitlines() implementation and Gtk.TextBuffer agree on where - linebreaks occur. Happily, this is usually the case. """ def __init__(self, buf, textfilter=None): @@ -240,48 +236,18 @@ def __init__(self, buf, textfilter=None): def __getitem__(self, key): if isinstance(key, slice): lo, hi, _ = key.indices(self.buf.get_line_count()) - - # FIXME: If we ask for arbitrary slices past the end of the buffer, - # this will return the last line. - start = self.buf.get_iter_at_line_or_eof(lo) + line_start = self.buf.get_iter_at_line_or_eof(lo) end = self.buf.get_iter_at_line_or_eof(hi) - txt = self.buf.get_text(start, end, False) - - filter_txt = self.textfilter(txt, self.buf, start, end) - lines = filter_txt.splitlines() - ends = filter_txt.splitlines(True) - - # The last line in a Gtk.TextBuffer is guaranteed never to end in a - # newline. As splitlines() discards an empty line at the end, we - # need to artificially add a line if the requested slice is past - # the end of the buffer, and the last line in the slice ended in a - # newline. - if hi >= self.buf.get_line_count() and \ - lo < self.buf.get_line_count() and \ - (len(lines) == 0 or len(lines[-1]) != len(ends[-1])): - lines.append("") - ends.append("") - - hi = self.buf.get_line_count() if hi == sys.maxsize else hi - if hi - lo != len(lines): - # These codepoints are considered line breaks by Python, but - # not by GtkTextStore. - additional_breaks = set(('\x0c', '\x85', '\u2028')) - i = 0 - while i < len(ends): - line, end = lines[i], ends[i] - # It's possible that the last line in a file would end in a - # line break character, which requires no joining. - if end and end[-1] in additional_breaks and \ - (not line or line[-1] not in additional_breaks): - assert len(ends) >= i + 1 - lines[i:i + 2] = [line + end[-1] + lines[i + 1]] - ends[i:i + 2] = [end + ends[i + 1]] - else: - # We only increment if we don't correct a line, to - # handle the case of a single line having multiple - # additional_breaks characters that need correcting. - i += 1 + + lines = [] + while line_start.compare(end) < 0: + line_end = line_start.copy() + if not line_end.ends_line(): + line_end.forward_to_line_end() + txt = self.buf.get_text(line_start, line_end, False) + filter_txt = self.textfilter(txt, self.buf, line_start, end) + lines.append(filter_txt) + line_start.forward_visible_line() return lines diff --git a/test/test_buffer_lines.py b/test/test_buffer_lines.py new file mode 100644 index 00000000..b9ae85f6 --- /dev/null +++ b/test/test_buffer_lines.py @@ -0,0 +1,49 @@ + +from unittest import mock + +import pytest + +from meld.meldbuffer import BufferLines, MeldBuffer + + +text = ("""0 +1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +""") + + +@pytest.mark.parametrize("line_start, line_end, expected_text", [ + (0, 1, ["0"],), + (0, 2, ["0", "1"],), + # zero-sized slice + (9, 9, [],), + (9, 10, ["9"],), + (9, 11, ["9", "10"],), + # Past the end of the buffer + (9, 12, ["9", "10"],), + # Waaaay past the end of the buffer + (9, 9999, ["9", "10"],), + # And sidling towards past-the-end start indices + (10, 12, ["10"],), + (11, 12, [],), +]) +def test_filter_text(line_start, line_end, expected_text): + + import meld.meldbuffer + + meld.meldbuffer.bind_settings = mock.MagicMock() + meld.meldbuffer.meldsettings = mock.MagicMock(style_scheme=None) + + buf = MeldBuffer() + buf.set_text(text) + + buffer_lines = BufferLines(buf) + assert buffer_lines[line_start:line_end] == expected_text From 12c9aaa772315c7f1d43f08beba8e010fc61ec0f Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sat, 12 Jan 2019 06:42:21 +1000 Subject: [PATCH 0783/1316] meldbuffer: Import cleanup --- meld/meldbuffer.py | 1 - 1 file changed, 1 deletion(-) diff --git a/meld/meldbuffer.py b/meld/meldbuffer.py index a27b20f6..d3dbd372 100644 --- a/meld/meldbuffer.py +++ b/meld/meldbuffer.py @@ -15,7 +15,6 @@ # along with this program. If not, see . import logging -import sys from gi.repository import Gio from gi.repository import GLib From 91e7149b8f472e945f7be18a28655bfe1ebb14dd Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sat, 12 Jan 2019 06:42:37 +1000 Subject: [PATCH 0784/1316] ui.gtkcompat: Fix regex escaping Best I can tell this had no impact on our selector parsing, but at least flake8 is happier now. --- meld/ui/gtkcompat.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meld/ui/gtkcompat.py b/meld/ui/gtkcompat.py index ae0df5d6..d20b146c 100644 --- a/meld/ui/gtkcompat.py +++ b/meld/ui/gtkcompat.py @@ -45,7 +45,7 @@ def append_element(path, selector): ('drop(active)', Gtk.StateFlags.DROP_ACTIVE) ] - toks = [t for t in re.split('([#\.:])', selector) if t] + toks = [t for t in re.split(r'([#\.:])', selector) if t] elements = [toks[i] + toks[i + 1] for i in range(1, len(toks), 2)] name = toks[0] From 231829dc67c26290614ea07becffa6564547fa5c Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sat, 12 Jan 2019 06:48:39 +1000 Subject: [PATCH 0785/1316] vc.git: Fix a "bad" escape string This had no effect, just placating flake8. --- meld/vc/git.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meld/vc/git.py b/meld/vc/git.py index beaced8c..d388557e 100644 --- a/meld/vc/git.py +++ b/meld/vc/git.py @@ -47,8 +47,8 @@ class Vc(_vc.Vc): NAME = "Git" VC_DIR = ".git" - GIT_DIFF_FILES_RE = ":(\d+) (\d+) ([a-z0-9]+) ([a-z0-9]+) ([XADMTU])\t(.*)" - DIFF_RE = re.compile(GIT_DIFF_FILES_RE) + DIFF_FILES_RE = r":(\d+) (\d+) ([a-z0-9]+) ([a-z0-9]+) ([XADMTU])\t(.*)" + DIFF_RE = re.compile(DIFF_FILES_RE) conflict_map = { # These are the arguments for git-show From 49f022033a1958f07184c50fa9cb6b23be878ad0 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sat, 12 Jan 2019 06:55:37 +1000 Subject: [PATCH 0786/1316] CI: Add glib2-devel to our deps for resource compilation --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0f6a2631..9ba242db 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ stages: variables: DEPENDENCIES: python3 pygobject3 gobject-introspection python3-gobject gtk3 gtksourceview3 - python3-pytest intltool + python3-pytest intltool glib2-devel .linux-common: &linux-common image: fedora:rawhide From 53b2dc3d10f64b9d911490ff4c0422d20ee3c86d Mon Sep 17 00:00:00 2001 From: Ryuta Fujii Date: Mon, 14 Jan 2019 15:12:06 +0000 Subject: [PATCH 0787/1316] Update Japanese translation --- po/ja.po | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/po/ja.po b/po/ja.po index bc009446..579752e4 100644 --- a/po/ja.po +++ b/po/ja.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: meld master\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n" -"POT-Creation-Date: 2019-01-07 22:26+0000\n" +"POT-Creation-Date: 2019-01-10 21:55+0000\n" "PO-Revision-Date: 2019-01-08 21:02+0900\n" "Last-Translator: sicklylife \n" "Language-Team: Japanese \n" @@ -18,7 +18,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: pygettext.py 1.5\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=1; plural=0;\n" #: ../bin/meld:190 msgid "Cannot import: " @@ -1109,7 +1109,7 @@ msgid "Remove selected filter" msgstr "選択したフィルターを削除します" #: ../meld/resources/ui/findbar.ui.h:1 ../meld/dirdiff.py:1040 -#: ../meld/iohelpers.py:107 +#: ../meld/iohelpers.py:113 msgid "_Replace" msgstr "置換(_R)" @@ -1222,7 +1222,7 @@ msgstr "パッチを生成" msgid "Copy to Clipboard" msgstr "クリップボードへコピー" -#: ../meld/resources/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:163 +#: ../meld/resources/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:165 msgid "Save Patch" msgstr "パッチを保存" @@ -1490,7 +1490,7 @@ msgid "Close _without Saving" msgstr "保存せずに閉じる(_W)" #: ../meld/resources/ui/save-confirm-dialog.ui.h:4 ../meld/dirdiff.py:1039 -#: ../meld/iohelpers.py:52 ../meld/iohelpers.py:106 +#: ../meld/iohelpers.py:58 ../meld/iohelpers.py:112 msgid "_Cancel" msgstr "キャンセル(_C)" @@ -1922,7 +1922,7 @@ msgid "" msgstr "" "“{}”には現在のエンコーディング“{}”でエンコードできない文字が含まれています。" -#: ../meld/filediff.py:1716 ../meld/patchdialog.py:142 +#: ../meld/filediff.py:1716 ../meld/patchdialog.py:144 #, python-format msgid "" "Couldn’t save file due to:\n" @@ -1931,7 +1931,7 @@ msgstr "" "次の理由によりファイルを保存できませんでした:\n" "%s" -#: ../meld/filediff.py:1720 ../meld/patchdialog.py:141 +#: ../meld/filediff.py:1720 ../meld/patchdialog.py:143 #, python-format msgid "Could not save file %s." msgstr "%s を保存できませんでした。" @@ -1963,34 +1963,34 @@ msgstr "上にコピー(_U)" msgid "Copy _down" msgstr "下にコピー(_D)" -#: ../meld/iohelpers.py:37 +#: ../meld/iohelpers.py:43 msgid "Deleting remote folders is not supported" msgstr "" -#: ../meld/iohelpers.py:39 +#: ../meld/iohelpers.py:45 msgid "Not a file or directory" msgstr "" -#: ../meld/iohelpers.py:43 +#: ../meld/iohelpers.py:49 msgid "“{}” can’t be put in the trash. Do you want to delete it immediately?" msgstr "" -#: ../meld/iohelpers.py:48 +#: ../meld/iohelpers.py:54 msgid "This remote location does not support sending items to the trash." msgstr "" -#: ../meld/iohelpers.py:53 +#: ../meld/iohelpers.py:59 #, fuzzy #| msgid "Delete change" msgid "_Delete Permanently" msgstr "変更点を削除します" -#: ../meld/iohelpers.py:100 +#: ../meld/iohelpers.py:106 #, python-format msgid "Replace file “%s”?" msgstr "“%s”を置き換えますか?" -#: ../meld/iohelpers.py:102 +#: ../meld/iohelpers.py:108 #, python-format msgid "" "A file with this name already exists in “%s”.\n" From 54732c5daa4cd57e251b5d7f059f9fe4f008bfef Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Tue, 15 Jan 2019 06:10:51 +1000 Subject: [PATCH 0788/1316] bin/meld: Try to compile missing gresources in uninstalled mode --- bin/meld | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/bin/meld b/bin/meld index b6a58bf4..3b8f967f 100755 --- a/bin/meld +++ b/bin/meld @@ -230,6 +230,18 @@ def setup_resources(): from gi.repository import GtkSource resource_file = os.path.join(meld.conf.DATADIR, "meld.gresource") + + if not os.path.exists(resource_file) and uninstalled: + subprocess.call( + [ + "glib-compile-resources", + "--target={}/meld.gresource".format(meld.conf.DATADIR), + "--sourcedir=meld/resources", + "meld/resources/meld.gresource.xml", + ], + cwd=melddir + ) + try: resources = Gio.resource_load(resource_file) Gio.resources_register(resources) From c078263d1efc8f63db94e89220aea78d99b427cf Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Fri, 18 Jan 2019 09:39:29 +1000 Subject: [PATCH 0789/1316] Add in a bunch of missed resource files I've just been testing with overlays, so simply didn't notice these... --- meld/resources/meld.gresource.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meld/resources/meld.gresource.xml b/meld/resources/meld.gresource.xml index aae05637..f9f418d5 100644 --- a/meld/resources/meld.gresource.xml +++ b/meld/resources/meld.gresource.xml @@ -14,7 +14,11 @@ ui/dirdiff.ui ui/encoding-selector.ui ui/filter-list.ui + ui/filediff.ui + ui/findbar.ui ui/language-selector.ui + ui/new-diff-tab.ui + ui/notebook-label.ui ui/patch-dialog.ui ui/preferences.ui ui/push-dialog.ui From 35aa803280782acf35cc00a35c57496b4018b3b3 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Fri, 18 Jan 2019 09:40:07 +1000 Subject: [PATCH 0790/1316] bin/meld: Fix the resource file name to match what we build The build helpers built with the application ID, but the main script built (and expected to find) the plain application name. Now they both want the application ID. --- bin/meld | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/meld b/bin/meld index 3b8f967f..2d77d625 100755 --- a/bin/meld +++ b/bin/meld @@ -229,13 +229,14 @@ def setup_resources(): from gi.repository import Gdk from gi.repository import GtkSource - resource_file = os.path.join(meld.conf.DATADIR, "meld.gresource") + resource_filename = meld.conf.APPLICATION_ID + ".gresource" + resource_file = os.path.join(meld.conf.DATADIR, resource_filename) if not os.path.exists(resource_file) and uninstalled: subprocess.call( [ "glib-compile-resources", - "--target={}/meld.gresource".format(meld.conf.DATADIR), + "--target={}".format(resource_file), "--sourcedir=meld/resources", "meld/resources/meld.gresource.xml", ], From 37008f41dd971b72e6d96bcdfcf872dd74d3cf52 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Fri, 18 Jan 2019 09:41:17 +1000 Subject: [PATCH 0791/1316] flatpak: Update our GtkSourceView bundled version Other than just being good practice, the 3.24.9 release also has a performance fix for space drawing that's very nice for us. --- data/org.gnome.meld-devel.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/org.gnome.meld-devel.json b/data/org.gnome.meld-devel.json index 9fe39bd1..98fc7ada 100644 --- a/data/org.gnome.meld-devel.json +++ b/data/org.gnome.meld-devel.json @@ -45,8 +45,8 @@ "sources": [ { "type": "archive", - "url": "https://download.gnome.org/sources/gtksourceview/3.24/gtksourceview-3.24.7.tar.xz", - "sha256": "a5c20d3a6347533689358f3ea52486409f6dd41d5a69c65eab7570cfaffee8e6" + "url": "https://download.gnome.org/sources/gtksourceview/3.24/gtksourceview-3.24.9.tar.xz", + "sha256": "699d76a453e6a3d3331906346e3dbfa25f2cbc9ec090e46635e9c6bb595e07c2" } ] }, From 71e8ec01cbeed09f603cea4caac755f1c2dd5221 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Fri, 18 Jan 2019 09:42:29 +1000 Subject: [PATCH 0792/1316] flatpak: Update to the GNOME 3.30 runtime for Python 3.6 --- data/org.gnome.meld-devel.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/org.gnome.meld-devel.json b/data/org.gnome.meld-devel.json index 98fc7ada..323f4dcb 100644 --- a/data/org.gnome.meld-devel.json +++ b/data/org.gnome.meld-devel.json @@ -1,7 +1,7 @@ { "app-id": "org.gnome.meld", "runtime": "org.gnome.Platform", - "runtime-version": "3.28", + "runtime-version": "3.30", "sdk": "org.gnome.Sdk", "command": "meld", "cleanup": [ From 8ceb83ae9d3bd23d53e16d729332abfd89412a4a Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 6 Jan 2019 07:10:54 +1000 Subject: [PATCH 0793/1316] settings: Support one-way gsettings bindings and use for source view When these settings are changed on the sourceview, we absolutely do not want that to be propagated back to the gsettings store. Currently these settings *can't* be changed, so this isn't a problem. However, we're about to add some UI for that, so this is preparation. Also, probably most of our gsettings bindings should actually be one- way, but they do require actual thought. --- meld/settings.py | 6 ++++++ meld/sourceview.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/meld/settings.py b/meld/settings.py index 601e9028..3cb9b576 100644 --- a/meld/settings.py +++ b/meld/settings.py @@ -106,6 +106,12 @@ def bind_settings(obj): settings_id, property_id = binding settings.bind(settings_id, obj, property_id, bind_flags) + bind_flags = ( + Gio.SettingsBindFlags.GET | Gio.SettingsBindFlags.NO_SENSITIVITY) + for binding in getattr(obj, '__gsettings_bindings_view__', ()): + settings_id, property_id = binding + settings.bind(settings_id, obj, property_id, bind_flags) + settings = None interface_settings = None diff --git a/meld/sourceview.py b/meld/sourceview.py index d3173be6..5004c81d 100644 --- a/meld/sourceview.py +++ b/meld/sourceview.py @@ -94,7 +94,7 @@ class MeldSourceView(GtkSource.View): __gtype_name__ = "MeldSourceView" - __gsettings_bindings__ = ( + __gsettings_bindings_view__ = ( ('highlight-current-line', 'highlight-current-line-local'), ('indent-width', 'tab-width'), ('insert-spaces-instead-of-tabs', 'insert-spaces-instead-of-tabs'), From dd6fefdd21eb3f16d566db1b626018359fbfb7a8 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 6 Jan 2019 07:23:41 +1000 Subject: [PATCH 0794/1316] ui.statusbar: Delay popover construction to realize There's no need to initialise these on initial status bar construction, particularly since one will go unused in all of our two-pane views. --- meld/ui/statusbar.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meld/ui/statusbar.py b/meld/ui/statusbar.py index be434984..f640efc8 100644 --- a/meld/ui/statusbar.py +++ b/meld/ui/statusbar.py @@ -124,7 +124,7 @@ class MeldStatusBar(Gtk.Statusbar): _line_column_text = _("Ln %i, Col %i") def __init__(self): - GObject.GObject.__init__(self) + super().__init__() self.props.margin = 0 self.props.spacing = 6 @@ -135,6 +135,9 @@ def __init__(self): hbox.remove(label) hbox.pack_end(label, False, True, 0) + def do_realize(self): + Gtk.Statusbar.do_realize(self) + self.box_box = Gtk.HBox(homogeneous=False, spacing=6) self.pack_end(self.box_box, False, True, 0) self.box_box.pack_end( From c508896f43a87d8962da40b50256e643cae40990 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 6 Jan 2019 07:25:16 +1000 Subject: [PATCH 0795/1316] sourceview: Expose a Boolean-ised text wrapping property This exists so that we have a property that can be bound to a PropertyAction for use in a popover menu toggle. I experimented with *not* doing this and exposing three radio buttons to match our three possible wrapping states, but it felt extremely clunky in the UI and was hard to label. The logic here for deciding what "enable wrapping" means here looks pretty odd, but it comes down to: * if we have some wrapping setting (i.e., wrap at characters) by default then respect that when re-enabling the wrapping; and * if we don't wrap by default then just use word wrapping. since this was the behaviour that felt least-wrong to me. --- meld/sourceview.py | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/meld/sourceview.py b/meld/sourceview.py index 5004c81d..948b6ce4 100644 --- a/meld/sourceview.py +++ b/meld/sourceview.py @@ -123,6 +123,15 @@ def set_show_line_numbers(self, show): type=bool, default=False, getter=get_show_line_numbers, setter=set_show_line_numbers) + wrap_mode_bool = GObject.Property( + type=bool, default=False, + nick="Wrap mode (Boolean version)", + blurb=( + "Mirror of the wrap-mode GtkTextView property, reduced to " + "a single Boolean for UI ease-of-use." + ), + ) + replaced_entries = ( # We replace the default GtkSourceView undo mechanism (Gdk.KEY_z, Gdk.ModifierType.CONTROL_MASK), @@ -228,6 +237,29 @@ def on_setting_changed(self, settings, key): def do_realize(self): bind_settings(self) + + def wrap_mode_from_bool(binding, from_value): + if from_value: + settings_mode = settings.get_enum('wrap-mode') + if settings_mode == Gtk.WrapMode.NONE: + mode = Gtk.WrapMode.WORD + else: + mode = settings_mode + else: + mode = Gtk.WrapMode.NONE + return mode + + def wrap_mode_to_bool(binding, from_value): + return bool(from_value) + + self.bind_property( + 'wrap-mode-bool', self, 'wrap-mode', + GObject.BindingFlags.BIDIRECTIONAL, + wrap_mode_from_bool, + wrap_mode_to_bool, + ) + self.wrap_mode_bool = wrap_mode_to_bool(None, self.props.wrap_mode) + self.on_setting_changed(meldsettings, 'font') self.on_setting_changed(meldsettings, 'style-scheme') return GtkSource.View.do_realize(self) From d852a3b1f28e37367cd97f9dae2b6c1156bee884 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 6 Jan 2019 07:37:24 +1000 Subject: [PATCH 0796/1316] ui.util: Add property action helper for binding multiple target objects --- meld/ui/util.py | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/meld/ui/util.py b/meld/ui/util.py index 1f38773a..821200ba 100644 --- a/meld/ui/util.py +++ b/meld/ui/util.py @@ -14,8 +14,11 @@ # along with this program. If not, see . import logging +from typing import List -from gi.repository import Gio, Gtk +from gi.repository import Gio +from gi.repository import GObject +from gi.repository import Gtk import meld.conf # Import support module to get all builder-constructed widgets in the namespace @@ -96,3 +99,21 @@ def extract_accels_from_menu(model: Gio.MenuModel, app: Gtk.Application): more, name, submodel = it.get_next() if submodel: extract_accels_from_menu(submodel, app) + + +def make_multiobject_property_action( + obj_list: List[GObject.Object], prop_name: str) -> Gio.PropertyAction: + """Construct a property action linked to multiple objects + + This is useful for creating actions linked to a GObject property, + where changing the property via the action should affect multiple + GObjects. + + As an example, changing the text wrapping mode of a file comparison + pane should change the wrapping mode for *all* panes. + """ + source, *targets = obj_list + action = Gio.PropertyAction.new(prop_name, source, prop_name) + for target in targets: + source.bind_property(prop_name, target, prop_name) + return action From 42818d68fbfa038e652aca85b61e826ee45f8361 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 6 Jan 2019 07:40:15 +1000 Subject: [PATCH 0797/1316] filediff: Create property actions for use in statusbar Exposing these properties via actions makes it easy to create a menu to for them in a status bar button popover. The actions are all exposed in a new "view" GAction group, and so are specific to the current file comparison. --- meld/filediff.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/meld/filediff.py b/meld/filediff.py index 59b9732d..649bea06 100644 --- a/meld/filediff.py +++ b/meld/filediff.py @@ -44,7 +44,8 @@ get_custom_encoding_candidates, LanguageManager, TextviewLineAnimationType) from meld.ui._gtktemplate import Template from meld.ui.findbar import FindBar -from meld.ui.util import map_widgets_into_lists +from meld.ui.util import ( + make_multiobject_property_action, map_widgets_into_lists) from meld.undo import UndoSequence @@ -236,6 +237,19 @@ def __init__(self, num_panes): self.in_nested_textview_gutter_expose = False self._cached_match = CachedSequenceMatcher(self.scheduler) + # Set up property actions for statusbar toggles + sourceview_prop_actions = [ + 'highlight-current-line-local', + 'show-line-numbers', + 'wrap-mode-bool', + ] + + prop_action_group = Gio.SimpleActionGroup() + for prop in sourceview_prop_actions: + action = make_multiobject_property_action(self.textview, prop) + prop_action_group.add_action(action) + self.insert_action_group('view', prop_action_group) + for buf in self.textbuffer: buf.undo_sequence = self.undosequence buf.connect("notify::has-selection", From 330391246216610775a51bf264a2d0678d922f4d Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 6 Jan 2019 07:41:54 +1000 Subject: [PATCH 0798/1316] bin/meld: Silence the resource overlay log spam --- bin/meld | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/meld b/bin/meld index 2d77d625..368961ee 100755 --- a/bin/meld +++ b/bin/meld @@ -327,6 +327,8 @@ def setup_glib_logging(): def silence(message): if "Drawing a gadget with negative dimensions" in message: return True + if "resource overlay" in message: + return True return False # This logging handler is for "old" glib logging using a simple From 8c7d5e0c5391d5e5fedbb33595f4d1f89afec4b6 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Fri, 4 Jan 2019 11:46:39 +1000 Subject: [PATCH 0799/1316] ui.statusbar: Add a new view settings popover to the status bar (#62) This exposes several view options that were previously preference-only in the status bar. --- meld/resources/ui/statusbar-menu.ui | 17 +++++++++++++++++ meld/ui/statusbar.py | 18 ++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 meld/resources/ui/statusbar-menu.ui diff --git a/meld/resources/ui/statusbar-menu.ui b/meld/resources/ui/statusbar-menu.ui new file mode 100644 index 00000000..8f16c77a --- /dev/null +++ b/meld/resources/ui/statusbar-menu.ui @@ -0,0 +1,17 @@ + + + + + Display line numbers + show-line-numbers + + + Highlight current line + highlight-current-line-local + + + Text wrapping + wrap-mode-bool + + + diff --git a/meld/ui/statusbar.py b/meld/ui/statusbar.py index f640efc8..f8d0790b 100644 --- a/meld/ui/statusbar.py +++ b/meld/ui/statusbar.py @@ -146,6 +146,8 @@ def do_realize(self): self.construct_highlighting_selector(), False, True, 0) self.box_box.pack_end( self.construct_encoding_selector(), False, True, 0) + self.box_box.pack_end( + self.construct_display_popover(), False, True, 0) self.box_box.show_all() def construct_line_display(self): @@ -264,3 +266,19 @@ def set_initial_language(selector): button.show() return button + + def construct_display_popover(self): + builder = Gtk.Builder.new_from_resource( + '/org/gnome/meld/ui/statusbar-menu.ui') + menu = builder.get_object('statusbar-menu') + + pop = Gtk.Popover() + pop.bind_model(menu, 'view') + pop.set_position(Gtk.PositionType.TOP) + + button = MeldStatusMenuButton() + button.set_label(_('Display')) + button.set_popover(pop) + button.show() + + return button From 949652b0ec376850f75104c4208f394658c52aa8 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sat, 19 Jan 2019 07:24:17 +1000 Subject: [PATCH 0800/1316] sourceview: Support toggling whitespace drawing from statusbar (#119) --- meld/filediff.py | 1 + meld/resources/ui/statusbar-menu.ui | 4 ++++ meld/sourceview.py | 24 ++++++++++++++++++++++++ 3 files changed, 29 insertions(+) diff --git a/meld/filediff.py b/meld/filediff.py index 649bea06..b178c302 100644 --- a/meld/filediff.py +++ b/meld/filediff.py @@ -239,6 +239,7 @@ def __init__(self, num_panes): # Set up property actions for statusbar toggles sourceview_prop_actions = [ + 'draw-spaces-bool', 'highlight-current-line-local', 'show-line-numbers', 'wrap-mode-bool', diff --git a/meld/resources/ui/statusbar-menu.ui b/meld/resources/ui/statusbar-menu.ui index 8f16c77a..a5da4f8f 100644 --- a/meld/resources/ui/statusbar-menu.ui +++ b/meld/resources/ui/statusbar-menu.ui @@ -5,6 +5,10 @@ Display line numbers show-line-numbers + + Show whitespace + draw-spaces-bool + Highlight current line highlight-current-line-local diff --git a/meld/sourceview.py b/meld/sourceview.py index 948b6ce4..e4fc6740 100644 --- a/meld/sourceview.py +++ b/meld/sourceview.py @@ -132,6 +132,15 @@ def set_show_line_numbers(self, show): ), ) + draw_spaces_bool = GObject.Property( + type=bool, default=False, + nick="Draw spaces (Boolean version)", + blurb=( + "Mirror of the draw-spaces GtkSourceView property, " + "reduced to a single Boolean for UI ease-of-use." + ), + ) + replaced_entries = ( # We replace the default GtkSourceView undo mechanism (Gdk.KEY_z, Gdk.ModifierType.CONTROL_MASK), @@ -260,6 +269,21 @@ def wrap_mode_to_bool(binding, from_value): ) self.wrap_mode_bool = wrap_mode_to_bool(None, self.props.wrap_mode) + def draw_spaces_from_bool(binding, from_value): + return GtkSource.DrawSpacesFlags.ALL if from_value else 0 + + def draw_spaces_to_bool(binding, from_value): + return bool(from_value) + + self.bind_property( + 'draw-spaces-bool', self, 'draw-spaces', + GObject.BindingFlags.BIDIRECTIONAL, + draw_spaces_from_bool, + draw_spaces_to_bool, + ) + self.draw_spaces_bool = draw_spaces_to_bool( + None, self.props.draw_spaces) + self.on_setting_changed(meldsettings, 'font') self.on_setting_changed(meldsettings, 'style-scheme') return GtkSource.View.do_realize(self) From c9752fe589121c99f316abd02413be787e921184 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sat, 19 Jan 2019 07:25:03 +1000 Subject: [PATCH 0801/1316] Align statusbar label with our preferences label --- meld/resources/ui/statusbar-menu.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meld/resources/ui/statusbar-menu.ui b/meld/resources/ui/statusbar-menu.ui index a5da4f8f..ec9594ab 100644 --- a/meld/resources/ui/statusbar-menu.ui +++ b/meld/resources/ui/statusbar-menu.ui @@ -2,7 +2,7 @@ - Display line numbers + Show line numbers show-line-numbers From 472d099a9b54244682d6354f5ed7376e4f2c5895 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sat, 19 Jan 2019 10:15:01 +1000 Subject: [PATCH 0802/1316] dirdiff: Fix support for missing folders in folder comparison --- meld/dirdiff.py | 4 ++-- meld/meldwindow.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meld/dirdiff.py b/meld/dirdiff.py index b2f6e302..e04d0408 100644 --- a/meld/dirdiff.py +++ b/meld/dirdiff.py @@ -720,7 +720,7 @@ def set_locations(self, locations): # the time we get this far. This is a fallback, and may be wrong! locations = list(locations) for i, l in enumerate(locations): - if not isinstance(l, str): + if l and not isinstance(l, str): locations[i] = l.decode(sys.getfilesystemencoding()) locations = [os.path.abspath(l) if l else '' for l in locations] self.current_path = None @@ -1469,7 +1469,7 @@ def format_name_override(f): ] existing_times = [s.st_mtime for s in stats if s] - newest_time = max(existing_times) + newest_time = max(existing_times) if existing_times else 0 if existing_times.count(newest_time) == len(existing_times): # If all actually-present files have the same mtime, don't # pretend that any are "newer", and do the same if e.g., diff --git a/meld/meldwindow.py b/meld/meldwindow.py index 87825b7c..abc6a202 100644 --- a/meld/meldwindow.py +++ b/meld/meldwindow.py @@ -540,7 +540,7 @@ def diff_created_cb(doc, newdoc): return doc def append_dirdiff(self, gfiles, auto_compare=False): - dirs = [d.get_path() for d in gfiles if d] + dirs = [d.get_path() if d else None for d in gfiles] assert len(dirs) in (1, 2, 3) doc = DirDiff(len(dirs)) self._append_page(doc, "folder") From d6d1297f872a875501e221f5ca251ab1dbb6ec52 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sat, 19 Jan 2019 10:21:10 +1000 Subject: [PATCH 0803/1316] dirdiff: Fix folder comparison display with >2G files This was broken with the unsafe_set speed ups. Because the "unsafe" bit here is the part that avoids the GObject.Value boxing, Python integers end up getting mapped to int, which then breaks with large values. --- meld/dirdiff.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meld/dirdiff.py b/meld/dirdiff.py index e04d0408..5b95bda2 100644 --- a/meld/dirdiff.py +++ b/meld/dirdiff.py @@ -244,7 +244,8 @@ def _files_same(files, regexes, comparison_args): class DirDiffTreeStore(tree.DiffTreeStore): def __init__(self, ntree): - super().__init__(ntree, [str, str, int, float, int]) + # FIXME: size should be a GObject.TYPE_UINT64, but we use -1 as a flag + super().__init__(ntree, [str, str, GObject.TYPE_INT64, float, int]) def add_error(self, parent, msg, pane): defaults = { @@ -1512,9 +1513,12 @@ def format_name_override(f): COL_EMBLEM: emblem, COL_EMBLEM_SECONDARY: link_emblem, COL_TIME: times[j], - COL_SIZE: sizes[j], COL_PERMS: perms[j] }) + # Size is handled independently, because unsafe_set + # can't correctly box GObject.TYPE_INT64. + self.model.set( + it, self.model.column_index(COL_SIZE, j), sizes[j]) else: self.model.set_path_state( it, j, tree.STATE_NONEXIST, any(isdir)) From b5c3878216866605f9979bf38729d49026370c24 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 20 Jan 2019 06:11:12 +1000 Subject: [PATCH 0804/1316] Ignore typing in build_helpers This is mostly distutils interaction, which has very poor hinting. --- setup.cfg | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/setup.cfg b/setup.cfg index 8dc0e3b0..de605d0d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -7,3 +7,9 @@ exclude = # Import order check settings import-order-style = edited application-import-names = meld + + +# build_helpers is almost entirely distutils interactions, which have +# poor type hinting +[mypy-meld.build_helpers] +ignore_errors = True From 6dd36bba7ab96df8db08543b1740d99c5911654b Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 20 Jan 2019 06:11:47 +1000 Subject: [PATCH 0805/1316] Minor type hint additions in painful places --- meld/ui/emblemcellrenderer.py | 5 ++++- meld/vc/_vc.py | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/meld/ui/emblemcellrenderer.py b/meld/ui/emblemcellrenderer.py index d9f369fb..4cebd040 100644 --- a/meld/ui/emblemcellrenderer.py +++ b/meld/ui/emblemcellrenderer.py @@ -14,8 +14,11 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . +from typing import Dict, Tuple + import cairo from gi.repository import Gdk +from gi.repository import GdkPixbuf from gi.repository import GObject from gi.repository import Gtk @@ -24,7 +27,7 @@ class EmblemCellRenderer(Gtk.CellRenderer): __gtype_name__ = "EmblemCellRenderer" - icon_cache = {} + icon_cache: Dict[Tuple[str, int], GdkPixbuf.Pixbuf] = {} icon_name = GObject.Property( type=str, diff --git a/meld/vc/_vc.py b/meld/vc/_vc.py index 11ab5d78..d592e8ea 100644 --- a/meld/vc/_vc.py +++ b/meld/vc/_vc.py @@ -29,6 +29,7 @@ import shutil import subprocess import tempfile +from typing import ClassVar from gi.repository import Gio from gi.repository import GLib @@ -126,12 +127,12 @@ def is_ignored(entry): class Vc: - VC_DIR = None + VC_DIR: ClassVar[str] #: Whether to walk the current location's parents to find a #: repository root. Only used in legacy version control systems #: (e.g., old SVN, CVS, RCS). - VC_ROOT_WALK = True + VC_ROOT_WALK: ClassVar[bool] = True def __init__(self, path): # Save the requested comparison location. The location may be a From 744de3622ee0ee059068c25367481c0cce2f9af5 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Mon, 21 Jan 2019 05:56:39 +1000 Subject: [PATCH 0806/1316] ui.statusbar: Add some missed translatable strings and disambiguate one --- meld/resources/ui/statusbar-menu.ui | 8 ++++---- meld/ui/statusbar.py | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/meld/resources/ui/statusbar-menu.ui b/meld/resources/ui/statusbar-menu.ui index ec9594ab..c8f32bba 100644 --- a/meld/resources/ui/statusbar-menu.ui +++ b/meld/resources/ui/statusbar-menu.ui @@ -2,19 +2,19 @@ - Show line numbers + Show line numbers show-line-numbers - Show whitespace + Show whitespace draw-spaces-bool - Highlight current line + Highlight current line highlight-current-line-local - Text wrapping + Text wrapping wrap-mode-bool diff --git a/meld/ui/statusbar.py b/meld/ui/statusbar.py index f8d0790b..a806d765 100644 --- a/meld/ui/statusbar.py +++ b/meld/ui/statusbar.py @@ -277,6 +277,8 @@ def construct_display_popover(self): pop.set_position(Gtk.PositionType.TOP) button = MeldStatusMenuButton() + # TRANSLATORS: This is the status bar label for a group of settings, + # such as text wrapping, show line numbers, whitespace, etc. button.set_label(_('Display')) button.set_popover(pop) button.show() From 17690e2619b0bac87fa8e66a1cf5aa2ec90dd741 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Mon, 21 Jan 2019 06:12:49 +1000 Subject: [PATCH 0807/1316] po: Add new statusbar menu to POTFILES --- po/POTFILES.in | 1 + 1 file changed, 1 insertion(+) diff --git a/po/POTFILES.in b/po/POTFILES.in index 26646487..de1fd8a6 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -24,6 +24,7 @@ data/org.gnome.meld.gschema.xml [type: gettext/glade]meld/resources/ui/push-dialog.ui [type: gettext/glade]meld/resources/ui/revert-dialog.ui [type: gettext/glade]meld/resources/ui/save-confirm-dialog.ui +[type: gettext/glade]meld/resources/ui/statusbar-menu.ui [type: gettext/glade]meld/resources/ui/vcview.ui meld/const.py meld/dirdiff.py From 4e596191db92d20eca2de3d62788592c4465aaa2 Mon Sep 17 00:00:00 2001 From: Anders Jonsson Date: Sun, 20 Jan 2019 20:28:12 +0000 Subject: [PATCH 0808/1316] Update Swedish translation --- po/sv.po | 206 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 109 insertions(+), 97 deletions(-) diff --git a/po/sv.po b/po/sv.po index fa53a7f5..be806b2e 100644 --- a/po/sv.po +++ b/po/sv.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: 2019-01-07 22:25+0000\n" -"PO-Revision-Date: 2019-01-07 23:25+0100\n" +"POT-Creation-Date: 2019-01-20 20:13+0000\n" +"PO-Revision-Date: 2019-01-20 21:27+0100\n" "Last-Translator: Anders Jonsson \n" "Language-Team: Swedish \n" "Language: sv\n" @@ -31,7 +31,7 @@ msgstr "Kan inte importera: " msgid "Meld requires %s or higher." msgstr "Meld kräver %s eller högre." -#: ../bin/meld:249 +#: ../bin/meld:262 #, c-format msgid "" "Couldn’t load Meld-specific CSS (%s)\n" @@ -143,6 +143,7 @@ msgstr "" "Om true kommer nya indenteringar att använda blanksteg istället för tabbar." #: ../data/org.gnome.meld.gschema.xml.h:11 +#: ../meld/resources/ui/statusbar-menu.ui.h:1 msgid "Show line numbers" msgstr "Visa radnummer" @@ -201,6 +202,7 @@ msgstr "" "bara vid slutet av ord (\"word\")." #: ../data/org.gnome.meld.gschema.xml.h:21 +#: ../meld/resources/ui/statusbar-menu.ui.h:3 msgid "Highlight current line" msgstr "Markera aktuell rad" @@ -878,8 +880,8 @@ msgstr "Kopiera till höger" msgid "Delete selected" msgstr "Ta bort markerade" -#: ../meld/resources/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:958 -#: ../meld/filediff.py:1586 +#: ../meld/resources/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:959 +#: ../meld/filediff.py:1601 msgid "Hide" msgstr "Dölj" @@ -914,7 +916,7 @@ msgstr "Nya" msgid "Show new" msgstr "Visa nya" -#: ../meld/resources/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:76 +#: ../meld/resources/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:77 msgid "Modified" msgstr "Ändrade" @@ -1129,7 +1131,7 @@ msgstr "Fil ett" #. Create icon and filename CellRenderer #: ../meld/resources/ui/filter-list.ui.h:2 ../meld/resources/ui/vcview.ui.h:30 -#: ../meld/dirdiff.py:454 +#: ../meld/dirdiff.py:455 msgid "Name" msgstr "Namn" @@ -1149,8 +1151,8 @@ msgstr "_Lägg till" msgid "Remove selected filter" msgstr "Ta bort markerat filter" -#: ../meld/resources/ui/findbar.ui.h:1 ../meld/dirdiff.py:1040 -#: ../meld/iohelpers.py:107 +#: ../meld/resources/ui/findbar.ui.h:1 ../meld/dirdiff.py:1041 +#: ../meld/iohelpers.py:113 msgid "_Replace" msgstr "_Ersätt" @@ -1263,7 +1265,7 @@ msgstr "Formatera som programfix" msgid "Copy to Clipboard" msgstr "Kopiera till Urklipp" -#: ../meld/resources/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:163 +#: ../meld/resources/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:165 msgid "Save Patch" msgstr "Spara programfix" @@ -1299,7 +1301,9 @@ msgstr "_Använd systemets typsnitt med fast bredd" msgid "_Editor font:" msgstr "_Typsnitt för redigerare:" -#: ../meld/resources/ui/preferences.ui.h:5 +#. 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 msgid "Display" msgstr "Visa" @@ -1530,8 +1534,8 @@ msgstr "Sparar du inte kommer ändringar att gå förlorade för alltid." msgid "Close _without Saving" msgstr "Stäng _utan att spara" -#: ../meld/resources/ui/save-confirm-dialog.ui.h:4 ../meld/dirdiff.py:1039 -#: ../meld/iohelpers.py:52 ../meld/iohelpers.py:106 +#: ../meld/resources/ui/save-confirm-dialog.ui.h:4 ../meld/dirdiff.py:1040 +#: ../meld/iohelpers.py:58 ../meld/iohelpers.py:112 msgid "_Cancel" msgstr "_Avbryt" @@ -1539,6 +1543,14 @@ msgstr "_Avbryt" msgid "_Save" msgstr "_Spara" +#: ../meld/resources/ui/statusbar-menu.ui.h:2 +msgid "Show whitespace" +msgstr "Visa tomrum" + +#: ../meld/resources/ui/statusbar-menu.ui.h:4 +msgid "Text wrapping" +msgstr "Textradbrytning" + #: ../meld/resources/ui/vcview.ui.h:3 msgid "Co_mmit…" msgstr "Che_cka in…" @@ -1631,7 +1643,7 @@ msgstr "O_versionerade" msgid "Show unversioned files" msgstr "Visa filer som inte versionshanteras" -#: ../meld/resources/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69 +#: ../meld/resources/ui/vcview.ui.h:28 ../meld/vc/_vc.py:70 msgid "Ignored" msgstr "Ignorerade" @@ -1668,82 +1680,82 @@ msgid "Mac OS (CR)" msgstr "Mac OS (CR)" #. Create file size CellRenderer -#: ../meld/dirdiff.py:475 ../meld/preferences.py:138 +#: ../meld/dirdiff.py:476 ../meld/preferences.py:138 msgid "Size" msgstr "Storlek" #. Create date-time CellRenderer -#: ../meld/dirdiff.py:483 ../meld/preferences.py:139 +#: ../meld/dirdiff.py:484 ../meld/preferences.py:139 msgid "Modification time" msgstr "Ändringstid" #. Create permissions CellRenderer -#: ../meld/dirdiff.py:491 ../meld/preferences.py:140 +#: ../meld/dirdiff.py:492 ../meld/preferences.py:140 msgid "Permissions" msgstr "Rättigheter" -#: ../meld/dirdiff.py:625 +#: ../meld/dirdiff.py:626 #, python-format msgid "Hide %s" msgstr "Dölj %s" -#: ../meld/dirdiff.py:767 ../meld/dirdiff.py:790 +#: ../meld/dirdiff.py:768 ../meld/dirdiff.py:791 #, python-format msgid "[%s] Scanning %s" msgstr "[%s] Söker igenom %s" -#: ../meld/dirdiff.py:925 +#: ../meld/dirdiff.py:926 #, python-format msgid "[%s] Done" msgstr "[%s] Klar" -#: ../meld/dirdiff.py:933 +#: ../meld/dirdiff.py:934 msgid "Folders have no differences" msgstr "Mapparna skiljer sig inte åt" -#: ../meld/dirdiff.py:935 +#: ../meld/dirdiff.py:936 msgid "Contents of scanned files in folders are identical." msgstr "Innehållet i mapparnas avsökta filer är identiskt." -#: ../meld/dirdiff.py:937 +#: ../meld/dirdiff.py:938 msgid "" "Scanned files in folders appear identical, but contents have not been " "scanned." msgstr "" "Mapparnas avsökta filer verkar identiska, men innehållet har inte genomsökts." -#: ../meld/dirdiff.py:940 +#: ../meld/dirdiff.py:941 msgid "File filters are in use, so not all files have been scanned." msgstr "Filfilter används, och därför har inte alla filer genomsökts." -#: ../meld/dirdiff.py:942 +#: ../meld/dirdiff.py:943 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:960 ../meld/filediff.py:1588 ../meld/filediff.py:1618 -#: ../meld/filediff.py:1620 ../meld/ui/msgarea.py:106 ../meld/ui/msgarea.py:119 +#: ../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 msgid "Hi_de" msgstr "_Dölj" -#: ../meld/dirdiff.py:969 +#: ../meld/dirdiff.py:970 msgid "Multiple errors occurred while scanning this folder" msgstr "Flera fel inträffade vid avsökning av denna mapp" -#: ../meld/dirdiff.py:970 +#: ../meld/dirdiff.py:971 msgid "Files with invalid encodings found" msgstr "Filer med ogiltiga teckenkodningar hittades" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:972 +#: ../meld/dirdiff.py:973 msgid "Some files were in an incorrect encoding. The names are something like:" msgstr "En del filer hade en felaktig kodning. Namnen är ungefär:" -#: ../meld/dirdiff.py:974 +#: ../meld/dirdiff.py:975 msgid "Files hidden by case insensitive comparison" msgstr "Filer dolda av skiftlägeskänslig jämförelse" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:976 +#: ../meld/dirdiff.py:977 msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. The following files in this folder are hidden:" @@ -1751,17 +1763,17 @@ msgstr "" "Du gör en skiftlägesokänslig jämförelse på ett skiftlägeskänsligt filsystem. " "En del filer syns inte:" -#: ../meld/dirdiff.py:987 +#: ../meld/dirdiff.py:988 #, python-format msgid "“%s” hidden by “%s”" msgstr "”%s” dolda av ”%s”" -#: ../meld/dirdiff.py:1043 +#: ../meld/dirdiff.py:1044 #, python-format msgid "Replace folder “%s”?" msgstr "Ersätt mappen ”%s”?" -#: ../meld/dirdiff.py:1045 +#: ../meld/dirdiff.py:1046 #, python-format msgid "" "Another folder with the same name already exists in “%s”.\n" @@ -1770,11 +1782,11 @@ msgstr "" "En annan mapp med samma namn existerar redan i ”%s”.\n" "Om du ersätter befintlig mapp kommer alla filer att förloras." -#: ../meld/dirdiff.py:1058 +#: ../meld/dirdiff.py:1059 msgid "Error copying file" msgstr "Fel vid filkopiering" -#: ../meld/dirdiff.py:1059 +#: ../meld/dirdiff.py:1060 #, python-format msgid "" "Couldn’t copy %s\n" @@ -1787,19 +1799,19 @@ msgstr "" "\n" "%s" -#: ../meld/dirdiff.py:1084 ../meld/vcview.py:720 +#: ../meld/dirdiff.py:1085 ../meld/vcview.py:720 msgid "Error deleting {}" msgstr "Fel vid borttagning av {}" -#: ../meld/dirdiff.py:1593 +#: ../meld/dirdiff.py:1597 msgid "No folder" msgstr "Ingen mapp" -#: ../meld/filediff.py:905 +#: ../meld/filediff.py:920 msgid "Comparison results will be inaccurate" msgstr "Jämförelseresultat kommer att bli osäkra" -#: ../meld/filediff.py:907 +#: ../meld/filediff.py:922 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1807,64 +1819,64 @@ msgstr "" "Ett filter ändrade antalet rader i filen vilket inte stöds. Jämförelsen " "kommer att vara osäker." -#: ../meld/filediff.py:979 +#: ../meld/filediff.py:994 msgid "Mark conflict as resolved?" msgstr "Markera konflikten som löst?" -#: ../meld/filediff.py:981 +#: ../meld/filediff.py:996 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:983 +#: ../meld/filediff.py:998 msgid "Cancel" msgstr "Avbryt" -#: ../meld/filediff.py:984 +#: ../meld/filediff.py:999 msgid "Mark _Resolved" msgstr "Markera som _löst" -#: ../meld/filediff.py:1303 +#: ../meld/filediff.py:1318 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Det uppstod ett problem vid öppnandet av filen ”%s”." -#: ../meld/filediff.py:1311 +#: ../meld/filediff.py:1326 #, python-format msgid "File %s appears to be a binary file." msgstr "Filen %s verkar vara en binärfil." -#: ../meld/filediff.py:1313 +#: ../meld/filediff.py:1328 msgid "Do you want to open the file using the default application?" msgstr "Vill du öppna filen med standardprogrammet?" -#: ../meld/filediff.py:1315 +#: ../meld/filediff.py:1330 msgid "Open" msgstr "Öppna" -#: ../meld/filediff.py:1331 +#: ../meld/filediff.py:1346 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Beräknar skillnader" -#: ../meld/filediff.py:1392 +#: ../meld/filediff.py:1407 #, python-format msgid "File %s has changed on disk" msgstr "Filen %s har ändrats på disk" -#: ../meld/filediff.py:1393 +#: ../meld/filediff.py:1408 msgid "Do you want to reload the file?" msgstr "Vill du läsa om filen?" -#: ../meld/filediff.py:1395 +#: ../meld/filediff.py:1410 msgid "_Reload" msgstr "_Läs om" -#: ../meld/filediff.py:1551 +#: ../meld/filediff.py:1566 msgid "Files are identical" msgstr "Filerna är identiska" -#: ../meld/filediff.py:1564 +#: ../meld/filediff.py:1579 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1872,11 +1884,11 @@ msgstr "" "Textfilter används och kan dölja skillnader mellan filer. Vill du jämföra de " "ofiltrerade filerna?" -#: ../meld/filediff.py:1569 +#: ../meld/filediff.py:1584 msgid "Files differ in line endings only" msgstr "Filer skiljer sig endast vad gäller radslut" -#: ../meld/filediff.py:1571 +#: ../meld/filediff.py:1586 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1885,15 +1897,15 @@ msgstr "" "Filerna är identiska förutom radavsluten:\n" "%s" -#: ../meld/filediff.py:1591 +#: ../meld/filediff.py:1606 msgid "Show without filters" msgstr "Visa utan filer" -#: ../meld/filediff.py:1613 +#: ../meld/filediff.py:1628 msgid "Change highlighting incomplete" msgstr "Ändra markering av ofärdiga" -#: ../meld/filediff.py:1614 +#: ../meld/filediff.py:1629 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." @@ -1902,19 +1914,19 @@ msgstr "" "Meld till att längre tid på sig att markera större ändringar, men det kan " "bli långsamt." -#: ../meld/filediff.py:1622 +#: ../meld/filediff.py:1637 msgid "Keep highlighting" msgstr "Använd markering" -#: ../meld/filediff.py:1624 +#: ../meld/filediff.py:1639 msgid "_Keep highlighting" msgstr "_Använd markering" -#: ../meld/filediff.py:1637 +#: ../meld/filediff.py:1652 msgid "Saving failed" msgstr "Misslyckades med att spara" -#: ../meld/filediff.py:1638 +#: ../meld/filediff.py:1653 msgid "" "Please consider copying any critical changes to another program or file to " "avoid data loss." @@ -1922,36 +1934,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:1647 +#: ../meld/filediff.py:1662 msgid "Save Left Pane As" msgstr "Spara vänsterpanel som" -#: ../meld/filediff.py:1649 +#: ../meld/filediff.py:1664 msgid "Save Middle Pane As" msgstr "Spara mittenpanel som" -#: ../meld/filediff.py:1651 +#: ../meld/filediff.py:1666 msgid "Save Right Pane As" msgstr "Spara högerpanel som" -#: ../meld/filediff.py:1664 +#: ../meld/filediff.py:1679 #, 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:1666 +#: ../meld/filediff.py:1681 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:1669 +#: ../meld/filediff.py:1684 msgid "Save Anyway" msgstr "Spara ändå" -#: ../meld/filediff.py:1670 +#: ../meld/filediff.py:1685 msgid "Don’t Save" msgstr "Spara inte" -#: ../meld/filediff.py:1712 +#: ../meld/filediff.py:1727 msgid "" "File “{}” contains characters that can’t be encoded using its current " "encoding “{}”." @@ -1959,7 +1971,7 @@ msgstr "" "Filen ”{}” innehåller tecken som inte kan kodas med dess aktuella kodning " "”{}”." -#: ../meld/filediff.py:1716 ../meld/patchdialog.py:142 +#: ../meld/filediff.py:1731 ../meld/patchdialog.py:144 #, python-format msgid "" "Couldn’t save file due to:\n" @@ -1968,16 +1980,16 @@ msgstr "" "Kunde in spara fil beroende på:\n" "%s" -#: ../meld/filediff.py:1720 ../meld/patchdialog.py:141 +#: ../meld/filediff.py:1735 ../meld/patchdialog.py:143 #, python-format msgid "Could not save file %s." msgstr "Kunde inte spara filen %s." -#: ../meld/filediff.py:2113 +#: ../meld/filediff.py:2128 msgid "Live comparison updating disabled" msgstr "Inaktivera realtidsuppdateringar av jämförelser" -#: ../meld/filediff.py:2114 +#: ../meld/filediff.py:2129 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -2001,33 +2013,33 @@ msgstr "Kopiera _upp" msgid "Copy _down" msgstr "Kopiera _ned" -#: ../meld/iohelpers.py:37 +#: ../meld/iohelpers.py:43 msgid "Deleting remote folders is not supported" msgstr "Att ta bort fjärrmappar stöds ej" -#: ../meld/iohelpers.py:39 +#: ../meld/iohelpers.py:45 msgid "Not a file or directory" msgstr "Inte en fil eller katalog" -#: ../meld/iohelpers.py:43 +#: ../meld/iohelpers.py:49 msgid "“{}” can’t be put in the trash. Do you want to delete it immediately?" msgstr "" "Kan inte flytta ”{}” till papperskorgen. Vill du ta bort den omedelbart?" -#: ../meld/iohelpers.py:48 +#: ../meld/iohelpers.py:54 msgid "This remote location does not support sending items to the trash." msgstr "Denna fjärrplats stöder inte att lägga objekt i papperskorgen." -#: ../meld/iohelpers.py:53 +#: ../meld/iohelpers.py:59 msgid "_Delete Permanently" msgstr "_Ta bort permanent" -#: ../meld/iohelpers.py:100 +#: ../meld/iohelpers.py:106 #, python-format msgid "Replace file “%s”?" msgstr "Ersätt filen ”%s”?" -#: ../meld/iohelpers.py:102 +#: ../meld/iohelpers.py:108 #, python-format msgid "" "A file with this name already exists in “%s”.\n" @@ -2132,7 +2144,7 @@ msgid "remote folder “{}” not supported" msgstr "fjärrmapp ”{}” stöds ej" #. TRANSLATORS: This is the label of a new, currently-unnamed file. -#: ../meld/meldbuffer.py:124 +#: ../meld/meldbuffer.py:123 msgid "" msgstr "" @@ -2355,7 +2367,7 @@ msgstr "Vanlig text" msgid "Ln %i, Col %i" msgstr "Rad %i, kolumn %i" -#: ../meld/ui/statusbar.py:177 +#: ../meld/ui/statusbar.py:182 msgid "Line you want to move the cursor to" msgstr "Rad du vill flytta markören till" @@ -2410,51 +2422,51 @@ msgstr "Ingen" msgid "Rev %s" msgstr "Rev %s" -#: ../meld/vc/_vc.py:54 +#: ../meld/vc/_vc.py:55 msgid "Merged" msgstr "Sammanfogade" -#: ../meld/vc/_vc.py:54 +#: ../meld/vc/_vc.py:55 msgid "Base" msgstr "Bas" -#: ../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 "Fjärr" -#: ../meld/vc/_vc.py:70 +#: ../meld/vc/_vc.py:71 msgid "Unversioned" msgstr "Oversionerad" -#: ../meld/vc/_vc.py:73 +#: ../meld/vc/_vc.py:74 msgid "Error" msgstr "Fel" -#: ../meld/vc/_vc.py:75 +#: ../meld/vc/_vc.py:76 msgid "Newly added" msgstr "Nyligen tillagt" -#: ../meld/vc/_vc.py:77 +#: ../meld/vc/_vc.py:78 msgid "Renamed" msgstr "Bytt namn" -#: ../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 "Borttagen" -#: ../meld/vc/_vc.py:80 +#: ../meld/vc/_vc.py:81 msgid "Missing" msgstr "Saknas" -#: ../meld/vc/_vc.py:81 +#: ../meld/vc/_vc.py:82 msgid "Not present" msgstr "Inte närvarande" From 08b4e90e5315b3a9306990fabf4cd1ab548942a6 Mon Sep 17 00:00:00 2001 From: heikkiket Date: Mon, 17 Dec 2018 22:04:10 +0000 Subject: [PATCH 0809/1316] [Issue #78]: Scrolling in central takes screen position in to account If scrolling with mouse and currently highlighted change is outside of the screen, seek next and previous changes outside of screen. If changes are at the first or last quarter of the textfield, treat them as they would be outside of screen. (cherry picked from commit d76eb0e01cbbfc0f1cb1a377e0d532d4d08aec9f) --- meld/filediff.py | 54 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 51 insertions(+), 3 deletions(-) diff --git a/meld/filediff.py b/meld/filediff.py index b178c302..044788b1 100644 --- a/meld/filediff.py +++ b/meld/filediff.py @@ -599,11 +599,59 @@ def go_to_chunk(self, target, pane=None, centered=False): @Template.Callback() def on_linkmap_scroll_event(self, linkmap, event): - self.next_diff(event.direction) + self.next_diff(event.direction, use_viewport=True) - def next_diff(self, direction, centered=False): + def next_diff(self, direction, centered=False, use_viewport=False): + # use_viewport: seek next and previous diffes based on where + # the user is currently scrolling at. target = (self.cursor.next if direction == Gdk.ScrollDirection.DOWN - else self.cursor.prev) + else self.cursor.prev) + + if use_viewport: + + if target is None: + return + + pane = self.cursor.pane + text_area = self.textview[pane].get_visible_rect() + + chunk = self.linediffer.get_chunk(target, pane) + if not chunk: + return + + + #Count the down top and bottom 25% of the window + topedge = text_area.y + bottomedge = text_area.y+text_area.height + + topline = self.textview[pane].get_line_at_y( + topedge).target_iter.get_line() + bottomline = self.textview[pane].get_line_at_y( + bottomedge).target_iter.get_line() + + topquarter = self.textview[pane].get_line_at_y( + topedge + text_area.height / 4).target_iter.get_line() + bottomquarter = self.textview[pane].get_line_at_y( + bottomedge - text_area.height / 4).target_iter.get_line() + + while chunk[1] < topquarter and direction == Gdk.ScrollDirection.DOWN: + target += 1 + if(target > self.linediffer.diff_count()): + return + + chunk = self.linediffer.get_chunk(target, pane) + if not chunk: + return + + while chunk[1] > bottomquarter and direction == Gdk.ScrollDirection.UP: + target -= 1 + if target < 0: + return + + chunk = self.linediffer.get_chunk(target, pane) + if not chunk: + return + self.go_to_chunk(target, centered=centered) @Template.Callback() From 3d6b14b0602cfd04b10bff1df60a0ac7c5b7d93b Mon Sep 17 00:00:00 2001 From: Ryuta Fujii Date: Tue, 22 Jan 2019 11:03:25 +0000 Subject: [PATCH 0810/1316] Update Japanese translation (cherry picked from commit d0a37917b33385fe5cd7936cf94014d1813447ea) --- po/ja.po | 1975 +++++++++++++++++++++++++++--------------------------- 1 file changed, 991 insertions(+), 984 deletions(-) diff --git a/po/ja.po b/po/ja.po index 579752e4..0df0ef68 100644 --- a/po/ja.po +++ b/po/ja.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: meld master\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n" -"POT-Creation-Date: 2019-01-10 21:55+0000\n" -"PO-Revision-Date: 2019-01-08 21:02+0900\n" +"POT-Creation-Date: 2019-01-14 15:16+0000\n" +"PO-Revision-Date: 2019-01-22 19:55+0900\n" "Last-Translator: sicklylife \n" "Language-Team: Japanese \n" "Language: ja\n" @@ -20,25 +20,26 @@ msgstr "" "Generated-By: pygettext.py 1.5\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../bin/meld:190 +#: ../bin/meld:194 msgid "Cannot import: " msgstr "インポートできません: " -#: ../bin/meld:193 +#: ../bin/meld:197 #, c-format msgid "Meld requires %s or higher." msgstr "Meld には %s 以上が必要です。" -#: ../bin/meld:249 +#: ../bin/meld:243 #, c-format msgid "" "Couldn’t load Meld-specific CSS (%s)\n" "%s" msgstr "" +"Meld 固有の CSS (%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 +#: ../data/org.gnome.meld.appdata.xml.in.h:1 ../data/ui/meldapp.ui.h:1 msgid "Meld" msgstr "Meld" @@ -99,10 +100,26 @@ msgid "Default window fullscreen state" msgstr "デフォルトでウィンドウがフルスクリーン表示されるかどうか" #: ../data/org.gnome.meld.gschema.xml.h:5 +msgid "Show toolbar" +msgstr "ツールバーを表示する" + +#: ../data/org.gnome.meld.gschema.xml.h:6 +msgid "If true, the window toolbar is visible." +msgstr "true の場合、ウィンドウにツールバーが表示されます。" + +#: ../data/org.gnome.meld.gschema.xml.h:7 +msgid "Show statusbar" +msgstr "ステータスバーを表示する" + +#: ../data/org.gnome.meld.gschema.xml.h:8 +msgid "If true, the window statusbar is visible." +msgstr "true の場合、ウィンドウにステータスバーが表示されます。" + +#: ../data/org.gnome.meld.gschema.xml.h:9 msgid "Additional automatically detected text encodings" msgstr "自動検出される追加のテキストエンコーディング" -#: ../data/org.gnome.meld.gschema.xml.h:6 +#: ../data/org.gnome.meld.gschema.xml.h:10 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 " @@ -115,56 +132,56 @@ msgstr "" "用されます。ユーザーのロケールによっては、他のエンコーディングでのデコードも" "試されるかもしれません。" -#: ../data/org.gnome.meld.gschema.xml.h:7 +#: ../data/org.gnome.meld.gschema.xml.h:11 msgid "Width of an indentation step" msgstr "タブの幅" -#: ../data/org.gnome.meld.gschema.xml.h:8 +#: ../data/org.gnome.meld.gschema.xml.h:12 msgid "The number of spaces to use for a single indent step" msgstr "インデント幅をスペース何個分にするか" -#: ../data/org.gnome.meld.gschema.xml.h:9 +#: ../data/org.gnome.meld.gschema.xml.h:13 msgid "Whether to indent using spaces or tabs" msgstr "スペースとタブのどちらを使ってインデントするか" -#: ../data/org.gnome.meld.gschema.xml.h:10 +#: ../data/org.gnome.meld.gschema.xml.h:14 msgid "If true, any new indentation will use spaces instead of tabs." msgstr "" "true の場合、新しいインデントではタブの代わりにスペースが使用されます。" -#: ../data/org.gnome.meld.gschema.xml.h:11 +#: ../data/org.gnome.meld.gschema.xml.h:15 msgid "Show line numbers" msgstr "行番号を表示する" -#: ../data/org.gnome.meld.gschema.xml.h:12 +#: ../data/org.gnome.meld.gschema.xml.h:16 msgid "If true, line numbers will be shown in the gutter of file comparisons." msgstr "true の場合、ファイル比較時のガター部分に行番号を表示します。" -#: ../data/org.gnome.meld.gschema.xml.h:13 +#: ../data/org.gnome.meld.gschema.xml.h:17 msgid "Highlight syntax" msgstr "シンタックスハイライト" -#: ../data/org.gnome.meld.gschema.xml.h:14 +#: ../data/org.gnome.meld.gschema.xml.h:18 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.h:15 +#: ../data/org.gnome.meld.gschema.xml.h:19 msgid "Color scheme to use for syntax highlighting" msgstr "シンタックスハイライトに使用するカラースキーマ" -#: ../data/org.gnome.meld.gschema.xml.h:16 +#: ../data/org.gnome.meld.gschema.xml.h:20 msgid "Used by GtkSourceView to determine colors for syntax highlighting" msgstr "" "シンタックスハイライトのために決められた色は GtkSourceView によって使用されま" "す" -#: ../data/org.gnome.meld.gschema.xml.h:17 +#: ../data/org.gnome.meld.gschema.xml.h:21 msgid "Displayed whitespace" msgstr "ホワイトスペースを表示する" -#: ../data/org.gnome.meld.gschema.xml.h:18 +#: ../data/org.gnome.meld.gschema.xml.h:22 msgid "" "Selector for individual whitespace character types to be shown. Possible " "values are 'space', 'tab', 'newline' and 'nbsp'." @@ -172,11 +189,11 @@ msgstr "" "表示する空白類文字の種類の設定です。使用可能な値は " "'space'、'tab'、'newline'、'nbsp' です。" -#: ../data/org.gnome.meld.gschema.xml.h:19 +#: ../data/org.gnome.meld.gschema.xml.h:23 msgid "Wrap mode" msgstr "折り返しのモード" -#: ../data/org.gnome.meld.gschema.xml.h:20 +#: ../data/org.gnome.meld.gschema.xml.h:24 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 " @@ -186,53 +203,53 @@ msgstr "" "'none'、任意の文字で折り返す場合は 'char'、単語の末尾で折り返す場合は 'word' " "を指定します。" -#: ../data/org.gnome.meld.gschema.xml.h:21 +#: ../data/org.gnome.meld.gschema.xml.h:25 msgid "Highlight current line" msgstr "現在の行のハイライト" -#: ../data/org.gnome.meld.gschema.xml.h:22 +#: ../data/org.gnome.meld.gschema.xml.h:26 msgid "" "If true, the line containing the cursor will be highlighted in file " "comparisons." msgstr "true の場合、ファイル比較時にカーソルのある行がハイライトされます。" -#: ../data/org.gnome.meld.gschema.xml.h:23 +#: ../data/org.gnome.meld.gschema.xml.h:27 msgid "Use the system default monospace font" msgstr "システムデフォルトの等幅フォントを使用する" -#: ../data/org.gnome.meld.gschema.xml.h:24 +#: ../data/org.gnome.meld.gschema.xml.h:28 msgid "" "If false, custom-font will be used instead of the system monospace font." msgstr "" "false の場合、システムの monospace フォントの代わりにカスタムフォントが使用さ" "れます。" -#: ../data/org.gnome.meld.gschema.xml.h:25 +#: ../data/org.gnome.meld.gschema.xml.h:29 msgid "Custom font" msgstr "カスタムフォント" -#: ../data/org.gnome.meld.gschema.xml.h:26 +#: ../data/org.gnome.meld.gschema.xml.h:30 msgid "" "The custom font to use, stored as a string and parsed as a Pango font " "description." msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:27 +#: ../data/org.gnome.meld.gschema.xml.h:31 msgid "Ignore blank lines when comparing files" msgstr "ファイル比較時に空行を無視する" -#: ../data/org.gnome.meld.gschema.xml.h:28 +#: ../data/org.gnome.meld.gschema.xml.h:32 msgid "" "If true, blank lines will be trimmed when highlighting changes between files." msgstr "" "true の場合、ファイル間の変更点をハイライトする際に、空行の差異をハイライトし" "ません。" -#: ../data/org.gnome.meld.gschema.xml.h:29 +#: ../data/org.gnome.meld.gschema.xml.h:33 msgid "Use the system default editor" msgstr "システムデフォルトのエディターを使用する" -#: ../data/org.gnome.meld.gschema.xml.h:30 +#: ../data/org.gnome.meld.gschema.xml.h:34 msgid "" "If false, custom-editor-command will be used instead of the system editor " "when opening files externally." @@ -240,33 +257,32 @@ msgstr "" "false の場合、ファイルを別のアプリで開く際に、システムのエディターの代わりに" "指定したエディターコマンドを使用します。" -#: ../data/org.gnome.meld.gschema.xml.h:31 +#: ../data/org.gnome.meld.gschema.xml.h:35 msgid "The custom editor launch command" msgstr "カスタムエディター起動コマンド" -#: ../data/org.gnome.meld.gschema.xml.h:32 +#: ../data/org.gnome.meld.gschema.xml.h:36 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.h:33 +#: ../data/org.gnome.meld.gschema.xml.h:37 msgid "Columns to display" msgstr "表示するカラム" -#: ../data/org.gnome.meld.gschema.xml.h:34 +#: ../data/org.gnome.meld.gschema.xml.h:38 msgid "" "List of column names in folder comparison and whether they should be " "displayed." msgstr "" "フォルダー比較時のカラム名の一覧と、それらを表示するかどうかの設定です。" -#: ../data/org.gnome.meld.gschema.xml.h:35 -#: ../meld/resources/ui/preferences.ui.h:25 +#: ../data/org.gnome.meld.gschema.xml.h:39 ../data/ui/preferences.ui.h:25 msgid "Ignore symbolic links" msgstr "シンボリックリンクを無視する" -#: ../data/org.gnome.meld.gschema.xml.h:36 +#: ../data/org.gnome.meld.gschema.xml.h:40 msgid "" "If true, folder comparisons do not follow symbolic links when traversing the " "folder tree." @@ -274,11 +290,11 @@ msgstr "" "true の場合、フォルダー比較時のフォルダーツリー走査において、シンボリックリン" "クのリンク先を走査しません。" -#: ../data/org.gnome.meld.gschema.xml.h:37 +#: ../data/org.gnome.meld.gschema.xml.h:41 msgid "Use shallow comparison" msgstr "浅い比較を使用する" -#: ../data/org.gnome.meld.gschema.xml.h:38 +#: ../data/org.gnome.meld.gschema.xml.h:42 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 " @@ -287,11 +303,11 @@ msgstr "" "true の場合、フォルダー比較時にサイズと mtime だけを基準にしてファイルを比較" "し、それらが一致すれば同一のファイルであると見做します。" -#: ../data/org.gnome.meld.gschema.xml.h:39 +#: ../data/org.gnome.meld.gschema.xml.h:43 msgid "File timestamp resolution" msgstr "ファイルのタイムスタンプ分解能" -#: ../data/org.gnome.meld.gschema.xml.h:40 +#: ../data/org.gnome.meld.gschema.xml.h:44 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 " @@ -302,12 +318,11 @@ msgstr "" "と見做される最小の差異(ナノ秒)です。これはタイムスタンプ分解能が異なるファイ" "ルシステム間で、ファイルの比較を行う際に役立ちます。" -#: ../data/org.gnome.meld.gschema.xml.h:41 -#: ../meld/resources/ui/preferences.ui.h:22 +#: ../data/org.gnome.meld.gschema.xml.h:45 ../data/ui/preferences.ui.h:22 msgid "Apply text filters during folder comparisons" msgstr "フォルダーの比較中にテキストフィルターを適用する" -#: ../data/org.gnome.meld.gschema.xml.h:42 +#: ../data/org.gnome.meld.gschema.xml.h:46 msgid "" "If true, folder comparisons that compare file contents also apply active " "text filters and the blank line trimming option, and ignore newline " @@ -317,102 +332,102 @@ msgstr "" "フィルターと空行のトリミングオプションが適用され、改行による差異は無視しま" "す。" -#: ../data/org.gnome.meld.gschema.xml.h:43 +#: ../data/org.gnome.meld.gschema.xml.h:47 msgid "File status filters" msgstr "ファイルの状態フィルター" -#: ../data/org.gnome.meld.gschema.xml.h:44 +#: ../data/org.gnome.meld.gschema.xml.h:48 msgid "List of statuses used to filter visible files in folder comparison." msgstr "" "フォルダー比較時に、表示するファイルをフィルタリングするために使用されるス" "テータスのリスト。" -#: ../data/org.gnome.meld.gschema.xml.h:45 +#: ../data/org.gnome.meld.gschema.xml.h:49 msgid "Show the version control console output" msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:46 +#: ../data/org.gnome.meld.gschema.xml.h:50 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.h:47 +#: ../data/org.gnome.meld.gschema.xml.h:51 msgid "Version control pane position" msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:48 +#: ../data/org.gnome.meld.gschema.xml.h:52 msgid "" "This is the height of the main version control tree when the console pane is " "shown." msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:49 +#: ../data/org.gnome.meld.gschema.xml.h:53 msgid "Present version comparisons as left-local/right-remote" msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:50 +#: ../data/org.gnome.meld.gschema.xml.h:54 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.h:51 +#: ../data/org.gnome.meld.gschema.xml.h:55 msgid "Order for files in three-way version control merge comparisons" msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:52 +#: ../data/org.gnome.meld.gschema.xml.h:56 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.h:53 +#: ../data/org.gnome.meld.gschema.xml.h:57 msgid "Show margin in commit message editor" msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:54 +#: ../data/org.gnome.meld.gschema.xml.h:58 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.h:55 +#: ../data/org.gnome.meld.gschema.xml.h:59 msgid "Margin column in commit message editor" msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:56 +#: ../data/org.gnome.meld.gschema.xml.h:60 msgid "" "The column at which to show the margin in the version control commit message " "editor." msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:57 +#: ../data/org.gnome.meld.gschema.xml.h:61 msgid "Automatically hard-wrap commit messages" msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:58 +#: ../data/org.gnome.meld.gschema.xml.h:62 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.h:59 +#: ../data/org.gnome.meld.gschema.xml.h:63 msgid "Version control status filters" msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:60 +#: ../data/org.gnome.meld.gschema.xml.h:64 msgid "" "List of statuses used to filter visible files in version control comparison." msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:61 +#: ../data/org.gnome.meld.gschema.xml.h:65 msgid "Filename-based filters" msgstr "ファイル名を対象としたフィルター" -#: ../data/org.gnome.meld.gschema.xml.h:62 +#: ../data/org.gnome.meld.gschema.xml.h:66 msgid "" "List of predefined filename-based filters that, if active, will remove " "matching files from a folder comparison." @@ -420,11 +435,11 @@ msgstr "" "ファイル名が対象の定義されたフィルターのリスト。有効な場合、フォルダーの比較" "から一致するファイルを除外します。" -#: ../data/org.gnome.meld.gschema.xml.h:63 +#: ../data/org.gnome.meld.gschema.xml.h:67 msgid "Text-based filters" msgstr "テキストを対象としたフィルター" -#: ../data/org.gnome.meld.gschema.xml.h:64 +#: ../data/org.gnome.meld.gschema.xml.h:68 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, " @@ -450,622 +465,397 @@ msgstr "Meld ダークスキーマ" msgid "Dark color scheme for Meld highlighting" msgstr "Meld がハイライトに用いるダークカラースキーマ" -#: ../meld/resources/gtk/help-overlay.ui.h:1 -msgctxt "shortcut window" -msgid "General" -msgstr "全般" +#: ../data/ui/application.ui.h:1 +msgid "About Meld" +msgstr "Meld について" -#: ../meld/resources/gtk/help-overlay.ui.h:2 -msgctxt "shortcut window" -msgid "New comparison" -msgstr "新しい比較" +#: ../data/ui/application.ui.h:2 +msgid "" +"Copyright © 2002-2009 Stephen Kennedy\n" +"Copyright © 2009-2017 Kai Willadsen" +msgstr "" +"Copyright © 2002-2009 Stephen Kennedy\n" +"Copyright © 2009-2017 Kai Willadsen" -#: ../meld/resources/gtk/help-overlay.ui.h:3 -msgctxt "shortcut window" -msgid "Close a comparison" -msgstr "比較を閉じる" +#: ../data/ui/application.ui.h:4 +msgid "Website" +msgstr "ウェブサイト" -#: ../meld/resources/gtk/help-overlay.ui.h:4 -msgctxt "shortcut window" -msgid "Quit Meld" -msgstr "Meld を終了する" +#: ../data/ui/application.ui.h:5 +msgid "translator-credits" +msgstr "" +"相花 毅 \n" +"Toshiharu Kudoh \n" +"Shinichirou Yamada \n" +"sicklylife " -#: ../meld/resources/gtk/help-overlay.ui.h:5 -msgctxt "shortcut window" -msgid "Stop the current action" -msgstr "現在適用中のアクションを停止する" +#: ../data/ui/application.ui.h:6 +msgid "_Preferences" +msgstr "設定(_P)" -#: ../meld/resources/gtk/help-overlay.ui.h:6 -msgctxt "shortcut window" -msgid "Refresh comparison" -msgstr "比較内容を更新する" +#: ../data/ui/application.ui.h:7 +msgid "_Help" +msgstr "ヘルプ(_H)" -#: ../meld/resources/gtk/help-overlay.ui.h:7 -msgctxt "shortcut window" -msgid "Fullscreen" -msgstr "フルスクリーンで表示する" +#: ../data/ui/application.ui.h:8 +msgid "Keyboard Shortcuts" +msgstr "キーボードショートカット" -#: ../meld/resources/gtk/help-overlay.ui.h:8 -msgctxt "shortcut window" -msgid "Tabs" -msgstr "タブ" +#: ../data/ui/application.ui.h:9 +msgid "_About" +msgstr "このアプリケーションについて(_A)" -#: ../meld/resources/gtk/help-overlay.ui.h:9 -msgctxt "shortcut window" -msgid "Go to previous tab" -msgstr "前のタブへ移動する" +#: ../data/ui/application.ui.h:10 +msgid "_Quit" +msgstr "終了(_Q)" -#: ../meld/resources/gtk/help-overlay.ui.h:10 -msgctxt "shortcut window" -msgid "Go to next tab" -msgstr "次のタブへ移動する" +#: ../data/ui/dirdiff.ui.h:1 ../data/ui/vcview.ui.h:1 +msgid "_Compare" +msgstr "比較(_C)" -#: ../meld/resources/gtk/help-overlay.ui.h:11 -msgctxt "shortcut window" -msgid "Switch to tab" -msgstr "タブを切り替える" +#: ../data/ui/dirdiff.ui.h:2 ../data/ui/vcview.ui.h:2 +msgid "Compare selected files" +msgstr "選択したファイルを比較します" -#: ../meld/resources/gtk/help-overlay.ui.h:12 -msgctxt "shortcut window" -msgid "Move tab left" -msgstr "タブを左へ移動する" +#: ../data/ui/dirdiff.ui.h:3 +msgid "Collapse Recursively" +msgstr "再帰的に畳む" -#: ../meld/resources/gtk/help-overlay.ui.h:13 -msgctxt "shortcut window" -msgid "Move tab right" -msgstr "タブを右へ移動する" +#: ../data/ui/dirdiff.ui.h:4 +msgid "Collapse selected folder and all subfolders" +msgstr "選択したフォルダーとすべてのサブフォルダーを畳みます" -#: ../meld/resources/gtk/help-overlay.ui.h:14 -msgctxt "shortcut window" -msgid "Changes" -msgstr "変更点" +#: ../data/ui/dirdiff.ui.h:5 +msgid "Expand Recursively" +msgstr "再帰的に展開" -#: ../meld/resources/gtk/help-overlay.ui.h:15 -msgctxt "shortcut window" -msgid "Go to previous change" -msgstr "前の変更点へジャンプする" +#: ../data/ui/dirdiff.ui.h:6 +msgid "Expand selected folder and all subfolders" +msgstr "選択したフォルダーとすべてのサブフォルダーを展開します" -#: ../meld/resources/gtk/help-overlay.ui.h:16 -msgctxt "shortcut window" -msgid "Go to next change" -msgstr "次の変更点へジャンプする" +#: ../data/ui/dirdiff.ui.h:7 +msgid "Copy to _Left" +msgstr "左へコピー(_L)" -#: ../meld/resources/gtk/help-overlay.ui.h:17 -msgctxt "shortcut window" -msgid "Editing" -msgstr "編集" +#: ../data/ui/dirdiff.ui.h:8 +msgid "Copy to left" +msgstr "左へコピーします" -#: ../meld/resources/gtk/help-overlay.ui.h:18 -msgctxt "shortcut window" -msgid "Undo" -msgstr "元に戻す" +#: ../data/ui/dirdiff.ui.h:9 +msgid "Copy to _Right" +msgstr "右へコピー(_R)" -#: ../meld/resources/gtk/help-overlay.ui.h:19 -msgctxt "shortcut window" -msgid "Redo" -msgstr "やり直し" +#: ../data/ui/dirdiff.ui.h:10 +msgid "Copy to right" +msgstr "右へコピーします" -#: ../meld/resources/gtk/help-overlay.ui.h:20 -msgctxt "shortcut window" -msgid "Cut" -msgstr "切り取り" +#: ../data/ui/dirdiff.ui.h:11 +msgid "Delete selected" +msgstr "選択したファイルなどを削除します" -#: ../meld/resources/gtk/help-overlay.ui.h:21 -msgctxt "shortcut window" -msgid "Copy" -msgstr "コピー" +#: ../data/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:907 ../meld/filediff.py:1497 +msgid "Hide" +msgstr "隠す" -#: ../meld/resources/gtk/help-overlay.ui.h:22 -msgctxt "shortcut window" -msgid "Paste" -msgstr "貼り付け" +#: ../data/ui/dirdiff.ui.h:13 +msgid "Hide selected" +msgstr "選択範囲を隠します" -#: ../meld/resources/gtk/help-overlay.ui.h:23 -msgctxt "shortcut window" -msgid "Find" -msgstr "検索" +#: ../data/ui/dirdiff.ui.h:14 +msgid "Ignore Filename Case" +msgstr "ファイル名の大/小文字を無視する" -#: ../meld/resources/gtk/help-overlay.ui.h:24 -msgctxt "shortcut window" -msgid "Find Next" -msgstr "次を検索する" +#: ../data/ui/dirdiff.ui.h:15 +msgid "" +"Consider differently-cased filenames that are otherwise-identical to be the " +"same" +msgstr "" -#: ../meld/resources/gtk/help-overlay.ui.h:25 -msgctxt "shortcut window" -msgid "Find Previous" -msgstr "前を検索する" +#: ../data/ui/dirdiff.ui.h:16 +msgid "Same" +msgstr "同じ部分" -#: ../meld/resources/gtk/help-overlay.ui.h:26 -msgctxt "shortcut window" -msgid "Replace" -msgstr "置換" +#: ../data/ui/dirdiff.ui.h:17 +msgid "Show identical" +msgstr "一致する部分を表示します" -#: ../meld/resources/gtk/help-overlay.ui.h:27 -msgctxt "shortcut window" -msgid "File comparison" -msgstr "ファイルの比較" - -#: ../meld/resources/gtk/help-overlay.ui.h:28 -msgctxt "shortcut window" -msgid "Save current file" -msgstr "このファイルを保存する" - -#: ../meld/resources/gtk/help-overlay.ui.h:29 -msgctxt "shortcut window" -msgid "Save current file to new path" -msgstr "このファイルを新しい名前で保存する" - -#: ../meld/resources/gtk/help-overlay.ui.h:30 -msgctxt "shortcut window" -msgid "Save all files in comparison" -msgstr "比較中のすべてのファイルを保存する" - -#: ../meld/resources/gtk/help-overlay.ui.h:31 -msgctxt "shortcut window" -msgid "Previous conflict" -msgstr "前の衝突箇所" - -#: ../meld/resources/gtk/help-overlay.ui.h:32 -msgctxt "shortcut window" -msgid "Next conflict" -msgstr "次の衝突箇所" - -#: ../meld/resources/gtk/help-overlay.ui.h:33 -msgctxt "shortcut window" -msgid "Push change to left" -msgstr "変更点を左へ適用する" - -#: ../meld/resources/gtk/help-overlay.ui.h:34 -msgctxt "shortcut window" -msgid "Push change to right" -msgstr "変更点を右へ適用する" - -#: ../meld/resources/gtk/help-overlay.ui.h:35 -msgctxt "shortcut window" -msgid "Pull change from left" -msgstr "変更点を左から適用する" - -#: ../meld/resources/gtk/help-overlay.ui.h:36 -msgctxt "shortcut window" -msgid "Pull change from right" -msgstr "変更点を右から適用する" - -#: ../meld/resources/gtk/help-overlay.ui.h:37 -msgctxt "shortcut window" -msgid "Copy change above left" -msgstr "左の変更点の上にコピーする" - -#: ../meld/resources/gtk/help-overlay.ui.h:38 -msgctxt "shortcut window" -msgid "Copy change below left" -msgstr "左の変更点の下にコピーする" - -#: ../meld/resources/gtk/help-overlay.ui.h:39 -msgctxt "shortcut window" -msgid "Copy change above right" -msgstr "右の変更点の上にコピーする" - -#: ../meld/resources/gtk/help-overlay.ui.h:40 -msgctxt "shortcut window" -msgid "Copy change below right" -msgstr "右の変更点の下にコピーする" - -#: ../meld/resources/gtk/help-overlay.ui.h:41 -msgctxt "shortcut window" -msgid "Delete change" -msgstr "変更点を削除する" - -#: ../meld/resources/gtk/help-overlay.ui.h:42 -msgctxt "shortcut window" -msgid "Previous comparison pane" -msgstr "前の比較ペイン" - -#: ../meld/resources/gtk/help-overlay.ui.h:43 -msgctxt "shortcut window" -msgid "Next comparison pane" -msgstr "次の比較ペイン" - -#: ../meld/resources/gtk/help-overlay.ui.h:44 -msgctxt "shortcut window" -msgid "Folder comparison" -msgstr "フォルダーの比較" - -#: ../meld/resources/gtk/help-overlay.ui.h:45 -msgctxt "shortcut window" -msgid "Copy to left" -msgstr "左へコピーする" - -#: ../meld/resources/gtk/help-overlay.ui.h:46 -msgctxt "shortcut window" -msgid "Copy to right" -msgstr "右へコピーする" - -#: ../meld/resources/gtk/help-overlay.ui.h:47 -msgctxt "shortcut window" -msgid "Version control comparison" -msgstr "バージョン管理の比較" - -#: ../meld/resources/gtk/help-overlay.ui.h:48 -msgctxt "shortcut window" -msgid "Commit to version control" -msgstr "バージョン管理へコミットする" - -#: ../meld/resources/gtk/help-overlay.ui.h:49 -msgctxt "shortcut window" -msgid "Show/hide console output" -msgstr "コンソール出力の表示/非表示" - -#: ../meld/resources/gtk/menus.ui.h:1 -msgid "_Preferences" -msgstr "設定(_P)" - -#: ../meld/resources/gtk/menus.ui.h:2 -msgid "_Help" -msgstr "ヘルプ(_H)" +#: ../data/ui/dirdiff.ui.h:18 +msgid "New" +msgstr "新しい部分" -#: ../meld/resources/gtk/menus.ui.h:3 -msgid "Keyboard Shortcuts" -msgstr "キーボードショートカット" +#: ../data/ui/dirdiff.ui.h:19 +msgid "Show new" +msgstr "新規の部分を表示します" -#: ../meld/resources/gtk/menus.ui.h:4 -msgid "_About" -msgstr "このアプリケーションについて(_A)" +#: ../data/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:76 +msgid "Modified" +msgstr "変更済" -#: ../meld/resources/gtk/menus.ui.h:5 -msgid "_Quit" -msgstr "終了(_Q)" +#: ../data/ui/dirdiff.ui.h:21 +msgid "Show modified" +msgstr "変更のあるファイルを表示します" -#: ../meld/resources/ui/about-dialog.ui.h:1 -msgid "About Meld" -msgstr "Meld について" +#: ../data/ui/dirdiff.ui.h:22 +msgid "Filters" +msgstr "フィルター" -#: ../meld/resources/ui/about-dialog.ui.h:2 -msgid "" -"Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2017 Kai Willadsen" -msgstr "" -"Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2017 Kai Willadsen" +#: ../data/ui/dirdiff.ui.h:23 +msgid "Set active filters" +msgstr "フィルターを選択します" -#: ../meld/resources/ui/about-dialog.ui.h:4 -msgid "Website" -msgstr "ウェブサイト" +#: ../data/ui/EditableList.ui.h:1 +msgid "Editable List" +msgstr "編集可能なリスト" -#: ../meld/resources/ui/about-dialog.ui.h:5 -msgid "translator-credits" -msgstr "" -"相花 毅 \n" -"Toshiharu Kudoh \n" -"Shinichirou Yamada \n" -"sicklylife " - -#: ../meld/resources/ui/column-list.ui.h:1 -#: ../meld/resources/ui/filter-list.ui.h:1 +#: ../data/ui/EditableList.ui.h:2 msgid "Active" msgstr "有効" -#: ../meld/resources/ui/column-list.ui.h:2 +#: ../data/ui/EditableList.ui.h:3 msgid "Column Name" msgstr "カラム名" -#: ../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 +#: ../data/ui/EditableList.ui.h:4 ../data/ui/vcview.ui.h:9 +msgid "_Add" +msgstr "追加(_A)" + +#: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11 +#: ../meld/vcview.py:680 msgid "_Remove" msgstr "削除(_R)" -#: ../meld/resources/ui/column-list.ui.h:4 -#: ../meld/resources/ui/filter-list.ui.h:8 +#: ../data/ui/EditableList.ui.h:6 msgid "Move item up" msgstr "アイテムを上へ移動します" -#: ../meld/resources/ui/column-list.ui.h:5 -#: ../meld/resources/ui/filter-list.ui.h:9 +#: ../data/ui/EditableList.ui.h:7 msgid "Move _Up" msgstr "上へ移動する(_U)" -#: ../meld/resources/ui/column-list.ui.h:6 -#: ../meld/resources/ui/filter-list.ui.h:10 +#: ../data/ui/EditableList.ui.h:8 msgid "Move item down" msgstr "アイテムを下へ移動します" -#: ../meld/resources/ui/column-list.ui.h:7 -#: ../meld/resources/ui/filter-list.ui.h:11 +#: ../data/ui/EditableList.ui.h:9 msgid "Move _Down" msgstr "下へ移動する(_D)" -#: ../meld/resources/ui/commit-dialog.ui.h:1 -msgid "Commit" -msgstr "" - -#: ../meld/resources/ui/commit-dialog.ui.h:2 -msgid "Commit Files" -msgstr "" - -#: ../meld/resources/ui/commit-dialog.ui.h:3 -msgid "Log Message" -msgstr "" - -#: ../meld/resources/ui/commit-dialog.ui.h:4 -msgid "Previous logs:" -msgstr "" - -#: ../meld/resources/ui/commit-dialog.ui.h:5 -msgid "Co_mmit" -msgstr "" - -#: ../meld/resources/ui/dirdiff.ui.h:1 ../meld/resources/ui/vcview.ui.h:1 -msgid "_Compare" -msgstr "比較(_C)" - -#: ../meld/resources/ui/dirdiff.ui.h:2 ../meld/resources/ui/vcview.ui.h:2 -msgid "Compare selected files" -msgstr "選択したファイルを比較します" - -#: ../meld/resources/ui/dirdiff.ui.h:3 -msgid "Collapse Recursively" -msgstr "" - -#: ../meld/resources/ui/dirdiff.ui.h:4 -msgid "Collapse selected folder and all subfolders" -msgstr "" - -#: ../meld/resources/ui/dirdiff.ui.h:5 -msgid "Expand Recursively" -msgstr "" - -#: ../meld/resources/ui/dirdiff.ui.h:6 -msgid "Expand selected folder and all subfolders" -msgstr "" - -#: ../meld/resources/ui/dirdiff.ui.h:7 -msgid "Copy to _Left" -msgstr "左へコピー(_L)" - -#: ../meld/resources/ui/dirdiff.ui.h:8 -msgid "Copy to left" -msgstr "左へコピーします" - -#: ../meld/resources/ui/dirdiff.ui.h:9 -msgid "Copy to _Right" -msgstr "右へコピー(_R)" - -#: ../meld/resources/ui/dirdiff.ui.h:10 -msgid "Copy to right" -msgstr "右へコピーします" - -#: ../meld/resources/ui/dirdiff.ui.h:11 -msgid "Delete selected" -msgstr "選択したファイルなどを削除します" - -#: ../meld/resources/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:958 -#: ../meld/filediff.py:1586 -msgid "Hide" -msgstr "隠す" - -#: ../meld/resources/ui/dirdiff.ui.h:13 -msgid "Hide selected" -msgstr "選択範囲を隠します" - -#: ../meld/resources/ui/dirdiff.ui.h:14 -msgid "Ignore Filename Case" -msgstr "ファイル名の大/小文字を無視する" - -#: ../meld/resources/ui/dirdiff.ui.h:15 -msgid "" -"Consider differently-cased filenames that are otherwise-identical to be the " -"same" -msgstr "" - -#: ../meld/resources/ui/dirdiff.ui.h:16 -msgid "Same" -msgstr "同じ部分" - -#: ../meld/resources/ui/dirdiff.ui.h:17 -msgid "Show identical" -msgstr "一致する部分を表示します" - -#: ../meld/resources/ui/dirdiff.ui.h:18 -msgid "New" -msgstr "新しい部分" - -#: ../meld/resources/ui/dirdiff.ui.h:19 -msgid "Show new" -msgstr "新規の部分を表示します" - -#: ../meld/resources/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:76 -msgid "Modified" -msgstr "変更済" +#. Create icon and filename CellRenderer +#: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35 +#: ../meld/dirdiff.py:407 +msgid "Name" +msgstr "名前" -#: ../meld/resources/ui/dirdiff.ui.h:21 -msgid "Show modified" -msgstr "変更のあるファイルを表示します" +#: ../data/ui/EditableList.ui.h:11 +msgid "Pattern" +msgstr "パターン" -#: ../meld/resources/ui/dirdiff.ui.h:22 -msgid "Filters" -msgstr "フィルター" +#: ../data/ui/EditableList.ui.h:12 +msgid "Add new filter" +msgstr "新しいフィルターを追加します" -#: ../meld/resources/ui/dirdiff.ui.h:23 -msgid "Set active filters" -msgstr "フィルターを選択します" +#: ../data/ui/EditableList.ui.h:13 +msgid "Remove selected filter" +msgstr "選択したフィルターを削除します" -#: ../meld/resources/ui/encoding-selector.ui.h:1 +#: ../data/ui/encoding-selector.ui.h:1 msgid "Search text encoding…" -msgstr "" +msgstr "テキストエンコーディングを検索…" -#: ../meld/resources/ui/filediff.ui.h:1 +#: ../data/ui/filediff.ui.h:1 msgid "Format as Patch…" msgstr "パッチを生成…" -#: ../meld/resources/ui/filediff.ui.h:2 +#: ../data/ui/filediff.ui.h:2 msgid "Create a patch using differences between files" msgstr "ファイル間の差分からパッチを生成します" -#: ../meld/resources/ui/filediff.ui.h:3 +#: ../data/ui/filediff.ui.h:3 msgid "Save A_ll" msgstr "すべて保存(_L)" -#: ../meld/resources/ui/filediff.ui.h:4 +#: ../data/ui/filediff.ui.h:4 msgid "Save all files in the current comparison" msgstr "比較中のすべてのファイルを保存します" -#: ../meld/resources/ui/filediff.ui.h:5 +#: ../data/ui/filediff.ui.h:5 msgid "Revert files to their saved versions" msgstr "ファイルを保存されたバージョンに戻します" -#: ../meld/resources/ui/filediff.ui.h:6 +#: ../data/ui/filediff.ui.h:6 msgid "Add Synchronization Point" msgstr "同期点を追加" -#: ../meld/resources/ui/filediff.ui.h:7 +#: ../data/ui/filediff.ui.h:7 msgid "Add a synchronization point for changes between files" msgstr "" -#: ../meld/resources/ui/filediff.ui.h:8 +#: ../data/ui/filediff.ui.h:8 msgid "Clear Synchronization Points" msgstr "同期点をクリア" -#: ../meld/resources/ui/filediff.ui.h:9 +#: ../data/ui/filediff.ui.h:9 msgid "Clear sychronization points for changes between files" msgstr "" -#: ../meld/resources/ui/filediff.ui.h:10 +#: ../data/ui/filediff.ui.h:10 msgid "Previous Conflict" msgstr "前の衝突箇所" -#: ../meld/resources/ui/filediff.ui.h:11 +#: ../data/ui/filediff.ui.h:11 msgid "Go to the previous conflict" msgstr "前の衝突箇所へジャンプします" -#: ../meld/resources/ui/filediff.ui.h:12 +#: ../data/ui/filediff.ui.h:12 msgid "Next Conflict" msgstr "次の衝突箇所" -#: ../meld/resources/ui/filediff.ui.h:13 +#: ../data/ui/filediff.ui.h:13 msgid "Go to the next conflict" msgstr "次の衝突箇所へジャンプします" -#: ../meld/resources/ui/filediff.ui.h:14 +#: ../data/ui/filediff.ui.h:14 msgid "Push to Left" msgstr "左へ適用" -#: ../meld/resources/ui/filediff.ui.h:15 +#: ../data/ui/filediff.ui.h:15 msgid "Push current change to the left" msgstr "現在の変更を左にも適用します" -#: ../meld/resources/ui/filediff.ui.h:16 +#: ../data/ui/filediff.ui.h:16 msgid "Push to Right" msgstr "右へ適用" -#: ../meld/resources/ui/filediff.ui.h:17 +#: ../data/ui/filediff.ui.h:17 msgid "Push current change to the right" msgstr "現在の変更を右にも適用します" -#: ../meld/resources/ui/filediff.ui.h:18 +#: ../data/ui/filediff.ui.h:18 msgid "Pull from Left" msgstr "左から適用" -#: ../meld/resources/ui/filediff.ui.h:19 +#: ../data/ui/filediff.ui.h:19 msgid "Pull change from the left" msgstr "左から変更を適用します" -#: ../meld/resources/ui/filediff.ui.h:20 +#: ../data/ui/filediff.ui.h:20 msgid "Pull from Right" msgstr "右から適用" -#: ../meld/resources/ui/filediff.ui.h:21 +#: ../data/ui/filediff.ui.h:21 msgid "Pull change from the right" msgstr "右から変更を適用します" -#: ../meld/resources/ui/filediff.ui.h:22 +#: ../data/ui/filediff.ui.h:22 msgid "Copy Above Left" msgstr "左の上にコピー" -#: ../meld/resources/ui/filediff.ui.h:23 +#: ../data/ui/filediff.ui.h:23 msgid "Copy change above the left chunk" msgstr "左の変更点の上にコピーします" -#: ../meld/resources/ui/filediff.ui.h:24 +#: ../data/ui/filediff.ui.h:24 msgid "Copy Below Left" msgstr "左の下にコピー" -#: ../meld/resources/ui/filediff.ui.h:25 +#: ../data/ui/filediff.ui.h:25 msgid "Copy change below the left chunk" msgstr "左の変更点の下にコピーします" -#: ../meld/resources/ui/filediff.ui.h:26 +#: ../data/ui/filediff.ui.h:26 msgid "Copy Above Right" msgstr "右の上にコピー" -#: ../meld/resources/ui/filediff.ui.h:27 +#: ../data/ui/filediff.ui.h:27 msgid "Copy change above the right chunk" msgstr "右の変更点の上にコピーします" -#: ../meld/resources/ui/filediff.ui.h:28 +#: ../data/ui/filediff.ui.h:28 msgid "Copy Below Right" msgstr "右の下にコピー" -#: ../meld/resources/ui/filediff.ui.h:29 +#: ../data/ui/filediff.ui.h:29 msgid "Copy change below the right chunk" msgstr "右の変更点の下にコピーします" -#: ../meld/resources/ui/filediff.ui.h:30 +#: ../data/ui/filediff.ui.h:30 msgid "Delete" msgstr "削除" -#: ../meld/resources/ui/filediff.ui.h:31 +#: ../data/ui/filediff.ui.h:31 msgid "Delete change" msgstr "変更点を削除します" -#: ../meld/resources/ui/filediff.ui.h:32 +#: ../data/ui/filediff.ui.h:32 msgid "Merge All from Left" msgstr "左からすべてをマージ" -#: ../meld/resources/ui/filediff.ui.h:33 +#: ../data/ui/filediff.ui.h:33 msgid "Merge all non-conflicting changes from the left" msgstr "" -#: ../meld/resources/ui/filediff.ui.h:34 +#: ../data/ui/filediff.ui.h:34 msgid "Merge All from Right" msgstr "右からすべてをマージ" -#: ../meld/resources/ui/filediff.ui.h:35 +#: ../data/ui/filediff.ui.h:35 msgid "Merge all non-conflicting changes from the right" msgstr "" -#: ../meld/resources/ui/filediff.ui.h:36 +#: ../data/ui/filediff.ui.h:36 msgid "Merge All" msgstr "すべてをマージ" -#: ../meld/resources/ui/filediff.ui.h:37 +#: ../data/ui/filediff.ui.h:37 msgid "Merge all non-conflicting changes from left and right panes" msgstr "" -#: ../meld/resources/ui/filediff.ui.h:38 +#: ../data/ui/filediff.ui.h:38 msgid "Previous Pane" msgstr "前のペイン" -#: ../meld/resources/ui/filediff.ui.h:39 +#: ../data/ui/filediff.ui.h:39 msgid "Move keyboard focus to the previous document in this comparison" msgstr "この比較のキーボードフォーカスを前のドキュメントに移動します" -#: ../meld/resources/ui/filediff.ui.h:40 +#: ../data/ui/filediff.ui.h:40 msgid "Next Pane" msgstr "次のペイン" -#: ../meld/resources/ui/filediff.ui.h:41 +#: ../data/ui/filediff.ui.h:41 msgid "Move keyboard focus to the next document in this comparison" msgstr "この比較のキーボードフォーカスを次のドキュメントに移動します" -#: ../meld/resources/ui/filediff.ui.h:42 +#: ../data/ui/filediff.ui.h:42 msgid "Lock Scrolling" msgstr "スクロールをロック" -#: ../meld/resources/ui/filediff.ui.h:43 +#: ../data/ui/filediff.ui.h:43 msgid "Lock scrolling of all panes" msgstr "すべてのペインでスクロールを同期します" -#: ../meld/resources/ui/filediff.ui.h:44 +#: ../data/ui/filediff.ui.h:44 +msgid "Save changes to documents before closing?" +msgstr "閉じる前にドキュメントへの変更を保存しますか?" + +#: ../data/ui/filediff.ui.h:45 +msgid "If you don’t save, changes will be permanently lost." +msgstr "保存しない場合、変更は永久に失われます。" + +#: ../data/ui/filediff.ui.h:46 +msgid "Close _without Saving" +msgstr "保存せずに閉じる(_W)" + +#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:988 ../meld/iohelpers.py:56 +#: ../meld/iohelpers.py:106 +msgid "_Cancel" +msgstr "キャンセル(_C)" + +#: ../data/ui/filediff.ui.h:48 +msgid "_Save" +msgstr "保存(_S)" + +#: ../data/ui/filediff.ui.h:49 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." @@ -1074,546 +864,763 @@ msgstr "" "ルのロックを解除して変更を加えることができますが、これらの変更は新しいファイ" "ルに保存しなければなりません。" -#: ../meld/resources/ui/filediff.ui.h:45 +#: ../data/ui/filediff.ui.h:50 msgid "File 3" msgstr "ファイル 3" -#: ../meld/resources/ui/filediff.ui.h:46 +#: ../data/ui/filediff.ui.h:51 msgid "File 2" msgstr "ファイル 2" -#: ../meld/resources/ui/filediff.ui.h:47 +#: ../data/ui/filediff.ui.h:52 msgid "File 1" msgstr "ファイル 1" -#. Create icon and filename CellRenderer -#: ../meld/resources/ui/filter-list.ui.h:2 ../meld/resources/ui/vcview.ui.h:30 -#: ../meld/dirdiff.py:454 -msgid "Name" -msgstr "名前" - -#: ../meld/resources/ui/filter-list.ui.h:3 -msgid "Pattern" -msgstr "パターン" - -#: ../meld/resources/ui/filter-list.ui.h:4 -msgid "Add new filter" -msgstr "新しいフィルターを追加します" +#: ../data/ui/filediff.ui.h:53 +msgid "Discard unsaved changes to documents?" +msgstr "ドキュメントへの変更を保存せずに破棄しますか?" -#: ../meld/resources/ui/filter-list.ui.h:5 ../meld/resources/ui/vcview.ui.h:9 -msgid "_Add" -msgstr "追加(_A)" +#: ../data/ui/filediff.ui.h:54 +msgid "Changes made to the following documents will be permanently lost:" +msgstr "次のドキュメントへの変更は永久に失われます:" -#: ../meld/resources/ui/filter-list.ui.h:6 -msgid "Remove selected filter" -msgstr "選択したフィルターを削除します" +#: ../data/ui/filediff.ui.h:55 +msgid "_Discard" +msgstr "破棄(_D)" -#: ../meld/resources/ui/findbar.ui.h:1 ../meld/dirdiff.py:1040 -#: ../meld/iohelpers.py:113 +#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:989 ../meld/iohelpers.py:107 msgid "_Replace" msgstr "置換(_R)" -#: ../meld/resources/ui/findbar.ui.h:2 +#: ../data/ui/findbar.ui.h:2 msgid "Replace _All" msgstr "すべて置換(_A)" -#: ../meld/resources/ui/findbar.ui.h:3 +#: ../data/ui/findbar.ui.h:3 msgid "_Previous" msgstr "前の結果(_P)" -#: ../meld/resources/ui/findbar.ui.h:4 +#: ../data/ui/findbar.ui.h:4 msgid "_Next" msgstr "次の結果(_N)" -#: ../meld/resources/ui/findbar.ui.h:5 +#: ../data/ui/findbar.ui.h:5 msgid "Find:" msgstr "検索:" -#: ../meld/resources/ui/findbar.ui.h:6 +#: ../data/ui/findbar.ui.h:6 msgid "Replace _with:" msgstr "次で置換(_W):" -#: ../meld/resources/ui/findbar.ui.h:7 +#: ../data/ui/findbar.ui.h:7 msgid "_Match case" msgstr "大/小文字を区別(_M)" -#: ../meld/resources/ui/findbar.ui.h:8 +#: ../data/ui/findbar.ui.h:8 msgid "Who_le word" msgstr "単語全体(_L)" -#: ../meld/resources/ui/findbar.ui.h:9 +#: ../data/ui/findbar.ui.h:9 msgid "Regular e_xpression" msgstr "正規表現(_X)" -#: ../meld/resources/ui/findbar.ui.h:10 +#: ../data/ui/findbar.ui.h:10 msgid "Wrapped" -msgstr "" +msgstr "折り返しました" -#: ../meld/resources/ui/language-selector.ui.h:1 +#: ../data/ui/language-selector.ui.h:1 msgid "Search highlight mode…" -msgstr "" - -#: ../meld/resources/ui/new-diff-tab.ui.h:1 ../meld/meldwindow.py:532 -#: ../meld/newdifftab.py:53 -msgid "New comparison" -msgstr "新しい比較" - -#: ../meld/resources/ui/new-diff-tab.ui.h:2 -msgid "File comparison" -msgstr "ファイルの比較" - -#: ../meld/resources/ui/new-diff-tab.ui.h:3 -msgid "Directory comparison" -msgstr "フォルダーの比較" - -#: ../meld/resources/ui/new-diff-tab.ui.h:4 -msgid "Version control view" -msgstr "" - -#: ../meld/resources/ui/new-diff-tab.ui.h:5 -msgid "_3-way comparison" -msgstr "3つを比較(_3)" - -#: ../meld/resources/ui/new-diff-tab.ui.h:6 -msgid "Select Third File" -msgstr "3番目のファイルを選択" - -#: ../meld/resources/ui/new-diff-tab.ui.h:7 -msgid "Select Second File" -msgstr "2番目のファイルを選択" - -#: ../meld/resources/ui/new-diff-tab.ui.h:8 -msgid "Select First File" -msgstr "1番目のファイルを選択" +msgstr "ハイライトモードを検索…" -#: ../meld/resources/ui/new-diff-tab.ui.h:9 -msgid "Select First Folder" -msgstr "1番目のフォルダーを選択" - -#: ../meld/resources/ui/new-diff-tab.ui.h:10 -msgid "Select Second Folder" -msgstr "2番目のフォルダーを選択" - -#: ../meld/resources/ui/new-diff-tab.ui.h:11 -msgid "Select Third Folder" -msgstr "3番目のフォルダーを選択" - -#: ../meld/resources/ui/new-diff-tab.ui.h:12 -msgid "Select A Version-Controlled Folder" -msgstr "" - -#: ../meld/resources/ui/new-diff-tab.ui.h:13 -msgid "_Blank comparison" -msgstr "空の比較(_B)" - -#: ../meld/resources/ui/new-diff-tab.ui.h:14 -msgid "C_ompare" -msgstr "比較(_O)" - -#: ../meld/resources/ui/notebook-label.ui.h:1 -msgid "Close Tab" -msgstr "タブを閉じる" - -#: ../meld/resources/ui/patch-dialog.ui.h:1 +#: ../data/ui/patch-dialog.ui.h:1 msgid "Format as Patch" msgstr "パッチを生成" -#: ../meld/resources/ui/patch-dialog.ui.h:2 +#: ../data/ui/patch-dialog.ui.h:2 msgid "Copy to Clipboard" msgstr "クリップボードへコピー" -#: ../meld/resources/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:165 +#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:152 msgid "Save Patch" msgstr "パッチを保存" -#: ../meld/resources/ui/patch-dialog.ui.h:4 +#: ../data/ui/patch-dialog.ui.h:4 msgid "Use differences between:" msgstr "次のペイン間の差分を使用する:" -#: ../meld/resources/ui/patch-dialog.ui.h:5 +#: ../data/ui/patch-dialog.ui.h:5 msgid "Left and middle panes" msgstr "左と中央のペイン" -#: ../meld/resources/ui/patch-dialog.ui.h:6 +#: ../data/ui/patch-dialog.ui.h:6 msgid "Middle and right panes" msgstr "中央と右のペイン" -#: ../meld/resources/ui/patch-dialog.ui.h:7 +#: ../data/ui/patch-dialog.ui.h:7 msgid "_Reverse patch direction" msgstr "パッチの対象を逆にする(_R)" -#: ../meld/resources/ui/preferences.ui.h:1 -msgid "Preferences" -msgstr "設定" +#: ../data/ui/preferences.ui.h:1 +msgid "Meld Preferences" +msgstr "Meld の設定" -#: ../meld/resources/ui/preferences.ui.h:2 +#: ../data/ui/preferences.ui.h:2 msgid "Font" msgstr "フォント" -#: ../meld/resources/ui/preferences.ui.h:3 +#: ../data/ui/preferences.ui.h:3 msgid "_Use the system fixed width font" msgstr "システムの等幅フォントを使用する(_U)" -#: ../meld/resources/ui/preferences.ui.h:4 +#: ../data/ui/preferences.ui.h:4 msgid "_Editor font:" msgstr "エディターのフォント(_E):" -#: ../meld/resources/ui/preferences.ui.h:5 +#: ../data/ui/preferences.ui.h:5 msgid "Display" msgstr "表示" -#: ../meld/resources/ui/preferences.ui.h:6 +#: ../data/ui/preferences.ui.h:6 msgid "_Tab width:" msgstr "タブの幅(_T):" -#: ../meld/resources/ui/preferences.ui.h:7 +#: ../data/ui/preferences.ui.h:7 msgid "_Insert spaces instead of tabs" msgstr "タブの代わりに空白を挿入する(_I)" -#: ../meld/resources/ui/preferences.ui.h:8 +#: ../data/ui/preferences.ui.h:8 msgid "Enable text _wrapping" msgstr "文字列の折り返しを有効にする(_W)" -#: ../meld/resources/ui/preferences.ui.h:9 +#: ../data/ui/preferences.ui.h:9 msgid "Do not _split words over two lines" msgstr "単語が二行に跨がらないようにする(_S)" -#: ../meld/resources/ui/preferences.ui.h:10 +#: ../data/ui/preferences.ui.h:10 msgid "Highlight _current line" msgstr "現在の行をハイライトする(_C)" -#: ../meld/resources/ui/preferences.ui.h:11 +#: ../data/ui/preferences.ui.h:11 msgid "Show _line numbers" msgstr "行番号を表示する(_L)" -#: ../meld/resources/ui/preferences.ui.h:12 +#: ../data/ui/preferences.ui.h:12 msgid "Show w_hitespace" msgstr "空白や改行を表示する(_H)" -#: ../meld/resources/ui/preferences.ui.h:13 +#: ../data/ui/preferences.ui.h:13 msgid "Use s_yntax highlighting" msgstr "シンタックスハイライトを有効にする(_Y)" -#: ../meld/resources/ui/preferences.ui.h:14 +#: ../data/ui/preferences.ui.h:14 msgid "Syntax highlighting color scheme:" msgstr "シンタックスハイライトのカラースキーマ:" -#: ../meld/resources/ui/preferences.ui.h:15 +#: ../data/ui/preferences.ui.h:15 msgid "External Editor" msgstr "外部エディター" -#: ../meld/resources/ui/preferences.ui.h:16 +#: ../data/ui/preferences.ui.h:16 msgid "Use _default system editor" msgstr "デフォルトのエディターを使用する(_D)" -#: ../meld/resources/ui/preferences.ui.h:17 +#: ../data/ui/preferences.ui.h:17 msgid "Edito_r command:" msgstr "エディターをコマンドで指定する(_R):" -#: ../meld/resources/ui/preferences.ui.h:18 +#: ../data/ui/preferences.ui.h:18 msgid "Editor" msgstr "エディター" -#: ../meld/resources/ui/preferences.ui.h:19 +#: ../data/ui/preferences.ui.h:19 msgid "Shallow Comparison" msgstr "浅い比較" -#: ../meld/resources/ui/preferences.ui.h:20 +#: ../data/ui/preferences.ui.h:20 msgid "C_ompare files based only on size and timestamp" msgstr "サイズとタイムスタンプだけを基準にしてファイルを比較する(_O)" -#: ../meld/resources/ui/preferences.ui.h:21 +#: ../data/ui/preferences.ui.h:21 msgid "_Timestamp resolution:" msgstr "タイムスタンプ分解能(_T):" -#: ../meld/resources/ui/preferences.ui.h:23 +#: ../data/ui/preferences.ui.h:23 msgid "Note: enabling text filters may make comparing large files much slower" msgstr "" "備考: テキストフィルターを有効にすると、大きなファイルの比較が遅くなる可能性" "があります" -#: ../meld/resources/ui/preferences.ui.h:24 +#: ../data/ui/preferences.ui.h:24 msgid "Symbolic Links" msgstr "シンボリックリンク" -#: ../meld/resources/ui/preferences.ui.h:26 +#: ../data/ui/preferences.ui.h:26 msgid "Visible Columns" msgstr "表示するカラム" -#: ../meld/resources/ui/preferences.ui.h:27 +#: ../data/ui/preferences.ui.h:27 msgid "Folder Comparisons" msgstr "フォルダーの比較" -#: ../meld/resources/ui/preferences.ui.h:28 +#: ../data/ui/preferences.ui.h:28 msgid "Version Comparisons" msgstr "" -#: ../meld/resources/ui/preferences.ui.h:29 +#: ../data/ui/preferences.ui.h:29 msgid "_Order when comparing file revisions:" msgstr "" -#: ../meld/resources/ui/preferences.ui.h:30 +#: ../data/ui/preferences.ui.h:30 msgid "Order when _merging files:" msgstr "" -#: ../meld/resources/ui/preferences.ui.h:31 -msgid "Commit Messages" -msgstr "コミットメッセージ" +#: ../data/ui/preferences.ui.h:31 +msgid "Commit Messages" +msgstr "コミットメッセージ" + +#: ../data/ui/preferences.ui.h:32 +msgid "Show _right margin at:" +msgstr "右マージンを表示する(_R):" + +#: ../data/ui/preferences.ui.h:33 +msgid "Automatically _break lines at right margin on commit" +msgstr "" + +#: ../data/ui/preferences.ui.h:34 +msgid "Version Control" +msgstr "バージョン管理" + +#: ../data/ui/preferences.ui.h:35 +msgid "Filename filters" +msgstr "ファイル名フィルター" + +#: ../data/ui/preferences.ui.h:36 +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 "" +"フォルダーの比較を行う際、ファイルとフォルダーを名前でフィルタリングできま" +"す。フィルタリングのパターンはそれぞれ、スペースで区切った SHELL 型式のワイル" +"ドカードの並びです。" + +#: ../data/ui/preferences.ui.h:37 ../meld/meldwindow.py:105 +msgid "File Filters" +msgstr "ファイルフィルター" + +#: ../data/ui/preferences.ui.h:38 +msgid "Change trimming" +msgstr "変更のトリミング" + +#: ../data/ui/preferences.ui.h:39 +msgid "Trim blank line differences from the start and end of changes" +msgstr "" +"変更点の始まりと終わりの部分から、空行の差異をハイライトしないように除外する" + +#: ../data/ui/preferences.ui.h:40 +msgid "Text filters" +msgstr "テキストフィルター" + +#: ../data/ui/preferences.ui.h:41 +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 "" +"ファイルの比較を行う時は、ある種類の変更だけ無視することができます。無視する" +"パターンはそれぞれ Python 形式の正規表現で指定し、その実装は無視する文字列を" +"空の文字列で置き換えるだけです。もし正規表現パターンにグループが含まれていた" +"ら、該当するグループの文字列だけ置き換えます。詳細はユーザーズ・マニュアルを" +"ご覧下さい。" + +#: ../data/ui/preferences.ui.h:42 +msgid "Text Filters" +msgstr "テキストフィルター" + +#: ../data/ui/preferences.ui.h:43 +msgid "Left is remote, right is local" +msgstr "" + +#: ../data/ui/preferences.ui.h:44 +msgid "Left is local, right is remote" +msgstr "" + +#: ../data/ui/preferences.ui.h:45 +msgid "Remote, merge, local" +msgstr "" + +#: ../data/ui/preferences.ui.h:46 +msgid "Local, merge, remote" +msgstr "" + +#: ../data/ui/preferences.ui.h:47 +msgid "1ns (ext4)" +msgstr "1ナノ秒 (ext4)" + +#: ../data/ui/preferences.ui.h:48 +msgid "100ns (NTFS)" +msgstr "100ナノ秒 (NTFS)" + +#: ../data/ui/preferences.ui.h:49 +msgid "1s (ext2/ext3)" +msgstr "1秒 (ext2/ext3)" + +#: ../data/ui/preferences.ui.h:50 +msgid "2s (VFAT)" +msgstr "2秒 (VFAT)" + +#: ../data/ui/shortcuts.ui.h:1 +msgctxt "shortcut window" +msgid "General" +msgstr "全般" + +#: ../data/ui/shortcuts.ui.h:2 +msgctxt "shortcut window" +msgid "New comparison" +msgstr "新しい比較" + +#: ../data/ui/shortcuts.ui.h:3 +msgctxt "shortcut window" +msgid "Close a comparison" +msgstr "比較を閉じる" + +#: ../data/ui/shortcuts.ui.h:4 +msgctxt "shortcut window" +msgid "Quit Meld" +msgstr "Meld を終了する" + +#: ../data/ui/shortcuts.ui.h:5 +msgctxt "shortcut window" +msgid "Stop the current action" +msgstr "現在適用中のアクションを停止する" + +#: ../data/ui/shortcuts.ui.h:6 +msgctxt "shortcut window" +msgid "Refresh comparison" +msgstr "比較内容を更新する" + +#: ../data/ui/shortcuts.ui.h:7 +msgctxt "shortcut window" +msgid "Fullscreen" +msgstr "フルスクリーンで表示する" + +#: ../data/ui/shortcuts.ui.h:8 +msgctxt "shortcut window" +msgid "Tabs" +msgstr "タブ" + +#: ../data/ui/shortcuts.ui.h:9 +msgctxt "shortcut window" +msgid "Go to previous tab" +msgstr "前のタブへ移動する" + +#: ../data/ui/shortcuts.ui.h:10 +msgctxt "shortcut window" +msgid "Go to next tab" +msgstr "次のタブへ移動する" + +#: ../data/ui/shortcuts.ui.h:11 +msgctxt "shortcut window" +msgid "Switch to tab" +msgstr "タブを切り替える" + +#: ../data/ui/shortcuts.ui.h:12 +msgctxt "shortcut window" +msgid "Move tab left" +msgstr "タブを左へ移動する" + +#: ../data/ui/shortcuts.ui.h:13 +msgctxt "shortcut window" +msgid "Move tab right" +msgstr "タブを右へ移動する" + +#: ../data/ui/shortcuts.ui.h:14 +msgctxt "shortcut window" +msgid "Changes" +msgstr "変更点" + +#: ../data/ui/shortcuts.ui.h:15 +msgctxt "shortcut window" +msgid "Go to previous change" +msgstr "前の変更点へジャンプする" + +#: ../data/ui/shortcuts.ui.h:16 +msgctxt "shortcut window" +msgid "Go to next change" +msgstr "次の変更点へジャンプする" + +#: ../data/ui/shortcuts.ui.h:17 +msgctxt "shortcut window" +msgid "Editing" +msgstr "編集" + +#: ../data/ui/shortcuts.ui.h:18 +msgctxt "shortcut window" +msgid "Undo" +msgstr "元に戻す" + +#: ../data/ui/shortcuts.ui.h:19 +msgctxt "shortcut window" +msgid "Redo" +msgstr "やり直し" + +#: ../data/ui/shortcuts.ui.h:20 +msgctxt "shortcut window" +msgid "Cut" +msgstr "切り取り" + +#: ../data/ui/shortcuts.ui.h:21 +msgctxt "shortcut window" +msgid "Copy" +msgstr "コピー" + +#: ../data/ui/shortcuts.ui.h:22 +msgctxt "shortcut window" +msgid "Paste" +msgstr "貼り付け" + +#: ../data/ui/shortcuts.ui.h:23 +msgctxt "shortcut window" +msgid "Find" +msgstr "検索" + +#: ../data/ui/shortcuts.ui.h:24 +msgctxt "shortcut window" +msgid "Find Next" +msgstr "次を検索する" + +#: ../data/ui/shortcuts.ui.h:25 +msgctxt "shortcut window" +msgid "Find Previous" +msgstr "前を検索する" + +#: ../data/ui/shortcuts.ui.h:26 +msgctxt "shortcut window" +msgid "Replace" +msgstr "置換" + +#: ../data/ui/shortcuts.ui.h:27 +msgctxt "shortcut window" +msgid "File comparison" +msgstr "ファイルの比較" + +#: ../data/ui/shortcuts.ui.h:28 +msgctxt "shortcut window" +msgid "Save current file" +msgstr "このファイルを保存する" + +#: ../data/ui/shortcuts.ui.h:29 +msgctxt "shortcut window" +msgid "Save current file to new path" +msgstr "このファイルを新しい名前で保存する" + +#: ../data/ui/shortcuts.ui.h:30 +msgctxt "shortcut window" +msgid "Save all files in comparison" +msgstr "比較中のすべてのファイルを保存する" + +#: ../data/ui/shortcuts.ui.h:31 +msgctxt "shortcut window" +msgid "Previous conflict" +msgstr "前の衝突箇所" + +#: ../data/ui/shortcuts.ui.h:32 +msgctxt "shortcut window" +msgid "Next conflict" +msgstr "次の衝突箇所" + +#: ../data/ui/shortcuts.ui.h:33 +msgctxt "shortcut window" +msgid "Push change to left" +msgstr "変更点を左へ適用する" -#: ../meld/resources/ui/preferences.ui.h:32 -msgid "Show _right margin at:" -msgstr "右マージンを表示する(_R):" +#: ../data/ui/shortcuts.ui.h:34 +msgctxt "shortcut window" +msgid "Push change to right" +msgstr "変更点を右へ適用する" -#: ../meld/resources/ui/preferences.ui.h:33 -msgid "Automatically _break lines at right margin on commit" -msgstr "" +#: ../data/ui/shortcuts.ui.h:35 +msgctxt "shortcut window" +msgid "Pull change from left" +msgstr "変更点を左から適用する" -#: ../meld/resources/ui/preferences.ui.h:34 -msgid "Version Control" -msgstr "バージョン管理" +#: ../data/ui/shortcuts.ui.h:36 +msgctxt "shortcut window" +msgid "Pull change from right" +msgstr "変更点を右から適用する" -#: ../meld/resources/ui/preferences.ui.h:35 -msgid "Filename filters" -msgstr "ファイル名フィルター" +#: ../data/ui/shortcuts.ui.h:37 +msgctxt "shortcut window" +msgid "Copy change above left" +msgstr "左の変更点の上にコピーする" -#: ../meld/resources/ui/preferences.ui.h:36 -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 "" -"フォルダーの比較を行う際、ファイルとフォルダーを名前でフィルタリングできま" -"す。フィルタリングのパターンはそれぞれ、スペースで区切った SHELL 型式のワイル" -"ドカードの並びです。" +#: ../data/ui/shortcuts.ui.h:38 +msgctxt "shortcut window" +msgid "Copy change below left" +msgstr "左の変更点の下にコピーする" -#: ../meld/resources/ui/preferences.ui.h:37 ../meld/meldwindow.py:114 -msgid "File Filters" -msgstr "ファイルフィルター" +#: ../data/ui/shortcuts.ui.h:39 +msgctxt "shortcut window" +msgid "Copy change above right" +msgstr "右の変更点の上にコピーする" -#: ../meld/resources/ui/preferences.ui.h:38 -msgid "Change trimming" -msgstr "変更のトリミング" +#: ../data/ui/shortcuts.ui.h:40 +msgctxt "shortcut window" +msgid "Copy change below right" +msgstr "右の変更点の下にコピーする" -#: ../meld/resources/ui/preferences.ui.h:39 -msgid "Trim blank line differences from the start and end of changes" -msgstr "" -"変更点の始まりと終わりの部分から、空行の差異をハイライトしないように除外する" +#: ../data/ui/shortcuts.ui.h:41 +msgctxt "shortcut window" +msgid "Delete change" +msgstr "変更点を削除する" -#: ../meld/resources/ui/preferences.ui.h:40 -msgid "Text filters" -msgstr "テキストフィルター" +#: ../data/ui/shortcuts.ui.h:42 +msgctxt "shortcut window" +msgid "Previous comparison pane" +msgstr "前の比較ペイン" -#: ../meld/resources/ui/preferences.ui.h:41 -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 "" -"ファイルの比較を行う時は、ある種類の変更だけ無視することができます。無視する" -"パターンはそれぞれ Python 形式の正規表現で指定し、その実装は無視する文字列を" -"空の文字列で置き換えるだけです。もし正規表現パターンにグループが含まれていた" -"ら、該当するグループの文字列だけ置き換えます。詳細はユーザーズ・マニュアルを" -"ご覧下さい。" +#: ../data/ui/shortcuts.ui.h:43 +msgctxt "shortcut window" +msgid "Next comparison pane" +msgstr "次の比較ペイン" -#: ../meld/resources/ui/preferences.ui.h:42 -msgid "Text Filters" -msgstr "テキストフィルター" +#: ../data/ui/shortcuts.ui.h:44 +msgctxt "shortcut window" +msgid "Folder comparison" +msgstr "フォルダーの比較" -#: ../meld/resources/ui/preferences.ui.h:43 -msgid "Left is remote, right is local" -msgstr "" +#: ../data/ui/shortcuts.ui.h:45 +msgctxt "shortcut window" +msgid "Copy to left" +msgstr "左へコピーする" -#: ../meld/resources/ui/preferences.ui.h:44 -msgid "Left is local, right is remote" -msgstr "" +#: ../data/ui/shortcuts.ui.h:46 +msgctxt "shortcut window" +msgid "Copy to right" +msgstr "右へコピーする" -#: ../meld/resources/ui/preferences.ui.h:45 -msgid "Remote, merge, local" -msgstr "" +#: ../data/ui/shortcuts.ui.h:47 +msgctxt "shortcut window" +msgid "Version control comparison" +msgstr "バージョン管理の比較" -#: ../meld/resources/ui/preferences.ui.h:46 -msgid "Local, merge, remote" -msgstr "" +#: ../data/ui/shortcuts.ui.h:48 +msgctxt "shortcut window" +msgid "Commit to version control" +msgstr "バージョン管理へコミットする" -#: ../meld/resources/ui/preferences.ui.h:47 -msgid "1ns (ext4)" -msgstr "1ナノ秒 (ext4)" +#: ../data/ui/shortcuts.ui.h:49 +msgctxt "shortcut window" +msgid "Show/hide console output" +msgstr "コンソール出力の表示/非表示" -#: ../meld/resources/ui/preferences.ui.h:48 -msgid "100ns (NTFS)" -msgstr "100ナノ秒 (NTFS)" +#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:567 +#: ../meld/newdifftab.py:49 +msgid "New comparison" +msgstr "新しい比較" -#: ../meld/resources/ui/preferences.ui.h:49 -msgid "1s (ext2/ext3)" -msgstr "1秒 (ext2/ext3)" +#: ../data/ui/tab-placeholder.ui.h:2 +msgid "File comparison" +msgstr "ファイルの比較" -#: ../meld/resources/ui/preferences.ui.h:50 -msgid "2s (VFAT)" -msgstr "2秒 (VFAT)" +#: ../data/ui/tab-placeholder.ui.h:3 +msgid "Directory comparison" +msgstr "フォルダーの比較" -#: ../meld/resources/ui/push-dialog.ui.h:1 -msgid "Push local commits to remote?" +#: ../data/ui/tab-placeholder.ui.h:4 +msgid "Version control view" msgstr "" -#: ../meld/resources/ui/push-dialog.ui.h:2 -msgid "The commits to be pushed are determined by your version control system." -msgstr "" +#: ../data/ui/tab-placeholder.ui.h:5 +msgid "_3-way comparison" +msgstr "3つを比較(_3)" -#: ../meld/resources/ui/push-dialog.ui.h:3 -msgid "_Push commits" -msgstr "" +#: ../data/ui/tab-placeholder.ui.h:6 +msgid "Select Third File" +msgstr "3番目のファイルを選択" -#: ../meld/resources/ui/revert-dialog.ui.h:1 -msgid "Discard unsaved changes to documents?" -msgstr "ドキュメントへの変更を保存せずに破棄しますか?" +#: ../data/ui/tab-placeholder.ui.h:7 +msgid "Select Second File" +msgstr "2番目のファイルを選択" -#: ../meld/resources/ui/revert-dialog.ui.h:2 -msgid "Changes made to the following documents will be permanently lost:" -msgstr "次のドキュメントへの変更は永久に失われます:" +#: ../data/ui/tab-placeholder.ui.h:8 +msgid "Select First File" +msgstr "1番目のファイルを選択" -#: ../meld/resources/ui/revert-dialog.ui.h:3 -msgid "_Discard" -msgstr "破棄(_D)" +#: ../data/ui/tab-placeholder.ui.h:9 +msgid "Select First Folder" +msgstr "1番目のフォルダーを選択" -#: ../meld/resources/ui/save-confirm-dialog.ui.h:1 -msgid "Save changes to documents before closing?" -msgstr "閉じる前にドキュメントへの変更を保存しますか?" +#: ../data/ui/tab-placeholder.ui.h:10 +msgid "Select Second Folder" +msgstr "2番目のフォルダーを選択" -#: ../meld/resources/ui/save-confirm-dialog.ui.h:2 -msgid "If you don’t save, changes will be permanently lost." -msgstr "保存しない場合、変更は永久に失われます。" +#: ../data/ui/tab-placeholder.ui.h:11 +msgid "Select Third Folder" +msgstr "3番目のフォルダーを選択" -#: ../meld/resources/ui/save-confirm-dialog.ui.h:3 -msgid "Close _without Saving" -msgstr "保存せずに閉じる(_W)" +#: ../data/ui/tab-placeholder.ui.h:12 +msgid "Select A Version-Controlled Folder" +msgstr "" -#: ../meld/resources/ui/save-confirm-dialog.ui.h:4 ../meld/dirdiff.py:1039 -#: ../meld/iohelpers.py:58 ../meld/iohelpers.py:112 -msgid "_Cancel" -msgstr "キャンセル(_C)" +#: ../data/ui/tab-placeholder.ui.h:13 +msgid "_Blank comparison" +msgstr "空の比較(_B)" -#: ../meld/resources/ui/save-confirm-dialog.ui.h:5 -msgid "_Save" -msgstr "保存(_S)" +#: ../data/ui/tab-placeholder.ui.h:14 +msgid "C_ompare" +msgstr "比較(_O)" -#: ../meld/resources/ui/vcview.ui.h:3 +#: ../data/ui/vcview.ui.h:3 msgid "Co_mmit…" msgstr "コミット(_M)…" -#: ../meld/resources/ui/vcview.ui.h:4 +#: ../data/ui/vcview.ui.h:4 msgid "Commit changes to version control" msgstr "" -#: ../meld/resources/ui/vcview.ui.h:5 +#: ../data/ui/vcview.ui.h:5 msgid "_Update" msgstr "" -#: ../meld/resources/ui/vcview.ui.h:6 +#: ../data/ui/vcview.ui.h:6 msgid "Update working copy from version control" msgstr "" -#: ../meld/resources/ui/vcview.ui.h:7 +#: ../data/ui/vcview.ui.h:7 msgid "_Push" msgstr "" -#: ../meld/resources/ui/vcview.ui.h:8 +#: ../data/ui/vcview.ui.h:8 msgid "Push local changes to remote" msgstr "" -#: ../meld/resources/ui/vcview.ui.h:10 +#: ../data/ui/vcview.ui.h:10 msgid "Add to version control" msgstr "" -#: ../meld/resources/ui/vcview.ui.h:12 +#: ../data/ui/vcview.ui.h:12 msgid "Remove from version control" msgstr "" -#: ../meld/resources/ui/vcview.ui.h:13 +#: ../data/ui/vcview.ui.h:13 msgid "Mar_k as Resolved" msgstr "" -#: ../meld/resources/ui/vcview.ui.h:14 +#: ../data/ui/vcview.ui.h:14 msgid "Mark as resolved in version control" msgstr "" -#: ../meld/resources/ui/vcview.ui.h:15 +#: ../data/ui/vcview.ui.h:15 msgid "Re_vert" msgstr "" -#: ../meld/resources/ui/vcview.ui.h:16 +#: ../data/ui/vcview.ui.h:16 msgid "Revert working copy to original state" msgstr "" -#: ../meld/resources/ui/vcview.ui.h:17 +#: ../data/ui/vcview.ui.h:17 msgid "Delete from working copy" msgstr "" -#: ../meld/resources/ui/vcview.ui.h:18 +#: ../data/ui/vcview.ui.h:18 msgid "Console" msgstr "コンソール" -#: ../meld/resources/ui/vcview.ui.h:19 +#: ../data/ui/vcview.ui.h:19 msgid "Show or hide the version control console output pane" msgstr "" -#: ../meld/resources/ui/vcview.ui.h:20 +#: ../data/ui/vcview.ui.h:20 msgid "_Flatten" msgstr "" -#: ../meld/resources/ui/vcview.ui.h:21 +#: ../data/ui/vcview.ui.h:21 msgid "Flatten directories" msgstr "" -#: ../meld/resources/ui/vcview.ui.h:22 +#: ../data/ui/vcview.ui.h:22 msgid "_Modified" msgstr "" -#: ../meld/resources/ui/vcview.ui.h:23 +#: ../data/ui/vcview.ui.h:23 msgid "Show modified files" msgstr "" -#: ../meld/resources/ui/vcview.ui.h:24 +#: ../data/ui/vcview.ui.h:24 msgid "_Normal" msgstr "" -#: ../meld/resources/ui/vcview.ui.h:25 +#: ../data/ui/vcview.ui.h:25 msgid "Show normal files" msgstr "" -#: ../meld/resources/ui/vcview.ui.h:26 +#: ../data/ui/vcview.ui.h:26 msgid "Un_versioned" msgstr "" -#: ../meld/resources/ui/vcview.ui.h:27 +#: ../data/ui/vcview.ui.h:27 msgid "Show unversioned files" msgstr "" -#: ../meld/resources/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69 +#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69 msgid "Ignored" msgstr "" -#: ../meld/resources/ui/vcview.ui.h:29 +#: ../data/ui/vcview.ui.h:29 msgid "Show ignored files" msgstr "" -#: ../meld/resources/ui/vcview.ui.h:31 ../meld/vcview.py:366 +#: ../data/ui/vcview.ui.h:30 +msgid "Commit" +msgstr "" + +#: ../data/ui/vcview.ui.h:31 +msgid "Commit Files" +msgstr "" + +#: ../data/ui/vcview.ui.h:32 +msgid "Log Message" +msgstr "" + +#: ../data/ui/vcview.ui.h:33 +msgid "Previous logs:" +msgstr "" + +#: ../data/ui/vcview.ui.h:34 +msgid "Co_mmit" +msgstr "" + +#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:331 msgid "Location" msgstr "" -#: ../meld/resources/ui/vcview.ui.h:32 +#: ../data/ui/vcview.ui.h:37 msgid "Status" msgstr "" -#: ../meld/resources/ui/vcview.ui.h:33 +#: ../data/ui/vcview.ui.h:38 msgid "Extra" msgstr "" -#: ../meld/resources/ui/vcview.ui.h:34 +#: ../data/ui/vcview.ui.h:39 msgid "Console output" msgstr "コンソール出力" +#: ../data/ui/vcview.ui.h:40 +msgid "Push local commits to remote?" +msgstr "" + +#: ../data/ui/vcview.ui.h:41 +msgid "The commits to be pushed are determined by your version control system." +msgstr "" + +#: ../data/ui/vcview.ui.h:42 +msgid "_Push commits" +msgstr "" + #: ../meld/const.py:12 msgid "UNIX (LF)" msgstr "" @@ -1627,44 +1634,44 @@ msgid "Mac OS (CR)" msgstr "" #. Create file size CellRenderer -#: ../meld/dirdiff.py:475 ../meld/preferences.py:138 +#: ../meld/dirdiff.py:428 ../meld/preferences.py:81 msgid "Size" msgstr "サイズ" #. Create date-time CellRenderer -#: ../meld/dirdiff.py:483 ../meld/preferences.py:139 +#: ../meld/dirdiff.py:436 ../meld/preferences.py:82 msgid "Modification time" msgstr "更新日時" #. Create permissions CellRenderer -#: ../meld/dirdiff.py:491 ../meld/preferences.py:140 +#: ../meld/dirdiff.py:444 ../meld/preferences.py:83 msgid "Permissions" msgstr "アクセス権" -#: ../meld/dirdiff.py:625 +#: ../meld/dirdiff.py:575 #, python-format msgid "Hide %s" msgstr "%s の表示を切り替えます" -#: ../meld/dirdiff.py:767 ../meld/dirdiff.py:790 +#: ../meld/dirdiff.py:716 ../meld/dirdiff.py:739 #, python-format msgid "[%s] Scanning %s" msgstr "[%s] %s をスキャン中" -#: ../meld/dirdiff.py:925 +#: ../meld/dirdiff.py:874 #, python-format msgid "[%s] Done" msgstr "[%s] 完了" -#: ../meld/dirdiff.py:933 +#: ../meld/dirdiff.py:882 msgid "Folders have no differences" msgstr "フォルダーに差異はありません" -#: ../meld/dirdiff.py:935 +#: ../meld/dirdiff.py:884 msgid "Contents of scanned files in folders are identical." msgstr "フォルダー内のスキャンされたファイルの内容は同一です。" -#: ../meld/dirdiff.py:937 +#: ../meld/dirdiff.py:886 msgid "" "Scanned files in folders appear identical, but contents have not been " "scanned." @@ -1672,44 +1679,44 @@ msgstr "" "フォルダー内のスキャンされたファイルは同一のように見えますが、内容はスキャン" "されていません。" -#: ../meld/dirdiff.py:940 +#: ../meld/dirdiff.py:889 msgid "File filters are in use, so not all files have been scanned." msgstr "" "ファイルフィルターが使用されているため、すべてのファイルがスキャンされたわけ" "ではありません。" -#: ../meld/dirdiff.py:942 +#: ../meld/dirdiff.py:891 msgid "Text filters are in use and may be masking content differences." msgstr "" "テキストフィルターが使用されているため、内容の差異が遮蔽されている可能性があ" "ります。" -#: ../meld/dirdiff.py:960 ../meld/filediff.py:1588 ../meld/filediff.py:1618 -#: ../meld/filediff.py:1620 ../meld/ui/msgarea.py:106 ../meld/ui/msgarea.py:119 +#: ../meld/dirdiff.py:909 ../meld/filediff.py:1499 ../meld/filediff.py:1529 +#: ../meld/filediff.py:1531 ../meld/ui/msgarea.py:106 ../meld/ui/msgarea.py:119 msgid "Hi_de" msgstr "隠す(_D)" -#: ../meld/dirdiff.py:969 +#: ../meld/dirdiff.py:918 msgid "Multiple errors occurred while scanning this folder" msgstr "このフォルダーの走査中に複数回のエラーが発生しました" -#: ../meld/dirdiff.py:970 +#: ../meld/dirdiff.py:919 msgid "Files with invalid encodings found" msgstr "間違ったエンコーディングを持つファイルが見つかりました" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:972 +#: ../meld/dirdiff.py:921 msgid "Some files were in an incorrect encoding. The names are something like:" msgstr "" "いくつかのファイルが間違ったエンコーディングを持っていました (次のようなファ" "イル名です):" -#: ../meld/dirdiff.py:974 +#: ../meld/dirdiff.py:923 msgid "Files hidden by case insensitive comparison" msgstr "大/小文字を区別せずに比較したファイルの一覧" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:976 +#: ../meld/dirdiff.py:925 msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. The following files in this folder are hidden:" @@ -1717,17 +1724,17 @@ msgstr "" "大/小文字を区別するファイルシステム上で大/小文字を無視した比較を行っていま" "す。このフォルダーでは次のファイルは表示されません:" -#: ../meld/dirdiff.py:987 +#: ../meld/dirdiff.py:936 #, python-format msgid "“%s” hidden by “%s”" msgstr "“%s”は“%s”によって隠されています" -#: ../meld/dirdiff.py:1043 +#: ../meld/dirdiff.py:992 #, python-format msgid "Replace folder “%s”?" msgstr "“%s”を置き換えますか?" -#: ../meld/dirdiff.py:1045 +#: ../meld/dirdiff.py:994 #, python-format msgid "" "Another folder with the same name already exists in “%s”.\n" @@ -1736,11 +1743,11 @@ msgstr "" "“%s”に同じ名前の別のフォルダーがすでに存在します。\n" "フォルダーを置き換えると、既存のファイルはすべて失われます。" -#: ../meld/dirdiff.py:1058 +#: ../meld/dirdiff.py:1007 msgid "Error copying file" msgstr "ファイルのコピーエラー" -#: ../meld/dirdiff.py:1059 +#: ../meld/dirdiff.py:1008 #, python-format msgid "" "Couldn’t copy %s\n" @@ -1753,19 +1760,19 @@ msgstr "" "コピー先: %s\n" "%s" -#: ../meld/dirdiff.py:1084 ../meld/vcview.py:720 +#: ../meld/dirdiff.py:1033 ../meld/vcview.py:703 msgid "Error deleting {}" msgstr "{} の削除中にエラーが発生しました" -#: ../meld/dirdiff.py:1593 +#: ../meld/dirdiff.py:1546 msgid "No folder" msgstr "" -#: ../meld/filediff.py:905 +#: ../meld/filediff.py:834 msgid "Comparison results will be inaccurate" msgstr "比較結果は不正確です" -#: ../meld/filediff.py:907 +#: ../meld/filediff.py:836 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1773,65 +1780,65 @@ msgstr "" "フィルターがファイル内の行数を変更しましたが、サポートされていないため、比較" "は正確ではありません。" -#: ../meld/filediff.py:979 +#: ../meld/filediff.py:905 msgid "Mark conflict as resolved?" msgstr "衝突箇所を解決済みとしてマークしますか?" -#: ../meld/filediff.py:981 +#: ../meld/filediff.py:907 msgid "" "If the conflict was resolved successfully, you may mark it as resolved now." msgstr "" "衝突箇所の解決に成功した場合は、解決済みとしてマークすることができます。" -#: ../meld/filediff.py:983 +#: ../meld/filediff.py:909 msgid "Cancel" msgstr "キャンセル" -#: ../meld/filediff.py:984 +#: ../meld/filediff.py:910 msgid "Mark _Resolved" msgstr "解決済みとしてマーク(_R)" -#: ../meld/filediff.py:1303 +#: ../meld/filediff.py:1214 #, python-format msgid "There was a problem opening the file “%s”." msgstr "“%s”を開く際に問題が発生しました。" -#: ../meld/filediff.py:1311 +#: ../meld/filediff.py:1222 #, python-format msgid "File %s appears to be a binary file." msgstr "%s はバイナリファイルのようです。" -#: ../meld/filediff.py:1313 +#: ../meld/filediff.py:1224 msgid "Do you want to open the file using the default application?" msgstr "デフォルトのアプリケーションを使用してファイルを開きますか?" -#: ../meld/filediff.py:1315 +#: ../meld/filediff.py:1226 msgid "Open" msgstr "開く" -#: ../meld/filediff.py:1331 +#: ../meld/filediff.py:1242 #, python-format msgid "[%s] Computing differences" msgstr "[%s] 差分の計算中" -#: ../meld/filediff.py:1392 +#: ../meld/filediff.py:1303 #, python-format msgid "File %s has changed on disk" msgstr "%s はディスク上で変更されました" -#: ../meld/filediff.py:1393 +#: ../meld/filediff.py:1304 msgid "Do you want to reload the file?" msgstr "ファイルを再読み込みしますか?" -#: ../meld/filediff.py:1395 +#: ../meld/filediff.py:1306 msgid "_Reload" msgstr "再読み込み(_R)" -#: ../meld/filediff.py:1551 +#: ../meld/filediff.py:1462 msgid "Files are identical" msgstr "同一のファイルです" -#: ../meld/filediff.py:1564 +#: ../meld/filediff.py:1475 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1839,11 +1846,11 @@ msgstr "" "テキストフィルターを使用しているため、ファイル間に違いが生じる場合がありま" "す。フィルタリングせずに比較しますか?" -#: ../meld/filediff.py:1569 +#: ../meld/filediff.py:1480 msgid "Files differ in line endings only" msgstr "ファイルは行末のみが異なります" -#: ../meld/filediff.py:1571 +#: ../meld/filediff.py:1482 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1852,15 +1859,15 @@ msgstr "" "改行コード以外のファイルの内容は同一です:\n" "%s" -#: ../meld/filediff.py:1591 +#: ../meld/filediff.py:1502 msgid "Show without filters" msgstr "フィルター無しで表示する" -#: ../meld/filediff.py:1613 +#: ../meld/filediff.py:1524 msgid "Change highlighting incomplete" msgstr "変更点のハイライトが不完全です" -#: ../meld/filediff.py:1614 +#: ../meld/filediff.py:1525 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." @@ -1868,61 +1875,61 @@ msgstr "" "変更点が多すぎるため、一部がハイライトされませんでした。Meld にハイライトを強" "制することができますが、大きな変更点をハイライトするには時間がかかります。" -#: ../meld/filediff.py:1622 +#: ../meld/filediff.py:1533 msgid "Keep highlighting" msgstr "ハイライトを続ける" -#: ../meld/filediff.py:1624 +#: ../meld/filediff.py:1535 msgid "_Keep highlighting" msgstr "ハイライトを続ける(_K)" -#: ../meld/filediff.py:1637 +#: ../meld/filediff.py:1548 msgid "Saving failed" -msgstr "" +msgstr "保存に失敗しました" -#: ../meld/filediff.py:1638 +#: ../meld/filediff.py:1549 msgid "" "Please consider copying any critical changes to another program or file to " "avoid data loss." -msgstr "" +msgstr "データの喪失を防ぐために、他のファイルやプログラムに重要な変更点を保存することを検討してください。" -#: ../meld/filediff.py:1647 +#: ../meld/filediff.py:1558 msgid "Save Left Pane As" msgstr "左のペインを別名で保存" -#: ../meld/filediff.py:1649 +#: ../meld/filediff.py:1560 msgid "Save Middle Pane As" msgstr "中央のペインを別名で保存" -#: ../meld/filediff.py:1651 +#: ../meld/filediff.py:1562 msgid "Save Right Pane As" msgstr "右のペインを別名で保存" -#: ../meld/filediff.py:1664 +#: ../meld/filediff.py:1575 #, python-format msgid "File %s has changed on disk since it was opened" msgstr "%s は開かれた後にディスク上で変更されました" -#: ../meld/filediff.py:1666 +#: ../meld/filediff.py:1577 msgid "If you save it, any external changes will be lost." msgstr "保存すると、外部からの変更は失われます。" -#: ../meld/filediff.py:1669 +#: ../meld/filediff.py:1580 msgid "Save Anyway" msgstr "とにかく保存する" -#: ../meld/filediff.py:1670 +#: ../meld/filediff.py:1581 msgid "Don’t Save" msgstr "保存しない" -#: ../meld/filediff.py:1712 +#: ../meld/filediff.py:1623 msgid "" "File “{}” contains characters that can’t be encoded using its current " "encoding “{}”." msgstr "" "“{}”には現在のエンコーディング“{}”でエンコードできない文字が含まれています。" -#: ../meld/filediff.py:1716 ../meld/patchdialog.py:144 +#: ../meld/filediff.py:1627 ../meld/patchdialog.py:131 #, python-format msgid "" "Couldn’t save file due to:\n" @@ -1931,16 +1938,16 @@ msgstr "" "次の理由によりファイルを保存できませんでした:\n" "%s" -#: ../meld/filediff.py:1720 ../meld/patchdialog.py:143 +#: ../meld/filediff.py:1631 ../meld/patchdialog.py:130 #, python-format msgid "Could not save file %s." msgstr "%s を保存できませんでした。" -#: ../meld/filediff.py:2113 +#: ../meld/filediff.py:2014 msgid "Live comparison updating disabled" msgstr "比較のライブアップデートは無効です" -#: ../meld/filediff.py:2114 +#: ../meld/filediff.py:2015 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -1955,42 +1962,40 @@ msgstr "" msgid "[%s] Merging files" msgstr "[%s] ファイルをマージ中" -#: ../meld/gutterrendererchunk.py:220 +#: ../meld/gutterrendererchunk.py:216 msgid "Copy _up" msgstr "上にコピー(_U)" -#: ../meld/gutterrendererchunk.py:221 +#: ../meld/gutterrendererchunk.py:217 msgid "Copy _down" msgstr "下にコピー(_D)" -#: ../meld/iohelpers.py:43 +#: ../meld/iohelpers.py:41 msgid "Deleting remote folders is not supported" msgstr "" -#: ../meld/iohelpers.py:45 +#: ../meld/iohelpers.py:43 msgid "Not a file or directory" -msgstr "" +msgstr "ファイルやフォルダーではありません" -#: ../meld/iohelpers.py:49 +#: ../meld/iohelpers.py:47 msgid "“{}” can’t be put in the trash. Do you want to delete it immediately?" -msgstr "" +msgstr "“{}”はゴミ箱に移動できません。ただちに削除しますか?" -#: ../meld/iohelpers.py:54 +#: ../meld/iohelpers.py:52 msgid "This remote location does not support sending items to the trash." msgstr "" -#: ../meld/iohelpers.py:59 -#, fuzzy -#| msgid "Delete change" +#: ../meld/iohelpers.py:57 msgid "_Delete Permanently" -msgstr "変更点を削除します" +msgstr "永久に削除(_D)" -#: ../meld/iohelpers.py:106 +#: ../meld/iohelpers.py:100 #, python-format msgid "Replace file “%s”?" msgstr "“%s”を置き換えますか?" -#: ../meld/iohelpers.py:108 +#: ../meld/iohelpers.py:102 #, python-format msgid "" "A file with this name already exists in “%s”.\n" @@ -1999,99 +2004,99 @@ msgstr "" "“%s”に同じ名前のファイルがすでに存在します。\n" "ファイルを置き換えると、既存の内容は失われます。" -#: ../meld/meldapp.py:169 +#: ../meld/meldapp.py:181 msgid "wrong number of arguments supplied to --diff" msgstr "--diff オプションに対する引数の数が間違っています" -#: ../meld/meldapp.py:174 +#: ../meld/meldapp.py:186 msgid "Start with an empty window" msgstr "空のウィンドウで起動する" -#: ../meld/meldapp.py:175 ../meld/meldapp.py:177 +#: ../meld/meldapp.py:187 ../meld/meldapp.py:189 msgid "file" msgstr "ファイル" -#: ../meld/meldapp.py:175 ../meld/meldapp.py:179 +#: ../meld/meldapp.py:187 ../meld/meldapp.py:191 msgid "folder" msgstr "フォルダー" -#: ../meld/meldapp.py:176 +#: ../meld/meldapp.py:188 msgid "Start a version control comparison" msgstr "バージョン管理の比較モードで起動する" -#: ../meld/meldapp.py:178 +#: ../meld/meldapp.py:190 msgid "Start a 2- or 3-way file comparison" msgstr "2つ、または3つのファイルを比較するモードで起動する" -#: ../meld/meldapp.py:180 +#: ../meld/meldapp.py:192 msgid "Start a 2- or 3-way folder comparison" msgstr "2つ、または3つのフォルダーを比較するモードで起動する" -#: ../meld/meldapp.py:223 +#: ../meld/meldapp.py:235 #, python-format msgid "Error: %s\n" msgstr "エラー: %s\n" -#: ../meld/meldapp.py:230 +#: ../meld/meldapp.py:242 msgid "Meld is a file and directory comparison tool." msgstr "Meld はファイルとフォルダーの内容を比較するツールです。" -#: ../meld/meldapp.py:234 +#: ../meld/meldapp.py:246 msgid "Set label to use instead of file name" msgstr "ファイル名の代わりに使用するラベルを指定する" -#: ../meld/meldapp.py:237 +#: ../meld/meldapp.py:249 msgid "Open a new tab in an already running instance" msgstr "すでに実行中のインスタンスで新しいタブを開く" -#: ../meld/meldapp.py:240 +#: ../meld/meldapp.py:252 msgid "Automatically compare all differing files on startup" msgstr "起動時にファイルの中にあるすべての差分を自動的に検出する" -#: ../meld/meldapp.py:243 +#: ../meld/meldapp.py:255 msgid "Ignored for compatibility" msgstr "" -#: ../meld/meldapp.py:247 +#: ../meld/meldapp.py:259 msgid "Set the target file for saving a merge result" msgstr "マージした結果を保存するファイル名を指定する" -#: ../meld/meldapp.py:250 +#: ../meld/meldapp.py:262 msgid "Automatically merge files" msgstr "自動的にファイルをマージする" -#: ../meld/meldapp.py:254 +#: ../meld/meldapp.py:266 msgid "Load a saved comparison from a Meld comparison file" msgstr "" -#: ../meld/meldapp.py:258 +#: ../meld/meldapp.py:270 msgid "Create a diff tab for the supplied files or folders" msgstr "" -#: ../meld/meldapp.py:278 +#: ../meld/meldapp.py:290 #, python-format msgid "too many arguments (wanted 0-3, got %d)" msgstr "" "引数が多すぎます (有効な数は 0 〜 3 ですが %d 個の引数を受け取りました)" -#: ../meld/meldapp.py:281 +#: ../meld/meldapp.py:293 msgid "can’t auto-merge less than 3 files" msgstr "3つ未満のファイルはオートマージできません" -#: ../meld/meldapp.py:283 +#: ../meld/meldapp.py:295 msgid "can’t auto-merge directories" msgstr "ディレクトリはオートマージできません" -#: ../meld/meldapp.py:297 +#: ../meld/meldapp.py:309 msgid "Error reading saved comparison file" msgstr "保存された比較ファイルの読み込みエラー" -#: ../meld/meldapp.py:314 +#: ../meld/meldapp.py:326 #, python-format msgid "invalid path or URI “%s”" msgstr "無効なパスまたは URI “%s”" -#: ../meld/meldapp.py:320 +#: ../meld/meldapp.py:332 msgid "remote folder “{}” not supported" msgstr "" @@ -2100,214 +2105,258 @@ msgstr "" msgid "" msgstr "<名前なし>" -#: ../meld/melddoc.py:63 +#: ../meld/melddoc.py:68 msgid "untitled" msgstr "タイトルなし" -#: ../meld/meldwindow.py:56 +#: ../meld/meldwindow.py:47 msgid "_File" msgstr "ファイル(_F)" -#: ../meld/meldwindow.py:57 +#: ../meld/meldwindow.py:48 msgid "_New Comparison…" msgstr "新しい比較(_N)…" -#: ../meld/meldwindow.py:58 +#: ../meld/meldwindow.py:49 msgid "Start a new comparison" msgstr "新しい比較を開始します" -#: ../meld/meldwindow.py:61 +#: ../meld/meldwindow.py:52 msgid "Save the current file" msgstr "このファイルを保存します" -#: ../meld/meldwindow.py:63 +#: ../meld/meldwindow.py:54 msgid "Save As…" msgstr "別名で保存…" -#: ../meld/meldwindow.py:64 +#: ../meld/meldwindow.py:55 msgid "Save the current file with a different name" msgstr "このファイルを別の名前で保存します" -#: ../meld/meldwindow.py:67 +#: ../meld/meldwindow.py:58 msgid "Close the current file" msgstr "このファイルを閉じます" -#: ../meld/meldwindow.py:70 +#: ../meld/meldwindow.py:61 msgid "_Edit" msgstr "編集(_E)" -#: ../meld/meldwindow.py:72 +#: ../meld/meldwindow.py:63 msgid "Undo the last action" msgstr "最後に適用したアクションに戻します" -#: ../meld/meldwindow.py:75 +#: ../meld/meldwindow.py:66 msgid "Redo the last undone action" msgstr "最後に適用したアクションをやり直します" -#: ../meld/meldwindow.py:77 +#: ../meld/meldwindow.py:68 msgid "Cut the selection" msgstr "選択範囲を切り取ります" -#: ../meld/meldwindow.py:79 +#: ../meld/meldwindow.py:70 msgid "Copy the selection" msgstr "選択範囲をコピーします" -#: ../meld/meldwindow.py:81 +#: ../meld/meldwindow.py:72 msgid "Paste the clipboard" msgstr "クリップボードの内容を貼り付けます" -#: ../meld/meldwindow.py:83 +#: ../meld/meldwindow.py:74 msgid "Find…" msgstr "検索…" -#: ../meld/meldwindow.py:83 +#: ../meld/meldwindow.py:74 msgid "Search for text" msgstr "検索する文字列" -#: ../meld/meldwindow.py:85 +#: ../meld/meldwindow.py:76 msgid "Find Ne_xt" msgstr "次を検索(_X)" -#: ../meld/meldwindow.py:86 +#: ../meld/meldwindow.py:77 msgid "Search forwards for the same text" msgstr "同じ文字列を前方検索します" -#: ../meld/meldwindow.py:88 +#: ../meld/meldwindow.py:79 msgid "Find _Previous" msgstr "前を検索(_P)" -#: ../meld/meldwindow.py:89 +#: ../meld/meldwindow.py:80 msgid "Search backwards for the same text" msgstr "同じ文字列を後方検索します" -#: ../meld/meldwindow.py:92 +#: ../meld/meldwindow.py:83 msgid "_Replace…" msgstr "置換(_R)…" -#: ../meld/meldwindow.py:93 +#: ../meld/meldwindow.py:84 msgid "Find and replace text" msgstr "文字列を検索して置換します" -#: ../meld/meldwindow.py:95 +#: ../meld/meldwindow.py:86 msgid "Go to _Line" msgstr "指定行へ移動(_L)" -#: ../meld/meldwindow.py:96 +#: ../meld/meldwindow.py:87 msgid "Go to a specific line" msgstr "指定した行へ移動します" -#: ../meld/meldwindow.py:99 +#: ../meld/meldwindow.py:90 msgid "_Changes" msgstr "変更点(_C)" -#: ../meld/meldwindow.py:100 +#: ../meld/meldwindow.py:91 msgid "Next Change" msgstr "次の変更点" -#: ../meld/meldwindow.py:101 +#: ../meld/meldwindow.py:92 msgid "Go to the next change" msgstr "次の変更点へジャンプします" -#: ../meld/meldwindow.py:103 +#: ../meld/meldwindow.py:94 msgid "Previous Change" msgstr "前の変更点" -#: ../meld/meldwindow.py:104 +#: ../meld/meldwindow.py:95 msgid "Go to the previous change" msgstr "前の変更点へジャンプします" -#: ../meld/meldwindow.py:106 +#: ../meld/meldwindow.py:97 msgid "Open Externally" msgstr "別のアプリで開く" -#: ../meld/meldwindow.py:107 +#: ../meld/meldwindow.py:98 msgid "Open selected file or directory in the default external application" msgstr "選択したファイルやフォルダーをデフォルトのアプリケーションで開きます" -#: ../meld/meldwindow.py:111 +#: ../meld/meldwindow.py:102 msgid "_View" msgstr "表示(_V)" -#: ../meld/meldwindow.py:112 +#: ../meld/meldwindow.py:103 msgid "File Status" msgstr "ファイルの状態" -#: ../meld/meldwindow.py:113 +#: ../meld/meldwindow.py:104 msgid "Version Status" msgstr "バージョンの状態" -#: ../meld/meldwindow.py:116 +#: ../meld/meldwindow.py:107 msgid "Stop the current action" msgstr "現在適用中のアクションを停止します" -#: ../meld/meldwindow.py:119 +#: ../meld/meldwindow.py:110 msgid "Refresh the view" msgstr "表示を更新します" -#: ../meld/meldwindow.py:123 +#: ../meld/meldwindow.py:114 msgid "Fullscreen" msgstr "フルスクリーン" -#: ../meld/meldwindow.py:124 +#: ../meld/meldwindow.py:115 msgid "View the comparison in fullscreen" msgstr "比較状況をフルスクリーンで表示します" -#: ../meld/meldwindow.py:133 +#: ../meld/meldwindow.py:117 +msgid "_Toolbar" +msgstr "ツールバー(_T)" + +#: ../meld/meldwindow.py:118 +msgid "Show or hide the toolbar" +msgstr "ツールバーを表示または非表示にします" + +#: ../meld/meldwindow.py:127 msgid "Open Recent" msgstr "最近の比較" -#: ../meld/meldwindow.py:134 +#: ../meld/meldwindow.py:128 msgid "Open recent files" msgstr "最近のファイルを開きます" -#: ../meld/meldwindow.py:567 +#: ../meld/meldwindow.py:150 +msgid "_Meld" +msgstr "Meld(_M)" + +#: ../meld/meldwindow.py:151 +msgid "Quit the program" +msgstr "プログラムを終了します" + +#: ../meld/meldwindow.py:153 +msgid "Prefere_nces" +msgstr "設定(_N)" + +#: ../meld/meldwindow.py:154 +msgid "Configure the application" +msgstr "Meld を設定します" + +#: ../meld/meldwindow.py:156 +msgid "_Contents" +msgstr "目次(_C)" + +#: ../meld/meldwindow.py:157 +msgid "Open the Meld manual" +msgstr "Meld のマニュアルを開きます" + +#: ../meld/meldwindow.py:159 +msgid "About this application" +msgstr "このアプリケーションについて" + +#: ../meld/meldwindow.py:602 #, python-format msgid "Need three files to auto-merge, got: %r" msgstr "オートマージには3つのファイルが必要です: %r" -#: ../meld/meldwindow.py:588 +#: ../meld/meldwindow.py:623 msgid "Cannot compare a mixture of files and directories" msgstr "ファイルとフォルダーの間での比較はできません" -#: ../meld/misc.py:155 +#: ../meld/misc.py:135 msgid "" "{}\n" "\n" "Meld encountered a critical error while running:\n" "{}" msgstr "" +"{}\n" +"\n" +"Meld の実行中に致命的なエラーが発生しました:\n" +"{}" -#: ../meld/misc.py:237 +#: ../meld/misc.py:254 #, python-format msgid "Couldn’t find colour scheme details for %s-%s; this is a bad install" msgstr "" "%s-%s のカラースキーマの詳細が見つかりませんでした。これはインストールが正常" "ではありません。" -#: ../meld/misc.py:311 +#: ../meld/misc.py:325 msgid "[None]" msgstr "[なし]" -#: ../meld/preferences.py:42 ../meld/preferences.py:135 +#: ../meld/preferences.py:33 msgid "label" msgstr "(新しい名前)" -#: ../meld/preferences.py:42 ../meld/preferences.py:135 +#: ../meld/preferences.py:33 msgid "pattern" msgstr "(新しいパターン)" -#: ../meld/recent.py:106 +#: ../meld/recent.py:105 msgid "Version control:" msgstr "バージョン管理:" -#: ../meld/ui/bufferselectors.py:114 +#: ../meld/ui/bufferselectors.py:32 #, python-brace-format msgid "{name} ({charset})" msgstr "" -#: ../meld/ui/bufferselectors.py:144 ../meld/ui/bufferselectors.py:152 +#: ../meld/ui/bufferselectors.py:65 ../meld/ui/bufferselectors.py:73 msgid "Plain Text" -msgstr "" +msgstr "プレーンテキスト" + +#: ../meld/ui/notebooklabel.py:63 +msgid "Close tab" +msgstr "タブを閉じる" #. Abbreviation for line, column so that it will fit in the status bar #: ../meld/ui/statusbar.py:124 @@ -2319,7 +2368,7 @@ msgstr "(%i行、%i列)" msgid "Line you want to move the cursor to" msgstr "" -#: ../meld/ui/vcdialogs.py:55 +#: ../meld/ui/vcdialogs.py:48 msgid "No files will be committed" msgstr "" @@ -2418,121 +2467,106 @@ msgstr "" #. Translators: This error message is shown when a version #. control binary isn't installed. -#: ../meld/vcview.py:282 +#: ../meld/vcview.py:248 #, python-format msgid "%(name)s (%(cmd)s not installed)" msgstr "" #. Translators: This error message is shown when a version #. controlled repository is invalid. -#: ../meld/vcview.py:286 +#: ../meld/vcview.py:252 #, python-format msgid "%(name)s (Invalid repository)" msgstr "" -#: ../meld/vcview.py:307 +#: ../meld/vcview.py:273 msgid "No valid version control system found in this folder" msgstr "" -#: ../meld/vcview.py:309 +#: ../meld/vcview.py:275 msgid "Only one version control system found in this folder" msgstr "" -#: ../meld/vcview.py:311 +#: ../meld/vcview.py:277 msgid "Choose which version control system to use" msgstr "" #. TRANSLATORS: This is the location of the directory being viewed -#: ../meld/vcview.py:366 +#: ../meld/vcview.py:331 #, python-format msgid "%s: %s" msgstr "" #. 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:338 msgid "Scanning repository" msgstr "" -#: ../meld/vcview.py:402 +#: ../meld/vcview.py:367 #, python-format msgid "Scanning %s" msgstr "%s をスキャン中" -#: ../meld/vcview.py:441 +#: ../meld/vcview.py:406 msgid "(Empty)" msgstr "(空)" -#: ../meld/vcview.py:487 +#: ../meld/vcview.py:450 #, python-format msgid "%s — local" msgstr "" -#: ../meld/vcview.py:488 +#: ../meld/vcview.py:451 #, python-format msgid "%s — remote" msgstr "" -#: ../meld/vcview.py:496 +#: ../meld/vcview.py:459 #, python-format msgid "%s (local, merge, remote)" msgstr "" -#: ../meld/vcview.py:501 +#: ../meld/vcview.py:464 #, python-format msgid "%s (remote, merge, local)" msgstr "" -#: ../meld/vcview.py:512 +#: ../meld/vcview.py:475 #, python-format msgid "%s — repository" msgstr "" -#: ../meld/vcview.py:518 +#: ../meld/vcview.py:481 #, python-format msgid "%s (working, repository)" msgstr "" -#: ../meld/vcview.py:522 +#: ../meld/vcview.py:485 #, python-format msgid "%s (repository, working)" msgstr "" -#: ../meld/vcview.py:688 +#: ../meld/vcview.py:674 msgid "Remove folder and all its files?" msgstr "" -#: ../meld/vcview.py:690 +#: ../meld/vcview.py:676 msgid "" "This will remove all selected files and folders, and all files within any " "selected folders, from version control." msgstr "" -#: ../meld/vcview.py:804 +#: ../meld/vcview.py:785 msgid "Clear" msgstr "" -#~ msgid "Show toolbar" -#~ msgstr "ツールバーを表示する" - -#~ msgid "If true, the window toolbar is visible." -#~ msgstr "true の場合、ウィンドウにツールバーが表示されます。" - -#~ msgid "Show statusbar" -#~ msgstr "ステータスバーを表示する" - -#~ msgid "If true, the window statusbar is visible." -#~ msgstr "true の場合、ウィンドウにステータスバーが表示されます。" - -#~ msgid "Editable List" -#~ msgstr "編集可能なリスト" +#~ msgid "Preferences" +#~ msgstr "設定" #~ msgid "Format as Patch..." #~ msgstr "パッチを生成..." -#~ msgid "Meld Preferences" -#~ msgstr "Meld の設定" - #~ msgid "INS" #~ msgstr "[挿入]" @@ -2550,30 +2584,3 @@ msgstr "" #~ msgid "_Replace..." #~ msgstr "置換(_R)..." - -#~ msgid "_Toolbar" -#~ msgstr "ツールバー(_T)" - -#~ msgid "Show or hide the toolbar" -#~ msgstr "ツールバーを表示または非表示にします" - -#~ msgid "_Meld" -#~ msgstr "Meld(_M)" - -#~ msgid "Quit the program" -#~ msgstr "プログラムを終了します" - -#~ msgid "Prefere_nces" -#~ msgstr "設定(_N)" - -#~ msgid "Configure the application" -#~ msgstr "Meld を設定します" - -#~ msgid "_Contents" -#~ msgstr "目次(_C)" - -#~ msgid "Open the Meld manual" -#~ msgstr "Meld のマニュアルを開きます" - -#~ msgid "About this application" -#~ msgstr "このアプリケーションについて" From 0d221af83bd4937a3939b1b6c07b28410bfd15b3 Mon Sep 17 00:00:00 2001 From: Ryuta Fujii Date: Tue, 22 Jan 2019 11:12:56 +0000 Subject: [PATCH 0811/1316] Update Japanese translation --- po/ja.po | 1995 +++++++++++++++++++++++++++--------------------------- 1 file changed, 1005 insertions(+), 990 deletions(-) diff --git a/po/ja.po b/po/ja.po index 0df0ef68..a3b0d836 100644 --- a/po/ja.po +++ b/po/ja.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: meld master\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n" -"POT-Creation-Date: 2019-01-14 15:16+0000\n" -"PO-Revision-Date: 2019-01-22 19:55+0900\n" +"POT-Creation-Date: 2019-01-22 11:04+0000\n" +"PO-Revision-Date: 2019-01-22 20:11+0900\n" "Last-Translator: sicklylife \n" "Language-Team: Japanese \n" "Language: ja\n" @@ -20,16 +20,16 @@ msgstr "" "Generated-By: pygettext.py 1.5\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../bin/meld:194 +#: ../bin/meld:190 msgid "Cannot import: " msgstr "インポートできません: " -#: ../bin/meld:197 +#: ../bin/meld:193 #, c-format msgid "Meld requires %s or higher." msgstr "Meld には %s 以上が必要です。" -#: ../bin/meld:243 +#: ../bin/meld:262 #, c-format msgid "" "Couldn’t load Meld-specific CSS (%s)\n" @@ -39,7 +39,8 @@ msgstr "" "%s" #: ../data/org.gnome.meld.desktop.in.h:1 -#: ../data/org.gnome.meld.appdata.xml.in.h:1 ../data/ui/meldapp.ui.h:1 +#: ../data/org.gnome.meld.appdata.xml.in.h:1 +#: ../meld/resources/ui/appwindow.ui.h:1 msgid "Meld" msgstr "Meld" @@ -100,26 +101,10 @@ msgid "Default window fullscreen state" msgstr "デフォルトでウィンドウがフルスクリーン表示されるかどうか" #: ../data/org.gnome.meld.gschema.xml.h:5 -msgid "Show toolbar" -msgstr "ツールバーを表示する" - -#: ../data/org.gnome.meld.gschema.xml.h:6 -msgid "If true, the window toolbar is visible." -msgstr "true の場合、ウィンドウにツールバーが表示されます。" - -#: ../data/org.gnome.meld.gschema.xml.h:7 -msgid "Show statusbar" -msgstr "ステータスバーを表示する" - -#: ../data/org.gnome.meld.gschema.xml.h:8 -msgid "If true, the window statusbar is visible." -msgstr "true の場合、ウィンドウにステータスバーが表示されます。" - -#: ../data/org.gnome.meld.gschema.xml.h:9 msgid "Additional automatically detected text encodings" msgstr "自動検出される追加のテキストエンコーディング" -#: ../data/org.gnome.meld.gschema.xml.h:10 +#: ../data/org.gnome.meld.gschema.xml.h:6 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 " @@ -132,56 +117,57 @@ msgstr "" "用されます。ユーザーのロケールによっては、他のエンコーディングでのデコードも" "試されるかもしれません。" -#: ../data/org.gnome.meld.gschema.xml.h:11 +#: ../data/org.gnome.meld.gschema.xml.h:7 msgid "Width of an indentation step" msgstr "タブの幅" -#: ../data/org.gnome.meld.gschema.xml.h:12 +#: ../data/org.gnome.meld.gschema.xml.h:8 msgid "The number of spaces to use for a single indent step" msgstr "インデント幅をスペース何個分にするか" -#: ../data/org.gnome.meld.gschema.xml.h:13 +#: ../data/org.gnome.meld.gschema.xml.h:9 msgid "Whether to indent using spaces or tabs" msgstr "スペースとタブのどちらを使ってインデントするか" -#: ../data/org.gnome.meld.gschema.xml.h:14 +#: ../data/org.gnome.meld.gschema.xml.h:10 msgid "If true, any new indentation will use spaces instead of tabs." msgstr "" "true の場合、新しいインデントではタブの代わりにスペースが使用されます。" -#: ../data/org.gnome.meld.gschema.xml.h:15 +#: ../data/org.gnome.meld.gschema.xml.h:11 +#: ../meld/resources/ui/statusbar-menu.ui.h:1 msgid "Show line numbers" msgstr "行番号を表示する" -#: ../data/org.gnome.meld.gschema.xml.h:16 +#: ../data/org.gnome.meld.gschema.xml.h:12 msgid "If true, line numbers will be shown in the gutter of file comparisons." msgstr "true の場合、ファイル比較時のガター部分に行番号を表示します。" -#: ../data/org.gnome.meld.gschema.xml.h:17 +#: ../data/org.gnome.meld.gschema.xml.h:13 msgid "Highlight syntax" msgstr "シンタックスハイライト" -#: ../data/org.gnome.meld.gschema.xml.h:18 +#: ../data/org.gnome.meld.gschema.xml.h:14 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.h:19 +#: ../data/org.gnome.meld.gschema.xml.h:15 msgid "Color scheme to use for syntax highlighting" msgstr "シンタックスハイライトに使用するカラースキーマ" -#: ../data/org.gnome.meld.gschema.xml.h:20 +#: ../data/org.gnome.meld.gschema.xml.h:16 msgid "Used by GtkSourceView to determine colors for syntax highlighting" msgstr "" "シンタックスハイライトのために決められた色は GtkSourceView によって使用されま" "す" -#: ../data/org.gnome.meld.gschema.xml.h:21 +#: ../data/org.gnome.meld.gschema.xml.h:17 msgid "Displayed whitespace" msgstr "ホワイトスペースを表示する" -#: ../data/org.gnome.meld.gschema.xml.h:22 +#: ../data/org.gnome.meld.gschema.xml.h:18 msgid "" "Selector for individual whitespace character types to be shown. Possible " "values are 'space', 'tab', 'newline' and 'nbsp'." @@ -189,11 +175,11 @@ msgstr "" "表示する空白類文字の種類の設定です。使用可能な値は " "'space'、'tab'、'newline'、'nbsp' です。" -#: ../data/org.gnome.meld.gschema.xml.h:23 +#: ../data/org.gnome.meld.gschema.xml.h:19 msgid "Wrap mode" msgstr "折り返しのモード" -#: ../data/org.gnome.meld.gschema.xml.h:24 +#: ../data/org.gnome.meld.gschema.xml.h:20 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 " @@ -203,53 +189,54 @@ msgstr "" "'none'、任意の文字で折り返す場合は 'char'、単語の末尾で折り返す場合は 'word' " "を指定します。" -#: ../data/org.gnome.meld.gschema.xml.h:25 +#: ../data/org.gnome.meld.gschema.xml.h:21 +#: ../meld/resources/ui/statusbar-menu.ui.h:3 msgid "Highlight current line" msgstr "現在の行のハイライト" -#: ../data/org.gnome.meld.gschema.xml.h:26 +#: ../data/org.gnome.meld.gschema.xml.h:22 msgid "" "If true, the line containing the cursor will be highlighted in file " "comparisons." msgstr "true の場合、ファイル比較時にカーソルのある行がハイライトされます。" -#: ../data/org.gnome.meld.gschema.xml.h:27 +#: ../data/org.gnome.meld.gschema.xml.h:23 msgid "Use the system default monospace font" msgstr "システムデフォルトの等幅フォントを使用する" -#: ../data/org.gnome.meld.gschema.xml.h:28 +#: ../data/org.gnome.meld.gschema.xml.h:24 msgid "" "If false, custom-font will be used instead of the system monospace font." msgstr "" "false の場合、システムの monospace フォントの代わりにカスタムフォントが使用さ" "れます。" -#: ../data/org.gnome.meld.gschema.xml.h:29 +#: ../data/org.gnome.meld.gschema.xml.h:25 msgid "Custom font" msgstr "カスタムフォント" -#: ../data/org.gnome.meld.gschema.xml.h:30 +#: ../data/org.gnome.meld.gschema.xml.h:26 msgid "" "The custom font to use, stored as a string and parsed as a Pango font " "description." msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:31 +#: ../data/org.gnome.meld.gschema.xml.h:27 msgid "Ignore blank lines when comparing files" msgstr "ファイル比較時に空行を無視する" -#: ../data/org.gnome.meld.gschema.xml.h:32 +#: ../data/org.gnome.meld.gschema.xml.h:28 msgid "" "If true, blank lines will be trimmed when highlighting changes between files." msgstr "" "true の場合、ファイル間の変更点をハイライトする際に、空行の差異をハイライトし" "ません。" -#: ../data/org.gnome.meld.gschema.xml.h:33 +#: ../data/org.gnome.meld.gschema.xml.h:29 msgid "Use the system default editor" msgstr "システムデフォルトのエディターを使用する" -#: ../data/org.gnome.meld.gschema.xml.h:34 +#: ../data/org.gnome.meld.gschema.xml.h:30 msgid "" "If false, custom-editor-command will be used instead of the system editor " "when opening files externally." @@ -257,32 +244,33 @@ msgstr "" "false の場合、ファイルを別のアプリで開く際に、システムのエディターの代わりに" "指定したエディターコマンドを使用します。" -#: ../data/org.gnome.meld.gschema.xml.h:35 +#: ../data/org.gnome.meld.gschema.xml.h:31 msgid "The custom editor launch command" msgstr "カスタムエディター起動コマンド" -#: ../data/org.gnome.meld.gschema.xml.h:36 +#: ../data/org.gnome.meld.gschema.xml.h:32 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.h:37 +#: ../data/org.gnome.meld.gschema.xml.h:33 msgid "Columns to display" msgstr "表示するカラム" -#: ../data/org.gnome.meld.gschema.xml.h:38 +#: ../data/org.gnome.meld.gschema.xml.h:34 msgid "" "List of column names in folder comparison and whether they should be " "displayed." msgstr "" "フォルダー比較時のカラム名の一覧と、それらを表示するかどうかの設定です。" -#: ../data/org.gnome.meld.gschema.xml.h:39 ../data/ui/preferences.ui.h:25 +#: ../data/org.gnome.meld.gschema.xml.h:35 +#: ../meld/resources/ui/preferences.ui.h:25 msgid "Ignore symbolic links" msgstr "シンボリックリンクを無視する" -#: ../data/org.gnome.meld.gschema.xml.h:40 +#: ../data/org.gnome.meld.gschema.xml.h:36 msgid "" "If true, folder comparisons do not follow symbolic links when traversing the " "folder tree." @@ -290,11 +278,11 @@ msgstr "" "true の場合、フォルダー比較時のフォルダーツリー走査において、シンボリックリン" "クのリンク先を走査しません。" -#: ../data/org.gnome.meld.gschema.xml.h:41 +#: ../data/org.gnome.meld.gschema.xml.h:37 msgid "Use shallow comparison" msgstr "浅い比較を使用する" -#: ../data/org.gnome.meld.gschema.xml.h:42 +#: ../data/org.gnome.meld.gschema.xml.h:38 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 " @@ -303,11 +291,11 @@ msgstr "" "true の場合、フォルダー比較時にサイズと mtime だけを基準にしてファイルを比較" "し、それらが一致すれば同一のファイルであると見做します。" -#: ../data/org.gnome.meld.gschema.xml.h:43 +#: ../data/org.gnome.meld.gschema.xml.h:39 msgid "File timestamp resolution" msgstr "ファイルのタイムスタンプ分解能" -#: ../data/org.gnome.meld.gschema.xml.h:44 +#: ../data/org.gnome.meld.gschema.xml.h:40 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 " @@ -318,11 +306,12 @@ msgstr "" "と見做される最小の差異(ナノ秒)です。これはタイムスタンプ分解能が異なるファイ" "ルシステム間で、ファイルの比較を行う際に役立ちます。" -#: ../data/org.gnome.meld.gschema.xml.h:45 ../data/ui/preferences.ui.h:22 +#: ../data/org.gnome.meld.gschema.xml.h:41 +#: ../meld/resources/ui/preferences.ui.h:22 msgid "Apply text filters during folder comparisons" msgstr "フォルダーの比較中にテキストフィルターを適用する" -#: ../data/org.gnome.meld.gschema.xml.h:46 +#: ../data/org.gnome.meld.gschema.xml.h:42 msgid "" "If true, folder comparisons that compare file contents also apply active " "text filters and the blank line trimming option, and ignore newline " @@ -332,102 +321,102 @@ msgstr "" "フィルターと空行のトリミングオプションが適用され、改行による差異は無視しま" "す。" -#: ../data/org.gnome.meld.gschema.xml.h:47 +#: ../data/org.gnome.meld.gschema.xml.h:43 msgid "File status filters" msgstr "ファイルの状態フィルター" -#: ../data/org.gnome.meld.gschema.xml.h:48 +#: ../data/org.gnome.meld.gschema.xml.h:44 msgid "List of statuses used to filter visible files in folder comparison." msgstr "" "フォルダー比較時に、表示するファイルをフィルタリングするために使用されるス" "テータスのリスト。" -#: ../data/org.gnome.meld.gschema.xml.h:49 +#: ../data/org.gnome.meld.gschema.xml.h:45 msgid "Show the version control console output" msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:50 +#: ../data/org.gnome.meld.gschema.xml.h:46 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.h:51 +#: ../data/org.gnome.meld.gschema.xml.h:47 msgid "Version control pane position" msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:52 +#: ../data/org.gnome.meld.gschema.xml.h:48 msgid "" "This is the height of the main version control tree when the console pane is " "shown." msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:53 +#: ../data/org.gnome.meld.gschema.xml.h:49 msgid "Present version comparisons as left-local/right-remote" msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:54 +#: ../data/org.gnome.meld.gschema.xml.h:50 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.h:55 +#: ../data/org.gnome.meld.gschema.xml.h:51 msgid "Order for files in three-way version control merge comparisons" msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:56 +#: ../data/org.gnome.meld.gschema.xml.h:52 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.h:57 +#: ../data/org.gnome.meld.gschema.xml.h:53 msgid "Show margin in commit message editor" msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:58 +#: ../data/org.gnome.meld.gschema.xml.h:54 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.h:59 +#: ../data/org.gnome.meld.gschema.xml.h:55 msgid "Margin column in commit message editor" msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:60 +#: ../data/org.gnome.meld.gschema.xml.h:56 msgid "" "The column at which to show the margin in the version control commit message " "editor." msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:61 +#: ../data/org.gnome.meld.gschema.xml.h:57 msgid "Automatically hard-wrap commit messages" msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:62 +#: ../data/org.gnome.meld.gschema.xml.h:58 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.h:63 +#: ../data/org.gnome.meld.gschema.xml.h:59 msgid "Version control status filters" msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:64 +#: ../data/org.gnome.meld.gschema.xml.h:60 msgid "" "List of statuses used to filter visible files in version control comparison." msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:65 +#: ../data/org.gnome.meld.gschema.xml.h:61 msgid "Filename-based filters" msgstr "ファイル名を対象としたフィルター" -#: ../data/org.gnome.meld.gschema.xml.h:66 +#: ../data/org.gnome.meld.gschema.xml.h:62 msgid "" "List of predefined filename-based filters that, if active, will remove " "matching files from a folder comparison." @@ -435,11 +424,11 @@ msgstr "" "ファイル名が対象の定義されたフィルターのリスト。有効な場合、フォルダーの比較" "から一致するファイルを除外します。" -#: ../data/org.gnome.meld.gschema.xml.h:67 +#: ../data/org.gnome.meld.gschema.xml.h:63 msgid "Text-based filters" msgstr "テキストを対象としたフィルター" -#: ../data/org.gnome.meld.gschema.xml.h:68 +#: ../data/org.gnome.meld.gschema.xml.h:64 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, " @@ -465,397 +454,622 @@ msgstr "Meld ダークスキーマ" msgid "Dark color scheme for Meld highlighting" msgstr "Meld がハイライトに用いるダークカラースキーマ" -#: ../data/ui/application.ui.h:1 -msgid "About Meld" -msgstr "Meld について" - -#: ../data/ui/application.ui.h:2 -msgid "" -"Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2017 Kai Willadsen" -msgstr "" -"Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2017 Kai Willadsen" +#: ../meld/resources/gtk/help-overlay.ui.h:1 +msgctxt "shortcut window" +msgid "General" +msgstr "全般" -#: ../data/ui/application.ui.h:4 -msgid "Website" -msgstr "ウェブサイト" +#: ../meld/resources/gtk/help-overlay.ui.h:2 +msgctxt "shortcut window" +msgid "New comparison" +msgstr "新しい比較" -#: ../data/ui/application.ui.h:5 -msgid "translator-credits" -msgstr "" -"相花 毅 \n" -"Toshiharu Kudoh \n" -"Shinichirou Yamada \n" -"sicklylife " +#: ../meld/resources/gtk/help-overlay.ui.h:3 +msgctxt "shortcut window" +msgid "Close a comparison" +msgstr "比較を閉じる" -#: ../data/ui/application.ui.h:6 -msgid "_Preferences" -msgstr "設定(_P)" +#: ../meld/resources/gtk/help-overlay.ui.h:4 +msgctxt "shortcut window" +msgid "Quit Meld" +msgstr "Meld を終了する" -#: ../data/ui/application.ui.h:7 -msgid "_Help" -msgstr "ヘルプ(_H)" +#: ../meld/resources/gtk/help-overlay.ui.h:5 +msgctxt "shortcut window" +msgid "Stop the current action" +msgstr "現在適用中のアクションを停止する" -#: ../data/ui/application.ui.h:8 -msgid "Keyboard Shortcuts" -msgstr "キーボードショートカット" +#: ../meld/resources/gtk/help-overlay.ui.h:6 +msgctxt "shortcut window" +msgid "Refresh comparison" +msgstr "比較内容を更新する" -#: ../data/ui/application.ui.h:9 -msgid "_About" -msgstr "このアプリケーションについて(_A)" +#: ../meld/resources/gtk/help-overlay.ui.h:7 +msgctxt "shortcut window" +msgid "Fullscreen" +msgstr "フルスクリーンで表示する" -#: ../data/ui/application.ui.h:10 -msgid "_Quit" -msgstr "終了(_Q)" +#: ../meld/resources/gtk/help-overlay.ui.h:8 +msgctxt "shortcut window" +msgid "Tabs" +msgstr "タブ" -#: ../data/ui/dirdiff.ui.h:1 ../data/ui/vcview.ui.h:1 -msgid "_Compare" -msgstr "比較(_C)" +#: ../meld/resources/gtk/help-overlay.ui.h:9 +msgctxt "shortcut window" +msgid "Go to previous tab" +msgstr "前のタブへ移動する" -#: ../data/ui/dirdiff.ui.h:2 ../data/ui/vcview.ui.h:2 -msgid "Compare selected files" -msgstr "選択したファイルを比較します" +#: ../meld/resources/gtk/help-overlay.ui.h:10 +msgctxt "shortcut window" +msgid "Go to next tab" +msgstr "次のタブへ移動する" -#: ../data/ui/dirdiff.ui.h:3 -msgid "Collapse Recursively" -msgstr "再帰的に畳む" +#: ../meld/resources/gtk/help-overlay.ui.h:11 +msgctxt "shortcut window" +msgid "Switch to tab" +msgstr "タブを切り替える" -#: ../data/ui/dirdiff.ui.h:4 -msgid "Collapse selected folder and all subfolders" -msgstr "選択したフォルダーとすべてのサブフォルダーを畳みます" +#: ../meld/resources/gtk/help-overlay.ui.h:12 +msgctxt "shortcut window" +msgid "Move tab left" +msgstr "タブを左へ移動する" -#: ../data/ui/dirdiff.ui.h:5 -msgid "Expand Recursively" -msgstr "再帰的に展開" +#: ../meld/resources/gtk/help-overlay.ui.h:13 +msgctxt "shortcut window" +msgid "Move tab right" +msgstr "タブを右へ移動する" -#: ../data/ui/dirdiff.ui.h:6 -msgid "Expand selected folder and all subfolders" -msgstr "選択したフォルダーとすべてのサブフォルダーを展開します" +#: ../meld/resources/gtk/help-overlay.ui.h:14 +msgctxt "shortcut window" +msgid "Changes" +msgstr "変更点" -#: ../data/ui/dirdiff.ui.h:7 -msgid "Copy to _Left" -msgstr "左へコピー(_L)" +#: ../meld/resources/gtk/help-overlay.ui.h:15 +msgctxt "shortcut window" +msgid "Go to previous change" +msgstr "前の変更点へジャンプする" -#: ../data/ui/dirdiff.ui.h:8 -msgid "Copy to left" -msgstr "左へコピーします" +#: ../meld/resources/gtk/help-overlay.ui.h:16 +msgctxt "shortcut window" +msgid "Go to next change" +msgstr "次の変更点へジャンプする" -#: ../data/ui/dirdiff.ui.h:9 -msgid "Copy to _Right" -msgstr "右へコピー(_R)" +#: ../meld/resources/gtk/help-overlay.ui.h:17 +msgctxt "shortcut window" +msgid "Editing" +msgstr "編集" -#: ../data/ui/dirdiff.ui.h:10 -msgid "Copy to right" -msgstr "右へコピーします" +#: ../meld/resources/gtk/help-overlay.ui.h:18 +msgctxt "shortcut window" +msgid "Undo" +msgstr "元に戻す" -#: ../data/ui/dirdiff.ui.h:11 -msgid "Delete selected" -msgstr "選択したファイルなどを削除します" +#: ../meld/resources/gtk/help-overlay.ui.h:19 +msgctxt "shortcut window" +msgid "Redo" +msgstr "やり直し" -#: ../data/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:907 ../meld/filediff.py:1497 -msgid "Hide" -msgstr "隠す" +#: ../meld/resources/gtk/help-overlay.ui.h:20 +msgctxt "shortcut window" +msgid "Cut" +msgstr "切り取り" -#: ../data/ui/dirdiff.ui.h:13 -msgid "Hide selected" -msgstr "選択範囲を隠します" +#: ../meld/resources/gtk/help-overlay.ui.h:21 +msgctxt "shortcut window" +msgid "Copy" +msgstr "コピー" -#: ../data/ui/dirdiff.ui.h:14 -msgid "Ignore Filename Case" -msgstr "ファイル名の大/小文字を無視する" +#: ../meld/resources/gtk/help-overlay.ui.h:22 +msgctxt "shortcut window" +msgid "Paste" +msgstr "貼り付け" -#: ../data/ui/dirdiff.ui.h:15 -msgid "" -"Consider differently-cased filenames that are otherwise-identical to be the " -"same" -msgstr "" +#: ../meld/resources/gtk/help-overlay.ui.h:23 +msgctxt "shortcut window" +msgid "Find" +msgstr "検索" -#: ../data/ui/dirdiff.ui.h:16 -msgid "Same" -msgstr "同じ部分" +#: ../meld/resources/gtk/help-overlay.ui.h:24 +msgctxt "shortcut window" +msgid "Find Next" +msgstr "次を検索する" -#: ../data/ui/dirdiff.ui.h:17 -msgid "Show identical" -msgstr "一致する部分を表示します" +#: ../meld/resources/gtk/help-overlay.ui.h:25 +msgctxt "shortcut window" +msgid "Find Previous" +msgstr "前を検索する" -#: ../data/ui/dirdiff.ui.h:18 -msgid "New" -msgstr "新しい部分" +#: ../meld/resources/gtk/help-overlay.ui.h:26 +msgctxt "shortcut window" +msgid "Replace" +msgstr "置換" -#: ../data/ui/dirdiff.ui.h:19 -msgid "Show new" -msgstr "新規の部分を表示します" +#: ../meld/resources/gtk/help-overlay.ui.h:27 +msgctxt "shortcut window" +msgid "File comparison" +msgstr "ファイルの比較" -#: ../data/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:76 -msgid "Modified" -msgstr "変更済" +#: ../meld/resources/gtk/help-overlay.ui.h:28 +msgctxt "shortcut window" +msgid "Save current file" +msgstr "このファイルを保存する" -#: ../data/ui/dirdiff.ui.h:21 -msgid "Show modified" -msgstr "変更のあるファイルを表示します" +#: ../meld/resources/gtk/help-overlay.ui.h:29 +msgctxt "shortcut window" +msgid "Save current file to new path" +msgstr "このファイルを新しい名前で保存する" -#: ../data/ui/dirdiff.ui.h:22 -msgid "Filters" -msgstr "フィルター" +#: ../meld/resources/gtk/help-overlay.ui.h:30 +msgctxt "shortcut window" +msgid "Save all files in comparison" +msgstr "比較中のすべてのファイルを保存する" -#: ../data/ui/dirdiff.ui.h:23 -msgid "Set active filters" -msgstr "フィルターを選択します" +#: ../meld/resources/gtk/help-overlay.ui.h:31 +msgctxt "shortcut window" +msgid "Previous conflict" +msgstr "前の衝突箇所" + +#: ../meld/resources/gtk/help-overlay.ui.h:32 +msgctxt "shortcut window" +msgid "Next conflict" +msgstr "次の衝突箇所" + +#: ../meld/resources/gtk/help-overlay.ui.h:33 +msgctxt "shortcut window" +msgid "Push change to left" +msgstr "変更点を左へ適用する" + +#: ../meld/resources/gtk/help-overlay.ui.h:34 +msgctxt "shortcut window" +msgid "Push change to right" +msgstr "変更点を右へ適用する" + +#: ../meld/resources/gtk/help-overlay.ui.h:35 +msgctxt "shortcut window" +msgid "Pull change from left" +msgstr "変更点を左から適用する" + +#: ../meld/resources/gtk/help-overlay.ui.h:36 +msgctxt "shortcut window" +msgid "Pull change from right" +msgstr "変更点を右から適用する" + +#: ../meld/resources/gtk/help-overlay.ui.h:37 +msgctxt "shortcut window" +msgid "Copy change above left" +msgstr "左の変更点の上にコピーする" + +#: ../meld/resources/gtk/help-overlay.ui.h:38 +msgctxt "shortcut window" +msgid "Copy change below left" +msgstr "左の変更点の下にコピーする" -#: ../data/ui/EditableList.ui.h:1 -msgid "Editable List" -msgstr "編集可能なリスト" +#: ../meld/resources/gtk/help-overlay.ui.h:39 +msgctxt "shortcut window" +msgid "Copy change above right" +msgstr "右の変更点の上にコピーする" -#: ../data/ui/EditableList.ui.h:2 +#: ../meld/resources/gtk/help-overlay.ui.h:40 +msgctxt "shortcut window" +msgid "Copy change below right" +msgstr "右の変更点の下にコピーする" + +#: ../meld/resources/gtk/help-overlay.ui.h:41 +msgctxt "shortcut window" +msgid "Delete change" +msgstr "変更点を削除する" + +#: ../meld/resources/gtk/help-overlay.ui.h:42 +msgctxt "shortcut window" +msgid "Previous comparison pane" +msgstr "前の比較ペイン" + +#: ../meld/resources/gtk/help-overlay.ui.h:43 +msgctxt "shortcut window" +msgid "Next comparison pane" +msgstr "次の比較ペイン" + +#: ../meld/resources/gtk/help-overlay.ui.h:44 +msgctxt "shortcut window" +msgid "Folder comparison" +msgstr "フォルダーの比較" + +#: ../meld/resources/gtk/help-overlay.ui.h:45 +msgctxt "shortcut window" +msgid "Copy to left" +msgstr "左へコピーする" + +#: ../meld/resources/gtk/help-overlay.ui.h:46 +msgctxt "shortcut window" +msgid "Copy to right" +msgstr "右へコピーする" + +#: ../meld/resources/gtk/help-overlay.ui.h:47 +msgctxt "shortcut window" +msgid "Version control comparison" +msgstr "バージョン管理の比較" + +#: ../meld/resources/gtk/help-overlay.ui.h:48 +msgctxt "shortcut window" +msgid "Commit to version control" +msgstr "バージョン管理へコミットする" + +#: ../meld/resources/gtk/help-overlay.ui.h:49 +msgctxt "shortcut window" +msgid "Show/hide console output" +msgstr "コンソール出力の表示/非表示" + +#: ../meld/resources/gtk/menus.ui.h:1 +msgid "_Preferences" +msgstr "設定(_P)" + +#: ../meld/resources/gtk/menus.ui.h:2 +msgid "_Help" +msgstr "ヘルプ(_H)" + +#: ../meld/resources/gtk/menus.ui.h:3 +msgid "Keyboard Shortcuts" +msgstr "キーボードショートカット" + +#: ../meld/resources/gtk/menus.ui.h:4 +msgid "_About" +msgstr "このアプリケーションについて(_A)" + +#: ../meld/resources/gtk/menus.ui.h:5 +msgid "_Quit" +msgstr "終了(_Q)" + +#: ../meld/resources/ui/about-dialog.ui.h:1 +msgid "About Meld" +msgstr "Meld について" + +#: ../meld/resources/ui/about-dialog.ui.h:2 +msgid "" +"Copyright © 2002-2009 Stephen Kennedy\n" +"Copyright © 2009-2017 Kai Willadsen" +msgstr "" +"Copyright © 2002-2009 Stephen Kennedy\n" +"Copyright © 2009-2017 Kai Willadsen" + +#: ../meld/resources/ui/about-dialog.ui.h:4 +msgid "Website" +msgstr "ウェブサイト" + +#: ../meld/resources/ui/about-dialog.ui.h:5 +msgid "translator-credits" +msgstr "" +"相花 毅 \n" +"Toshiharu Kudoh \n" +"Shinichirou Yamada \n" +"sicklylife " + +#: ../meld/resources/ui/column-list.ui.h:1 +#: ../meld/resources/ui/filter-list.ui.h:1 msgid "Active" msgstr "有効" -#: ../data/ui/EditableList.ui.h:3 +#: ../meld/resources/ui/column-list.ui.h:2 msgid "Column Name" msgstr "カラム名" -#: ../data/ui/EditableList.ui.h:4 ../data/ui/vcview.ui.h:9 -msgid "_Add" -msgstr "追加(_A)" - -#: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11 -#: ../meld/vcview.py:680 +#: ../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 msgid "_Remove" msgstr "削除(_R)" -#: ../data/ui/EditableList.ui.h:6 +#: ../meld/resources/ui/column-list.ui.h:4 +#: ../meld/resources/ui/filter-list.ui.h:8 msgid "Move item up" msgstr "アイテムを上へ移動します" -#: ../data/ui/EditableList.ui.h:7 +#: ../meld/resources/ui/column-list.ui.h:5 +#: ../meld/resources/ui/filter-list.ui.h:9 msgid "Move _Up" msgstr "上へ移動する(_U)" -#: ../data/ui/EditableList.ui.h:8 +#: ../meld/resources/ui/column-list.ui.h:6 +#: ../meld/resources/ui/filter-list.ui.h:10 msgid "Move item down" msgstr "アイテムを下へ移動します" -#: ../data/ui/EditableList.ui.h:9 +#: ../meld/resources/ui/column-list.ui.h:7 +#: ../meld/resources/ui/filter-list.ui.h:11 msgid "Move _Down" msgstr "下へ移動する(_D)" -#. Create icon and filename CellRenderer -#: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35 -#: ../meld/dirdiff.py:407 -msgid "Name" -msgstr "名前" +#: ../meld/resources/ui/commit-dialog.ui.h:1 +msgid "Commit" +msgstr "" -#: ../data/ui/EditableList.ui.h:11 -msgid "Pattern" -msgstr "パターン" +#: ../meld/resources/ui/commit-dialog.ui.h:2 +msgid "Commit Files" +msgstr "" -#: ../data/ui/EditableList.ui.h:12 -msgid "Add new filter" -msgstr "新しいフィルターを追加します" +#: ../meld/resources/ui/commit-dialog.ui.h:3 +msgid "Log Message" +msgstr "" -#: ../data/ui/EditableList.ui.h:13 -msgid "Remove selected filter" -msgstr "選択したフィルターを削除します" +#: ../meld/resources/ui/commit-dialog.ui.h:4 +msgid "Previous logs:" +msgstr "" + +#: ../meld/resources/ui/commit-dialog.ui.h:5 +msgid "Co_mmit" +msgstr "" + +#: ../meld/resources/ui/dirdiff.ui.h:1 ../meld/resources/ui/vcview.ui.h:1 +msgid "_Compare" +msgstr "比較(_C)" + +#: ../meld/resources/ui/dirdiff.ui.h:2 ../meld/resources/ui/vcview.ui.h:2 +msgid "Compare selected files" +msgstr "選択したファイルを比較します" + +#: ../meld/resources/ui/dirdiff.ui.h:3 +msgid "Collapse Recursively" +msgstr "再帰的に畳む" + +#: ../meld/resources/ui/dirdiff.ui.h:4 +msgid "Collapse selected folder and all subfolders" +msgstr "選択したフォルダーとすべてのサブフォルダーを畳みます" + +#: ../meld/resources/ui/dirdiff.ui.h:5 +msgid "Expand Recursively" +msgstr "再帰的に展開" + +#: ../meld/resources/ui/dirdiff.ui.h:6 +msgid "Expand selected folder and all subfolders" +msgstr "選択したフォルダーとすべてのサブフォルダーを展開します" + +#: ../meld/resources/ui/dirdiff.ui.h:7 +msgid "Copy to _Left" +msgstr "左へコピー(_L)" + +#: ../meld/resources/ui/dirdiff.ui.h:8 +msgid "Copy to left" +msgstr "左へコピーします" + +#: ../meld/resources/ui/dirdiff.ui.h:9 +msgid "Copy to _Right" +msgstr "右へコピー(_R)" + +#: ../meld/resources/ui/dirdiff.ui.h:10 +msgid "Copy to right" +msgstr "右へコピーします" + +#: ../meld/resources/ui/dirdiff.ui.h:11 +msgid "Delete selected" +msgstr "選択したファイルなどを削除します" + +#: ../meld/resources/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:959 +#: ../meld/filediff.py:1601 +msgid "Hide" +msgstr "隠す" + +#: ../meld/resources/ui/dirdiff.ui.h:13 +msgid "Hide selected" +msgstr "選択範囲を隠します" + +#: ../meld/resources/ui/dirdiff.ui.h:14 +msgid "Ignore Filename Case" +msgstr "ファイル名の大/小文字を無視する" + +#: ../meld/resources/ui/dirdiff.ui.h:15 +msgid "" +"Consider differently-cased filenames that are otherwise-identical to be the " +"same" +msgstr "" -#: ../data/ui/encoding-selector.ui.h:1 +#: ../meld/resources/ui/dirdiff.ui.h:16 +msgid "Same" +msgstr "同じ部分" + +#: ../meld/resources/ui/dirdiff.ui.h:17 +msgid "Show identical" +msgstr "一致する部分を表示します" + +#: ../meld/resources/ui/dirdiff.ui.h:18 +msgid "New" +msgstr "新しい部分" + +#: ../meld/resources/ui/dirdiff.ui.h:19 +msgid "Show new" +msgstr "新規の部分を表示します" + +#: ../meld/resources/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:77 +msgid "Modified" +msgstr "変更済" + +#: ../meld/resources/ui/dirdiff.ui.h:21 +msgid "Show modified" +msgstr "変更のあるファイルを表示します" + +#: ../meld/resources/ui/dirdiff.ui.h:22 +msgid "Filters" +msgstr "フィルター" + +#: ../meld/resources/ui/dirdiff.ui.h:23 +msgid "Set active filters" +msgstr "フィルターを選択します" + +#: ../meld/resources/ui/encoding-selector.ui.h:1 msgid "Search text encoding…" msgstr "テキストエンコーディングを検索…" -#: ../data/ui/filediff.ui.h:1 +#: ../meld/resources/ui/filediff.ui.h:1 msgid "Format as Patch…" msgstr "パッチを生成…" -#: ../data/ui/filediff.ui.h:2 +#: ../meld/resources/ui/filediff.ui.h:2 msgid "Create a patch using differences between files" msgstr "ファイル間の差分からパッチを生成します" -#: ../data/ui/filediff.ui.h:3 +#: ../meld/resources/ui/filediff.ui.h:3 msgid "Save A_ll" msgstr "すべて保存(_L)" -#: ../data/ui/filediff.ui.h:4 +#: ../meld/resources/ui/filediff.ui.h:4 msgid "Save all files in the current comparison" msgstr "比較中のすべてのファイルを保存します" -#: ../data/ui/filediff.ui.h:5 +#: ../meld/resources/ui/filediff.ui.h:5 msgid "Revert files to their saved versions" msgstr "ファイルを保存されたバージョンに戻します" -#: ../data/ui/filediff.ui.h:6 +#: ../meld/resources/ui/filediff.ui.h:6 msgid "Add Synchronization Point" msgstr "同期点を追加" -#: ../data/ui/filediff.ui.h:7 +#: ../meld/resources/ui/filediff.ui.h:7 msgid "Add a synchronization point for changes between files" msgstr "" -#: ../data/ui/filediff.ui.h:8 +#: ../meld/resources/ui/filediff.ui.h:8 msgid "Clear Synchronization Points" msgstr "同期点をクリア" -#: ../data/ui/filediff.ui.h:9 +#: ../meld/resources/ui/filediff.ui.h:9 msgid "Clear sychronization points for changes between files" msgstr "" -#: ../data/ui/filediff.ui.h:10 +#: ../meld/resources/ui/filediff.ui.h:10 msgid "Previous Conflict" msgstr "前の衝突箇所" -#: ../data/ui/filediff.ui.h:11 +#: ../meld/resources/ui/filediff.ui.h:11 msgid "Go to the previous conflict" msgstr "前の衝突箇所へジャンプします" -#: ../data/ui/filediff.ui.h:12 +#: ../meld/resources/ui/filediff.ui.h:12 msgid "Next Conflict" msgstr "次の衝突箇所" -#: ../data/ui/filediff.ui.h:13 +#: ../meld/resources/ui/filediff.ui.h:13 msgid "Go to the next conflict" msgstr "次の衝突箇所へジャンプします" -#: ../data/ui/filediff.ui.h:14 +#: ../meld/resources/ui/filediff.ui.h:14 msgid "Push to Left" msgstr "左へ適用" -#: ../data/ui/filediff.ui.h:15 +#: ../meld/resources/ui/filediff.ui.h:15 msgid "Push current change to the left" msgstr "現在の変更を左にも適用します" -#: ../data/ui/filediff.ui.h:16 +#: ../meld/resources/ui/filediff.ui.h:16 msgid "Push to Right" msgstr "右へ適用" -#: ../data/ui/filediff.ui.h:17 +#: ../meld/resources/ui/filediff.ui.h:17 msgid "Push current change to the right" msgstr "現在の変更を右にも適用します" -#: ../data/ui/filediff.ui.h:18 +#: ../meld/resources/ui/filediff.ui.h:18 msgid "Pull from Left" msgstr "左から適用" -#: ../data/ui/filediff.ui.h:19 +#: ../meld/resources/ui/filediff.ui.h:19 msgid "Pull change from the left" msgstr "左から変更を適用します" -#: ../data/ui/filediff.ui.h:20 +#: ../meld/resources/ui/filediff.ui.h:20 msgid "Pull from Right" msgstr "右から適用" -#: ../data/ui/filediff.ui.h:21 +#: ../meld/resources/ui/filediff.ui.h:21 msgid "Pull change from the right" msgstr "右から変更を適用します" -#: ../data/ui/filediff.ui.h:22 +#: ../meld/resources/ui/filediff.ui.h:22 msgid "Copy Above Left" msgstr "左の上にコピー" -#: ../data/ui/filediff.ui.h:23 +#: ../meld/resources/ui/filediff.ui.h:23 msgid "Copy change above the left chunk" msgstr "左の変更点の上にコピーします" -#: ../data/ui/filediff.ui.h:24 +#: ../meld/resources/ui/filediff.ui.h:24 msgid "Copy Below Left" msgstr "左の下にコピー" -#: ../data/ui/filediff.ui.h:25 +#: ../meld/resources/ui/filediff.ui.h:25 msgid "Copy change below the left chunk" msgstr "左の変更点の下にコピーします" -#: ../data/ui/filediff.ui.h:26 +#: ../meld/resources/ui/filediff.ui.h:26 msgid "Copy Above Right" msgstr "右の上にコピー" -#: ../data/ui/filediff.ui.h:27 +#: ../meld/resources/ui/filediff.ui.h:27 msgid "Copy change above the right chunk" msgstr "右の変更点の上にコピーします" -#: ../data/ui/filediff.ui.h:28 +#: ../meld/resources/ui/filediff.ui.h:28 msgid "Copy Below Right" msgstr "右の下にコピー" -#: ../data/ui/filediff.ui.h:29 +#: ../meld/resources/ui/filediff.ui.h:29 msgid "Copy change below the right chunk" msgstr "右の変更点の下にコピーします" -#: ../data/ui/filediff.ui.h:30 +#: ../meld/resources/ui/filediff.ui.h:30 msgid "Delete" msgstr "削除" -#: ../data/ui/filediff.ui.h:31 +#: ../meld/resources/ui/filediff.ui.h:31 msgid "Delete change" msgstr "変更点を削除します" -#: ../data/ui/filediff.ui.h:32 +#: ../meld/resources/ui/filediff.ui.h:32 msgid "Merge All from Left" msgstr "左からすべてをマージ" -#: ../data/ui/filediff.ui.h:33 +#: ../meld/resources/ui/filediff.ui.h:33 msgid "Merge all non-conflicting changes from the left" msgstr "" -#: ../data/ui/filediff.ui.h:34 +#: ../meld/resources/ui/filediff.ui.h:34 msgid "Merge All from Right" msgstr "右からすべてをマージ" -#: ../data/ui/filediff.ui.h:35 +#: ../meld/resources/ui/filediff.ui.h:35 msgid "Merge all non-conflicting changes from the right" msgstr "" -#: ../data/ui/filediff.ui.h:36 +#: ../meld/resources/ui/filediff.ui.h:36 msgid "Merge All" msgstr "すべてをマージ" -#: ../data/ui/filediff.ui.h:37 +#: ../meld/resources/ui/filediff.ui.h:37 msgid "Merge all non-conflicting changes from left and right panes" msgstr "" -#: ../data/ui/filediff.ui.h:38 +#: ../meld/resources/ui/filediff.ui.h:38 msgid "Previous Pane" msgstr "前のペイン" -#: ../data/ui/filediff.ui.h:39 +#: ../meld/resources/ui/filediff.ui.h:39 msgid "Move keyboard focus to the previous document in this comparison" msgstr "この比較のキーボードフォーカスを前のドキュメントに移動します" -#: ../data/ui/filediff.ui.h:40 +#: ../meld/resources/ui/filediff.ui.h:40 msgid "Next Pane" msgstr "次のペイン" -#: ../data/ui/filediff.ui.h:41 +#: ../meld/resources/ui/filediff.ui.h:41 msgid "Move keyboard focus to the next document in this comparison" msgstr "この比較のキーボードフォーカスを次のドキュメントに移動します" -#: ../data/ui/filediff.ui.h:42 +#: ../meld/resources/ui/filediff.ui.h:42 msgid "Lock Scrolling" msgstr "スクロールをロック" -#: ../data/ui/filediff.ui.h:43 +#: ../meld/resources/ui/filediff.ui.h:43 msgid "Lock scrolling of all panes" msgstr "すべてのペインでスクロールを同期します" -#: ../data/ui/filediff.ui.h:44 -msgid "Save changes to documents before closing?" -msgstr "閉じる前にドキュメントへの変更を保存しますか?" - -#: ../data/ui/filediff.ui.h:45 -msgid "If you don’t save, changes will be permanently lost." -msgstr "保存しない場合、変更は永久に失われます。" - -#: ../data/ui/filediff.ui.h:46 -msgid "Close _without Saving" -msgstr "保存せずに閉じる(_W)" - -#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:988 ../meld/iohelpers.py:56 -#: ../meld/iohelpers.py:106 -msgid "_Cancel" -msgstr "キャンセル(_C)" - -#: ../data/ui/filediff.ui.h:48 -msgid "_Save" -msgstr "保存(_S)" - -#: ../data/ui/filediff.ui.h:49 +#: ../meld/resources/ui/filediff.ui.h:44 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." @@ -864,763 +1078,560 @@ msgstr "" "ルのロックを解除して変更を加えることができますが、これらの変更は新しいファイ" "ルに保存しなければなりません。" -#: ../data/ui/filediff.ui.h:50 +#: ../meld/resources/ui/filediff.ui.h:45 msgid "File 3" msgstr "ファイル 3" -#: ../data/ui/filediff.ui.h:51 +#: ../meld/resources/ui/filediff.ui.h:46 msgid "File 2" msgstr "ファイル 2" -#: ../data/ui/filediff.ui.h:52 +#: ../meld/resources/ui/filediff.ui.h:47 msgid "File 1" msgstr "ファイル 1" -#: ../data/ui/filediff.ui.h:53 -msgid "Discard unsaved changes to documents?" -msgstr "ドキュメントへの変更を保存せずに破棄しますか?" +#. Create icon and filename CellRenderer +#: ../meld/resources/ui/filter-list.ui.h:2 ../meld/resources/ui/vcview.ui.h:30 +#: ../meld/dirdiff.py:455 +msgid "Name" +msgstr "名前" -#: ../data/ui/filediff.ui.h:54 -msgid "Changes made to the following documents will be permanently lost:" -msgstr "次のドキュメントへの変更は永久に失われます:" +#: ../meld/resources/ui/filter-list.ui.h:3 +msgid "Pattern" +msgstr "パターン" -#: ../data/ui/filediff.ui.h:55 -msgid "_Discard" -msgstr "破棄(_D)" +#: ../meld/resources/ui/filter-list.ui.h:4 +msgid "Add new filter" +msgstr "新しいフィルターを追加します" + +#: ../meld/resources/ui/filter-list.ui.h:5 ../meld/resources/ui/vcview.ui.h:9 +msgid "_Add" +msgstr "追加(_A)" + +#: ../meld/resources/ui/filter-list.ui.h:6 +msgid "Remove selected filter" +msgstr "選択したフィルターを削除します" -#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:989 ../meld/iohelpers.py:107 +#: ../meld/resources/ui/findbar.ui.h:1 ../meld/dirdiff.py:1041 +#: ../meld/iohelpers.py:113 msgid "_Replace" msgstr "置換(_R)" -#: ../data/ui/findbar.ui.h:2 +#: ../meld/resources/ui/findbar.ui.h:2 msgid "Replace _All" msgstr "すべて置換(_A)" -#: ../data/ui/findbar.ui.h:3 +#: ../meld/resources/ui/findbar.ui.h:3 msgid "_Previous" msgstr "前の結果(_P)" -#: ../data/ui/findbar.ui.h:4 +#: ../meld/resources/ui/findbar.ui.h:4 msgid "_Next" msgstr "次の結果(_N)" -#: ../data/ui/findbar.ui.h:5 +#: ../meld/resources/ui/findbar.ui.h:5 msgid "Find:" msgstr "検索:" -#: ../data/ui/findbar.ui.h:6 +#: ../meld/resources/ui/findbar.ui.h:6 msgid "Replace _with:" msgstr "次で置換(_W):" -#: ../data/ui/findbar.ui.h:7 +#: ../meld/resources/ui/findbar.ui.h:7 msgid "_Match case" msgstr "大/小文字を区別(_M)" -#: ../data/ui/findbar.ui.h:8 +#: ../meld/resources/ui/findbar.ui.h:8 msgid "Who_le word" msgstr "単語全体(_L)" -#: ../data/ui/findbar.ui.h:9 +#: ../meld/resources/ui/findbar.ui.h:9 msgid "Regular e_xpression" msgstr "正規表現(_X)" -#: ../data/ui/findbar.ui.h:10 +#: ../meld/resources/ui/findbar.ui.h:10 msgid "Wrapped" msgstr "折り返しました" -#: ../data/ui/language-selector.ui.h:1 +#: ../meld/resources/ui/language-selector.ui.h:1 msgid "Search highlight mode…" msgstr "ハイライトモードを検索…" -#: ../data/ui/patch-dialog.ui.h:1 +#: ../meld/resources/ui/new-diff-tab.ui.h:1 ../meld/meldwindow.py:532 +#: ../meld/newdifftab.py:53 +msgid "New comparison" +msgstr "新しい比較" + +#: ../meld/resources/ui/new-diff-tab.ui.h:2 +msgid "File comparison" +msgstr "ファイルの比較" + +#: ../meld/resources/ui/new-diff-tab.ui.h:3 +msgid "Directory comparison" +msgstr "フォルダーの比較" + +#: ../meld/resources/ui/new-diff-tab.ui.h:4 +msgid "Version control view" +msgstr "" + +#: ../meld/resources/ui/new-diff-tab.ui.h:5 +msgid "_3-way comparison" +msgstr "3つを比較(_3)" + +#: ../meld/resources/ui/new-diff-tab.ui.h:6 +msgid "Select Third File" +msgstr "3番目のファイルを選択" + +#: ../meld/resources/ui/new-diff-tab.ui.h:7 +msgid "Select Second File" +msgstr "2番目のファイルを選択" + +#: ../meld/resources/ui/new-diff-tab.ui.h:8 +msgid "Select First File" +msgstr "1番目のファイルを選択" + +#: ../meld/resources/ui/new-diff-tab.ui.h:9 +msgid "Select First Folder" +msgstr "1番目のフォルダーを選択" + +#: ../meld/resources/ui/new-diff-tab.ui.h:10 +msgid "Select Second Folder" +msgstr "2番目のフォルダーを選択" + +#: ../meld/resources/ui/new-diff-tab.ui.h:11 +msgid "Select Third Folder" +msgstr "3番目のフォルダーを選択" + +#: ../meld/resources/ui/new-diff-tab.ui.h:12 +msgid "Select A Version-Controlled Folder" +msgstr "" + +#: ../meld/resources/ui/new-diff-tab.ui.h:13 +msgid "_Blank comparison" +msgstr "空の比較(_B)" + +#: ../meld/resources/ui/new-diff-tab.ui.h:14 +msgid "C_ompare" +msgstr "比較(_O)" + +#: ../meld/resources/ui/notebook-label.ui.h:1 +msgid "Close Tab" +msgstr "タブを閉じる" + +#: ../meld/resources/ui/patch-dialog.ui.h:1 msgid "Format as Patch" msgstr "パッチを生成" -#: ../data/ui/patch-dialog.ui.h:2 +#: ../meld/resources/ui/patch-dialog.ui.h:2 msgid "Copy to Clipboard" msgstr "クリップボードへコピー" -#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:152 +#: ../meld/resources/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:165 msgid "Save Patch" msgstr "パッチを保存" -#: ../data/ui/patch-dialog.ui.h:4 +#: ../meld/resources/ui/patch-dialog.ui.h:4 msgid "Use differences between:" msgstr "次のペイン間の差分を使用する:" -#: ../data/ui/patch-dialog.ui.h:5 +#: ../meld/resources/ui/patch-dialog.ui.h:5 msgid "Left and middle panes" msgstr "左と中央のペイン" -#: ../data/ui/patch-dialog.ui.h:6 +#: ../meld/resources/ui/patch-dialog.ui.h:6 msgid "Middle and right panes" msgstr "中央と右のペイン" -#: ../data/ui/patch-dialog.ui.h:7 +#: ../meld/resources/ui/patch-dialog.ui.h:7 msgid "_Reverse patch direction" msgstr "パッチの対象を逆にする(_R)" -#: ../data/ui/preferences.ui.h:1 -msgid "Meld Preferences" -msgstr "Meld の設定" +#: ../meld/resources/ui/preferences.ui.h:1 +msgid "Preferences" +msgstr "設定" -#: ../data/ui/preferences.ui.h:2 +#: ../meld/resources/ui/preferences.ui.h:2 msgid "Font" msgstr "フォント" -#: ../data/ui/preferences.ui.h:3 +#: ../meld/resources/ui/preferences.ui.h:3 msgid "_Use the system fixed width font" msgstr "システムの等幅フォントを使用する(_U)" -#: ../data/ui/preferences.ui.h:4 +#: ../meld/resources/ui/preferences.ui.h:4 msgid "_Editor font:" msgstr "エディターのフォント(_E):" -#: ../data/ui/preferences.ui.h:5 +#. 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 msgid "Display" msgstr "表示" -#: ../data/ui/preferences.ui.h:6 +#: ../meld/resources/ui/preferences.ui.h:6 msgid "_Tab width:" msgstr "タブの幅(_T):" -#: ../data/ui/preferences.ui.h:7 +#: ../meld/resources/ui/preferences.ui.h:7 msgid "_Insert spaces instead of tabs" msgstr "タブの代わりに空白を挿入する(_I)" -#: ../data/ui/preferences.ui.h:8 +#: ../meld/resources/ui/preferences.ui.h:8 msgid "Enable text _wrapping" msgstr "文字列の折り返しを有効にする(_W)" -#: ../data/ui/preferences.ui.h:9 +#: ../meld/resources/ui/preferences.ui.h:9 msgid "Do not _split words over two lines" msgstr "単語が二行に跨がらないようにする(_S)" -#: ../data/ui/preferences.ui.h:10 +#: ../meld/resources/ui/preferences.ui.h:10 msgid "Highlight _current line" msgstr "現在の行をハイライトする(_C)" -#: ../data/ui/preferences.ui.h:11 +#: ../meld/resources/ui/preferences.ui.h:11 msgid "Show _line numbers" msgstr "行番号を表示する(_L)" -#: ../data/ui/preferences.ui.h:12 +#: ../meld/resources/ui/preferences.ui.h:12 msgid "Show w_hitespace" msgstr "空白や改行を表示する(_H)" -#: ../data/ui/preferences.ui.h:13 +#: ../meld/resources/ui/preferences.ui.h:13 msgid "Use s_yntax highlighting" msgstr "シンタックスハイライトを有効にする(_Y)" -#: ../data/ui/preferences.ui.h:14 +#: ../meld/resources/ui/preferences.ui.h:14 msgid "Syntax highlighting color scheme:" msgstr "シンタックスハイライトのカラースキーマ:" -#: ../data/ui/preferences.ui.h:15 +#: ../meld/resources/ui/preferences.ui.h:15 msgid "External Editor" msgstr "外部エディター" -#: ../data/ui/preferences.ui.h:16 +#: ../meld/resources/ui/preferences.ui.h:16 msgid "Use _default system editor" msgstr "デフォルトのエディターを使用する(_D)" -#: ../data/ui/preferences.ui.h:17 +#: ../meld/resources/ui/preferences.ui.h:17 msgid "Edito_r command:" msgstr "エディターをコマンドで指定する(_R):" -#: ../data/ui/preferences.ui.h:18 +#: ../meld/resources/ui/preferences.ui.h:18 msgid "Editor" msgstr "エディター" -#: ../data/ui/preferences.ui.h:19 +#: ../meld/resources/ui/preferences.ui.h:19 msgid "Shallow Comparison" msgstr "浅い比較" -#: ../data/ui/preferences.ui.h:20 +#: ../meld/resources/ui/preferences.ui.h:20 msgid "C_ompare files based only on size and timestamp" msgstr "サイズとタイムスタンプだけを基準にしてファイルを比較する(_O)" -#: ../data/ui/preferences.ui.h:21 +#: ../meld/resources/ui/preferences.ui.h:21 msgid "_Timestamp resolution:" msgstr "タイムスタンプ分解能(_T):" -#: ../data/ui/preferences.ui.h:23 +#: ../meld/resources/ui/preferences.ui.h:23 msgid "Note: enabling text filters may make comparing large files much slower" msgstr "" "備考: テキストフィルターを有効にすると、大きなファイルの比較が遅くなる可能性" "があります" -#: ../data/ui/preferences.ui.h:24 +#: ../meld/resources/ui/preferences.ui.h:24 msgid "Symbolic Links" msgstr "シンボリックリンク" -#: ../data/ui/preferences.ui.h:26 +#: ../meld/resources/ui/preferences.ui.h:26 msgid "Visible Columns" msgstr "表示するカラム" -#: ../data/ui/preferences.ui.h:27 +#: ../meld/resources/ui/preferences.ui.h:27 msgid "Folder Comparisons" msgstr "フォルダーの比較" -#: ../data/ui/preferences.ui.h:28 +#: ../meld/resources/ui/preferences.ui.h:28 msgid "Version Comparisons" msgstr "" -#: ../data/ui/preferences.ui.h:29 +#: ../meld/resources/ui/preferences.ui.h:29 msgid "_Order when comparing file revisions:" msgstr "" -#: ../data/ui/preferences.ui.h:30 +#: ../meld/resources/ui/preferences.ui.h:30 msgid "Order when _merging files:" msgstr "" -#: ../data/ui/preferences.ui.h:31 -msgid "Commit Messages" -msgstr "コミットメッセージ" - -#: ../data/ui/preferences.ui.h:32 -msgid "Show _right margin at:" -msgstr "右マージンを表示する(_R):" - -#: ../data/ui/preferences.ui.h:33 -msgid "Automatically _break lines at right margin on commit" -msgstr "" - -#: ../data/ui/preferences.ui.h:34 -msgid "Version Control" -msgstr "バージョン管理" - -#: ../data/ui/preferences.ui.h:35 -msgid "Filename filters" -msgstr "ファイル名フィルター" - -#: ../data/ui/preferences.ui.h:36 -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 "" -"フォルダーの比較を行う際、ファイルとフォルダーを名前でフィルタリングできま" -"す。フィルタリングのパターンはそれぞれ、スペースで区切った SHELL 型式のワイル" -"ドカードの並びです。" - -#: ../data/ui/preferences.ui.h:37 ../meld/meldwindow.py:105 -msgid "File Filters" -msgstr "ファイルフィルター" - -#: ../data/ui/preferences.ui.h:38 -msgid "Change trimming" -msgstr "変更のトリミング" - -#: ../data/ui/preferences.ui.h:39 -msgid "Trim blank line differences from the start and end of changes" -msgstr "" -"変更点の始まりと終わりの部分から、空行の差異をハイライトしないように除外する" - -#: ../data/ui/preferences.ui.h:40 -msgid "Text filters" -msgstr "テキストフィルター" - -#: ../data/ui/preferences.ui.h:41 -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 "" -"ファイルの比較を行う時は、ある種類の変更だけ無視することができます。無視する" -"パターンはそれぞれ Python 形式の正規表現で指定し、その実装は無視する文字列を" -"空の文字列で置き換えるだけです。もし正規表現パターンにグループが含まれていた" -"ら、該当するグループの文字列だけ置き換えます。詳細はユーザーズ・マニュアルを" -"ご覧下さい。" - -#: ../data/ui/preferences.ui.h:42 -msgid "Text Filters" -msgstr "テキストフィルター" - -#: ../data/ui/preferences.ui.h:43 -msgid "Left is remote, right is local" -msgstr "" - -#: ../data/ui/preferences.ui.h:44 -msgid "Left is local, right is remote" -msgstr "" - -#: ../data/ui/preferences.ui.h:45 -msgid "Remote, merge, local" -msgstr "" - -#: ../data/ui/preferences.ui.h:46 -msgid "Local, merge, remote" -msgstr "" - -#: ../data/ui/preferences.ui.h:47 -msgid "1ns (ext4)" -msgstr "1ナノ秒 (ext4)" - -#: ../data/ui/preferences.ui.h:48 -msgid "100ns (NTFS)" -msgstr "100ナノ秒 (NTFS)" - -#: ../data/ui/preferences.ui.h:49 -msgid "1s (ext2/ext3)" -msgstr "1秒 (ext2/ext3)" - -#: ../data/ui/preferences.ui.h:50 -msgid "2s (VFAT)" -msgstr "2秒 (VFAT)" - -#: ../data/ui/shortcuts.ui.h:1 -msgctxt "shortcut window" -msgid "General" -msgstr "全般" - -#: ../data/ui/shortcuts.ui.h:2 -msgctxt "shortcut window" -msgid "New comparison" -msgstr "新しい比較" - -#: ../data/ui/shortcuts.ui.h:3 -msgctxt "shortcut window" -msgid "Close a comparison" -msgstr "比較を閉じる" - -#: ../data/ui/shortcuts.ui.h:4 -msgctxt "shortcut window" -msgid "Quit Meld" -msgstr "Meld を終了する" - -#: ../data/ui/shortcuts.ui.h:5 -msgctxt "shortcut window" -msgid "Stop the current action" -msgstr "現在適用中のアクションを停止する" - -#: ../data/ui/shortcuts.ui.h:6 -msgctxt "shortcut window" -msgid "Refresh comparison" -msgstr "比較内容を更新する" - -#: ../data/ui/shortcuts.ui.h:7 -msgctxt "shortcut window" -msgid "Fullscreen" -msgstr "フルスクリーンで表示する" - -#: ../data/ui/shortcuts.ui.h:8 -msgctxt "shortcut window" -msgid "Tabs" -msgstr "タブ" - -#: ../data/ui/shortcuts.ui.h:9 -msgctxt "shortcut window" -msgid "Go to previous tab" -msgstr "前のタブへ移動する" - -#: ../data/ui/shortcuts.ui.h:10 -msgctxt "shortcut window" -msgid "Go to next tab" -msgstr "次のタブへ移動する" - -#: ../data/ui/shortcuts.ui.h:11 -msgctxt "shortcut window" -msgid "Switch to tab" -msgstr "タブを切り替える" - -#: ../data/ui/shortcuts.ui.h:12 -msgctxt "shortcut window" -msgid "Move tab left" -msgstr "タブを左へ移動する" - -#: ../data/ui/shortcuts.ui.h:13 -msgctxt "shortcut window" -msgid "Move tab right" -msgstr "タブを右へ移動する" - -#: ../data/ui/shortcuts.ui.h:14 -msgctxt "shortcut window" -msgid "Changes" -msgstr "変更点" - -#: ../data/ui/shortcuts.ui.h:15 -msgctxt "shortcut window" -msgid "Go to previous change" -msgstr "前の変更点へジャンプする" - -#: ../data/ui/shortcuts.ui.h:16 -msgctxt "shortcut window" -msgid "Go to next change" -msgstr "次の変更点へジャンプする" - -#: ../data/ui/shortcuts.ui.h:17 -msgctxt "shortcut window" -msgid "Editing" -msgstr "編集" - -#: ../data/ui/shortcuts.ui.h:18 -msgctxt "shortcut window" -msgid "Undo" -msgstr "元に戻す" - -#: ../data/ui/shortcuts.ui.h:19 -msgctxt "shortcut window" -msgid "Redo" -msgstr "やり直し" - -#: ../data/ui/shortcuts.ui.h:20 -msgctxt "shortcut window" -msgid "Cut" -msgstr "切り取り" - -#: ../data/ui/shortcuts.ui.h:21 -msgctxt "shortcut window" -msgid "Copy" -msgstr "コピー" - -#: ../data/ui/shortcuts.ui.h:22 -msgctxt "shortcut window" -msgid "Paste" -msgstr "貼り付け" - -#: ../data/ui/shortcuts.ui.h:23 -msgctxt "shortcut window" -msgid "Find" -msgstr "検索" - -#: ../data/ui/shortcuts.ui.h:24 -msgctxt "shortcut window" -msgid "Find Next" -msgstr "次を検索する" - -#: ../data/ui/shortcuts.ui.h:25 -msgctxt "shortcut window" -msgid "Find Previous" -msgstr "前を検索する" - -#: ../data/ui/shortcuts.ui.h:26 -msgctxt "shortcut window" -msgid "Replace" -msgstr "置換" - -#: ../data/ui/shortcuts.ui.h:27 -msgctxt "shortcut window" -msgid "File comparison" -msgstr "ファイルの比較" - -#: ../data/ui/shortcuts.ui.h:28 -msgctxt "shortcut window" -msgid "Save current file" -msgstr "このファイルを保存する" - -#: ../data/ui/shortcuts.ui.h:29 -msgctxt "shortcut window" -msgid "Save current file to new path" -msgstr "このファイルを新しい名前で保存する" - -#: ../data/ui/shortcuts.ui.h:30 -msgctxt "shortcut window" -msgid "Save all files in comparison" -msgstr "比較中のすべてのファイルを保存する" - -#: ../data/ui/shortcuts.ui.h:31 -msgctxt "shortcut window" -msgid "Previous conflict" -msgstr "前の衝突箇所" +#: ../meld/resources/ui/preferences.ui.h:31 +msgid "Commit Messages" +msgstr "コミットメッセージ" -#: ../data/ui/shortcuts.ui.h:32 -msgctxt "shortcut window" -msgid "Next conflict" -msgstr "次の衝突箇所" +#: ../meld/resources/ui/preferences.ui.h:32 +msgid "Show _right margin at:" +msgstr "右マージンを表示する(_R):" -#: ../data/ui/shortcuts.ui.h:33 -msgctxt "shortcut window" -msgid "Push change to left" -msgstr "変更点を左へ適用する" +#: ../meld/resources/ui/preferences.ui.h:33 +msgid "Automatically _break lines at right margin on commit" +msgstr "" -#: ../data/ui/shortcuts.ui.h:34 -msgctxt "shortcut window" -msgid "Push change to right" -msgstr "変更点を右へ適用する" +#: ../meld/resources/ui/preferences.ui.h:34 +msgid "Version Control" +msgstr "バージョン管理" -#: ../data/ui/shortcuts.ui.h:35 -msgctxt "shortcut window" -msgid "Pull change from left" -msgstr "変更点を左から適用する" +#: ../meld/resources/ui/preferences.ui.h:35 +msgid "Filename filters" +msgstr "ファイル名フィルター" -#: ../data/ui/shortcuts.ui.h:36 -msgctxt "shortcut window" -msgid "Pull change from right" -msgstr "変更点を右から適用する" +#: ../meld/resources/ui/preferences.ui.h:36 +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 "" +"フォルダーの比較を行う際、ファイルとフォルダーを名前でフィルタリングできま" +"す。フィルタリングのパターンはそれぞれ、スペースで区切った SHELL 型式のワイル" +"ドカードの並びです。" -#: ../data/ui/shortcuts.ui.h:37 -msgctxt "shortcut window" -msgid "Copy change above left" -msgstr "左の変更点の上にコピーする" +#: ../meld/resources/ui/preferences.ui.h:37 ../meld/meldwindow.py:114 +msgid "File Filters" +msgstr "ファイルフィルター" -#: ../data/ui/shortcuts.ui.h:38 -msgctxt "shortcut window" -msgid "Copy change below left" -msgstr "左の変更点の下にコピーする" +#: ../meld/resources/ui/preferences.ui.h:38 +msgid "Change trimming" +msgstr "変更のトリミング" -#: ../data/ui/shortcuts.ui.h:39 -msgctxt "shortcut window" -msgid "Copy change above right" -msgstr "右の変更点の上にコピーする" +#: ../meld/resources/ui/preferences.ui.h:39 +msgid "Trim blank line differences from the start and end of changes" +msgstr "" +"変更点の始まりと終わりの部分から、空行の差異をハイライトしないように除外する" -#: ../data/ui/shortcuts.ui.h:40 -msgctxt "shortcut window" -msgid "Copy change below right" -msgstr "右の変更点の下にコピーする" +#: ../meld/resources/ui/preferences.ui.h:40 +msgid "Text filters" +msgstr "テキストフィルター" -#: ../data/ui/shortcuts.ui.h:41 -msgctxt "shortcut window" -msgid "Delete change" -msgstr "変更点を削除する" +#: ../meld/resources/ui/preferences.ui.h:41 +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 "" +"ファイルの比較を行う時は、ある種類の変更だけ無視することができます。無視する" +"パターンはそれぞれ Python 形式の正規表現で指定し、その実装は無視する文字列を" +"空の文字列で置き換えるだけです。もし正規表現パターンにグループが含まれていた" +"ら、該当するグループの文字列だけ置き換えます。詳細はユーザーズ・マニュアルを" +"ご覧下さい。" -#: ../data/ui/shortcuts.ui.h:42 -msgctxt "shortcut window" -msgid "Previous comparison pane" -msgstr "前の比較ペイン" +#: ../meld/resources/ui/preferences.ui.h:42 +msgid "Text Filters" +msgstr "テキストフィルター" -#: ../data/ui/shortcuts.ui.h:43 -msgctxt "shortcut window" -msgid "Next comparison pane" -msgstr "次の比較ペイン" +#: ../meld/resources/ui/preferences.ui.h:43 +msgid "Left is remote, right is local" +msgstr "" -#: ../data/ui/shortcuts.ui.h:44 -msgctxt "shortcut window" -msgid "Folder comparison" -msgstr "フォルダーの比較" +#: ../meld/resources/ui/preferences.ui.h:44 +msgid "Left is local, right is remote" +msgstr "" -#: ../data/ui/shortcuts.ui.h:45 -msgctxt "shortcut window" -msgid "Copy to left" -msgstr "左へコピーする" +#: ../meld/resources/ui/preferences.ui.h:45 +msgid "Remote, merge, local" +msgstr "" -#: ../data/ui/shortcuts.ui.h:46 -msgctxt "shortcut window" -msgid "Copy to right" -msgstr "右へコピーする" +#: ../meld/resources/ui/preferences.ui.h:46 +msgid "Local, merge, remote" +msgstr "" -#: ../data/ui/shortcuts.ui.h:47 -msgctxt "shortcut window" -msgid "Version control comparison" -msgstr "バージョン管理の比較" +#: ../meld/resources/ui/preferences.ui.h:47 +msgid "1ns (ext4)" +msgstr "1ナノ秒 (ext4)" -#: ../data/ui/shortcuts.ui.h:48 -msgctxt "shortcut window" -msgid "Commit to version control" -msgstr "バージョン管理へコミットする" +#: ../meld/resources/ui/preferences.ui.h:48 +msgid "100ns (NTFS)" +msgstr "100ナノ秒 (NTFS)" -#: ../data/ui/shortcuts.ui.h:49 -msgctxt "shortcut window" -msgid "Show/hide console output" -msgstr "コンソール出力の表示/非表示" +#: ../meld/resources/ui/preferences.ui.h:49 +msgid "1s (ext2/ext3)" +msgstr "1秒 (ext2/ext3)" -#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:567 -#: ../meld/newdifftab.py:49 -msgid "New comparison" -msgstr "新しい比較" +#: ../meld/resources/ui/preferences.ui.h:50 +msgid "2s (VFAT)" +msgstr "2秒 (VFAT)" -#: ../data/ui/tab-placeholder.ui.h:2 -msgid "File comparison" -msgstr "ファイルの比較" +#: ../meld/resources/ui/push-dialog.ui.h:1 +msgid "Push local commits to remote?" +msgstr "" -#: ../data/ui/tab-placeholder.ui.h:3 -msgid "Directory comparison" -msgstr "フォルダーの比較" +#: ../meld/resources/ui/push-dialog.ui.h:2 +msgid "The commits to be pushed are determined by your version control system." +msgstr "" -#: ../data/ui/tab-placeholder.ui.h:4 -msgid "Version control view" +#: ../meld/resources/ui/push-dialog.ui.h:3 +msgid "_Push commits" msgstr "" -#: ../data/ui/tab-placeholder.ui.h:5 -msgid "_3-way comparison" -msgstr "3つを比較(_3)" +#: ../meld/resources/ui/revert-dialog.ui.h:1 +msgid "Discard unsaved changes to documents?" +msgstr "ドキュメントへの変更を保存せずに破棄しますか?" -#: ../data/ui/tab-placeholder.ui.h:6 -msgid "Select Third File" -msgstr "3番目のファイルを選択" +#: ../meld/resources/ui/revert-dialog.ui.h:2 +msgid "Changes made to the following documents will be permanently lost:" +msgstr "次のドキュメントへの変更は永久に失われます:" -#: ../data/ui/tab-placeholder.ui.h:7 -msgid "Select Second File" -msgstr "2番目のファイルを選択" +#: ../meld/resources/ui/revert-dialog.ui.h:3 +msgid "_Discard" +msgstr "破棄(_D)" -#: ../data/ui/tab-placeholder.ui.h:8 -msgid "Select First File" -msgstr "1番目のファイルを選択" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:1 +msgid "Save changes to documents before closing?" +msgstr "閉じる前にドキュメントへの変更を保存しますか?" -#: ../data/ui/tab-placeholder.ui.h:9 -msgid "Select First Folder" -msgstr "1番目のフォルダーを選択" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:2 +msgid "If you don’t save, changes will be permanently lost." +msgstr "保存しない場合、変更は永久に失われます。" -#: ../data/ui/tab-placeholder.ui.h:10 -msgid "Select Second Folder" -msgstr "2番目のフォルダーを選択" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:3 +msgid "Close _without Saving" +msgstr "保存せずに閉じる(_W)" -#: ../data/ui/tab-placeholder.ui.h:11 -msgid "Select Third Folder" -msgstr "3番目のフォルダーを選択" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:4 ../meld/dirdiff.py:1040 +#: ../meld/iohelpers.py:58 ../meld/iohelpers.py:112 +msgid "_Cancel" +msgstr "キャンセル(_C)" -#: ../data/ui/tab-placeholder.ui.h:12 -msgid "Select A Version-Controlled Folder" -msgstr "" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:5 +msgid "_Save" +msgstr "保存(_S)" -#: ../data/ui/tab-placeholder.ui.h:13 -msgid "_Blank comparison" -msgstr "空の比較(_B)" +#: ../meld/resources/ui/statusbar-menu.ui.h:2 +#, fuzzy +#| msgid "Show w_hitespace" +msgid "Show whitespace" +msgstr "空白や改行を表示する(_H)" -#: ../data/ui/tab-placeholder.ui.h:14 -msgid "C_ompare" -msgstr "比較(_O)" +#: ../meld/resources/ui/statusbar-menu.ui.h:4 +#, fuzzy +#| msgid "Enable text _wrapping" +msgid "Text wrapping" +msgstr "文字列の折り返しを有効にする(_W)" -#: ../data/ui/vcview.ui.h:3 +#: ../meld/resources/ui/vcview.ui.h:3 msgid "Co_mmit…" msgstr "コミット(_M)…" -#: ../data/ui/vcview.ui.h:4 +#: ../meld/resources/ui/vcview.ui.h:4 msgid "Commit changes to version control" msgstr "" -#: ../data/ui/vcview.ui.h:5 +#: ../meld/resources/ui/vcview.ui.h:5 msgid "_Update" msgstr "" -#: ../data/ui/vcview.ui.h:6 +#: ../meld/resources/ui/vcview.ui.h:6 msgid "Update working copy from version control" msgstr "" -#: ../data/ui/vcview.ui.h:7 +#: ../meld/resources/ui/vcview.ui.h:7 msgid "_Push" msgstr "" -#: ../data/ui/vcview.ui.h:8 +#: ../meld/resources/ui/vcview.ui.h:8 msgid "Push local changes to remote" msgstr "" -#: ../data/ui/vcview.ui.h:10 +#: ../meld/resources/ui/vcview.ui.h:10 msgid "Add to version control" msgstr "" -#: ../data/ui/vcview.ui.h:12 +#: ../meld/resources/ui/vcview.ui.h:12 msgid "Remove from version control" msgstr "" -#: ../data/ui/vcview.ui.h:13 +#: ../meld/resources/ui/vcview.ui.h:13 msgid "Mar_k as Resolved" msgstr "" -#: ../data/ui/vcview.ui.h:14 +#: ../meld/resources/ui/vcview.ui.h:14 msgid "Mark as resolved in version control" msgstr "" -#: ../data/ui/vcview.ui.h:15 +#: ../meld/resources/ui/vcview.ui.h:15 msgid "Re_vert" msgstr "" -#: ../data/ui/vcview.ui.h:16 +#: ../meld/resources/ui/vcview.ui.h:16 msgid "Revert working copy to original state" msgstr "" -#: ../data/ui/vcview.ui.h:17 +#: ../meld/resources/ui/vcview.ui.h:17 msgid "Delete from working copy" msgstr "" -#: ../data/ui/vcview.ui.h:18 +#: ../meld/resources/ui/vcview.ui.h:18 msgid "Console" msgstr "コンソール" -#: ../data/ui/vcview.ui.h:19 +#: ../meld/resources/ui/vcview.ui.h:19 msgid "Show or hide the version control console output pane" msgstr "" -#: ../data/ui/vcview.ui.h:20 +#: ../meld/resources/ui/vcview.ui.h:20 msgid "_Flatten" msgstr "" -#: ../data/ui/vcview.ui.h:21 +#: ../meld/resources/ui/vcview.ui.h:21 msgid "Flatten directories" msgstr "" -#: ../data/ui/vcview.ui.h:22 +#: ../meld/resources/ui/vcview.ui.h:22 msgid "_Modified" msgstr "" -#: ../data/ui/vcview.ui.h:23 +#: ../meld/resources/ui/vcview.ui.h:23 msgid "Show modified files" msgstr "" -#: ../data/ui/vcview.ui.h:24 +#: ../meld/resources/ui/vcview.ui.h:24 msgid "_Normal" msgstr "" -#: ../data/ui/vcview.ui.h:25 +#: ../meld/resources/ui/vcview.ui.h:25 msgid "Show normal files" msgstr "" -#: ../data/ui/vcview.ui.h:26 +#: ../meld/resources/ui/vcview.ui.h:26 msgid "Un_versioned" msgstr "" -#: ../data/ui/vcview.ui.h:27 +#: ../meld/resources/ui/vcview.ui.h:27 msgid "Show unversioned files" msgstr "" -#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69 +#: ../meld/resources/ui/vcview.ui.h:28 ../meld/vc/_vc.py:70 msgid "Ignored" msgstr "" -#: ../data/ui/vcview.ui.h:29 +#: ../meld/resources/ui/vcview.ui.h:29 msgid "Show ignored files" msgstr "" -#: ../data/ui/vcview.ui.h:30 -msgid "Commit" -msgstr "" - -#: ../data/ui/vcview.ui.h:31 -msgid "Commit Files" -msgstr "" - -#: ../data/ui/vcview.ui.h:32 -msgid "Log Message" -msgstr "" - -#: ../data/ui/vcview.ui.h:33 -msgid "Previous logs:" -msgstr "" - -#: ../data/ui/vcview.ui.h:34 -msgid "Co_mmit" -msgstr "" - -#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:331 +#: ../meld/resources/ui/vcview.ui.h:31 ../meld/vcview.py:366 msgid "Location" msgstr "" -#: ../data/ui/vcview.ui.h:37 +#: ../meld/resources/ui/vcview.ui.h:32 msgid "Status" msgstr "" -#: ../data/ui/vcview.ui.h:38 +#: ../meld/resources/ui/vcview.ui.h:33 msgid "Extra" msgstr "" -#: ../data/ui/vcview.ui.h:39 +#: ../meld/resources/ui/vcview.ui.h:34 msgid "Console output" msgstr "コンソール出力" -#: ../data/ui/vcview.ui.h:40 -msgid "Push local commits to remote?" -msgstr "" - -#: ../data/ui/vcview.ui.h:41 -msgid "The commits to be pushed are determined by your version control system." -msgstr "" - -#: ../data/ui/vcview.ui.h:42 -msgid "_Push commits" -msgstr "" - #: ../meld/const.py:12 msgid "UNIX (LF)" msgstr "" @@ -1634,44 +1645,44 @@ msgid "Mac OS (CR)" msgstr "" #. Create file size CellRenderer -#: ../meld/dirdiff.py:428 ../meld/preferences.py:81 +#: ../meld/dirdiff.py:476 ../meld/preferences.py:138 msgid "Size" msgstr "サイズ" #. Create date-time CellRenderer -#: ../meld/dirdiff.py:436 ../meld/preferences.py:82 +#: ../meld/dirdiff.py:484 ../meld/preferences.py:139 msgid "Modification time" msgstr "更新日時" #. Create permissions CellRenderer -#: ../meld/dirdiff.py:444 ../meld/preferences.py:83 +#: ../meld/dirdiff.py:492 ../meld/preferences.py:140 msgid "Permissions" msgstr "アクセス権" -#: ../meld/dirdiff.py:575 +#: ../meld/dirdiff.py:626 #, python-format msgid "Hide %s" msgstr "%s の表示を切り替えます" -#: ../meld/dirdiff.py:716 ../meld/dirdiff.py:739 +#: ../meld/dirdiff.py:768 ../meld/dirdiff.py:791 #, python-format msgid "[%s] Scanning %s" msgstr "[%s] %s をスキャン中" -#: ../meld/dirdiff.py:874 +#: ../meld/dirdiff.py:926 #, python-format msgid "[%s] Done" msgstr "[%s] 完了" -#: ../meld/dirdiff.py:882 +#: ../meld/dirdiff.py:934 msgid "Folders have no differences" msgstr "フォルダーに差異はありません" -#: ../meld/dirdiff.py:884 +#: ../meld/dirdiff.py:936 msgid "Contents of scanned files in folders are identical." msgstr "フォルダー内のスキャンされたファイルの内容は同一です。" -#: ../meld/dirdiff.py:886 +#: ../meld/dirdiff.py:938 msgid "" "Scanned files in folders appear identical, but contents have not been " "scanned." @@ -1679,44 +1690,44 @@ msgstr "" "フォルダー内のスキャンされたファイルは同一のように見えますが、内容はスキャン" "されていません。" -#: ../meld/dirdiff.py:889 +#: ../meld/dirdiff.py:941 msgid "File filters are in use, so not all files have been scanned." msgstr "" "ファイルフィルターが使用されているため、すべてのファイルがスキャンされたわけ" "ではありません。" -#: ../meld/dirdiff.py:891 +#: ../meld/dirdiff.py:943 msgid "Text filters are in use and may be masking content differences." msgstr "" "テキストフィルターが使用されているため、内容の差異が遮蔽されている可能性があ" "ります。" -#: ../meld/dirdiff.py:909 ../meld/filediff.py:1499 ../meld/filediff.py:1529 -#: ../meld/filediff.py:1531 ../meld/ui/msgarea.py:106 ../meld/ui/msgarea.py:119 +#: ../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 msgid "Hi_de" msgstr "隠す(_D)" -#: ../meld/dirdiff.py:918 +#: ../meld/dirdiff.py:970 msgid "Multiple errors occurred while scanning this folder" msgstr "このフォルダーの走査中に複数回のエラーが発生しました" -#: ../meld/dirdiff.py:919 +#: ../meld/dirdiff.py:971 msgid "Files with invalid encodings found" msgstr "間違ったエンコーディングを持つファイルが見つかりました" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:921 +#: ../meld/dirdiff.py:973 msgid "Some files were in an incorrect encoding. The names are something like:" msgstr "" "いくつかのファイルが間違ったエンコーディングを持っていました (次のようなファ" "イル名です):" -#: ../meld/dirdiff.py:923 +#: ../meld/dirdiff.py:975 msgid "Files hidden by case insensitive comparison" msgstr "大/小文字を区別せずに比較したファイルの一覧" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:925 +#: ../meld/dirdiff.py:977 msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. The following files in this folder are hidden:" @@ -1724,17 +1735,17 @@ msgstr "" "大/小文字を区別するファイルシステム上で大/小文字を無視した比較を行っていま" "す。このフォルダーでは次のファイルは表示されません:" -#: ../meld/dirdiff.py:936 +#: ../meld/dirdiff.py:988 #, python-format msgid "“%s” hidden by “%s”" msgstr "“%s”は“%s”によって隠されています" -#: ../meld/dirdiff.py:992 +#: ../meld/dirdiff.py:1044 #, python-format msgid "Replace folder “%s”?" msgstr "“%s”を置き換えますか?" -#: ../meld/dirdiff.py:994 +#: ../meld/dirdiff.py:1046 #, python-format msgid "" "Another folder with the same name already exists in “%s”.\n" @@ -1743,11 +1754,11 @@ msgstr "" "“%s”に同じ名前の別のフォルダーがすでに存在します。\n" "フォルダーを置き換えると、既存のファイルはすべて失われます。" -#: ../meld/dirdiff.py:1007 +#: ../meld/dirdiff.py:1059 msgid "Error copying file" msgstr "ファイルのコピーエラー" -#: ../meld/dirdiff.py:1008 +#: ../meld/dirdiff.py:1060 #, python-format msgid "" "Couldn’t copy %s\n" @@ -1760,19 +1771,19 @@ msgstr "" "コピー先: %s\n" "%s" -#: ../meld/dirdiff.py:1033 ../meld/vcview.py:703 +#: ../meld/dirdiff.py:1085 ../meld/vcview.py:720 msgid "Error deleting {}" msgstr "{} の削除中にエラーが発生しました" -#: ../meld/dirdiff.py:1546 +#: ../meld/dirdiff.py:1597 msgid "No folder" msgstr "" -#: ../meld/filediff.py:834 +#: ../meld/filediff.py:920 msgid "Comparison results will be inaccurate" msgstr "比較結果は不正確です" -#: ../meld/filediff.py:836 +#: ../meld/filediff.py:922 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1780,65 +1791,65 @@ msgstr "" "フィルターがファイル内の行数を変更しましたが、サポートされていないため、比較" "は正確ではありません。" -#: ../meld/filediff.py:905 +#: ../meld/filediff.py:994 msgid "Mark conflict as resolved?" msgstr "衝突箇所を解決済みとしてマークしますか?" -#: ../meld/filediff.py:907 +#: ../meld/filediff.py:996 msgid "" "If the conflict was resolved successfully, you may mark it as resolved now." msgstr "" "衝突箇所の解決に成功した場合は、解決済みとしてマークすることができます。" -#: ../meld/filediff.py:909 +#: ../meld/filediff.py:998 msgid "Cancel" msgstr "キャンセル" -#: ../meld/filediff.py:910 +#: ../meld/filediff.py:999 msgid "Mark _Resolved" msgstr "解決済みとしてマーク(_R)" -#: ../meld/filediff.py:1214 +#: ../meld/filediff.py:1318 #, python-format msgid "There was a problem opening the file “%s”." msgstr "“%s”を開く際に問題が発生しました。" -#: ../meld/filediff.py:1222 +#: ../meld/filediff.py:1326 #, python-format msgid "File %s appears to be a binary file." msgstr "%s はバイナリファイルのようです。" -#: ../meld/filediff.py:1224 +#: ../meld/filediff.py:1328 msgid "Do you want to open the file using the default application?" msgstr "デフォルトのアプリケーションを使用してファイルを開きますか?" -#: ../meld/filediff.py:1226 +#: ../meld/filediff.py:1330 msgid "Open" msgstr "開く" -#: ../meld/filediff.py:1242 +#: ../meld/filediff.py:1346 #, python-format msgid "[%s] Computing differences" msgstr "[%s] 差分の計算中" -#: ../meld/filediff.py:1303 +#: ../meld/filediff.py:1407 #, python-format msgid "File %s has changed on disk" msgstr "%s はディスク上で変更されました" -#: ../meld/filediff.py:1304 +#: ../meld/filediff.py:1408 msgid "Do you want to reload the file?" msgstr "ファイルを再読み込みしますか?" -#: ../meld/filediff.py:1306 +#: ../meld/filediff.py:1410 msgid "_Reload" msgstr "再読み込み(_R)" -#: ../meld/filediff.py:1462 +#: ../meld/filediff.py:1566 msgid "Files are identical" msgstr "同一のファイルです" -#: ../meld/filediff.py:1475 +#: ../meld/filediff.py:1579 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1846,11 +1857,11 @@ msgstr "" "テキストフィルターを使用しているため、ファイル間に違いが生じる場合がありま" "す。フィルタリングせずに比較しますか?" -#: ../meld/filediff.py:1480 +#: ../meld/filediff.py:1584 msgid "Files differ in line endings only" msgstr "ファイルは行末のみが異なります" -#: ../meld/filediff.py:1482 +#: ../meld/filediff.py:1586 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1859,15 +1870,15 @@ msgstr "" "改行コード以外のファイルの内容は同一です:\n" "%s" -#: ../meld/filediff.py:1502 +#: ../meld/filediff.py:1606 msgid "Show without filters" msgstr "フィルター無しで表示する" -#: ../meld/filediff.py:1524 +#: ../meld/filediff.py:1628 msgid "Change highlighting incomplete" msgstr "変更点のハイライトが不完全です" -#: ../meld/filediff.py:1525 +#: ../meld/filediff.py:1629 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." @@ -1875,61 +1886,63 @@ msgstr "" "変更点が多すぎるため、一部がハイライトされませんでした。Meld にハイライトを強" "制することができますが、大きな変更点をハイライトするには時間がかかります。" -#: ../meld/filediff.py:1533 +#: ../meld/filediff.py:1637 msgid "Keep highlighting" msgstr "ハイライトを続ける" -#: ../meld/filediff.py:1535 +#: ../meld/filediff.py:1639 msgid "_Keep highlighting" msgstr "ハイライトを続ける(_K)" -#: ../meld/filediff.py:1548 +#: ../meld/filediff.py:1652 msgid "Saving failed" msgstr "保存に失敗しました" -#: ../meld/filediff.py:1549 +#: ../meld/filediff.py:1653 msgid "" "Please consider copying any critical changes to another program or file to " "avoid data loss." -msgstr "データの喪失を防ぐために、他のファイルやプログラムに重要な変更点を保存することを検討してください。" +msgstr "" +"データの喪失を防ぐために、他のファイルやプログラムに重要な変更点を保存するこ" +"とを検討してください。" -#: ../meld/filediff.py:1558 +#: ../meld/filediff.py:1662 msgid "Save Left Pane As" msgstr "左のペインを別名で保存" -#: ../meld/filediff.py:1560 +#: ../meld/filediff.py:1664 msgid "Save Middle Pane As" msgstr "中央のペインを別名で保存" -#: ../meld/filediff.py:1562 +#: ../meld/filediff.py:1666 msgid "Save Right Pane As" msgstr "右のペインを別名で保存" -#: ../meld/filediff.py:1575 +#: ../meld/filediff.py:1679 #, python-format msgid "File %s has changed on disk since it was opened" msgstr "%s は開かれた後にディスク上で変更されました" -#: ../meld/filediff.py:1577 +#: ../meld/filediff.py:1681 msgid "If you save it, any external changes will be lost." msgstr "保存すると、外部からの変更は失われます。" -#: ../meld/filediff.py:1580 +#: ../meld/filediff.py:1684 msgid "Save Anyway" msgstr "とにかく保存する" -#: ../meld/filediff.py:1581 +#: ../meld/filediff.py:1685 msgid "Don’t Save" msgstr "保存しない" -#: ../meld/filediff.py:1623 +#: ../meld/filediff.py:1727 msgid "" "File “{}” contains characters that can’t be encoded using its current " "encoding “{}”." msgstr "" "“{}”には現在のエンコーディング“{}”でエンコードできない文字が含まれています。" -#: ../meld/filediff.py:1627 ../meld/patchdialog.py:131 +#: ../meld/filediff.py:1731 ../meld/patchdialog.py:144 #, python-format msgid "" "Couldn’t save file due to:\n" @@ -1938,16 +1951,16 @@ msgstr "" "次の理由によりファイルを保存できませんでした:\n" "%s" -#: ../meld/filediff.py:1631 ../meld/patchdialog.py:130 +#: ../meld/filediff.py:1735 ../meld/patchdialog.py:143 #, python-format msgid "Could not save file %s." msgstr "%s を保存できませんでした。" -#: ../meld/filediff.py:2014 +#: ../meld/filediff.py:2128 msgid "Live comparison updating disabled" msgstr "比較のライブアップデートは無効です" -#: ../meld/filediff.py:2015 +#: ../meld/filediff.py:2129 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -1962,40 +1975,40 @@ msgstr "" msgid "[%s] Merging files" msgstr "[%s] ファイルをマージ中" -#: ../meld/gutterrendererchunk.py:216 +#: ../meld/gutterrendererchunk.py:220 msgid "Copy _up" msgstr "上にコピー(_U)" -#: ../meld/gutterrendererchunk.py:217 +#: ../meld/gutterrendererchunk.py:221 msgid "Copy _down" msgstr "下にコピー(_D)" -#: ../meld/iohelpers.py:41 +#: ../meld/iohelpers.py:43 msgid "Deleting remote folders is not supported" msgstr "" -#: ../meld/iohelpers.py:43 +#: ../meld/iohelpers.py:45 msgid "Not a file or directory" msgstr "ファイルやフォルダーではありません" -#: ../meld/iohelpers.py:47 +#: ../meld/iohelpers.py:49 msgid "“{}” can’t be put in the trash. Do you want to delete it immediately?" msgstr "“{}”はゴミ箱に移動できません。ただちに削除しますか?" -#: ../meld/iohelpers.py:52 +#: ../meld/iohelpers.py:54 msgid "This remote location does not support sending items to the trash." msgstr "" -#: ../meld/iohelpers.py:57 +#: ../meld/iohelpers.py:59 msgid "_Delete Permanently" msgstr "永久に削除(_D)" -#: ../meld/iohelpers.py:100 +#: ../meld/iohelpers.py:106 #, python-format msgid "Replace file “%s”?" msgstr "“%s”を置き換えますか?" -#: ../meld/iohelpers.py:102 +#: ../meld/iohelpers.py:108 #, python-format msgid "" "A file with this name already exists in “%s”.\n" @@ -2004,313 +2017,277 @@ msgstr "" "“%s”に同じ名前のファイルがすでに存在します。\n" "ファイルを置き換えると、既存の内容は失われます。" -#: ../meld/meldapp.py:181 +#: ../meld/meldapp.py:169 msgid "wrong number of arguments supplied to --diff" msgstr "--diff オプションに対する引数の数が間違っています" -#: ../meld/meldapp.py:186 +#: ../meld/meldapp.py:174 msgid "Start with an empty window" msgstr "空のウィンドウで起動する" -#: ../meld/meldapp.py:187 ../meld/meldapp.py:189 +#: ../meld/meldapp.py:175 ../meld/meldapp.py:177 msgid "file" msgstr "ファイル" -#: ../meld/meldapp.py:187 ../meld/meldapp.py:191 +#: ../meld/meldapp.py:175 ../meld/meldapp.py:179 msgid "folder" msgstr "フォルダー" -#: ../meld/meldapp.py:188 +#: ../meld/meldapp.py:176 msgid "Start a version control comparison" msgstr "バージョン管理の比較モードで起動する" -#: ../meld/meldapp.py:190 +#: ../meld/meldapp.py:178 msgid "Start a 2- or 3-way file comparison" msgstr "2つ、または3つのファイルを比較するモードで起動する" -#: ../meld/meldapp.py:192 +#: ../meld/meldapp.py:180 msgid "Start a 2- or 3-way folder comparison" msgstr "2つ、または3つのフォルダーを比較するモードで起動する" -#: ../meld/meldapp.py:235 +#: ../meld/meldapp.py:223 #, python-format msgid "Error: %s\n" msgstr "エラー: %s\n" -#: ../meld/meldapp.py:242 +#: ../meld/meldapp.py:230 msgid "Meld is a file and directory comparison tool." msgstr "Meld はファイルとフォルダーの内容を比較するツールです。" -#: ../meld/meldapp.py:246 +#: ../meld/meldapp.py:234 msgid "Set label to use instead of file name" msgstr "ファイル名の代わりに使用するラベルを指定する" -#: ../meld/meldapp.py:249 +#: ../meld/meldapp.py:237 msgid "Open a new tab in an already running instance" msgstr "すでに実行中のインスタンスで新しいタブを開く" -#: ../meld/meldapp.py:252 +#: ../meld/meldapp.py:240 msgid "Automatically compare all differing files on startup" msgstr "起動時にファイルの中にあるすべての差分を自動的に検出する" -#: ../meld/meldapp.py:255 +#: ../meld/meldapp.py:243 msgid "Ignored for compatibility" msgstr "" -#: ../meld/meldapp.py:259 +#: ../meld/meldapp.py:247 msgid "Set the target file for saving a merge result" msgstr "マージした結果を保存するファイル名を指定する" -#: ../meld/meldapp.py:262 +#: ../meld/meldapp.py:250 msgid "Automatically merge files" msgstr "自動的にファイルをマージする" -#: ../meld/meldapp.py:266 +#: ../meld/meldapp.py:254 msgid "Load a saved comparison from a Meld comparison file" msgstr "" -#: ../meld/meldapp.py:270 +#: ../meld/meldapp.py:258 msgid "Create a diff tab for the supplied files or folders" msgstr "" -#: ../meld/meldapp.py:290 +#: ../meld/meldapp.py:278 #, python-format msgid "too many arguments (wanted 0-3, got %d)" msgstr "" "引数が多すぎます (有効な数は 0 〜 3 ですが %d 個の引数を受け取りました)" -#: ../meld/meldapp.py:293 +#: ../meld/meldapp.py:281 msgid "can’t auto-merge less than 3 files" msgstr "3つ未満のファイルはオートマージできません" -#: ../meld/meldapp.py:295 +#: ../meld/meldapp.py:283 msgid "can’t auto-merge directories" msgstr "ディレクトリはオートマージできません" -#: ../meld/meldapp.py:309 +#: ../meld/meldapp.py:297 msgid "Error reading saved comparison file" msgstr "保存された比較ファイルの読み込みエラー" -#: ../meld/meldapp.py:326 +#: ../meld/meldapp.py:314 #, python-format msgid "invalid path or URI “%s”" msgstr "無効なパスまたは URI “%s”" -#: ../meld/meldapp.py:332 +#: ../meld/meldapp.py:320 msgid "remote folder “{}” not supported" msgstr "" #. TRANSLATORS: This is the label of a new, currently-unnamed file. -#: ../meld/meldbuffer.py:124 +#: ../meld/meldbuffer.py:123 msgid "" msgstr "<名前なし>" -#: ../meld/melddoc.py:68 +#: ../meld/melddoc.py:63 msgid "untitled" msgstr "タイトルなし" -#: ../meld/meldwindow.py:47 +#: ../meld/meldwindow.py:56 msgid "_File" msgstr "ファイル(_F)" -#: ../meld/meldwindow.py:48 +#: ../meld/meldwindow.py:57 msgid "_New Comparison…" msgstr "新しい比較(_N)…" -#: ../meld/meldwindow.py:49 +#: ../meld/meldwindow.py:58 msgid "Start a new comparison" msgstr "新しい比較を開始します" -#: ../meld/meldwindow.py:52 +#: ../meld/meldwindow.py:61 msgid "Save the current file" msgstr "このファイルを保存します" -#: ../meld/meldwindow.py:54 +#: ../meld/meldwindow.py:63 msgid "Save As…" msgstr "別名で保存…" -#: ../meld/meldwindow.py:55 +#: ../meld/meldwindow.py:64 msgid "Save the current file with a different name" msgstr "このファイルを別の名前で保存します" -#: ../meld/meldwindow.py:58 +#: ../meld/meldwindow.py:67 msgid "Close the current file" msgstr "このファイルを閉じます" -#: ../meld/meldwindow.py:61 +#: ../meld/meldwindow.py:70 msgid "_Edit" msgstr "編集(_E)" -#: ../meld/meldwindow.py:63 +#: ../meld/meldwindow.py:72 msgid "Undo the last action" msgstr "最後に適用したアクションに戻します" -#: ../meld/meldwindow.py:66 +#: ../meld/meldwindow.py:75 msgid "Redo the last undone action" msgstr "最後に適用したアクションをやり直します" -#: ../meld/meldwindow.py:68 +#: ../meld/meldwindow.py:77 msgid "Cut the selection" msgstr "選択範囲を切り取ります" -#: ../meld/meldwindow.py:70 +#: ../meld/meldwindow.py:79 msgid "Copy the selection" msgstr "選択範囲をコピーします" -#: ../meld/meldwindow.py:72 +#: ../meld/meldwindow.py:81 msgid "Paste the clipboard" msgstr "クリップボードの内容を貼り付けます" -#: ../meld/meldwindow.py:74 +#: ../meld/meldwindow.py:83 msgid "Find…" msgstr "検索…" -#: ../meld/meldwindow.py:74 +#: ../meld/meldwindow.py:83 msgid "Search for text" msgstr "検索する文字列" -#: ../meld/meldwindow.py:76 +#: ../meld/meldwindow.py:85 msgid "Find Ne_xt" msgstr "次を検索(_X)" -#: ../meld/meldwindow.py:77 +#: ../meld/meldwindow.py:86 msgid "Search forwards for the same text" msgstr "同じ文字列を前方検索します" -#: ../meld/meldwindow.py:79 +#: ../meld/meldwindow.py:88 msgid "Find _Previous" msgstr "前を検索(_P)" -#: ../meld/meldwindow.py:80 +#: ../meld/meldwindow.py:89 msgid "Search backwards for the same text" msgstr "同じ文字列を後方検索します" -#: ../meld/meldwindow.py:83 +#: ../meld/meldwindow.py:92 msgid "_Replace…" msgstr "置換(_R)…" -#: ../meld/meldwindow.py:84 +#: ../meld/meldwindow.py:93 msgid "Find and replace text" msgstr "文字列を検索して置換します" -#: ../meld/meldwindow.py:86 +#: ../meld/meldwindow.py:95 msgid "Go to _Line" msgstr "指定行へ移動(_L)" -#: ../meld/meldwindow.py:87 +#: ../meld/meldwindow.py:96 msgid "Go to a specific line" msgstr "指定した行へ移動します" -#: ../meld/meldwindow.py:90 +#: ../meld/meldwindow.py:99 msgid "_Changes" msgstr "変更点(_C)" -#: ../meld/meldwindow.py:91 +#: ../meld/meldwindow.py:100 msgid "Next Change" msgstr "次の変更点" -#: ../meld/meldwindow.py:92 +#: ../meld/meldwindow.py:101 msgid "Go to the next change" msgstr "次の変更点へジャンプします" -#: ../meld/meldwindow.py:94 +#: ../meld/meldwindow.py:103 msgid "Previous Change" msgstr "前の変更点" -#: ../meld/meldwindow.py:95 +#: ../meld/meldwindow.py:104 msgid "Go to the previous change" msgstr "前の変更点へジャンプします" -#: ../meld/meldwindow.py:97 +#: ../meld/meldwindow.py:106 msgid "Open Externally" msgstr "別のアプリで開く" -#: ../meld/meldwindow.py:98 +#: ../meld/meldwindow.py:107 msgid "Open selected file or directory in the default external application" msgstr "選択したファイルやフォルダーをデフォルトのアプリケーションで開きます" -#: ../meld/meldwindow.py:102 +#: ../meld/meldwindow.py:111 msgid "_View" msgstr "表示(_V)" -#: ../meld/meldwindow.py:103 +#: ../meld/meldwindow.py:112 msgid "File Status" msgstr "ファイルの状態" -#: ../meld/meldwindow.py:104 +#: ../meld/meldwindow.py:113 msgid "Version Status" msgstr "バージョンの状態" -#: ../meld/meldwindow.py:107 +#: ../meld/meldwindow.py:116 msgid "Stop the current action" msgstr "現在適用中のアクションを停止します" -#: ../meld/meldwindow.py:110 +#: ../meld/meldwindow.py:119 msgid "Refresh the view" msgstr "表示を更新します" -#: ../meld/meldwindow.py:114 +#: ../meld/meldwindow.py:123 msgid "Fullscreen" msgstr "フルスクリーン" -#: ../meld/meldwindow.py:115 +#: ../meld/meldwindow.py:124 msgid "View the comparison in fullscreen" msgstr "比較状況をフルスクリーンで表示します" -#: ../meld/meldwindow.py:117 -msgid "_Toolbar" -msgstr "ツールバー(_T)" - -#: ../meld/meldwindow.py:118 -msgid "Show or hide the toolbar" -msgstr "ツールバーを表示または非表示にします" - -#: ../meld/meldwindow.py:127 +#: ../meld/meldwindow.py:133 msgid "Open Recent" msgstr "最近の比較" -#: ../meld/meldwindow.py:128 +#: ../meld/meldwindow.py:134 msgid "Open recent files" msgstr "最近のファイルを開きます" -#: ../meld/meldwindow.py:150 -msgid "_Meld" -msgstr "Meld(_M)" - -#: ../meld/meldwindow.py:151 -msgid "Quit the program" -msgstr "プログラムを終了します" - -#: ../meld/meldwindow.py:153 -msgid "Prefere_nces" -msgstr "設定(_N)" - -#: ../meld/meldwindow.py:154 -msgid "Configure the application" -msgstr "Meld を設定します" - -#: ../meld/meldwindow.py:156 -msgid "_Contents" -msgstr "目次(_C)" - -#: ../meld/meldwindow.py:157 -msgid "Open the Meld manual" -msgstr "Meld のマニュアルを開きます" - -#: ../meld/meldwindow.py:159 -msgid "About this application" -msgstr "このアプリケーションについて" - -#: ../meld/meldwindow.py:602 +#: ../meld/meldwindow.py:567 #, python-format msgid "Need three files to auto-merge, got: %r" msgstr "オートマージには3つのファイルが必要です: %r" -#: ../meld/meldwindow.py:623 +#: ../meld/meldwindow.py:588 msgid "Cannot compare a mixture of files and directories" msgstr "ファイルとフォルダーの間での比較はできません" -#: ../meld/misc.py:135 +#: ../meld/misc.py:155 msgid "" "{}\n" "\n" @@ -2322,53 +2299,49 @@ msgstr "" "Meld の実行中に致命的なエラーが発生しました:\n" "{}" -#: ../meld/misc.py:254 +#: ../meld/misc.py:237 #, python-format msgid "Couldn’t find colour scheme details for %s-%s; this is a bad install" msgstr "" "%s-%s のカラースキーマの詳細が見つかりませんでした。これはインストールが正常" "ではありません。" -#: ../meld/misc.py:325 +#: ../meld/misc.py:311 msgid "[None]" msgstr "[なし]" -#: ../meld/preferences.py:33 +#: ../meld/preferences.py:42 ../meld/preferences.py:135 msgid "label" msgstr "(新しい名前)" -#: ../meld/preferences.py:33 +#: ../meld/preferences.py:42 ../meld/preferences.py:135 msgid "pattern" msgstr "(新しいパターン)" -#: ../meld/recent.py:105 +#: ../meld/recent.py:106 msgid "Version control:" msgstr "バージョン管理:" -#: ../meld/ui/bufferselectors.py:32 +#: ../meld/ui/bufferselectors.py:114 #, python-brace-format msgid "{name} ({charset})" msgstr "" -#: ../meld/ui/bufferselectors.py:65 ../meld/ui/bufferselectors.py:73 +#: ../meld/ui/bufferselectors.py:144 ../meld/ui/bufferselectors.py:152 msgid "Plain Text" msgstr "プレーンテキスト" -#: ../meld/ui/notebooklabel.py:63 -msgid "Close tab" -msgstr "タブを閉じる" - #. 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 "(%i行、%i列)" -#: ../meld/ui/statusbar.py:177 +#: ../meld/ui/statusbar.py:182 msgid "Line you want to move the cursor to" msgstr "" -#: ../meld/ui/vcdialogs.py:48 +#: ../meld/ui/vcdialogs.py:55 msgid "No files will be committed" msgstr "" @@ -2417,152 +2390,194 @@ msgstr "なし" msgid "Rev %s" msgstr "" -#: ../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:70 +#: ../meld/vc/_vc.py:71 msgid "Unversioned" msgstr "" -#: ../meld/vc/_vc.py:73 +#: ../meld/vc/_vc.py:74 msgid "Error" msgstr "" -#: ../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 "" #. Translators: This error message is shown when a version #. control binary isn't installed. -#: ../meld/vcview.py:248 +#: ../meld/vcview.py:282 #, python-format msgid "%(name)s (%(cmd)s not installed)" msgstr "" #. Translators: This error message is shown when a version #. controlled repository is invalid. -#: ../meld/vcview.py:252 +#: ../meld/vcview.py:286 #, python-format msgid "%(name)s (Invalid repository)" msgstr "" -#: ../meld/vcview.py:273 +#: ../meld/vcview.py:307 msgid "No valid version control system found in this folder" msgstr "" -#: ../meld/vcview.py:275 +#: ../meld/vcview.py:309 msgid "Only one version control system found in this folder" msgstr "" -#: ../meld/vcview.py:277 +#: ../meld/vcview.py:311 msgid "Choose which version control system to use" msgstr "" #. TRANSLATORS: This is the location of the directory being viewed -#: ../meld/vcview.py:331 +#: ../meld/vcview.py:366 #, python-format msgid "%s: %s" msgstr "" #. Initial yield so when we add this to our tasks, we don't #. create iterators that may be invalidated. -#: ../meld/vcview.py:338 +#: ../meld/vcview.py:373 msgid "Scanning repository" msgstr "" -#: ../meld/vcview.py:367 +#: ../meld/vcview.py:402 #, python-format msgid "Scanning %s" msgstr "%s をスキャン中" -#: ../meld/vcview.py:406 +#: ../meld/vcview.py:441 msgid "(Empty)" msgstr "(空)" -#: ../meld/vcview.py:450 +#: ../meld/vcview.py:487 #, python-format msgid "%s — local" msgstr "" -#: ../meld/vcview.py:451 +#: ../meld/vcview.py:488 #, python-format msgid "%s — remote" msgstr "" -#: ../meld/vcview.py:459 +#: ../meld/vcview.py:496 #, python-format msgid "%s (local, merge, remote)" msgstr "" -#: ../meld/vcview.py:464 +#: ../meld/vcview.py:501 #, python-format msgid "%s (remote, merge, local)" msgstr "" -#: ../meld/vcview.py:475 +#: ../meld/vcview.py:512 #, python-format msgid "%s — repository" msgstr "" -#: ../meld/vcview.py:481 +#: ../meld/vcview.py:518 #, python-format msgid "%s (working, repository)" msgstr "" -#: ../meld/vcview.py:485 +#: ../meld/vcview.py:522 #, python-format msgid "%s (repository, working)" msgstr "" -#: ../meld/vcview.py:674 +#: ../meld/vcview.py:688 msgid "Remove folder and all its files?" msgstr "" -#: ../meld/vcview.py:676 +#: ../meld/vcview.py:690 msgid "" "This will remove all selected files and folders, and all files within any " "selected folders, from version control." msgstr "" -#: ../meld/vcview.py:785 +#: ../meld/vcview.py:804 msgid "Clear" msgstr "" -#~ msgid "Preferences" -#~ msgstr "設定" +#~ msgid "Show toolbar" +#~ msgstr "ツールバーを表示する" + +#~ msgid "If true, the window toolbar is visible." +#~ msgstr "true の場合、ウィンドウにツールバーが表示されます。" + +#~ msgid "Show statusbar" +#~ msgstr "ステータスバーを表示する" + +#~ msgid "If true, the window statusbar is visible." +#~ msgstr "true の場合、ウィンドウにステータスバーが表示されます。" + +#~ msgid "Editable List" +#~ msgstr "編集可能なリスト" + +#~ msgid "Meld Preferences" +#~ msgstr "Meld の設定" + +#~ msgid "_Toolbar" +#~ msgstr "ツールバー(_T)" + +#~ msgid "Show or hide the toolbar" +#~ msgstr "ツールバーを表示または非表示にします" + +#~ msgid "_Meld" +#~ msgstr "Meld(_M)" + +#~ msgid "Quit the program" +#~ msgstr "プログラムを終了します" + +#~ msgid "Prefere_nces" +#~ msgstr "設定(_N)" + +#~ msgid "Configure the application" +#~ msgstr "Meld を設定します" + +#~ msgid "_Contents" +#~ msgstr "目次(_C)" + +#~ msgid "Open the Meld manual" +#~ msgstr "Meld のマニュアルを開きます" + +#~ msgid "About this application" +#~ msgstr "このアプリケーションについて" #~ msgid "Format as Patch..." #~ msgstr "パッチを生成..." From 636a513ba9abd9299ea702eb9ead7d376fd98cc4 Mon Sep 17 00:00:00 2001 From: Ryuta Fujii Date: Tue, 22 Jan 2019 13:01:44 +0000 Subject: [PATCH 0812/1316] Update Japanese translation --- po/ja.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/ja.po b/po/ja.po index a3b0d836..c4d0850b 100644 --- a/po/ja.po +++ b/po/ja.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: meld master\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n" -"POT-Creation-Date: 2019-01-22 11:04+0000\n" -"PO-Revision-Date: 2019-01-22 20:11+0900\n" +"POT-Creation-Date: 2019-01-22 11:13+0000\n" +"PO-Revision-Date: 2019-01-22 21:59+0900\n" "Last-Translator: sicklylife \n" "Language-Team: Japanese \n" "Language: ja\n" @@ -1903,7 +1903,7 @@ msgid "" "Please consider copying any critical changes to another program or file to " "avoid data loss." msgstr "" -"データの喪失を防ぐために、他のファイルやプログラムに重要な変更点を保存するこ" +"データの喪失を防ぐために、他のファイルやプログラムへ重要な変更点をコピーするこ" "とを検討してください。" #: ../meld/filediff.py:1662 From b2eee5de5a032f962e3acc830c91e973c741a5d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Dr=C4=85g?= Date: Tue, 22 Jan 2019 19:26:44 +0100 Subject: [PATCH 0813/1316] Update Polish translation --- po/pl.po | 208 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 110 insertions(+), 98 deletions(-) diff --git a/po/pl.po b/po/pl.po index 12e51c08..9909e27b 100644 --- a/po/pl.po +++ b/po/pl.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: meld\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-06 18:52+0100\n" -"PO-Revision-Date: 2019-01-06 18:53+0100\n" +"POT-Creation-Date: 2019-01-22 19:24+0100\n" +"PO-Revision-Date: 2019-01-22 19:25+0100\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "Language: pl\n" @@ -29,7 +29,7 @@ msgstr "Nie można zaimportować: " msgid "Meld requires %s or higher." msgstr "Program Meld wymaga wersji %s lub nowszej." -#: ../bin/meld:249 +#: ../bin/meld:262 #, c-format msgid "" "Couldn’t load Meld-specific CSS (%s)\n" @@ -143,8 +143,9 @@ msgstr "" "tabulatorów." #: ../data/org.gnome.meld.gschema.xml.h:11 +#: ../meld/resources/ui/statusbar-menu.ui.h:1 msgid "Show line numbers" -msgstr "Wyświetlanie numerów wierszy" +msgstr "Numery wierszy" #: ../data/org.gnome.meld.gschema.xml.h:12 msgid "If true, line numbers will be shown in the gutter of file comparisons." @@ -200,6 +201,7 @@ msgstr "" "„word” (tylko na końcu wyrazów)." #: ../data/org.gnome.meld.gschema.xml.h:21 +#: ../meld/resources/ui/statusbar-menu.ui.h:3 msgid "Highlight current line" msgstr "Wyróżnianie bieżącego wiersza" @@ -888,8 +890,8 @@ msgstr "Kopiuje element na prawo" msgid "Delete selected" msgstr "Usuwa zaznaczone" -#: ../meld/resources/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:958 -#: ../meld/filediff.py:1586 +#: ../meld/resources/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:959 +#: ../meld/filediff.py:1601 msgid "Hide" msgstr "Ukryj" @@ -923,7 +925,7 @@ msgstr "Nowe" msgid "Show new" msgstr "Wyświetla nowe" -#: ../meld/resources/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:76 +#: ../meld/resources/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:77 msgid "Modified" msgstr "Zmodyfikowane" @@ -1137,7 +1139,7 @@ msgstr "1. plik" #. Create icon and filename CellRenderer #: ../meld/resources/ui/filter-list.ui.h:2 ../meld/resources/ui/vcview.ui.h:30 -#: ../meld/dirdiff.py:454 +#: ../meld/dirdiff.py:455 msgid "Name" msgstr "Nazwa" @@ -1157,8 +1159,8 @@ msgstr "_Dodaj" msgid "Remove selected filter" msgstr "Usuwa zaznaczony filtr" -#: ../meld/resources/ui/findbar.ui.h:1 ../meld/dirdiff.py:1040 -#: ../meld/iohelpers.py:107 +#: ../meld/resources/ui/findbar.ui.h:1 ../meld/dirdiff.py:1041 +#: ../meld/iohelpers.py:113 msgid "_Replace" msgstr "Z_amień" @@ -1271,7 +1273,7 @@ msgstr "Sformatowanie jako poprawka" msgid "Copy to Clipboard" msgstr "Skopiuj do schowka" -#: ../meld/resources/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:163 +#: ../meld/resources/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:165 msgid "Save Patch" msgstr "Zapisz poprawkę" @@ -1307,7 +1309,9 @@ msgstr "Systemowa o stałej s_zerokości" msgid "_Editor font:" msgstr "Czcionka _edytora:" -#: ../meld/resources/ui/preferences.ui.h:5 +#. 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 msgid "Display" msgstr "Wyświetlanie" @@ -1540,8 +1544,8 @@ msgstr "" msgid "Close _without Saving" msgstr "Zamknij _bez zapisywania" -#: ../meld/resources/ui/save-confirm-dialog.ui.h:4 ../meld/dirdiff.py:1039 -#: ../meld/iohelpers.py:52 ../meld/iohelpers.py:106 +#: ../meld/resources/ui/save-confirm-dialog.ui.h:4 ../meld/dirdiff.py:1040 +#: ../meld/iohelpers.py:58 ../meld/iohelpers.py:112 msgid "_Cancel" msgstr "_Anuluj" @@ -1549,6 +1553,14 @@ msgstr "_Anuluj" msgid "_Save" msgstr "_Zapisz" +#: ../meld/resources/ui/statusbar-menu.ui.h:2 +msgid "Show whitespace" +msgstr "Białe znaki" + +#: ../meld/resources/ui/statusbar-menu.ui.h:4 +msgid "Text wrapping" +msgstr "Zawijanie wierszy" + #: ../meld/resources/ui/vcview.ui.h:3 msgid "Co_mmit…" msgstr "_Zatwierdź…" @@ -1641,7 +1653,7 @@ msgstr "Poza systemem kontroli _wersji" msgid "Show unversioned files" msgstr "Wyświetla pliki poza systemem kontroli wersji" -#: ../meld/resources/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69 +#: ../meld/resources/ui/vcview.ui.h:28 ../meld/vc/_vc.py:70 msgid "Ignored" msgstr "Zignorowane" @@ -1678,44 +1690,44 @@ msgid "Mac OS (CR)" msgstr "Mac OS (CR)" #. Create file size CellRenderer -#: ../meld/dirdiff.py:475 ../meld/preferences.py:138 +#: ../meld/dirdiff.py:476 ../meld/preferences.py:138 msgid "Size" msgstr "Rozmiar" #. Create date-time CellRenderer -#: ../meld/dirdiff.py:483 ../meld/preferences.py:139 +#: ../meld/dirdiff.py:484 ../meld/preferences.py:139 msgid "Modification time" msgstr "Czas modyfikacji" #. Create permissions CellRenderer -#: ../meld/dirdiff.py:491 ../meld/preferences.py:140 +#: ../meld/dirdiff.py:492 ../meld/preferences.py:140 msgid "Permissions" msgstr "Uprawnienia" -#: ../meld/dirdiff.py:625 +#: ../meld/dirdiff.py:626 #, python-format msgid "Hide %s" msgstr "Ukryj %s" -#: ../meld/dirdiff.py:767 ../meld/dirdiff.py:790 +#: ../meld/dirdiff.py:768 ../meld/dirdiff.py:791 #, python-format msgid "[%s] Scanning %s" msgstr "[%s] Skanowanie %s" -#: ../meld/dirdiff.py:925 +#: ../meld/dirdiff.py:926 #, python-format msgid "[%s] Done" msgstr "[%s] Ukończono" -#: ../meld/dirdiff.py:933 +#: ../meld/dirdiff.py:934 msgid "Folders have no differences" msgstr "Katalogi się nie różnią" -#: ../meld/dirdiff.py:935 +#: ../meld/dirdiff.py:936 msgid "Contents of scanned files in folders are identical." msgstr "Treść zeskanowanych plików w katalogach jest identyczna." -#: ../meld/dirdiff.py:937 +#: ../meld/dirdiff.py:938 msgid "" "Scanned files in folders appear identical, but contents have not been " "scanned." @@ -1723,40 +1735,40 @@ msgstr "" "Zeskanowane pliki wydają się identyczne, ale treść mogła nie zostać " "zeskanowana." -#: ../meld/dirdiff.py:940 +#: ../meld/dirdiff.py:941 msgid "File filters are in use, so not all files have been scanned." msgstr "" "Filtry plików są używane, więc nie wszystkie pliki zostały zeskanowane." -#: ../meld/dirdiff.py:942 +#: ../meld/dirdiff.py:943 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:960 ../meld/filediff.py:1588 ../meld/filediff.py:1618 -#: ../meld/filediff.py:1620 ../meld/ui/msgarea.py:106 ../meld/ui/msgarea.py:119 +#: ../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 msgid "Hi_de" msgstr "_Ukryj" -#: ../meld/dirdiff.py:969 +#: ../meld/dirdiff.py:970 msgid "Multiple errors occurred while scanning this folder" msgstr "Wystąpiło wiele błędów podczas skanowania tego katalogu" -#: ../meld/dirdiff.py:970 +#: ../meld/dirdiff.py:971 msgid "Files with invalid encodings found" msgstr "Odnaleziono pliki z nieprawidłowym kodowaniem znaków" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:972 +#: ../meld/dirdiff.py:973 msgid "Some files were in an incorrect encoding. The names are something like:" msgstr "" "Niektóre pliki mają nieprawidłowe kodowanie znaków. Nazwy tych plików to:" -#: ../meld/dirdiff.py:974 +#: ../meld/dirdiff.py:975 msgid "Files hidden by case insensitive comparison" msgstr "Pliku ukryte przez porównywanie bez uwzględniania wielkości liter" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:976 +#: ../meld/dirdiff.py:977 msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. The following files in this folder are hidden:" @@ -1765,17 +1777,17 @@ msgstr "" "w systemie plików, który rozróżnia wielkość liter. Następujące pliki w tym " "katalogu zostały ukryte:" -#: ../meld/dirdiff.py:987 +#: ../meld/dirdiff.py:988 #, python-format msgid "“%s” hidden by “%s”" msgstr "„%s” ukryty przez „%s”" -#: ../meld/dirdiff.py:1043 +#: ../meld/dirdiff.py:1044 #, python-format msgid "Replace folder “%s”?" msgstr "Zastąpić katalog „%s”?" -#: ../meld/dirdiff.py:1045 +#: ../meld/dirdiff.py:1046 #, python-format msgid "" "Another folder with the same name already exists in “%s”.\n" @@ -1785,11 +1797,11 @@ msgstr "" "Zastąpienie istniejącego katalogu spowoduje utratę wszystkich plików w nim " "zawartych." -#: ../meld/dirdiff.py:1058 +#: ../meld/dirdiff.py:1059 msgid "Error copying file" msgstr "Błąd podczas kopiowania pliku" -#: ../meld/dirdiff.py:1059 +#: ../meld/dirdiff.py:1060 #, python-format msgid "" "Couldn’t copy %s\n" @@ -1802,19 +1814,19 @@ msgstr "" "\n" "%s" -#: ../meld/dirdiff.py:1084 ../meld/vcview.py:720 +#: ../meld/dirdiff.py:1085 ../meld/vcview.py:720 msgid "Error deleting {}" msgstr "Błąd podczas usuwania {}" -#: ../meld/dirdiff.py:1593 +#: ../meld/dirdiff.py:1597 msgid "No folder" msgstr "Brak katalogu" -#: ../meld/filediff.py:905 +#: ../meld/filediff.py:920 msgid "Comparison results will be inaccurate" msgstr "Wyniki porównania będą niepoprawne" -#: ../meld/filediff.py:907 +#: ../meld/filediff.py:922 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1822,66 +1834,66 @@ msgstr "" "Filtr zmienił liczbę wierszy w pliku, co nie jest obsługiwane. Porównanie " "będzie niepoprawne." -#: ../meld/filediff.py:979 +#: ../meld/filediff.py:994 msgid "Mark conflict as resolved?" msgstr "Oznaczyć konflikt jako rozwiązany?" -#: ../meld/filediff.py:981 +#: ../meld/filediff.py:996 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:983 +#: ../meld/filediff.py:998 msgid "Cancel" msgstr "Anuluj" -#: ../meld/filediff.py:984 +#: ../meld/filediff.py:999 msgid "Mark _Resolved" msgstr "Oznacz jako _rozwiązane" -#: ../meld/filediff.py:1303 +#: ../meld/filediff.py:1318 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Wystąpił problem podczas otwierania pliku „%s”." -#: ../meld/filediff.py:1311 +#: ../meld/filediff.py:1326 #, python-format msgid "File %s appears to be a binary file." msgstr "Plik %s wygląda na plik binarny." -#: ../meld/filediff.py:1313 +#: ../meld/filediff.py:1328 msgid "Do you want to open the file using the default application?" msgstr "Otworzyć go w domyślnym programie?" -#: ../meld/filediff.py:1315 +#: ../meld/filediff.py:1330 msgid "Open" msgstr "Otwórz" -#: ../meld/filediff.py:1331 +#: ../meld/filediff.py:1346 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Analizowanie różnic" -#: ../meld/filediff.py:1392 +#: ../meld/filediff.py:1407 #, python-format msgid "File %s has changed on disk" msgstr "Plik %s został zmieniony na dysku" -#: ../meld/filediff.py:1393 +#: ../meld/filediff.py:1408 msgid "Do you want to reload the file?" msgstr "Ponownie wczytać plik?" -#: ../meld/filediff.py:1395 +#: ../meld/filediff.py:1410 msgid "_Reload" msgstr "_Wczytaj ponownie" -#: ../meld/filediff.py:1551 +#: ../meld/filediff.py:1566 msgid "Files are identical" msgstr "Pliki są identyczne" -#: ../meld/filediff.py:1564 +#: ../meld/filediff.py:1579 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1889,11 +1901,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:1569 +#: ../meld/filediff.py:1584 msgid "Files differ in line endings only" msgstr "Pliki różnią się tylko znacznikami końca wierszy" -#: ../meld/filediff.py:1571 +#: ../meld/filediff.py:1586 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1902,15 +1914,15 @@ msgstr "" "Pliki są identyczne, z wyjątkiem różnych znaczników końca wierszy:\n" "%s" -#: ../meld/filediff.py:1591 +#: ../meld/filediff.py:1606 msgid "Show without filters" msgstr "Wyświetl bez filtrów" -#: ../meld/filediff.py:1613 +#: ../meld/filediff.py:1628 msgid "Change highlighting incomplete" msgstr "Wyróżnianie zmian jest niepełne" -#: ../meld/filediff.py:1614 +#: ../meld/filediff.py:1629 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." @@ -1918,19 +1930,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:1622 +#: ../meld/filediff.py:1637 msgid "Keep highlighting" msgstr "Wyróżniaj dalej" -#: ../meld/filediff.py:1624 +#: ../meld/filediff.py:1639 msgid "_Keep highlighting" msgstr "_Wyróżniaj dalej" -#: ../meld/filediff.py:1637 +#: ../meld/filediff.py:1652 msgid "Saving failed" msgstr "Zapisanie się nie powiodło" -#: ../meld/filediff.py:1638 +#: ../meld/filediff.py:1653 msgid "" "Please consider copying any critical changes to another program or file to " "avoid data loss." @@ -1938,38 +1950,38 @@ msgstr "" "Proszę rozważyć skopiowanie wszelkich ważnych zmian w innym programie lub " "pliku, aby uniknąć utraty danych." -#: ../meld/filediff.py:1647 +#: ../meld/filediff.py:1662 msgid "Save Left Pane As" msgstr "Zapis lewego panelu jako" -#: ../meld/filediff.py:1649 +#: ../meld/filediff.py:1664 msgid "Save Middle Pane As" msgstr "Zapis środkowego panelu jako" -#: ../meld/filediff.py:1651 +#: ../meld/filediff.py:1666 msgid "Save Right Pane As" msgstr "Zapis prawego panelu jako" -#: ../meld/filediff.py:1664 +#: ../meld/filediff.py:1679 #, 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:1666 +#: ../meld/filediff.py:1681 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:1669 +#: ../meld/filediff.py:1684 msgid "Save Anyway" msgstr "Zapisz mimo to" -#: ../meld/filediff.py:1670 +#: ../meld/filediff.py:1685 msgid "Don’t Save" msgstr "Nie zapisuj" -#: ../meld/filediff.py:1712 +#: ../meld/filediff.py:1727 msgid "" "File “{}” contains characters that can’t be encoded using its current " "encoding “{}”." @@ -1977,7 +1989,7 @@ msgstr "" "Plik „{}” zawiera znaki, których nie można zakodować za pomocą jego obecnego " "kodowania, „{}”." -#: ../meld/filediff.py:1716 ../meld/patchdialog.py:142 +#: ../meld/filediff.py:1731 ../meld/patchdialog.py:144 #, python-format msgid "" "Couldn’t save file due to:\n" @@ -1986,16 +1998,16 @@ msgstr "" "Nie można zapisać pliku z powodu:\n" "%s" -#: ../meld/filediff.py:1720 ../meld/patchdialog.py:141 +#: ../meld/filediff.py:1735 ../meld/patchdialog.py:143 #, python-format msgid "Could not save file %s." msgstr "Nie można zapisać pliku %s." -#: ../meld/filediff.py:2113 +#: ../meld/filediff.py:2128 msgid "Live comparison updating disabled" msgstr "Wyłączono aktualizowanie porównań na żywo" -#: ../meld/filediff.py:2114 +#: ../meld/filediff.py:2129 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -2018,32 +2030,32 @@ msgstr "Skopiuj w gó_rę" msgid "Copy _down" msgstr "Skopiuj w _dół" -#: ../meld/iohelpers.py:37 +#: ../meld/iohelpers.py:43 msgid "Deleting remote folders is not supported" msgstr "Usuwanie zdalnych katalogów jest nieobsługiwane" -#: ../meld/iohelpers.py:39 +#: ../meld/iohelpers.py:45 msgid "Not a file or directory" msgstr "Nie jest plikiem ani katalogiem" -#: ../meld/iohelpers.py:43 +#: ../meld/iohelpers.py:49 msgid "“{}” can’t be put in the trash. Do you want to delete it immediately?" msgstr "Nie można przenieść pliku „{}” do kosza. Usunąć go trwale?" -#: ../meld/iohelpers.py:48 +#: ../meld/iohelpers.py:54 msgid "This remote location does not support sending items to the trash." msgstr "To zdalne położenie nie obsługuje przenoszenia elementów do kosza." -#: ../meld/iohelpers.py:53 +#: ../meld/iohelpers.py:59 msgid "_Delete Permanently" msgstr "_Usuń trwale" -#: ../meld/iohelpers.py:100 +#: ../meld/iohelpers.py:106 #, python-format msgid "Replace file “%s”?" msgstr "Zastąpić plik „%s”?" -#: ../meld/iohelpers.py:102 +#: ../meld/iohelpers.py:108 #, python-format msgid "" "A file with this name already exists in “%s”.\n" @@ -2149,7 +2161,7 @@ msgid "remote folder “{}” not supported" msgstr "zdalny katalog „{}” jest nieobsługiwany" #. TRANSLATORS: This is the label of a new, currently-unnamed file. -#: ../meld/meldbuffer.py:124 +#: ../meld/meldbuffer.py:123 msgid "" msgstr "" @@ -2372,7 +2384,7 @@ msgstr "Zwykły tekst" msgid "Ln %i, Col %i" msgstr "Wrsz %i, kol %i" -#: ../meld/ui/statusbar.py:177 +#: ../meld/ui/statusbar.py:182 msgid "Line you want to move the cursor to" msgstr "Wiersz, do którego przenieść kursor" @@ -2429,51 +2441,51 @@ msgstr "Brak" msgid "Rev %s" msgstr "Wersja %s" -#: ../meld/vc/_vc.py:54 +#: ../meld/vc/_vc.py:55 msgid "Merged" msgstr "Scalone" -#: ../meld/vc/_vc.py:54 +#: ../meld/vc/_vc.py:55 msgid "Base" msgstr "Podstawa" -#: ../meld/vc/_vc.py:54 +#: ../meld/vc/_vc.py:55 msgid "Local" msgstr "Lokalne" -#: ../meld/vc/_vc.py:54 +#: ../meld/vc/_vc.py:55 msgid "Remote" msgstr "Zdalne" -#: ../meld/vc/_vc.py:70 +#: ../meld/vc/_vc.py:71 msgid "Unversioned" msgstr "Poza systemem kontroli wersji" -#: ../meld/vc/_vc.py:73 +#: ../meld/vc/_vc.py:74 msgid "Error" msgstr "Błąd" -#: ../meld/vc/_vc.py:75 +#: ../meld/vc/_vc.py:76 msgid "Newly added" msgstr "Nowo dodany" -#: ../meld/vc/_vc.py:77 +#: ../meld/vc/_vc.py:78 msgid "Renamed" msgstr "Zmieniono nazwę" -#: ../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 "Usunięty" -#: ../meld/vc/_vc.py:80 +#: ../meld/vc/_vc.py:81 msgid "Missing" msgstr "Brakujący" -#: ../meld/vc/_vc.py:81 +#: ../meld/vc/_vc.py:82 msgid "Not present" msgstr "Nieobecny" From 040cfeb6e12ac3ce50dab16fc8c40b366a21086d Mon Sep 17 00:00:00 2001 From: Alan Mortensen Date: Mon, 28 Jan 2019 13:29:30 +0100 Subject: [PATCH 0814/1316] Updated Danish translation --- po/da.po | 2029 +++++++++++++++++++++++++++--------------------------- 1 file changed, 1018 insertions(+), 1011 deletions(-) diff --git a/po/da.po b/po/da.po index 7a22f116..e8c93a25 100644 --- a/po/da.po +++ b/po/da.po @@ -2,7 +2,7 @@ # Copyright (C) 2018 meld & nedenstående oversættere. # This file is distributed under the same license as the meld package. # Joe Hansen , 2010, 2011, 2018. -# Alan Mortensen , 2016, 2018. +# Alan Mortensen , 2016, 2018-19. # # merge -> flet (sammenføj er til versionstyringskommandoer) # pane -> rude @@ -17,8 +17,8 @@ msgid "" msgstr "" "Project-Id-Version: meld master\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n" -"POT-Creation-Date: 2018-10-27 22:06+0000\n" -"PO-Revision-Date: 2018-10-28 16:07+0100\n" +"POT-Creation-Date: 2019-01-20 20:13+0000\n" +"PO-Revision-Date: 2019-01-26 15:29+0100\n" "Last-Translator: Alan Mortensen \n" "Language-Team: Danish \n" "Language: da\n" @@ -28,16 +28,16 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.0.6\n" -#: ../bin/meld:194 +#: ../bin/meld:190 msgid "Cannot import: " msgstr "Kan ikke importere: " -#: ../bin/meld:197 +#: ../bin/meld:193 #, c-format msgid "Meld requires %s or higher." msgstr "Meld kræver %s eller højere." -#: ../bin/meld:243 +#: ../bin/meld:262 #, c-format msgid "" "Couldn’t load Meld-specific CSS (%s)\n" @@ -47,7 +47,8 @@ msgstr "" "%s" #: ../data/org.gnome.meld.desktop.in.h:1 -#: ../data/org.gnome.meld.appdata.xml.in.h:1 ../data/ui/meldapp.ui.h:1 +#: ../data/org.gnome.meld.appdata.xml.in.h:1 +#: ../meld/resources/ui/appwindow.ui.h:1 msgid "Meld" msgstr "Meld" @@ -116,26 +117,10 @@ msgid "Default window fullscreen state" msgstr "Fuldskærmstilstand for standardvinduet" #: ../data/org.gnome.meld.gschema.xml.h:5 -msgid "Show toolbar" -msgstr "Vis værktøjsbjælken" - -#: ../data/org.gnome.meld.gschema.xml.h:6 -msgid "If true, the window toolbar is visible." -msgstr "Hvis sand er vinduets værktøjsbjælke synlig." - -#: ../data/org.gnome.meld.gschema.xml.h:7 -msgid "Show statusbar" -msgstr "Vis statusbjælke" - -#: ../data/org.gnome.meld.gschema.xml.h:8 -msgid "If true, the window statusbar is visible." -msgstr "Hvis sand er vinduets statujsbjælke synlig." - -#: ../data/org.gnome.meld.gschema.xml.h:9 msgid "Additional automatically detected text encodings" msgstr "Yderligere automatisk fundne tekstkodninger" -#: ../data/org.gnome.meld.gschema.xml.h:10 +#: ../data/org.gnome.meld.gschema.xml.h:6 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 " @@ -147,38 +132,39 @@ msgstr "" "de aktuelle standardkodninger for regionen altid blive brugt; afhængig af " "brugerens region vil andre kodninger også blive prøvet." -#: ../data/org.gnome.meld.gschema.xml.h:11 +#: ../data/org.gnome.meld.gschema.xml.h:7 msgid "Width of an indentation step" msgstr "Indrykningsbredde" -#: ../data/org.gnome.meld.gschema.xml.h:12 +#: ../data/org.gnome.meld.gschema.xml.h:8 msgid "The number of spaces to use for a single indent step" msgstr "Antallet af mellemrum der skal bruges på en enkelt indrykning" -#: ../data/org.gnome.meld.gschema.xml.h:13 +#: ../data/org.gnome.meld.gschema.xml.h:9 msgid "Whether to indent using spaces or tabs" msgstr "Om indrykning sker med mellemrum eller tabulator" -#: ../data/org.gnome.meld.gschema.xml.h:14 +#: ../data/org.gnome.meld.gschema.xml.h:10 msgid "If true, any new indentation will use spaces instead of tabs." msgstr "" "Hvis sand vil nye indrykninger bruge mellemrum i stedet for tabulatorer." -#: ../data/org.gnome.meld.gschema.xml.h:15 +#: ../data/org.gnome.meld.gschema.xml.h:11 +#: ../meld/resources/ui/statusbar-menu.ui.h:1 msgid "Show line numbers" msgstr "Vis linjenumre" -#: ../data/org.gnome.meld.gschema.xml.h:16 +#: ../data/org.gnome.meld.gschema.xml.h:12 msgid "If true, line numbers will be shown in the gutter of file comparisons." msgstr "" "Hvis sand vil linjenumre blive vist i filsammenligningers indvendige " "margener." -#: ../data/org.gnome.meld.gschema.xml.h:17 +#: ../data/org.gnome.meld.gschema.xml.h:13 msgid "Highlight syntax" msgstr "Syntaksfremhævning" -#: ../data/org.gnome.meld.gschema.xml.h:18 +#: ../data/org.gnome.meld.gschema.xml.h:14 msgid "" "Whether to highlight syntax in comparisons. Because of Meld’s own color " "highlighting, this is off by default." @@ -186,20 +172,20 @@ msgstr "" "Om syntaks skal fremhæves i sammenligninger. Pga. Melds egen " "farvefremhævning er dette som standard slået fra." -#: ../data/org.gnome.meld.gschema.xml.h:19 +#: ../data/org.gnome.meld.gschema.xml.h:15 msgid "Color scheme to use for syntax highlighting" msgstr "Farveskema til brug for syntaksfremhævning" -#: ../data/org.gnome.meld.gschema.xml.h:20 +#: ../data/org.gnome.meld.gschema.xml.h:16 msgid "Used by GtkSourceView to determine colors for syntax highlighting" msgstr "" "Bruges af GtkSourceView til at bestemme farver til fremhævning af syntaks" -#: ../data/org.gnome.meld.gschema.xml.h:21 +#: ../data/org.gnome.meld.gschema.xml.h:17 msgid "Displayed whitespace" msgstr "Viste blanktegn" -#: ../data/org.gnome.meld.gschema.xml.h:22 +#: ../data/org.gnome.meld.gschema.xml.h:18 msgid "" "Selector for individual whitespace character types to be shown. Possible " "values are 'space', 'tab', 'newline' and 'nbsp'." @@ -207,11 +193,11 @@ msgstr "" "Hvilken type blanktegn skal vises. Mulige værdier er: “space”, “tab”, " "“newline” og “nbsp”." -#: ../data/org.gnome.meld.gschema.xml.h:23 +#: ../data/org.gnome.meld.gschema.xml.h:19 msgid "Wrap mode" msgstr "Ombrydningstilstand" -#: ../data/org.gnome.meld.gschema.xml.h:24 +#: ../data/org.gnome.meld.gschema.xml.h:20 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 " @@ -221,33 +207,34 @@ msgstr "" "indstilling: overhovedet ikke (“none”), ved ethvert tegn (“char”) eller kun " "efter et ord (“word”)." -#: ../data/org.gnome.meld.gschema.xml.h:25 +#: ../data/org.gnome.meld.gschema.xml.h:21 +#: ../meld/resources/ui/statusbar-menu.ui.h:3 msgid "Highlight current line" msgstr "Fremhæv den aktuelle linje" -#: ../data/org.gnome.meld.gschema.xml.h:26 +#: ../data/org.gnome.meld.gschema.xml.h:22 msgid "" "If true, the line containing the cursor will be highlighted in file " "comparisons." msgstr "" "Hvis sand vil linjen med markøren blive fremhævet i filsammenligninger." -#: ../data/org.gnome.meld.gschema.xml.h:27 +#: ../data/org.gnome.meld.gschema.xml.h:23 msgid "Use the system default monospace font" msgstr "Brug systemets standardskrifttype med fast bredde" -#: ../data/org.gnome.meld.gschema.xml.h:28 +#: ../data/org.gnome.meld.gschema.xml.h:24 msgid "" "If false, custom-font will be used instead of the system monospace font." msgstr "" "Hvis falsk vil en tilpasset skrifttype blive brugt i stedet for systemets " "standardskrifttype med fast bredde." -#: ../data/org.gnome.meld.gschema.xml.h:29 +#: ../data/org.gnome.meld.gschema.xml.h:25 msgid "Custom font" msgstr "Tilpasset skrifttype" -#: ../data/org.gnome.meld.gschema.xml.h:30 +#: ../data/org.gnome.meld.gschema.xml.h:26 msgid "" "The custom font to use, stored as a string and parsed as a Pango font " "description." @@ -255,11 +242,11 @@ msgstr "" "Den tilpassede skrifttype som skal bruges. Gemmes som en streng og fortolkes " "som en Pango-skrifttypebeskrivelse." -#: ../data/org.gnome.meld.gschema.xml.h:31 +#: ../data/org.gnome.meld.gschema.xml.h:27 msgid "Ignore blank lines when comparing files" msgstr "Ignorér tomme linjer, når filer sammenlignes" -#: ../data/org.gnome.meld.gschema.xml.h:32 +#: ../data/org.gnome.meld.gschema.xml.h:28 msgid "" "If true, blank lines will be trimmed when highlighting changes between files." msgstr "" @@ -268,11 +255,11 @@ msgstr "" # Brug det _normale systemredigeringsprogram # Brug systemets _standardredigeringsprogram -#: ../data/org.gnome.meld.gschema.xml.h:33 +#: ../data/org.gnome.meld.gschema.xml.h:29 msgid "Use the system default editor" msgstr "Brug systemets standardredigeringsprogram" -#: ../data/org.gnome.meld.gschema.xml.h:34 +#: ../data/org.gnome.meld.gschema.xml.h:30 msgid "" "If false, custom-editor-command will be used instead of the system editor " "when opening files externally." @@ -280,11 +267,11 @@ msgstr "" "Hvis falsk vil “custom-editor-command” blive brugt i stedet for systemets " "redigeringsprogram, når filer åbnes eksternt." -#: ../data/org.gnome.meld.gschema.xml.h:35 +#: ../data/org.gnome.meld.gschema.xml.h:31 msgid "The custom editor launch command" msgstr "Kommando til at starte brugerdefineret redigeringsprogram" -#: ../data/org.gnome.meld.gschema.xml.h:36 +#: ../data/org.gnome.meld.gschema.xml.h:32 msgid "" "The command used to launch a custom editor. Some limited templating is " "supported here; at the moment '{file}' and '{line}' are recognised tokens." @@ -293,21 +280,22 @@ msgstr "" "brug af skabeloner understøttes; for øjeblikket kan “{file}” og “{line}” " "bruges." -#: ../data/org.gnome.meld.gschema.xml.h:37 +#: ../data/org.gnome.meld.gschema.xml.h:33 msgid "Columns to display" msgstr "Kolonner der skal vises" -#: ../data/org.gnome.meld.gschema.xml.h:38 +#: ../data/org.gnome.meld.gschema.xml.h:34 msgid "" "List of column names in folder comparison and whether they should be " "displayed." msgstr "Liste over kolonnenavne i mappesammenligning og om de skal vises." -#: ../data/org.gnome.meld.gschema.xml.h:39 ../data/ui/preferences.ui.h:25 +#: ../data/org.gnome.meld.gschema.xml.h:35 +#: ../meld/resources/ui/preferences.ui.h:25 msgid "Ignore symbolic links" msgstr "Ignorér symbolske henvisninger" -#: ../data/org.gnome.meld.gschema.xml.h:40 +#: ../data/org.gnome.meld.gschema.xml.h:36 msgid "" "If true, folder comparisons do not follow symbolic links when traversing the " "folder tree." @@ -315,11 +303,11 @@ msgstr "" "Hvis sand vil mappesammenligninger ikke følge symbolske henvisninger, når " "mappetræet gennemkrydses." -#: ../data/org.gnome.meld.gschema.xml.h:41 +#: ../data/org.gnome.meld.gschema.xml.h:37 msgid "Use shallow comparison" msgstr "Brug overfladisk sammenligningen" -#: ../data/org.gnome.meld.gschema.xml.h:42 +#: ../data/org.gnome.meld.gschema.xml.h:38 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 " @@ -329,11 +317,11 @@ msgstr "" "størrelse og mtime. Filer anses for at være identiske, hvis deres størrelse " "og mtime matcher og ellers forskellige." -#: ../data/org.gnome.meld.gschema.xml.h:43 +#: ../data/org.gnome.meld.gschema.xml.h:39 msgid "File timestamp resolution" msgstr "Filers tidsstempelopløsning" -#: ../data/org.gnome.meld.gschema.xml.h:44 +#: ../data/org.gnome.meld.gschema.xml.h:40 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 " @@ -345,11 +333,12 @@ msgstr "" "Dette er nyttigt, når der sammenlignes filer på tværs af filsystemer med " "forskellig tidsstempelopløsning." -#: ../data/org.gnome.meld.gschema.xml.h:45 ../data/ui/preferences.ui.h:22 +#: ../data/org.gnome.meld.gschema.xml.h:41 +#: ../meld/resources/ui/preferences.ui.h:22 msgid "Apply text filters during folder comparisons" msgstr "Anvend tekstfiltre under mappesammenligninger" -#: ../data/org.gnome.meld.gschema.xml.h:46 +#: ../data/org.gnome.meld.gschema.xml.h:42 msgid "" "If true, folder comparisons that compare file contents also apply active " "text filters and the blank line trimming option, and ignore newline " @@ -359,21 +348,21 @@ msgstr "" "anvende aktive tekstfiltre og beskære tomme linjer samt ignorere newline-" "forskelle." -#: ../data/org.gnome.meld.gschema.xml.h:47 +#: ../data/org.gnome.meld.gschema.xml.h:43 msgid "File status filters" msgstr "Filtre for filstatus" -#: ../data/org.gnome.meld.gschema.xml.h:48 +#: ../data/org.gnome.meld.gschema.xml.h:44 msgid "List of statuses used to filter visible files in folder comparison." msgstr "" "Oversigt over statusser brugt til at filtrere synlige filer i " "mappesammenligninger." -#: ../data/org.gnome.meld.gschema.xml.h:49 +#: ../data/org.gnome.meld.gschema.xml.h:45 msgid "Show the version control console output" msgstr "Vis konsoloutputtet for versionsstyring" -#: ../data/org.gnome.meld.gschema.xml.h:50 +#: ../data/org.gnome.meld.gschema.xml.h:46 msgid "" "If true, a console output section will be shown in version control views, " "showing the commands run for version control operations." @@ -382,21 +371,21 @@ msgstr "" "versionsstyring, som viser de kommandoer, der køres for " "versionsstyringshandlinger." -#: ../data/org.gnome.meld.gschema.xml.h:51 +#: ../data/org.gnome.meld.gschema.xml.h:47 msgid "Version control pane position" msgstr "Rudeplacering af versionsstyring" -#: ../data/org.gnome.meld.gschema.xml.h:52 +#: ../data/org.gnome.meld.gschema.xml.h:48 msgid "" "This is the height of the main version control tree when the console pane is " "shown." msgstr "Dette er højden på versionsstyringens hovedtræ, når konsolruden vises." -#: ../data/org.gnome.meld.gschema.xml.h:53 +#: ../data/org.gnome.meld.gschema.xml.h:49 msgid "Present version comparisons as left-local/right-remote" msgstr "Nuværende versionssammenligninger som venstre-lokal/højre-fjern" -#: ../data/org.gnome.meld.gschema.xml.h:54 +#: ../data/org.gnome.meld.gschema.xml.h:50 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, " @@ -406,11 +395,11 @@ msgstr "" "højre-er-fjern-skema til at bestemme, i hvilken rækkefølge filer vises i " "ruder. Ellers vil et venstre-er-deres/højre-er-min-skema blive anvendt." -#: ../data/org.gnome.meld.gschema.xml.h:55 +#: ../data/org.gnome.meld.gschema.xml.h:51 msgid "Order for files in three-way version control merge comparisons" msgstr "Filrækkefølge i fletssammenligninger i trevejsversionsstyring" -#: ../data/org.gnome.meld.gschema.xml.h:56 +#: ../data/org.gnome.meld.gschema.xml.h:52 msgid "" "Choices for file order are remote/merged/local and local/merged/remote. This " "preference only affects three-way comparisons launched from the version " @@ -421,11 +410,11 @@ msgstr "" "versionsstyringsvisningen, så den bruges kun til at løse sammenfletninger/" "konflikter i Meld." -#: ../data/org.gnome.meld.gschema.xml.h:57 +#: ../data/org.gnome.meld.gschema.xml.h:53 msgid "Show margin in commit message editor" msgstr "Vis margen i redigeringsprogram til commit-beskeder" -#: ../data/org.gnome.meld.gschema.xml.h:58 +#: ../data/org.gnome.meld.gschema.xml.h:54 msgid "" "If true, a guide will be displayed to show what column the margin is at in " "the version control commit message editor." @@ -433,11 +422,11 @@ msgstr "" "Hvis sand vil en hjælpelinje blive vist, som viser, hvilken kolonne margenen " "er ved i redigeringsprogrammet til versionsstyringens commit-beskeder." -#: ../data/org.gnome.meld.gschema.xml.h:59 +#: ../data/org.gnome.meld.gschema.xml.h:55 msgid "Margin column in commit message editor" msgstr "Margenkolonne i redigeringsprogram til commit-beskeder" -#: ../data/org.gnome.meld.gschema.xml.h:60 +#: ../data/org.gnome.meld.gschema.xml.h:56 msgid "" "The column at which to show the margin in the version control commit message " "editor." @@ -445,11 +434,11 @@ msgstr "" "Den kolonne hvor margenen skal vises i redigeringsprogrammet til " "versionsstyring af commit-beskeder." -#: ../data/org.gnome.meld.gschema.xml.h:61 +#: ../data/org.gnome.meld.gschema.xml.h:57 msgid "Automatically hard-wrap commit messages" msgstr "Automatisk tvungen linjeskift i commit-beskeder" -#: ../data/org.gnome.meld.gschema.xml.h:62 +#: ../data/org.gnome.meld.gschema.xml.h:58 msgid "" "If true, the version control commit message editor will hard-wrap (i.e., " "insert line breaks) at the commit margin before commit." @@ -457,22 +446,22 @@ msgstr "" "Hvis sand vil redigeringsprogrammet til versionsstyring af commit-beskeder " "indføre tvungen linjeskift ved commit-margen før commit." -#: ../data/org.gnome.meld.gschema.xml.h:63 +#: ../data/org.gnome.meld.gschema.xml.h:59 msgid "Version control status filters" msgstr "Statusfiltre til versionsstyring" -#: ../data/org.gnome.meld.gschema.xml.h:64 +#: ../data/org.gnome.meld.gschema.xml.h:60 msgid "" "List of statuses used to filter visible files in version control comparison." msgstr "" "Oversigt over statusser anvendt til at filtrere synlige filer i " "versionsstyringssammenligninger." -#: ../data/org.gnome.meld.gschema.xml.h:65 +#: ../data/org.gnome.meld.gschema.xml.h:61 msgid "Filename-based filters" msgstr "Filnavne-baserede filtre" -#: ../data/org.gnome.meld.gschema.xml.h:66 +#: ../data/org.gnome.meld.gschema.xml.h:62 msgid "" "List of predefined filename-based filters that, if active, will remove " "matching files from a folder comparison." @@ -480,11 +469,11 @@ msgstr "" "Oversigt over foruddefinerede filnavne-baserede filtre, som, hvis aktive, " "vil fjerne matchende filer i en mappesammenligning." -#: ../data/org.gnome.meld.gschema.xml.h:67 +#: ../data/org.gnome.meld.gschema.xml.h:63 msgid "Text-based filters" msgstr "Tekst-baserede filtre" -#: ../data/org.gnome.meld.gschema.xml.h:68 +#: ../data/org.gnome.meld.gschema.xml.h:64 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, " @@ -510,401 +499,627 @@ msgstr "Melds mørke skema" msgid "Dark color scheme for Meld highlighting" msgstr "Mørkt farveskema for fremhævning i Meld" -#: ../data/ui/application.ui.h:1 -msgid "About Meld" -msgstr "Om Meld" +#: ../meld/resources/gtk/help-overlay.ui.h:1 +msgctxt "shortcut window" +msgid "General" +msgstr "Generelt" -#: ../data/ui/application.ui.h:2 -msgid "" -"Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2017 Kai Willadsen" -msgstr "" -"Ophavsret © 2002-2009 Stephen Kennedy\n" -"Ophavsret © 2009-2017 Kai Willadsen" +#: ../meld/resources/gtk/help-overlay.ui.h:2 +msgctxt "shortcut window" +msgid "New comparison" +msgstr "Ny sammenligning" -#: ../data/ui/application.ui.h:4 -msgid "Website" -msgstr "Websted" +#: ../meld/resources/gtk/help-overlay.ui.h:3 +msgctxt "shortcut window" +msgid "Close a comparison" +msgstr "Luk en sammenligning" -#: ../data/ui/application.ui.h:5 -msgid "translator-credits" -msgstr "" -"Joe Hansen, 2010, 2011.\n" -"Alan Mortensen, 2016, 2017.\n" -"\n" -"Dansk-gruppen \n" -"Mere info: http://www.dansk-gruppen.dk" +#: ../meld/resources/gtk/help-overlay.ui.h:4 +msgctxt "shortcut window" +msgid "Quit Meld" +msgstr "Afslut Meld" -#: ../data/ui/application.ui.h:6 -msgid "_Preferences" -msgstr "_Indstillinger" +#: ../meld/resources/gtk/help-overlay.ui.h:5 +msgctxt "shortcut window" +msgid "Stop the current action" +msgstr "Stop den aktuelle handling" -#: ../data/ui/application.ui.h:7 -msgid "_Help" -msgstr "_Hjælp" +#: ../meld/resources/gtk/help-overlay.ui.h:6 +msgctxt "shortcut window" +msgid "Refresh comparison" +msgstr "Opdatér sammenligningen" -#: ../data/ui/application.ui.h:8 -msgid "Keyboard Shortcuts" -msgstr "Tastaturgenveje" +#: ../meld/resources/gtk/help-overlay.ui.h:7 +msgctxt "shortcut window" +msgid "Fullscreen" +msgstr "Fuldskærm" -#: ../data/ui/application.ui.h:9 -msgid "_About" -msgstr "_Om" +#: ../meld/resources/gtk/help-overlay.ui.h:8 +msgctxt "shortcut window" +msgid "Tabs" +msgstr "Faneblade" -#: ../data/ui/application.ui.h:10 -msgid "_Quit" -msgstr "_Afslut" +#: ../meld/resources/gtk/help-overlay.ui.h:9 +msgctxt "shortcut window" +msgid "Go to previous tab" +msgstr "Gå til det forrige faneblad" -#: ../data/ui/dirdiff.ui.h:1 ../data/ui/vcview.ui.h:1 -msgid "_Compare" -msgstr "_Sammenlign" +#: ../meld/resources/gtk/help-overlay.ui.h:10 +msgctxt "shortcut window" +msgid "Go to next tab" +msgstr "Gå til det næste faneblad" -#: ../data/ui/dirdiff.ui.h:2 ../data/ui/vcview.ui.h:2 -msgid "Compare selected files" -msgstr "Sammenlign de valgte filer" +#: ../meld/resources/gtk/help-overlay.ui.h:11 +msgctxt "shortcut window" +msgid "Switch to tab" +msgstr "Skift til faneblad" -#: ../data/ui/dirdiff.ui.h:3 -msgid "Collapse Recursively" -msgstr "Fold sammen rekursivt" +#: ../meld/resources/gtk/help-overlay.ui.h:12 +msgctxt "shortcut window" +msgid "Move tab left" +msgstr "Flyt fanebladet til venstre" -#: ../data/ui/dirdiff.ui.h:4 -msgid "Collapse selected folder and all subfolders" -msgstr "Fold den valgte mappe og alle undermapperne sammen" +#: ../meld/resources/gtk/help-overlay.ui.h:13 +msgctxt "shortcut window" +msgid "Move tab right" +msgstr "Flyt fanebladet til højre" -#: ../data/ui/dirdiff.ui.h:5 -msgid "Expand Recursively" -msgstr "Udfold rekursivt" +#: ../meld/resources/gtk/help-overlay.ui.h:14 +msgctxt "shortcut window" +msgid "Changes" +msgstr "Ændringer" -#: ../data/ui/dirdiff.ui.h:6 -msgid "Expand selected folder and all subfolders" -msgstr "Udfold den valgte mappe og alle undermapperne" +#: ../meld/resources/gtk/help-overlay.ui.h:15 +msgctxt "shortcut window" +msgid "Go to previous change" +msgstr "Gå til den forrige ændring" -#: ../data/ui/dirdiff.ui.h:7 -msgid "Copy to _Left" -msgstr "Kopiér til _venstre" +#: ../meld/resources/gtk/help-overlay.ui.h:16 +msgctxt "shortcut window" +msgid "Go to next change" +msgstr "Gå til den næste ændring" -#: ../data/ui/dirdiff.ui.h:8 -msgid "Copy to left" -msgstr "Kopiér til venstre" +#: ../meld/resources/gtk/help-overlay.ui.h:17 +msgctxt "shortcut window" +msgid "Editing" +msgstr "Redigering" -#: ../data/ui/dirdiff.ui.h:9 -msgid "Copy to _Right" -msgstr "Kopiér til _højre" +#: ../meld/resources/gtk/help-overlay.ui.h:18 +msgctxt "shortcut window" +msgid "Undo" +msgstr "Fortryd" -#: ../data/ui/dirdiff.ui.h:10 -msgid "Copy to right" -msgstr "Kopiér til højre" +#: ../meld/resources/gtk/help-overlay.ui.h:19 +msgctxt "shortcut window" +msgid "Redo" +msgstr "Gentag" -#: ../data/ui/dirdiff.ui.h:11 -msgid "Delete selected" -msgstr "Slet det valgte" +#: ../meld/resources/gtk/help-overlay.ui.h:20 +msgctxt "shortcut window" +msgid "Cut" +msgstr "Klip" -#: ../data/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:920 ../meld/filediff.py:1489 -msgid "Hide" -msgstr "Skjul" +#: ../meld/resources/gtk/help-overlay.ui.h:21 +msgctxt "shortcut window" +msgid "Copy" +msgstr "Kopiér" -#: ../data/ui/dirdiff.ui.h:13 -msgid "Hide selected" -msgstr "Skjul det valgte" +#: ../meld/resources/gtk/help-overlay.ui.h:22 +msgctxt "shortcut window" +msgid "Paste" +msgstr "Indsæt" -#: ../data/ui/dirdiff.ui.h:14 -msgid "Ignore Filename Case" -msgstr "Ignorér store/små bogstaver i filnavne" +#: ../meld/resources/gtk/help-overlay.ui.h:23 +msgctxt "shortcut window" +msgid "Find" +msgstr "Find" -#: ../data/ui/dirdiff.ui.h:15 -msgid "" -"Consider differently-cased filenames that are otherwise-identical to be the " -"same" -msgstr "" -"Anse filnavne med forskelle i store/små bogstaver, men ellers er identiske, " -"som værende ens" +#: ../meld/resources/gtk/help-overlay.ui.h:24 +msgctxt "shortcut window" +msgid "Find Next" +msgstr "Find næste" -#: ../data/ui/dirdiff.ui.h:16 -msgid "Same" -msgstr "Ens" +#: ../meld/resources/gtk/help-overlay.ui.h:25 +msgctxt "shortcut window" +msgid "Find Previous" +msgstr "Find forrige" -#: ../data/ui/dirdiff.ui.h:17 -msgid "Show identical" -msgstr "Vis ens" +#: ../meld/resources/gtk/help-overlay.ui.h:26 +msgctxt "shortcut window" +msgid "Replace" +msgstr "Erstat" -#: ../data/ui/dirdiff.ui.h:18 -msgid "New" -msgstr "Ny" +#: ../meld/resources/gtk/help-overlay.ui.h:27 +msgctxt "shortcut window" +msgid "File comparison" +msgstr "Filsammenligning" -#: ../data/ui/dirdiff.ui.h:19 -msgid "Show new" -msgstr "Vis ny" +#: ../meld/resources/gtk/help-overlay.ui.h:28 +msgctxt "shortcut window" +msgid "Save current file" +msgstr "Gem den aktuelle fil" -#: ../data/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:76 -msgid "Modified" -msgstr "Ændret" +#: ../meld/resources/gtk/help-overlay.ui.h:29 +msgctxt "shortcut window" +msgid "Save current file to new path" +msgstr "Gem den aktuelle fil et andet sted" -#: ../data/ui/dirdiff.ui.h:21 -msgid "Show modified" -msgstr "Vis ændret" +#: ../meld/resources/gtk/help-overlay.ui.h:30 +msgctxt "shortcut window" +msgid "Save all files in comparison" +msgstr "Gem alle filer i sammenligningen" -#: ../data/ui/dirdiff.ui.h:22 -msgid "Filters" -msgstr "Filtre" +#: ../meld/resources/gtk/help-overlay.ui.h:31 +msgctxt "shortcut window" +msgid "Previous conflict" +msgstr "Forrige konflikt" -#: ../data/ui/dirdiff.ui.h:23 -msgid "Set active filters" -msgstr "Angiv aktivt filter" +#: ../meld/resources/gtk/help-overlay.ui.h:32 +msgctxt "shortcut window" +msgid "Next conflict" +msgstr "Næste konflikt" + +#: ../meld/resources/gtk/help-overlay.ui.h:33 +msgctxt "shortcut window" +msgid "Push change to left" +msgstr "Skub ændringen til venstre" + +#: ../meld/resources/gtk/help-overlay.ui.h:34 +msgctxt "shortcut window" +msgid "Push change to right" +msgstr "Skub ændringen til højre" + +#: ../meld/resources/gtk/help-overlay.ui.h:35 +msgctxt "shortcut window" +msgid "Pull change from left" +msgstr "Træk ændringen fra venstre" + +#: ../meld/resources/gtk/help-overlay.ui.h:36 +msgctxt "shortcut window" +msgid "Pull change from right" +msgstr "Træk ændringen fra højre" + +#: ../meld/resources/gtk/help-overlay.ui.h:37 +msgctxt "shortcut window" +msgid "Copy change above left" +msgstr "Kopiér ændringen ovenfor til venstre" + +#: ../meld/resources/gtk/help-overlay.ui.h:38 +msgctxt "shortcut window" +msgid "Copy change below left" +msgstr "Kopiér ændringen nedenfor til venstre" + +#: ../meld/resources/gtk/help-overlay.ui.h:39 +msgctxt "shortcut window" +msgid "Copy change above right" +msgstr "Kopiér ændringen ovenfor til højre" + +#: ../meld/resources/gtk/help-overlay.ui.h:40 +msgctxt "shortcut window" +msgid "Copy change below right" +msgstr "Kopiér ændringen nedenfor til højre" + +#: ../meld/resources/gtk/help-overlay.ui.h:41 +msgctxt "shortcut window" +msgid "Delete change" +msgstr "Slet ændring" + +#: ../meld/resources/gtk/help-overlay.ui.h:42 +msgctxt "shortcut window" +msgid "Previous comparison pane" +msgstr "Forrige sammenligningsrude" + +#: ../meld/resources/gtk/help-overlay.ui.h:43 +msgctxt "shortcut window" +msgid "Next comparison pane" +msgstr "Næste sammenligningsrude" + +#: ../meld/resources/gtk/help-overlay.ui.h:44 +msgctxt "shortcut window" +msgid "Folder comparison" +msgstr "Mappesammenligning" + +#: ../meld/resources/gtk/help-overlay.ui.h:45 +msgctxt "shortcut window" +msgid "Copy to left" +msgstr "Kopiér til venstre" + +#: ../meld/resources/gtk/help-overlay.ui.h:46 +msgctxt "shortcut window" +msgid "Copy to right" +msgstr "Kopiér til højre" + +#: ../meld/resources/gtk/help-overlay.ui.h:47 +msgctxt "shortcut window" +msgid "Version control comparison" +msgstr "Versionsstyringssammenligning" + +#: ../meld/resources/gtk/help-overlay.ui.h:48 +msgctxt "shortcut window" +msgid "Commit to version control" +msgstr "Commit til versionsstyring" + +#: ../meld/resources/gtk/help-overlay.ui.h:49 +msgctxt "shortcut window" +msgid "Show/hide console output" +msgstr "Vis/skjul konsoloutput" + +#: ../meld/resources/gtk/menus.ui.h:1 +msgid "_Preferences" +msgstr "_Indstillinger" + +#: ../meld/resources/gtk/menus.ui.h:2 +msgid "_Help" +msgstr "_Hjælp" + +#: ../meld/resources/gtk/menus.ui.h:3 +msgid "Keyboard Shortcuts" +msgstr "Tastaturgenveje" + +#: ../meld/resources/gtk/menus.ui.h:4 +msgid "_About" +msgstr "_Om" + +#: ../meld/resources/gtk/menus.ui.h:5 +msgid "_Quit" +msgstr "_Afslut" + +#: ../meld/resources/ui/about-dialog.ui.h:1 +msgid "About Meld" +msgstr "Om Meld" + +#: ../meld/resources/ui/about-dialog.ui.h:2 +msgid "" +"Copyright © 2002-2009 Stephen Kennedy\n" +"Copyright © 2009-2017 Kai Willadsen" +msgstr "" +"Ophavsret © 2002-2009 Stephen Kennedy\n" +"Ophavsret © 2009-2017 Kai Willadsen" -#: ../data/ui/EditableList.ui.h:1 -msgid "Editable List" -msgstr "Redigerbar liste" +#: ../meld/resources/ui/about-dialog.ui.h:4 +msgid "Website" +msgstr "Websted" + +#: ../meld/resources/ui/about-dialog.ui.h:5 +msgid "translator-credits" +msgstr "" +"Joe Hansen, 2010, 2011.\n" +"Alan Mortensen, 2016, 2017.\n" +"\n" +"Dansk-gruppen \n" +"Mere info: http://www.dansk-gruppen.dk" -#: ../data/ui/EditableList.ui.h:2 +#: ../meld/resources/ui/column-list.ui.h:1 +#: ../meld/resources/ui/filter-list.ui.h:1 msgid "Active" msgstr "Aktiv" -#: ../data/ui/EditableList.ui.h:3 +#: ../meld/resources/ui/column-list.ui.h:2 msgid "Column Name" msgstr "Kolonnenavn" -#: ../data/ui/EditableList.ui.h:4 ../data/ui/vcview.ui.h:9 -msgid "_Add" -msgstr "_Tilføj" - -#: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11 -#: ../meld/vcview.py:680 +#: ../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 msgid "_Remove" msgstr "_Fjern" -#: ../data/ui/EditableList.ui.h:6 +#: ../meld/resources/ui/column-list.ui.h:4 +#: ../meld/resources/ui/filter-list.ui.h:8 msgid "Move item up" msgstr "Flyt element op" -#: ../data/ui/EditableList.ui.h:7 +#: ../meld/resources/ui/column-list.ui.h:5 +#: ../meld/resources/ui/filter-list.ui.h:9 msgid "Move _Up" msgstr "Flyt _op" -#: ../data/ui/EditableList.ui.h:8 +#: ../meld/resources/ui/column-list.ui.h:6 +#: ../meld/resources/ui/filter-list.ui.h:10 msgid "Move item down" msgstr "Flyt element ned" -#: ../data/ui/EditableList.ui.h:9 +#: ../meld/resources/ui/column-list.ui.h:7 +#: ../meld/resources/ui/filter-list.ui.h:11 msgid "Move _Down" msgstr "Flyt _ned" -#. Create icon and filename CellRenderer -#: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35 -#: ../meld/dirdiff.py:416 -msgid "Name" -msgstr "Navn" +#: ../meld/resources/ui/commit-dialog.ui.h:1 +msgid "Commit" +msgstr "Commit" -#: ../data/ui/EditableList.ui.h:11 -msgid "Pattern" -msgstr "Mønster" +#: ../meld/resources/ui/commit-dialog.ui.h:2 +msgid "Commit Files" +msgstr "Commit filer" -#: ../data/ui/EditableList.ui.h:12 -msgid "Add new filter" -msgstr "Tilføj nyt filter" +#: ../meld/resources/ui/commit-dialog.ui.h:3 +msgid "Log Message" +msgstr "Logbesked" -#: ../data/ui/EditableList.ui.h:13 -msgid "Remove selected filter" -msgstr "Fjern det valgte filter" +# logpunkter?, logindgange? +#: ../meld/resources/ui/commit-dialog.ui.h:4 +msgid "Previous logs:" +msgstr "Forrige logge:" + +#: ../meld/resources/ui/commit-dialog.ui.h:5 +msgid "Co_mmit" +msgstr "Co_mmit" + +#: ../meld/resources/ui/dirdiff.ui.h:1 ../meld/resources/ui/vcview.ui.h:1 +msgid "_Compare" +msgstr "_Sammenlign" + +#: ../meld/resources/ui/dirdiff.ui.h:2 ../meld/resources/ui/vcview.ui.h:2 +msgid "Compare selected files" +msgstr "Sammenlign de valgte filer" + +#: ../meld/resources/ui/dirdiff.ui.h:3 +msgid "Collapse Recursively" +msgstr "Fold sammen rekursivt" + +#: ../meld/resources/ui/dirdiff.ui.h:4 +msgid "Collapse selected folder and all subfolders" +msgstr "Fold den valgte mappe og alle undermapperne sammen" + +#: ../meld/resources/ui/dirdiff.ui.h:5 +msgid "Expand Recursively" +msgstr "Udfold rekursivt" + +#: ../meld/resources/ui/dirdiff.ui.h:6 +msgid "Expand selected folder and all subfolders" +msgstr "Udfold den valgte mappe og alle undermapperne" + +#: ../meld/resources/ui/dirdiff.ui.h:7 +msgid "Copy to _Left" +msgstr "Kopiér til _venstre" + +#: ../meld/resources/ui/dirdiff.ui.h:8 +msgid "Copy to left" +msgstr "Kopiér til venstre" + +#: ../meld/resources/ui/dirdiff.ui.h:9 +msgid "Copy to _Right" +msgstr "Kopiér til _højre" + +#: ../meld/resources/ui/dirdiff.ui.h:10 +msgid "Copy to right" +msgstr "Kopiér til højre" -#: ../data/ui/encoding-selector.ui.h:1 +#: ../meld/resources/ui/dirdiff.ui.h:11 +msgid "Delete selected" +msgstr "Slet det valgte" + +#: ../meld/resources/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:959 +#: ../meld/filediff.py:1601 +msgid "Hide" +msgstr "Skjul" + +#: ../meld/resources/ui/dirdiff.ui.h:13 +msgid "Hide selected" +msgstr "Skjul det valgte" + +#: ../meld/resources/ui/dirdiff.ui.h:14 +msgid "Ignore Filename Case" +msgstr "Ignorér store/små bogstaver i filnavne" + +#: ../meld/resources/ui/dirdiff.ui.h:15 +msgid "" +"Consider differently-cased filenames that are otherwise-identical to be the " +"same" +msgstr "" +"Anse filnavne med forskelle i store/små bogstaver, men ellers er identiske, " +"som værende ens" + +#: ../meld/resources/ui/dirdiff.ui.h:16 +msgid "Same" +msgstr "Ens" + +#: ../meld/resources/ui/dirdiff.ui.h:17 +msgid "Show identical" +msgstr "Vis ens" + +#: ../meld/resources/ui/dirdiff.ui.h:18 +msgid "New" +msgstr "Ny" + +#: ../meld/resources/ui/dirdiff.ui.h:19 +msgid "Show new" +msgstr "Vis ny" + +#: ../meld/resources/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:77 +msgid "Modified" +msgstr "Ændret" + +#: ../meld/resources/ui/dirdiff.ui.h:21 +msgid "Show modified" +msgstr "Vis ændret" + +#: ../meld/resources/ui/dirdiff.ui.h:22 +msgid "Filters" +msgstr "Filtre" + +#: ../meld/resources/ui/dirdiff.ui.h:23 +msgid "Set active filters" +msgstr "Angiv aktivt filter" + +#: ../meld/resources/ui/encoding-selector.ui.h:1 msgid "Search text encoding…" msgstr "Søg tekstkodning …" -#: ../data/ui/filediff.ui.h:1 +#: ../meld/resources/ui/filediff.ui.h:1 msgid "Format as Patch…" msgstr "Formatér som rettelse (patch) …" -#: ../data/ui/filediff.ui.h:2 +#: ../meld/resources/ui/filediff.ui.h:2 msgid "Create a patch using differences between files" msgstr "Opret en rettelse (patch) ud fra forskelle mellem filer" -#: ../data/ui/filediff.ui.h:3 +#: ../meld/resources/ui/filediff.ui.h:3 msgid "Save A_ll" msgstr "Gem a_lle" -#: ../data/ui/filediff.ui.h:4 +#: ../meld/resources/ui/filediff.ui.h:4 msgid "Save all files in the current comparison" msgstr "Gem alle filer i den aktuelle sammenligning" -#: ../data/ui/filediff.ui.h:5 +#: ../meld/resources/ui/filediff.ui.h:5 msgid "Revert files to their saved versions" msgstr "Tilbagefør filer til deres gemte versioner" -#: ../data/ui/filediff.ui.h:6 +#: ../meld/resources/ui/filediff.ui.h:6 msgid "Add Synchronization Point" msgstr "Tilføj synkroniseringspunkt" -#: ../data/ui/filediff.ui.h:7 +#: ../meld/resources/ui/filediff.ui.h:7 msgid "Add a synchronization point for changes between files" msgstr "Tilføj et synkroniseringspunkt for ændringer mellem filer" -#: ../data/ui/filediff.ui.h:8 +#: ../meld/resources/ui/filediff.ui.h:8 msgid "Clear Synchronization Points" msgstr "Ryd synkroniseringspunkter" -#: ../data/ui/filediff.ui.h:9 +#: ../meld/resources/ui/filediff.ui.h:9 msgid "Clear sychronization points for changes between files" msgstr "Ryd synkroniseringspunkter for ændringer mellem filer" -#: ../data/ui/filediff.ui.h:10 +#: ../meld/resources/ui/filediff.ui.h:10 msgid "Previous Conflict" msgstr "Forrige konflikt" -#: ../data/ui/filediff.ui.h:11 +#: ../meld/resources/ui/filediff.ui.h:11 msgid "Go to the previous conflict" msgstr "Gå til den forrige konflikt" -#: ../data/ui/filediff.ui.h:12 +#: ../meld/resources/ui/filediff.ui.h:12 msgid "Next Conflict" msgstr "Næste konflikt" -#: ../data/ui/filediff.ui.h:13 +#: ../meld/resources/ui/filediff.ui.h:13 msgid "Go to the next conflict" msgstr "Gå til den næste konflikt" -#: ../data/ui/filediff.ui.h:14 +#: ../meld/resources/ui/filediff.ui.h:14 msgid "Push to Left" msgstr "Skub til venstre" -#: ../data/ui/filediff.ui.h:15 +#: ../meld/resources/ui/filediff.ui.h:15 msgid "Push current change to the left" msgstr "Skub aktuel ændring til venstre" -#: ../data/ui/filediff.ui.h:16 +#: ../meld/resources/ui/filediff.ui.h:16 msgid "Push to Right" msgstr "Skub til højre" -#: ../data/ui/filediff.ui.h:17 +#: ../meld/resources/ui/filediff.ui.h:17 msgid "Push current change to the right" msgstr "Skub aktuel ændring til højre" -#: ../data/ui/filediff.ui.h:18 +#: ../meld/resources/ui/filediff.ui.h:18 msgid "Pull from Left" msgstr "Træk fra venstre" -#: ../data/ui/filediff.ui.h:19 +#: ../meld/resources/ui/filediff.ui.h:19 msgid "Pull change from the left" msgstr "Træk ændring fra venstre" -#: ../data/ui/filediff.ui.h:20 +#: ../meld/resources/ui/filediff.ui.h:20 msgid "Pull from Right" msgstr "Træk fra højre" -#: ../data/ui/filediff.ui.h:21 +#: ../meld/resources/ui/filediff.ui.h:21 msgid "Pull change from the right" msgstr "Træk ændring fra højre" -#: ../data/ui/filediff.ui.h:22 +#: ../meld/resources/ui/filediff.ui.h:22 msgid "Copy Above Left" msgstr "Kopiér ovenfor til venstre" -#: ../data/ui/filediff.ui.h:23 +#: ../meld/resources/ui/filediff.ui.h:23 msgid "Copy change above the left chunk" msgstr "Kopiér ændring over det store venstre stykke" -#: ../data/ui/filediff.ui.h:24 +#: ../meld/resources/ui/filediff.ui.h:24 msgid "Copy Below Left" msgstr "Kopiér nedenfor til venstre" -#: ../data/ui/filediff.ui.h:25 +#: ../meld/resources/ui/filediff.ui.h:25 msgid "Copy change below the left chunk" msgstr "Kopiér ændring nedenunder det store venstre stykke" -#: ../data/ui/filediff.ui.h:26 +#: ../meld/resources/ui/filediff.ui.h:26 msgid "Copy Above Right" msgstr "Kopiér ovenfor til højre" -#: ../data/ui/filediff.ui.h:27 +#: ../meld/resources/ui/filediff.ui.h:27 msgid "Copy change above the right chunk" msgstr "Kopiér ændring over det store højre stykke" -#: ../data/ui/filediff.ui.h:28 +#: ../meld/resources/ui/filediff.ui.h:28 msgid "Copy Below Right" msgstr "Kopiér nedenfor til højre" -#: ../data/ui/filediff.ui.h:29 +#: ../meld/resources/ui/filediff.ui.h:29 msgid "Copy change below the right chunk" msgstr "Kopiér ændring nedenunder det store højre stykke" -#: ../data/ui/filediff.ui.h:30 +#: ../meld/resources/ui/filediff.ui.h:30 msgid "Delete" msgstr "Slet" -#: ../data/ui/filediff.ui.h:31 +#: ../meld/resources/ui/filediff.ui.h:31 msgid "Delete change" msgstr "Slet ændring" -#: ../data/ui/filediff.ui.h:32 +#: ../meld/resources/ui/filediff.ui.h:32 msgid "Merge All from Left" msgstr "Flet alle fra venstre" -#: ../data/ui/filediff.ui.h:33 +#: ../meld/resources/ui/filediff.ui.h:33 msgid "Merge all non-conflicting changes from the left" msgstr "Flet alle ændringer, der ikke er i konflikt, fra venstre" -#: ../data/ui/filediff.ui.h:34 +#: ../meld/resources/ui/filediff.ui.h:34 msgid "Merge All from Right" msgstr "Flet alle fra højre" -#: ../data/ui/filediff.ui.h:35 +#: ../meld/resources/ui/filediff.ui.h:35 msgid "Merge all non-conflicting changes from the right" msgstr "Flet alle ændringer, der ikke er i konflikt, fra højre" -#: ../data/ui/filediff.ui.h:36 +#: ../meld/resources/ui/filediff.ui.h:36 msgid "Merge All" msgstr "Flet alle" -#: ../data/ui/filediff.ui.h:37 +#: ../meld/resources/ui/filediff.ui.h:37 msgid "Merge all non-conflicting changes from left and right panes" msgstr "" "Flet alle ændringer, der ikke er i konflikt, fra venstre og højre ruder" -#: ../data/ui/filediff.ui.h:38 +#: ../meld/resources/ui/filediff.ui.h:38 msgid "Previous Pane" msgstr "Forrige rude" -#: ../data/ui/filediff.ui.h:39 +#: ../meld/resources/ui/filediff.ui.h:39 msgid "Move keyboard focus to the previous document in this comparison" msgstr "Flyt tastaturets fokus til det forrige dokument i denne sammenligning" -#: ../data/ui/filediff.ui.h:40 +#: ../meld/resources/ui/filediff.ui.h:40 msgid "Next Pane" msgstr "Næste rude" -#: ../data/ui/filediff.ui.h:41 +#: ../meld/resources/ui/filediff.ui.h:41 msgid "Move keyboard focus to the next document in this comparison" msgstr "Flyt tastaturets fokus til det næste dokument i denne sammenligning" -#: ../data/ui/filediff.ui.h:42 +#: ../meld/resources/ui/filediff.ui.h:42 msgid "Lock Scrolling" msgstr "Lås rulning" -#: ../data/ui/filediff.ui.h:43 +#: ../meld/resources/ui/filediff.ui.h:43 msgid "Lock scrolling of all panes" msgstr "Lås rulning i alle ruder" -#: ../data/ui/filediff.ui.h:44 -msgid "Save changes to documents before closing?" -msgstr "Gem ændringer i dokumenter, før der lukkes?" - -#: ../data/ui/filediff.ui.h:45 -msgid "If you don’t save, changes will be permanently lost." -msgstr "Ændringerne vil gå tabt, hvis ikke du gemmer." - -#: ../data/ui/filediff.ui.h:46 -msgid "Close _without Saving" -msgstr "Luk _uden at gemme" - -#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:1001 ../meld/filediff.py:1598 -#: ../meld/iohelpers.py:50 ../meld/iohelpers.py:100 -msgid "_Cancel" -msgstr "_Annullér" - -#: ../data/ui/filediff.ui.h:48 -msgid "_Save" -msgstr "_Gem" - -#: ../data/ui/filediff.ui.h:49 +#: ../meld/resources/ui/filediff.ui.h:44 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." @@ -912,776 +1127,568 @@ msgstr "" "Der kan ikke skrives til denne fil. Du kan klikke her for at låse filen op " "og alligevel foretage ændringer, men ændringerne skal gemmes til en ny fil." -#: ../data/ui/filediff.ui.h:50 +#: ../meld/resources/ui/filediff.ui.h:45 msgid "File 3" msgstr "Fil 3" -#: ../data/ui/filediff.ui.h:51 +#: ../meld/resources/ui/filediff.ui.h:46 msgid "File 2" msgstr "Fil 2" -#: ../data/ui/filediff.ui.h:52 +#: ../meld/resources/ui/filediff.ui.h:47 msgid "File 1" msgstr "Fil 1" -#: ../data/ui/filediff.ui.h:53 -msgid "Discard unsaved changes to documents?" -msgstr "Kassér ikke gemte ændringer i dokumentet?" +#. Create icon and filename CellRenderer +#: ../meld/resources/ui/filter-list.ui.h:2 ../meld/resources/ui/vcview.ui.h:30 +#: ../meld/dirdiff.py:455 +msgid "Name" +msgstr "Navn" -#: ../data/ui/filediff.ui.h:54 -msgid "Changes made to the following documents will be permanently lost:" -msgstr "Ændringer foretaget i følgende dokumenter vil gå tabt for altid:" +#: ../meld/resources/ui/filter-list.ui.h:3 +msgid "Pattern" +msgstr "Mønster" -# Fjern, gem ikke, kasser, forkast (ordliste har kasser) -#: ../data/ui/filediff.ui.h:55 -msgid "_Discard" -msgstr "_Kassér" +#: ../meld/resources/ui/filter-list.ui.h:4 +msgid "Add new filter" +msgstr "Tilføj nyt filter" -#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:1002 ../meld/iohelpers.py:101 +#: ../meld/resources/ui/filter-list.ui.h:5 ../meld/resources/ui/vcview.ui.h:9 +msgid "_Add" +msgstr "_Tilføj" + +#: ../meld/resources/ui/filter-list.ui.h:6 +msgid "Remove selected filter" +msgstr "Fjern det valgte filter" + +#: ../meld/resources/ui/findbar.ui.h:1 ../meld/dirdiff.py:1041 +#: ../meld/iohelpers.py:113 msgid "_Replace" msgstr "_Erstat" -#: ../data/ui/findbar.ui.h:2 +#: ../meld/resources/ui/findbar.ui.h:2 msgid "Replace _All" msgstr "Erstat _alle" -#: ../data/ui/findbar.ui.h:3 +#: ../meld/resources/ui/findbar.ui.h:3 msgid "_Previous" msgstr "_Forrige" -#: ../data/ui/findbar.ui.h:4 +#: ../meld/resources/ui/findbar.ui.h:4 msgid "_Next" msgstr "_Næste" -#: ../data/ui/findbar.ui.h:5 +#: ../meld/resources/ui/findbar.ui.h:5 msgid "Find:" msgstr "Find:" -#: ../data/ui/findbar.ui.h:6 +#: ../meld/resources/ui/findbar.ui.h:6 msgid "Replace _with:" msgstr "Erstat _med:" -#: ../data/ui/findbar.ui.h:7 +#: ../meld/resources/ui/findbar.ui.h:7 msgid "_Match case" msgstr "_Forskel på store/små bogstaver" -#: ../data/ui/findbar.ui.h:8 +#: ../meld/resources/ui/findbar.ui.h:8 msgid "Who_le word" msgstr "_Hele ord" -#: ../data/ui/findbar.ui.h:9 +#: ../meld/resources/ui/findbar.ui.h:9 msgid "Regular e_xpression" msgstr "Regulært _udtryk" -#: ../data/ui/findbar.ui.h:10 +#: ../meld/resources/ui/findbar.ui.h:10 msgid "Wrapped" msgstr "Ombrudt" -#: ../data/ui/language-selector.ui.h:1 +#: ../meld/resources/ui/language-selector.ui.h:1 msgid "Search highlight mode…" msgstr "Tilstand for søgefremhævelse …" -#: ../data/ui/patch-dialog.ui.h:1 +#: ../meld/resources/ui/new-diff-tab.ui.h:1 ../meld/meldwindow.py:532 +#: ../meld/newdifftab.py:53 +msgid "New comparison" +msgstr "Ny sammenligning" + +# Sammenligning af _filer +#: ../meld/resources/ui/new-diff-tab.ui.h:2 +msgid "File comparison" +msgstr "Filsammenligning" + +# Sammenligning af _mapper +#: ../meld/resources/ui/new-diff-tab.ui.h:3 +msgid "Directory comparison" +msgstr "Mappesammenligning" + +#: ../meld/resources/ui/new-diff-tab.ui.h:4 +msgid "Version control view" +msgstr "Visning af versionsstyring" + +# Sammenligning af _filer +#: ../meld/resources/ui/new-diff-tab.ui.h:5 +msgid "_3-way comparison" +msgstr "_Trevejssammenligning" + +#: ../meld/resources/ui/new-diff-tab.ui.h:6 +msgid "Select Third File" +msgstr "Vælg den 3. fil" + +#: ../meld/resources/ui/new-diff-tab.ui.h:7 +msgid "Select Second File" +msgstr "Vælg den 2. fil" + +#: ../meld/resources/ui/new-diff-tab.ui.h:8 +msgid "Select First File" +msgstr "Vælg den 1. fil" + +#: ../meld/resources/ui/new-diff-tab.ui.h:9 +msgid "Select First Folder" +msgstr "Vælg den 1. mappe" + +#: ../meld/resources/ui/new-diff-tab.ui.h:10 +msgid "Select Second Folder" +msgstr "Vælg den 2. mappe" + +#: ../meld/resources/ui/new-diff-tab.ui.h:11 +msgid "Select Third Folder" +msgstr "Vælg den 3. mappe" + +#: ../meld/resources/ui/new-diff-tab.ui.h:12 +msgid "Select A Version-Controlled Folder" +msgstr "Vælg en versionsstyret mappe" + +#: ../meld/resources/ui/new-diff-tab.ui.h:13 +msgid "_Blank comparison" +msgstr "_Tom sammenligning" + +#: ../meld/resources/ui/new-diff-tab.ui.h:14 +msgid "C_ompare" +msgstr "_Sammenlign" + +#: ../meld/resources/ui/notebook-label.ui.h:1 +msgid "Close Tab" +msgstr "Luk faneblad" + +#: ../meld/resources/ui/patch-dialog.ui.h:1 msgid "Format as Patch" msgstr "Formatér som rettelse (patch)" -#: ../data/ui/patch-dialog.ui.h:2 +#: ../meld/resources/ui/patch-dialog.ui.h:2 msgid "Copy to Clipboard" msgstr "Kopiér til udklipsholderen" -#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:152 +#: ../meld/resources/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:165 msgid "Save Patch" msgstr "Gem rettelse (patch)" -#: ../data/ui/patch-dialog.ui.h:4 +#: ../meld/resources/ui/patch-dialog.ui.h:4 msgid "Use differences between:" msgstr "Brug forskelle mellem:" -#: ../data/ui/patch-dialog.ui.h:5 +#: ../meld/resources/ui/patch-dialog.ui.h:5 msgid "Left and middle panes" msgstr "Ruder til venstre og i midten" -#: ../data/ui/patch-dialog.ui.h:6 +#: ../meld/resources/ui/patch-dialog.ui.h:6 msgid "Middle and right panes" msgstr "Ruder i midten og til højre" -#: ../data/ui/patch-dialog.ui.h:7 +#: ../meld/resources/ui/patch-dialog.ui.h:7 msgid "_Reverse patch direction" msgstr "_Modsat rettelsesretning" -#: ../data/ui/preferences.ui.h:1 -msgid "Meld Preferences" -msgstr "Indstillinger for Meld" +#: ../meld/resources/ui/preferences.ui.h:1 +msgid "Preferences" +msgstr "Indstillinger" -#: ../data/ui/preferences.ui.h:2 +#: ../meld/resources/ui/preferences.ui.h:2 msgid "Font" msgstr "Skrifttype" -#: ../data/ui/preferences.ui.h:3 +#: ../meld/resources/ui/preferences.ui.h:3 msgid "_Use the system fixed width font" msgstr "_Brug systemets standardskrifttype med fast bredde" # Det er ikke det eksterne redigeringsprogram, men internt i Meld. -#: ../data/ui/preferences.ui.h:4 +#: ../meld/resources/ui/preferences.ui.h:4 msgid "_Editor font:" msgstr "_Skrifttype for redigering:" -#: ../data/ui/preferences.ui.h:5 +#. 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 msgid "Display" msgstr "Skærm" -#: ../data/ui/preferences.ui.h:6 +#: ../meld/resources/ui/preferences.ui.h:6 msgid "_Tab width:" msgstr "_Bredde på tabulator:" -#: ../data/ui/preferences.ui.h:7 +#: ../meld/resources/ui/preferences.ui.h:7 msgid "_Insert spaces instead of tabs" msgstr "_Indsæt mellemrum i stedet for tabulator" -#: ../data/ui/preferences.ui.h:8 +#: ../meld/resources/ui/preferences.ui.h:8 msgid "Enable text _wrapping" msgstr "Aktivér _tekstombrydning" -#: ../data/ui/preferences.ui.h:9 +#: ../meld/resources/ui/preferences.ui.h:9 msgid "Do not _split words over two lines" msgstr "_Opdel ikke ord over to linjer" -#: ../data/ui/preferences.ui.h:10 +#: ../meld/resources/ui/preferences.ui.h:10 msgid "Highlight _current line" msgstr "Fremhæv _aktuelle linje" -#: ../data/ui/preferences.ui.h:11 +#: ../meld/resources/ui/preferences.ui.h:11 msgid "Show _line numbers" msgstr "Vis _linjenumre" -#: ../data/ui/preferences.ui.h:12 +#: ../meld/resources/ui/preferences.ui.h:12 msgid "Show w_hitespace" msgstr "Vis _blanktegn" -#: ../data/ui/preferences.ui.h:13 +#: ../meld/resources/ui/preferences.ui.h:13 msgid "Use s_yntax highlighting" msgstr "Brug _syntaksfremhævning" -#: ../data/ui/preferences.ui.h:14 +#: ../meld/resources/ui/preferences.ui.h:14 msgid "Syntax highlighting color scheme:" msgstr "Farveskema for syntaksfremhævning:" -#: ../data/ui/preferences.ui.h:15 +#: ../meld/resources/ui/preferences.ui.h:15 msgid "External Editor" msgstr "Eksternt redigeringsprogram" # Brug det _normale systemredigeringsprogram # Brug systemets _standardredigeringsprogram -#: ../data/ui/preferences.ui.h:16 +#: ../meld/resources/ui/preferences.ui.h:16 msgid "Use _default system editor" msgstr "Brug det _normale systemredigeringsprogram" -#: ../data/ui/preferences.ui.h:17 +#: ../meld/resources/ui/preferences.ui.h:17 msgid "Edito_r command:" msgstr "_Kommando for redigeringsprogram:" -#: ../data/ui/preferences.ui.h:18 +#: ../meld/resources/ui/preferences.ui.h:18 msgid "Editor" msgstr "Redigeringsprogram" -#: ../data/ui/preferences.ui.h:19 +#: ../meld/resources/ui/preferences.ui.h:19 msgid "Shallow Comparison" msgstr "Overfladisk sammenligning" -#: ../data/ui/preferences.ui.h:20 +#: ../meld/resources/ui/preferences.ui.h:20 msgid "C_ompare files based only on size and timestamp" msgstr "_Sammenlign kun filer baseret på størrelse og tidsstempel" -#: ../data/ui/preferences.ui.h:21 +#: ../meld/resources/ui/preferences.ui.h:21 msgid "_Timestamp resolution:" msgstr "_Tidsstempelopløsning:" -#: ../data/ui/preferences.ui.h:23 +#: ../meld/resources/ui/preferences.ui.h:23 msgid "Note: enabling text filters may make comparing large files much slower" msgstr "" "Bemærk: Aktivering af tekstfiltre kan gøre sammenligning af store filer " "meget langsommere" -#: ../data/ui/preferences.ui.h:24 +#: ../meld/resources/ui/preferences.ui.h:24 msgid "Symbolic Links" msgstr "Symbolske henvisninger" -#: ../data/ui/preferences.ui.h:26 +#: ../meld/resources/ui/preferences.ui.h:26 msgid "Visible Columns" msgstr "Synlige kolonner" -#: ../data/ui/preferences.ui.h:27 +#: ../meld/resources/ui/preferences.ui.h:27 msgid "Folder Comparisons" msgstr "Mappesammenligninger" -#: ../data/ui/preferences.ui.h:28 +#: ../meld/resources/ui/preferences.ui.h:28 msgid "Version Comparisons" msgstr "Versionssammenligninger" -#: ../data/ui/preferences.ui.h:29 +#: ../meld/resources/ui/preferences.ui.h:29 msgid "_Order when comparing file revisions:" msgstr "_Rækkefølge ved sammenligning af filrevisioner:" -#: ../data/ui/preferences.ui.h:30 +#: ../meld/resources/ui/preferences.ui.h:30 msgid "Order when _merging files:" msgstr "R_ækkefølge når filer flettes:" -#: ../data/ui/preferences.ui.h:31 +#: ../meld/resources/ui/preferences.ui.h:31 msgid "Commit Messages" msgstr "Commit-beskeder" -#: ../data/ui/preferences.ui.h:32 +#: ../meld/resources/ui/preferences.ui.h:32 msgid "Show _right margin at:" msgstr "Vis _højre margen ved:" -#: ../data/ui/preferences.ui.h:33 +#: ../meld/resources/ui/preferences.ui.h:33 msgid "Automatically _break lines at right margin on commit" msgstr "Bryd automatisk linjer ved højre margen ved commit" -#: ../data/ui/preferences.ui.h:34 +#: ../meld/resources/ui/preferences.ui.h:34 msgid "Version Control" msgstr "Versionsstyring" -#: ../data/ui/preferences.ui.h:35 +#: ../meld/resources/ui/preferences.ui.h:35 msgid "Filename filters" -msgstr "Filnavnefiltre" - -#: ../data/ui/preferences.ui.h:36 -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 "" -"Når der udføres mappesammenligninger, kan du filtrere filer og mapper fra " -"efter navn. Hvert mønster er en liste af skallignende jokertegn adskilt af " -"mellemrum." - -#: ../data/ui/preferences.ui.h:37 ../meld/meldwindow.py:105 -msgid "File Filters" -msgstr "Filfiltre" - -#: ../data/ui/preferences.ui.h:38 -msgid "Change trimming" -msgstr "Ændr beskæring" - -#: ../data/ui/preferences.ui.h:39 -msgid "Trim blank line differences from the start and end of changes" -msgstr "" -"Beskær tomme linjer-forskelle fra begyndelsen og slutningen af ændringer" - -#: ../data/ui/preferences.ui.h:40 -msgid "Text filters" -msgstr "Tekstfiltre" - -# vert mønster er et regulært udtryk i python, der erstatter -# tilsvarende tekst med den tomme streng før sammenligningen udføres. -#: ../data/ui/preferences.ui.h:41 -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 "" -"Når der udføres filsammenligninger, kan du ignorere visse ændringer. Hvert " -"mønster her er et regulært udtryk i python, som erstatter tilsvarende tekst " -"med den tomme streng før sammenligning udføres. Hvis udtrykket indeholder " -"grupper, bliver kun grupperne erstattet. Se brugermanualen for yderligere " -"detaljer." - -#: ../data/ui/preferences.ui.h:42 -msgid "Text Filters" -msgstr "Tekstfiltre" - -#: ../data/ui/preferences.ui.h:43 -msgid "Left is remote, right is local" -msgstr "Venstre er fjern, højre er lokal" - -#: ../data/ui/preferences.ui.h:44 -msgid "Left is local, right is remote" -msgstr "Venstre er lokal, højre er fjern" - -#: ../data/ui/preferences.ui.h:45 -msgid "Remote, merge, local" -msgstr "Fjern, flet, lokal" - -#: ../data/ui/preferences.ui.h:46 -msgid "Local, merge, remote" -msgstr "Lokal, flet, fjern" - -#: ../data/ui/preferences.ui.h:47 -msgid "1ns (ext4)" -msgstr "1ns (ext4)" - -#: ../data/ui/preferences.ui.h:48 -msgid "100ns (NTFS)" -msgstr "100ns (NTFS)" - -#: ../data/ui/preferences.ui.h:49 -msgid "1s (ext2/ext3)" -msgstr "1s (ext2/ext3)" - -#: ../data/ui/preferences.ui.h:50 -msgid "2s (VFAT)" -msgstr "2s (VFAT)" - -#: ../data/ui/shortcuts.ui.h:1 -msgctxt "shortcut window" -msgid "General" -msgstr "Generelt" - -#: ../data/ui/shortcuts.ui.h:2 -msgctxt "shortcut window" -msgid "New comparison" -msgstr "Ny sammenligning" - -#: ../data/ui/shortcuts.ui.h:3 -msgctxt "shortcut window" -msgid "Close a comparison" -msgstr "Luk en sammenligning" - -#: ../data/ui/shortcuts.ui.h:4 -msgctxt "shortcut window" -msgid "Quit Meld" -msgstr "Afslut Meld" - -#: ../data/ui/shortcuts.ui.h:5 -msgctxt "shortcut window" -msgid "Stop the current action" -msgstr "Stop den aktuelle handling" - -#: ../data/ui/shortcuts.ui.h:6 -msgctxt "shortcut window" -msgid "Refresh comparison" -msgstr "Opdatér sammenligningen" - -#: ../data/ui/shortcuts.ui.h:7 -msgctxt "shortcut window" -msgid "Fullscreen" -msgstr "Fuldskærm" - -#: ../data/ui/shortcuts.ui.h:8 -msgctxt "shortcut window" -msgid "Tabs" -msgstr "Faneblade" - -#: ../data/ui/shortcuts.ui.h:9 -msgctxt "shortcut window" -msgid "Go to previous tab" -msgstr "Gå til det forrige faneblad" - -#: ../data/ui/shortcuts.ui.h:10 -msgctxt "shortcut window" -msgid "Go to next tab" -msgstr "Gå til det næste faneblad" - -#: ../data/ui/shortcuts.ui.h:11 -msgctxt "shortcut window" -msgid "Switch to tab" -msgstr "Skift til faneblad" - -#: ../data/ui/shortcuts.ui.h:12 -msgctxt "shortcut window" -msgid "Move tab left" -msgstr "Flyt fanebladet til venstre" - -#: ../data/ui/shortcuts.ui.h:13 -msgctxt "shortcut window" -msgid "Move tab right" -msgstr "Flyt fanebladet til højre" - -#: ../data/ui/shortcuts.ui.h:14 -msgctxt "shortcut window" -msgid "Changes" -msgstr "Ændringer" - -#: ../data/ui/shortcuts.ui.h:15 -msgctxt "shortcut window" -msgid "Go to previous change" -msgstr "Gå til den forrige ændring" - -#: ../data/ui/shortcuts.ui.h:16 -msgctxt "shortcut window" -msgid "Go to next change" -msgstr "Gå til den næste ændring" - -#: ../data/ui/shortcuts.ui.h:17 -msgctxt "shortcut window" -msgid "Editing" -msgstr "Redigering" - -#: ../data/ui/shortcuts.ui.h:18 -msgctxt "shortcut window" -msgid "Undo" -msgstr "Fortryd" - -#: ../data/ui/shortcuts.ui.h:19 -msgctxt "shortcut window" -msgid "Redo" -msgstr "Gentag" - -#: ../data/ui/shortcuts.ui.h:20 -msgctxt "shortcut window" -msgid "Cut" -msgstr "Klip" - -#: ../data/ui/shortcuts.ui.h:21 -msgctxt "shortcut window" -msgid "Copy" -msgstr "Kopiér" - -#: ../data/ui/shortcuts.ui.h:22 -msgctxt "shortcut window" -msgid "Paste" -msgstr "Indsæt" - -#: ../data/ui/shortcuts.ui.h:23 -msgctxt "shortcut window" -msgid "Find" -msgstr "Find" - -#: ../data/ui/shortcuts.ui.h:24 -msgctxt "shortcut window" -msgid "Find Next" -msgstr "Find næste" - -#: ../data/ui/shortcuts.ui.h:25 -msgctxt "shortcut window" -msgid "Find Previous" -msgstr "Find forrige" - -#: ../data/ui/shortcuts.ui.h:26 -msgctxt "shortcut window" -msgid "Replace" -msgstr "Erstat" - -#: ../data/ui/shortcuts.ui.h:27 -msgctxt "shortcut window" -msgid "File comparison" -msgstr "Filsammenligning" - -#: ../data/ui/shortcuts.ui.h:28 -msgctxt "shortcut window" -msgid "Save current file" -msgstr "Gem den aktuelle fil" - -#: ../data/ui/shortcuts.ui.h:29 -msgctxt "shortcut window" -msgid "Save current file to new path" -msgstr "Gem den aktuelle fil et andet sted" - -#: ../data/ui/shortcuts.ui.h:30 -msgctxt "shortcut window" -msgid "Save all files in comparison" -msgstr "Gem alle filer i sammenligningen" - -#: ../data/ui/shortcuts.ui.h:31 -msgctxt "shortcut window" -msgid "Previous conflict" -msgstr "Forrige konflikt" - -#: ../data/ui/shortcuts.ui.h:32 -msgctxt "shortcut window" -msgid "Next conflict" -msgstr "Næste konflikt" - -#: ../data/ui/shortcuts.ui.h:33 -msgctxt "shortcut window" -msgid "Push change to left" -msgstr "Skub ændringen til venstre" - -#: ../data/ui/shortcuts.ui.h:34 -msgctxt "shortcut window" -msgid "Push change to right" -msgstr "Skub ændringen til højre" - -#: ../data/ui/shortcuts.ui.h:35 -msgctxt "shortcut window" -msgid "Pull change from left" -msgstr "Træk ændringen fra venstre" - -#: ../data/ui/shortcuts.ui.h:36 -msgctxt "shortcut window" -msgid "Pull change from right" -msgstr "Træk ændringen fra højre" +msgstr "Filnavnefiltre" -#: ../data/ui/shortcuts.ui.h:37 -msgctxt "shortcut window" -msgid "Copy change above left" -msgstr "Kopiér ændringen ovenfor til venstre" +#: ../meld/resources/ui/preferences.ui.h:36 +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 "" +"Når der udføres mappesammenligninger, kan du filtrere filer og mapper fra " +"efter navn. Hvert mønster er en liste af skallignende jokertegn adskilt af " +"mellemrum." -#: ../data/ui/shortcuts.ui.h:38 -msgctxt "shortcut window" -msgid "Copy change below left" -msgstr "Kopiér ændringen nedenfor til venstre" +#: ../meld/resources/ui/preferences.ui.h:37 ../meld/meldwindow.py:114 +msgid "File Filters" +msgstr "Filfiltre" -#: ../data/ui/shortcuts.ui.h:39 -msgctxt "shortcut window" -msgid "Copy change above right" -msgstr "Kopiér ændringen ovenfor til højre" +#: ../meld/resources/ui/preferences.ui.h:38 +msgid "Change trimming" +msgstr "Ændr beskæring" -#: ../data/ui/shortcuts.ui.h:40 -msgctxt "shortcut window" -msgid "Copy change below right" -msgstr "Kopiér ændringen nedenfor til højre" +#: ../meld/resources/ui/preferences.ui.h:39 +msgid "Trim blank line differences from the start and end of changes" +msgstr "" +"Beskær tomme linjer-forskelle fra begyndelsen og slutningen af ændringer" -#: ../data/ui/shortcuts.ui.h:41 -msgctxt "shortcut window" -msgid "Delete change" -msgstr "Slet ændring" +#: ../meld/resources/ui/preferences.ui.h:40 +msgid "Text filters" +msgstr "Tekstfiltre" -#: ../data/ui/shortcuts.ui.h:42 -msgctxt "shortcut window" -msgid "Previous comparison pane" -msgstr "Forrige sammenligningsrude" +# vert mønster er et regulært udtryk i python, der erstatter +# tilsvarende tekst med den tomme streng før sammenligningen udføres. +#: ../meld/resources/ui/preferences.ui.h:41 +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 "" +"Når der udføres filsammenligninger, kan du ignorere visse ændringer. Hvert " +"mønster her er et regulært udtryk i python, som erstatter tilsvarende tekst " +"med den tomme streng før sammenligning udføres. Hvis udtrykket indeholder " +"grupper, bliver kun grupperne erstattet. Se brugermanualen for yderligere " +"detaljer." -#: ../data/ui/shortcuts.ui.h:43 -msgctxt "shortcut window" -msgid "Next comparison pane" -msgstr "Næste sammenligningsrude" +#: ../meld/resources/ui/preferences.ui.h:42 +msgid "Text Filters" +msgstr "Tekstfiltre" -#: ../data/ui/shortcuts.ui.h:44 -msgctxt "shortcut window" -msgid "Folder comparison" -msgstr "Mappesammenligning" +#: ../meld/resources/ui/preferences.ui.h:43 +msgid "Left is remote, right is local" +msgstr "Venstre er fjern, højre er lokal" -#: ../data/ui/shortcuts.ui.h:45 -msgctxt "shortcut window" -msgid "Copy to left" -msgstr "Kopiér til venstre" +#: ../meld/resources/ui/preferences.ui.h:44 +msgid "Left is local, right is remote" +msgstr "Venstre er lokal, højre er fjern" -#: ../data/ui/shortcuts.ui.h:46 -msgctxt "shortcut window" -msgid "Copy to right" -msgstr "Kopiér til højre" +#: ../meld/resources/ui/preferences.ui.h:45 +msgid "Remote, merge, local" +msgstr "Fjern, flet, lokal" -#: ../data/ui/shortcuts.ui.h:47 -msgctxt "shortcut window" -msgid "Version control comparison" -msgstr "Versionsstyringssammenligning" +#: ../meld/resources/ui/preferences.ui.h:46 +msgid "Local, merge, remote" +msgstr "Lokal, flet, fjern" -#: ../data/ui/shortcuts.ui.h:48 -msgctxt "shortcut window" -msgid "Commit to version control" -msgstr "Commit til versionsstyring" +#: ../meld/resources/ui/preferences.ui.h:47 +msgid "1ns (ext4)" +msgstr "1ns (ext4)" -#: ../data/ui/shortcuts.ui.h:49 -msgctxt "shortcut window" -msgid "Show/hide console output" -msgstr "Vis/skjul konsoloutput" +#: ../meld/resources/ui/preferences.ui.h:48 +msgid "100ns (NTFS)" +msgstr "100ns (NTFS)" -#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:567 -#: ../meld/newdifftab.py:49 -msgid "New comparison" -msgstr "Ny sammenligning" +#: ../meld/resources/ui/preferences.ui.h:49 +msgid "1s (ext2/ext3)" +msgstr "1s (ext2/ext3)" -# Sammenligning af _filer -#: ../data/ui/tab-placeholder.ui.h:2 -msgid "File comparison" -msgstr "Filsammenligning" +#: ../meld/resources/ui/preferences.ui.h:50 +msgid "2s (VFAT)" +msgstr "2s (VFAT)" -# Sammenligning af _mapper -#: ../data/ui/tab-placeholder.ui.h:3 -msgid "Directory comparison" -msgstr "Mappesammenligning" +#: ../meld/resources/ui/push-dialog.ui.h:1 +msgid "Push local commits to remote?" +msgstr "Skub lokale commit'er til fjern?" -#: ../data/ui/tab-placeholder.ui.h:4 -msgid "Version control view" -msgstr "Visning af versionsstyring" +#: ../meld/resources/ui/push-dialog.ui.h:2 +msgid "The commits to be pushed are determined by your version control system." +msgstr "" +"Hvilke commit'er, der skubbes, bestemmes af dit versionsstyringssystem." -# Sammenligning af _filer -#: ../data/ui/tab-placeholder.ui.h:5 -msgid "_3-way comparison" -msgstr "_Trevejssammenligning" +#: ../meld/resources/ui/push-dialog.ui.h:3 +msgid "_Push commits" +msgstr "_Skub commit'er" -#: ../data/ui/tab-placeholder.ui.h:6 -msgid "Select Third File" -msgstr "Vælg den 3. fil" +#: ../meld/resources/ui/revert-dialog.ui.h:1 +msgid "Discard unsaved changes to documents?" +msgstr "Kassér ikke gemte ændringer i dokumentet?" -#: ../data/ui/tab-placeholder.ui.h:7 -msgid "Select Second File" -msgstr "Vælg den 2. fil" +#: ../meld/resources/ui/revert-dialog.ui.h:2 +msgid "Changes made to the following documents will be permanently lost:" +msgstr "Ændringer foretaget i følgende dokumenter vil gå tabt for altid:" -#: ../data/ui/tab-placeholder.ui.h:8 -msgid "Select First File" -msgstr "Vælg den 1. fil" +# Fjern, gem ikke, kasser, forkast (ordliste har kasser) +#: ../meld/resources/ui/revert-dialog.ui.h:3 +msgid "_Discard" +msgstr "_Kassér" -#: ../data/ui/tab-placeholder.ui.h:9 -msgid "Select First Folder" -msgstr "Vælg den 1. mappe" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:1 +msgid "Save changes to documents before closing?" +msgstr "Gem ændringer i dokumenter, før der lukkes?" -#: ../data/ui/tab-placeholder.ui.h:10 -msgid "Select Second Folder" -msgstr "Vælg den 2. mappe" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:2 +msgid "If you don’t save, changes will be permanently lost." +msgstr "Ændringerne vil gå tabt, hvis ikke du gemmer." -#: ../data/ui/tab-placeholder.ui.h:11 -msgid "Select Third Folder" -msgstr "Vælg den 3. mappe" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:3 +msgid "Close _without Saving" +msgstr "Luk _uden at gemme" -#: ../data/ui/tab-placeholder.ui.h:12 -msgid "Select A Version-Controlled Folder" -msgstr "Vælg en versionsstyret mappe" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:4 ../meld/dirdiff.py:1040 +#: ../meld/iohelpers.py:58 ../meld/iohelpers.py:112 +msgid "_Cancel" +msgstr "_Annullér" -#: ../data/ui/tab-placeholder.ui.h:13 -msgid "_Blank comparison" -msgstr "_Tom sammenligning" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:5 +msgid "_Save" +msgstr "_Gem" -#: ../data/ui/tab-placeholder.ui.h:14 -msgid "C_ompare" -msgstr "_Sammenlign" +#: ../meld/resources/ui/statusbar-menu.ui.h:2 +msgid "Show whitespace" +msgstr "Vis blanktegn" -#: ../data/ui/vcview.ui.h:3 +#: ../meld/resources/ui/statusbar-menu.ui.h:4 +msgid "Text wrapping" +msgstr "Tekstombrydning" + +#: ../meld/resources/ui/vcview.ui.h:3 msgid "Co_mmit…" msgstr "Co_mmit …" -#: ../data/ui/vcview.ui.h:4 +#: ../meld/resources/ui/vcview.ui.h:4 msgid "Commit changes to version control" msgstr "Commit ændringer til versionsstyring" -#: ../data/ui/vcview.ui.h:5 +#: ../meld/resources/ui/vcview.ui.h:5 msgid "_Update" msgstr "_Opdatér" -#: ../data/ui/vcview.ui.h:6 +#: ../meld/resources/ui/vcview.ui.h:6 msgid "Update working copy from version control" msgstr "Opdatér arbejdskopi fra versionsstyring" -#: ../data/ui/vcview.ui.h:7 +#: ../meld/resources/ui/vcview.ui.h:7 msgid "_Push" msgstr "_Skub" -#: ../data/ui/vcview.ui.h:8 +#: ../meld/resources/ui/vcview.ui.h:8 msgid "Push local changes to remote" msgstr "Skub lokale ændringer til fjern" -#: ../data/ui/vcview.ui.h:10 +#: ../meld/resources/ui/vcview.ui.h:10 msgid "Add to version control" msgstr "Tilføj til versionsstyring" -#: ../data/ui/vcview.ui.h:12 +#: ../meld/resources/ui/vcview.ui.h:12 msgid "Remove from version control" msgstr "Fjern fra versionsstyring" -#: ../data/ui/vcview.ui.h:13 +#: ../meld/resources/ui/vcview.ui.h:13 msgid "Mar_k as Resolved" msgstr "Markér som l_øst" -#: ../data/ui/vcview.ui.h:14 +#: ../meld/resources/ui/vcview.ui.h:14 msgid "Mark as resolved in version control" msgstr "Markér som løst i versionsstyring" -#: ../data/ui/vcview.ui.h:15 +#: ../meld/resources/ui/vcview.ui.h:15 msgid "Re_vert" msgstr "_Gendan" # "Gendan til oprindelig" / "Gendan oprindelig" / "Gendan tidligere" -#: ../data/ui/vcview.ui.h:16 +#: ../meld/resources/ui/vcview.ui.h:16 msgid "Revert working copy to original state" msgstr "Gendan arbejdskopi til oprindelig tilstand" -#: ../data/ui/vcview.ui.h:17 +#: ../meld/resources/ui/vcview.ui.h:17 msgid "Delete from working copy" msgstr "Slet fra arbejdskopi" -#: ../data/ui/vcview.ui.h:18 +#: ../meld/resources/ui/vcview.ui.h:18 msgid "Console" msgstr "Konsol" -#: ../data/ui/vcview.ui.h:19 +#: ../meld/resources/ui/vcview.ui.h:19 msgid "Show or hide the version control console output pane" msgstr "Vis eller skjul versionsstyringskonsollens outputrude" -#: ../data/ui/vcview.ui.h:20 +#: ../meld/resources/ui/vcview.ui.h:20 msgid "_Flatten" msgstr "_Fladgør" -#: ../data/ui/vcview.ui.h:21 +#: ../meld/resources/ui/vcview.ui.h:21 msgid "Flatten directories" msgstr "Fladgør mapper" -#: ../data/ui/vcview.ui.h:22 +#: ../meld/resources/ui/vcview.ui.h:22 msgid "_Modified" msgstr "_Ændret" -#: ../data/ui/vcview.ui.h:23 +#: ../meld/resources/ui/vcview.ui.h:23 msgid "Show modified files" msgstr "Vis ændrede filer" -#: ../data/ui/vcview.ui.h:24 +#: ../meld/resources/ui/vcview.ui.h:24 msgid "_Normal" msgstr "_Normal" -#: ../data/ui/vcview.ui.h:25 +#: ../meld/resources/ui/vcview.ui.h:25 msgid "Show normal files" msgstr "Vis normale filer" -#: ../data/ui/vcview.ui.h:26 +#: ../meld/resources/ui/vcview.ui.h:26 msgid "Un_versioned" msgstr "Ikke _versioneret" # "Vis ikke-versionsstyrede filer" -#: ../data/ui/vcview.ui.h:27 +#: ../meld/resources/ui/vcview.ui.h:27 msgid "Show unversioned files" msgstr "Vis filer uden versionering" -#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69 +#: ../meld/resources/ui/vcview.ui.h:28 ../meld/vc/_vc.py:70 msgid "Ignored" msgstr "Ignoreret" -#: ../data/ui/vcview.ui.h:29 +#: ../meld/resources/ui/vcview.ui.h:29 msgid "Show ignored files" msgstr "Vis ignorerede filer" -#: ../data/ui/vcview.ui.h:30 -msgid "Commit" -msgstr "Commit" - -#: ../data/ui/vcview.ui.h:31 -msgid "Commit Files" -msgstr "Commit filer" - -#: ../data/ui/vcview.ui.h:32 -msgid "Log Message" -msgstr "Logbesked" - -# logpunkter?, logindgange? -#: ../data/ui/vcview.ui.h:33 -msgid "Previous logs:" -msgstr "Forrige logge:" - -#: ../data/ui/vcview.ui.h:34 -msgid "Co_mmit" -msgstr "Co_mmit" - -#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:331 +#: ../meld/resources/ui/vcview.ui.h:31 ../meld/vcview.py:366 msgid "Location" msgstr "Sted" -#: ../data/ui/vcview.ui.h:37 +#: ../meld/resources/ui/vcview.ui.h:32 msgid "Status" msgstr "Status" -#: ../data/ui/vcview.ui.h:38 +#: ../meld/resources/ui/vcview.ui.h:33 msgid "Extra" msgstr "Ekstra" -#: ../data/ui/vcview.ui.h:39 +#: ../meld/resources/ui/vcview.ui.h:34 msgid "Console output" msgstr "Konsoloutput" -#: ../data/ui/vcview.ui.h:40 -msgid "Push local commits to remote?" -msgstr "Skub lokale commit'er til fjern?" - -#: ../data/ui/vcview.ui.h:41 -msgid "The commits to be pushed are determined by your version control system." -msgstr "" -"Hvilke commit'er, der skubbes, bestemmes af dit versionsstyringssystem." - -#: ../data/ui/vcview.ui.h:42 -msgid "_Push commits" -msgstr "_Skub commit'er" - #: ../meld/const.py:12 msgid "UNIX (LF)" msgstr "UNIX (LF)" @@ -1695,44 +1702,44 @@ msgid "Mac OS (CR)" msgstr "Mac OS (CR)" #. Create file size CellRenderer -#: ../meld/dirdiff.py:437 ../meld/preferences.py:81 +#: ../meld/dirdiff.py:476 ../meld/preferences.py:138 msgid "Size" msgstr "Størrelse" #. Create date-time CellRenderer -#: ../meld/dirdiff.py:445 ../meld/preferences.py:82 +#: ../meld/dirdiff.py:484 ../meld/preferences.py:139 msgid "Modification time" msgstr "Ændringstidspunkt" #. Create permissions CellRenderer -#: ../meld/dirdiff.py:453 ../meld/preferences.py:83 +#: ../meld/dirdiff.py:492 ../meld/preferences.py:140 msgid "Permissions" msgstr "Rettigheder" -#: ../meld/dirdiff.py:588 +#: ../meld/dirdiff.py:626 #, python-format msgid "Hide %s" msgstr "Skjul %s" -#: ../meld/dirdiff.py:729 ../meld/dirdiff.py:752 +#: ../meld/dirdiff.py:768 ../meld/dirdiff.py:791 #, python-format msgid "[%s] Scanning %s" msgstr "[%s] Skanner %s" -#: ../meld/dirdiff.py:887 +#: ../meld/dirdiff.py:926 #, python-format msgid "[%s] Done" msgstr "[%s] Færdig" -#: ../meld/dirdiff.py:895 +#: ../meld/dirdiff.py:934 msgid "Folders have no differences" msgstr "Der er ingen forskelle på mapperne" -#: ../meld/dirdiff.py:897 +#: ../meld/dirdiff.py:936 msgid "Contents of scanned files in folders are identical." msgstr "Indholdet af de skannede filer i mapperne er ens." -#: ../meld/dirdiff.py:899 +#: ../meld/dirdiff.py:938 msgid "" "Scanned files in folders appear identical, but contents have not been " "scanned." @@ -1740,40 +1747,40 @@ msgstr "" "De skannede filer i mapperne ser ud til at være ens, men indholdet er ikke " "blevet skannet." -#: ../meld/dirdiff.py:902 +#: ../meld/dirdiff.py:941 msgid "File filters are in use, so not all files have been scanned." msgstr "Ikke alle filer er blevet skannet, da filfiltre er i brug." -#: ../meld/dirdiff.py:904 +#: ../meld/dirdiff.py:943 msgid "Text filters are in use and may be masking content differences." msgstr "Tekstfiltre er i brug og kan maskere forskelle i indhold." -#: ../meld/dirdiff.py:922 ../meld/filediff.py:1491 ../meld/filediff.py:1521 -#: ../meld/filediff.py:1523 ../meld/ui/msgarea.py:106 ../meld/ui/msgarea.py:119 +#: ../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 msgid "Hi_de" msgstr "_Skjul" -#: ../meld/dirdiff.py:931 +#: ../meld/dirdiff.py:970 msgid "Multiple errors occurred while scanning this folder" msgstr "Der opstod flere fejl, under skanning af mappen" -#: ../meld/dirdiff.py:932 +#: ../meld/dirdiff.py:971 msgid "Files with invalid encodings found" msgstr "Fandt filer med ugyldige kodninger" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:934 +#: ../meld/dirdiff.py:973 msgid "Some files were in an incorrect encoding. The names are something like:" msgstr "Nogle filer var ikke kodet korrekt. Navnene er noget lignende dette:" -#: ../meld/dirdiff.py:936 +#: ../meld/dirdiff.py:975 msgid "Files hidden by case insensitive comparison" msgstr "Filer skjult af søgning, som ikke tager højde for store/små bogstaver" # Du udfører en sammenligning uden forskel på store og små bogstaver på # et filsystem, hvor der er forskel på store og små bogstaver. #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:938 +#: ../meld/dirdiff.py:977 msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. The following files in this folder are hidden:" @@ -1782,17 +1789,17 @@ msgstr "" "på et filsystem, som tager højde for store/små bogstaver. Følgende filer i " "denne mappe er skjulte:" -#: ../meld/dirdiff.py:949 +#: ../meld/dirdiff.py:988 #, python-format msgid "“%s” hidden by “%s”" msgstr "“%s” skjult af “%s”" -#: ../meld/dirdiff.py:1005 +#: ../meld/dirdiff.py:1044 #, python-format msgid "Replace folder “%s”?" msgstr "Erstat mappen “%s”?" -#: ../meld/dirdiff.py:1007 +#: ../meld/dirdiff.py:1046 #, python-format msgid "" "Another folder with the same name already exists in “%s”.\n" @@ -1801,11 +1808,11 @@ msgstr "" "En mappe med det samme navn findes allerede i “%s”.\n" "Hvis du erstatter den eksisterende mappe, vil alle filer i den gå tabt." -#: ../meld/dirdiff.py:1020 +#: ../meld/dirdiff.py:1059 msgid "Error copying file" msgstr "Fejl ved kopiering af fil" -#: ../meld/dirdiff.py:1021 +#: ../meld/dirdiff.py:1060 #, python-format msgid "" "Couldn’t copy %s\n" @@ -1818,19 +1825,19 @@ msgstr "" "\n" "%s" -#: ../meld/dirdiff.py:1046 ../meld/vcview.py:703 +#: ../meld/dirdiff.py:1085 ../meld/vcview.py:720 msgid "Error deleting {}" msgstr "Fejl ved sletning af {}" -#: ../meld/dirdiff.py:1577 +#: ../meld/dirdiff.py:1597 msgid "No folder" msgstr "Ingen mappe" -#: ../meld/filediff.py:834 +#: ../meld/filediff.py:920 msgid "Comparison results will be inaccurate" msgstr "Resultatet af sammenligningen vil være unøjagtigt" -#: ../meld/filediff.py:836 +#: ../meld/filediff.py:922 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1838,64 +1845,64 @@ msgstr "" "Et filter ændrede antallet af linjer i filen, hvilket ikke understøttes. " "Sammenligningen vil ikke være nøjagtig." -#: ../meld/filediff.py:893 +#: ../meld/filediff.py:994 msgid "Mark conflict as resolved?" msgstr "Markér konflikt som løst?" -#: ../meld/filediff.py:895 +#: ../meld/filediff.py:996 msgid "" "If the conflict was resolved successfully, you may mark it as resolved now." msgstr "Hvis konflikten blev løst, kan du nu markere den som løst." -#: ../meld/filediff.py:897 +#: ../meld/filediff.py:998 msgid "Cancel" msgstr "Annullér" -#: ../meld/filediff.py:898 +#: ../meld/filediff.py:999 msgid "Mark _Resolved" msgstr "Markér som _løst" -#: ../meld/filediff.py:1206 +#: ../meld/filediff.py:1318 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Der var et problem med at åbne filen “%s”." -#: ../meld/filediff.py:1214 +#: ../meld/filediff.py:1326 #, python-format msgid "File %s appears to be a binary file." msgstr "Filen %s ser ud til at være en binær fil." -#: ../meld/filediff.py:1216 +#: ../meld/filediff.py:1328 msgid "Do you want to open the file using the default application?" msgstr "Vil du åbne filen med standardprogrammet?" -#: ../meld/filediff.py:1218 +#: ../meld/filediff.py:1330 msgid "Open" msgstr "Åbn" -#: ../meld/filediff.py:1234 +#: ../meld/filediff.py:1346 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Beregner forskelle" -#: ../meld/filediff.py:1295 +#: ../meld/filediff.py:1407 #, python-format msgid "File %s has changed on disk" msgstr "Filen %s er blevet ændret på disken" -#: ../meld/filediff.py:1296 +#: ../meld/filediff.py:1408 msgid "Do you want to reload the file?" msgstr "Vil du genindlæse filen?" -#: ../meld/filediff.py:1298 +#: ../meld/filediff.py:1410 msgid "_Reload" msgstr "_Genindlæs" -#: ../meld/filediff.py:1454 +#: ../meld/filediff.py:1566 msgid "Files are identical" msgstr "Filer er identiske" -#: ../meld/filediff.py:1467 +#: ../meld/filediff.py:1579 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1903,11 +1910,11 @@ msgstr "" "Tekstfiltre er i brug og kan maskere forskelle mellem filer. Vil du " "sammenligne de ikke-filtrerede filer?" -#: ../meld/filediff.py:1472 +#: ../meld/filediff.py:1584 msgid "Files differ in line endings only" msgstr "Filer er kun forskellige i slutningen af linjerne" -#: ../meld/filediff.py:1474 +#: ../meld/filediff.py:1586 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1916,15 +1923,15 @@ msgstr "" "Filerne er ens bortset fra forskelle i slutningen af linjerne:\n" "%s" -#: ../meld/filediff.py:1494 +#: ../meld/filediff.py:1606 msgid "Show without filters" msgstr "Vis uden filtre" -#: ../meld/filediff.py:1516 +#: ../meld/filediff.py:1628 msgid "Change highlighting incomplete" msgstr "Fremhævning af ændringer ufuldstændig" -#: ../meld/filediff.py:1517 +#: ../meld/filediff.py:1629 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." @@ -1933,19 +1940,19 @@ msgstr "" "Meld til at bruge længere tid på at fremhæve større ændringer, selvom det " "kan være langsomt." -#: ../meld/filediff.py:1525 +#: ../meld/filediff.py:1637 msgid "Keep highlighting" msgstr "Bliv ved med at fremhæve" -#: ../meld/filediff.py:1527 +#: ../meld/filediff.py:1639 msgid "_Keep highlighting" msgstr "_Bliv ved med at fremhæve" -#: ../meld/filediff.py:1540 +#: ../meld/filediff.py:1652 msgid "Saving failed" msgstr "Kunne ikke gemme" -#: ../meld/filediff.py:1541 +#: ../meld/filediff.py:1653 msgid "" "Please consider copying any critical changes to another program or file to " "avoid data loss." @@ -1953,60 +1960,45 @@ msgstr "" "Overvej at kopiere kritiske ændringer til et andet program eller en anden " "fil for at undgå tab af data." -#: ../meld/filediff.py:1550 +#: ../meld/filediff.py:1662 msgid "Save Left Pane As" msgstr "Gem venstre rude som" -#: ../meld/filediff.py:1552 +#: ../meld/filediff.py:1664 msgid "Save Middle Pane As" msgstr "Gem midterste rude som" -#: ../meld/filediff.py:1554 +#: ../meld/filediff.py:1666 msgid "Save Right Pane As" msgstr "Gem højre rude som" -#: ../meld/filediff.py:1567 +#: ../meld/filediff.py:1679 #, python-format msgid "File %s has changed on disk since it was opened" msgstr "Filen %s er blevet ændret på disken, siden den blev åbnet" -#: ../meld/filediff.py:1569 +#: ../meld/filediff.py:1681 msgid "If you save it, any external changes will be lost." msgstr "" "Hvis du gemmer den, vil alle ændringer, som er foretaget eksternt, gå tabt." -#: ../meld/filediff.py:1572 +#: ../meld/filediff.py:1684 msgid "Save Anyway" msgstr "Gem alligevel" -#: ../meld/filediff.py:1573 +#: ../meld/filediff.py:1685 msgid "Don’t Save" msgstr "Gem ikke" -#: ../meld/filediff.py:1599 -msgid "_Save as UTF-8" -msgstr "_Gem som UTF-8" - -#: ../meld/filediff.py:1602 -#, python-format -msgid "Couldn’t encode text as “%s”" -msgstr "Kunne ikke kode teksten som “%s”" - -#: ../meld/filediff.py:1604 -#, python-format +#: ../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?" +"File “{}” contains characters that can’t be encoded using its current " +"encoding “{}”." msgstr "" -"Filen “%s” indeholder tegn, som ikke kan kodes med kodningen “%s”.\n" -"Ønsker du at gemme som UTF-8?" - -#: ../meld/filediff.py:1644 ../meld/patchdialog.py:130 -#, python-format -msgid "Could not save file %s." -msgstr "Kunne ikke gemme filen %s." +"Filen “{}” indeholder tegn, som ikke kan kodes med filens aktuelle kodning " +"“{}”." -#: ../meld/filediff.py:1645 ../meld/patchdialog.py:131 +#: ../meld/filediff.py:1731 ../meld/patchdialog.py:144 #, python-format msgid "" "Couldn’t save file due to:\n" @@ -2015,11 +2007,16 @@ msgstr "" "Kunne ikke gemme filen pga.:\n" "%s" -#: ../meld/filediff.py:2020 +#: ../meld/filediff.py:1735 ../meld/patchdialog.py:143 +#, python-format +msgid "Could not save file %s." +msgstr "Kunne ikke gemme filen %s." + +#: ../meld/filediff.py:2128 msgid "Live comparison updating disabled" msgstr "Liveopdatering af sammenligninger deaktiveret" -#: ../meld/filediff.py:2021 +#: ../meld/filediff.py:2129 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -2034,41 +2031,40 @@ msgstr "" msgid "[%s] Merging files" msgstr "[%s] Fletter filer" -#: ../meld/gutterrendererchunk.py:216 +#: ../meld/gutterrendererchunk.py:220 msgid "Copy _up" msgstr "Kopiér _op" -#: ../meld/gutterrendererchunk.py:217 +#: ../meld/gutterrendererchunk.py:221 msgid "Copy _down" msgstr "Kopiér _ned" -#: ../meld/iohelpers.py:35 +#: ../meld/iohelpers.py:43 msgid "Deleting remote folders is not supported" msgstr "Sletning af eksterne mapper understøttes ikke" -#: ../meld/iohelpers.py:37 +#: ../meld/iohelpers.py:45 msgid "Not a file or directory" msgstr "Ikke en fil eller mappe" -#: ../meld/iohelpers.py:41 +#: ../meld/iohelpers.py:49 msgid "“{}” can’t be put in the trash. Do you want to delete it immediately?" msgstr "“{}” kan ikke puttes i papirkurven. Vil du slette den helt?" -#: ../meld/iohelpers.py:46 +#: ../meld/iohelpers.py:54 msgid "This remote location does not support sending items to the trash." -msgstr "" -"Denne eksterne placering understøtter ikke papirkurv." +msgstr "Denne eksterne placering understøtter ikke papirkurv." -#: ../meld/iohelpers.py:51 +#: ../meld/iohelpers.py:59 msgid "_Delete Permanently" msgstr "_Slet for evigt" -#: ../meld/iohelpers.py:94 +#: ../meld/iohelpers.py:106 #, python-format msgid "Replace file “%s”?" msgstr "Erstat filen “%s”?" -#: ../meld/iohelpers.py:96 +#: ../meld/iohelpers.py:108 #, python-format msgid "" "A file with this name already exists in “%s”.\n" @@ -2077,316 +2073,280 @@ msgstr "" "Der er allerede en fil med dette navn i “%s”.\n" "Hvis du erstatter den eksisterende fil, vil dens indhold gå tabt." -#: ../meld/meldapp.py:181 +#: ../meld/meldapp.py:169 msgid "wrong number of arguments supplied to --diff" msgstr "forkert antal argumenter angivet til --diff" -#: ../meld/meldapp.py:186 +#: ../meld/meldapp.py:174 msgid "Start with an empty window" msgstr "Start med et tomt vindue" -#: ../meld/meldapp.py:187 ../meld/meldapp.py:189 +#: ../meld/meldapp.py:175 ../meld/meldapp.py:177 msgid "file" msgstr "fil" -#: ../meld/meldapp.py:187 ../meld/meldapp.py:191 +#: ../meld/meldapp.py:175 ../meld/meldapp.py:179 msgid "folder" msgstr "mappe" -#: ../meld/meldapp.py:188 +#: ../meld/meldapp.py:176 msgid "Start a version control comparison" msgstr "Start en sammenligning af versioner" -#: ../meld/meldapp.py:190 +#: ../meld/meldapp.py:178 msgid "Start a 2- or 3-way file comparison" msgstr "Sammenlign to eller tre filer" -#: ../meld/meldapp.py:192 +#: ../meld/meldapp.py:180 msgid "Start a 2- or 3-way folder comparison" msgstr "Sammenlign to eller tre mapper" -#: ../meld/meldapp.py:235 +#: ../meld/meldapp.py:223 #, python-format msgid "Error: %s\n" msgstr "Fejl: %s\n" -#: ../meld/meldapp.py:242 +#: ../meld/meldapp.py:230 msgid "Meld is a file and directory comparison tool." msgstr "Meld er et sammenligningsværktøj for filer og mapper." -#: ../meld/meldapp.py:246 +#: ../meld/meldapp.py:234 msgid "Set label to use instead of file name" msgstr "Angiv etiket, der skal bruges i stedet for filnavn" -#: ../meld/meldapp.py:249 +#: ../meld/meldapp.py:237 msgid "Open a new tab in an already running instance" msgstr "Åbn et nyt faneblad i en allerede kørende forekomst" -#: ../meld/meldapp.py:252 +#: ../meld/meldapp.py:240 msgid "Automatically compare all differing files on startup" msgstr "Sammenlign automatisk alle filer der har forskelle ved opstart" -#: ../meld/meldapp.py:255 +#: ../meld/meldapp.py:243 msgid "Ignored for compatibility" msgstr "Ignoreret pga. kompatibilitet" -#: ../meld/meldapp.py:259 +#: ../meld/meldapp.py:247 msgid "Set the target file for saving a merge result" msgstr "Angiv målfilen hvor resultatet af en fletning skal gemmes" -#: ../meld/meldapp.py:262 +#: ../meld/meldapp.py:250 msgid "Automatically merge files" msgstr "Flet automatisk filer" -#: ../meld/meldapp.py:266 +#: ../meld/meldapp.py:254 msgid "Load a saved comparison from a Meld comparison file" msgstr "Indlæs en gemt sammenligning fra en Meld-sammenligningsfil" # Tab is a common term for a widget used to provide page-based switching in GUIs, # as seen in gedit, epiphany, firefox, etc. # https://secure.wikimedia.org/wikipedia/en/wiki/Tab_%28GUI%29 -#: ../meld/meldapp.py:270 +#: ../meld/meldapp.py:258 msgid "Create a diff tab for the supplied files or folders" msgstr "Opret et forskelsfaneblad for de angivne filer eller mapper." -#: ../meld/meldapp.py:290 +#: ../meld/meldapp.py:278 #, python-format msgid "too many arguments (wanted 0-3, got %d)" msgstr "for mange argumenter (ønskede 0-3, fik %d)" -#: ../meld/meldapp.py:293 +#: ../meld/meldapp.py:281 msgid "can’t auto-merge less than 3 files" msgstr "kan ikke auto-flette mindre end tre filer" -#: ../meld/meldapp.py:295 +#: ../meld/meldapp.py:283 msgid "can’t auto-merge directories" msgstr "kan ikke auto-flette mapper" -#: ../meld/meldapp.py:309 +#: ../meld/meldapp.py:297 msgid "Error reading saved comparison file" msgstr "Fejl ved læsning af gemt sammenligningsfil" -#: ../meld/meldapp.py:326 +#: ../meld/meldapp.py:314 #, python-format msgid "invalid path or URI “%s”" msgstr "ugyldig sti eller URI “%s”" -#: ../meld/meldapp.py:332 +#: ../meld/meldapp.py:320 msgid "remote folder “{}” not supported" msgstr "ekstern mappe “{}” er ikke understøttet" #. TRANSLATORS: This is the label of a new, currently-unnamed file. -#: ../meld/meldbuffer.py:124 +#: ../meld/meldbuffer.py:123 msgid "" msgstr "" -#: ../meld/melddoc.py:68 +#: ../meld/melddoc.py:63 msgid "untitled" msgstr "uden titel" -#: ../meld/meldwindow.py:47 +#: ../meld/meldwindow.py:56 msgid "_File" msgstr "_Fil" # Sammenligning af _filer -#: ../meld/meldwindow.py:48 +#: ../meld/meldwindow.py:57 msgid "_New Comparison…" msgstr "_Ny sammenligning …" -#: ../meld/meldwindow.py:49 +#: ../meld/meldwindow.py:58 msgid "Start a new comparison" msgstr "Start en ny sammenligning" -#: ../meld/meldwindow.py:52 +#: ../meld/meldwindow.py:61 msgid "Save the current file" msgstr "Gem den aktuelle fil" -#: ../meld/meldwindow.py:54 +#: ../meld/meldwindow.py:63 msgid "Save As…" msgstr "Gem som …" -#: ../meld/meldwindow.py:55 +#: ../meld/meldwindow.py:64 msgid "Save the current file with a different name" msgstr "Gem den aktuelle fil under et andet navn" -#: ../meld/meldwindow.py:58 +#: ../meld/meldwindow.py:67 msgid "Close the current file" msgstr "Luk den aktuelle fil" -#: ../meld/meldwindow.py:61 +#: ../meld/meldwindow.py:70 msgid "_Edit" msgstr "_Redigér" -#: ../meld/meldwindow.py:63 +#: ../meld/meldwindow.py:72 msgid "Undo the last action" msgstr "Fortryd sidste handling" -#: ../meld/meldwindow.py:66 +#: ../meld/meldwindow.py:75 msgid "Redo the last undone action" msgstr "Gendan den sidste fortrydelseshandling" -#: ../meld/meldwindow.py:68 +#: ../meld/meldwindow.py:77 msgid "Cut the selection" msgstr "Klip markeringen" -#: ../meld/meldwindow.py:70 +#: ../meld/meldwindow.py:79 msgid "Copy the selection" msgstr "Kopiér markeringen" -#: ../meld/meldwindow.py:72 +#: ../meld/meldwindow.py:81 msgid "Paste the clipboard" msgstr "Indsæt fra udklipsholderen" -#: ../meld/meldwindow.py:74 +#: ../meld/meldwindow.py:83 msgid "Find…" msgstr "Find …" -#: ../meld/meldwindow.py:74 +#: ../meld/meldwindow.py:83 msgid "Search for text" msgstr "Søg efter tekst" -#: ../meld/meldwindow.py:76 +#: ../meld/meldwindow.py:85 msgid "Find Ne_xt" msgstr "Find _næste" -#: ../meld/meldwindow.py:77 +#: ../meld/meldwindow.py:86 msgid "Search forwards for the same text" msgstr "Søg fremad efter den samme tekst" -#: ../meld/meldwindow.py:79 +#: ../meld/meldwindow.py:88 msgid "Find _Previous" msgstr "Find _forrige" -#: ../meld/meldwindow.py:80 +#: ../meld/meldwindow.py:89 msgid "Search backwards for the same text" msgstr "Søg bagud efter den samme tekst" -#: ../meld/meldwindow.py:83 +#: ../meld/meldwindow.py:92 msgid "_Replace…" msgstr "_Erstat …" -#: ../meld/meldwindow.py:84 +#: ../meld/meldwindow.py:93 msgid "Find and replace text" msgstr "Find og erstat tekst" -#: ../meld/meldwindow.py:86 +#: ../meld/meldwindow.py:95 msgid "Go to _Line" msgstr "Gå til _linje" -#: ../meld/meldwindow.py:87 +#: ../meld/meldwindow.py:96 msgid "Go to a specific line" msgstr "Gå til en specifik linje" -#: ../meld/meldwindow.py:90 +#: ../meld/meldwindow.py:99 msgid "_Changes" msgstr "_Ændringer" -#: ../meld/meldwindow.py:91 +#: ../meld/meldwindow.py:100 msgid "Next Change" msgstr "Næste ændring" -#: ../meld/meldwindow.py:92 +#: ../meld/meldwindow.py:101 msgid "Go to the next change" msgstr "Gå til den næste ændring" -#: ../meld/meldwindow.py:94 +#: ../meld/meldwindow.py:103 msgid "Previous Change" msgstr "Forrige ændring" -#: ../meld/meldwindow.py:95 +#: ../meld/meldwindow.py:104 msgid "Go to the previous change" msgstr "Gå til den forrige ændring" -#: ../meld/meldwindow.py:97 +#: ../meld/meldwindow.py:106 msgid "Open Externally" msgstr "Åbn eksternt" -#: ../meld/meldwindow.py:98 +#: ../meld/meldwindow.py:107 msgid "Open selected file or directory in the default external application" msgstr "Åbn den valgte fil eller mappe i det eksterne standardprogram" -#: ../meld/meldwindow.py:102 +#: ../meld/meldwindow.py:111 msgid "_View" msgstr "_Vis" -#: ../meld/meldwindow.py:103 +#: ../meld/meldwindow.py:112 msgid "File Status" msgstr "Filstatus" -#: ../meld/meldwindow.py:104 +#: ../meld/meldwindow.py:113 msgid "Version Status" msgstr "Versionsstatus" -#: ../meld/meldwindow.py:107 +#: ../meld/meldwindow.py:116 msgid "Stop the current action" msgstr "Stop den aktuelle handling" -#: ../meld/meldwindow.py:110 +#: ../meld/meldwindow.py:119 msgid "Refresh the view" msgstr "Opdatér visningen" -#: ../meld/meldwindow.py:114 +#: ../meld/meldwindow.py:123 msgid "Fullscreen" msgstr "Fuldskærm" -#: ../meld/meldwindow.py:115 +#: ../meld/meldwindow.py:124 msgid "View the comparison in fullscreen" msgstr "Vis sammenligningen i fuldskærm" -#: ../meld/meldwindow.py:117 -msgid "_Toolbar" -msgstr "_Værktøjsbjælke" - -#: ../meld/meldwindow.py:118 -msgid "Show or hide the toolbar" -msgstr "Vis eller skjul værktøjsbjælken" - -#: ../meld/meldwindow.py:127 +#: ../meld/meldwindow.py:133 msgid "Open Recent" msgstr "Åbn seneste" -#: ../meld/meldwindow.py:128 +#: ../meld/meldwindow.py:134 msgid "Open recent files" msgstr "Åbn seneste filer" -#: ../meld/meldwindow.py:150 -msgid "_Meld" -msgstr "_Meld" - -#: ../meld/meldwindow.py:151 -msgid "Quit the program" -msgstr "Afslut programmet" - -#: ../meld/meldwindow.py:153 -msgid "Prefere_nces" -msgstr "_Indstillinger" - -#: ../meld/meldwindow.py:154 -msgid "Configure the application" -msgstr "Konfigurér programmet" - -#: ../meld/meldwindow.py:156 -msgid "_Contents" -msgstr "_Indhold" - -#: ../meld/meldwindow.py:157 -msgid "Open the Meld manual" -msgstr "Åbn manualen til Meld" - -#: ../meld/meldwindow.py:159 -msgid "About this application" -msgstr "Om programmet" - -#: ../meld/meldwindow.py:602 +#: ../meld/meldwindow.py:567 #, python-format msgid "Need three files to auto-merge, got: %r" msgstr "Behøver tre filer for at auto-flette, fik: %r" -#: ../meld/meldwindow.py:623 +#: ../meld/meldwindow.py:588 msgid "Cannot compare a mixture of files and directories" msgstr "Kan ikke sammenligne en blanding af filer og mapper" -#: ../meld/misc.py:135 +#: ../meld/misc.py:155 msgid "" "{}\n" "\n" @@ -2398,54 +2358,50 @@ msgstr "" "Meld stødte på en kritisk fejl under kørslen af:\n" "{}" -#: ../meld/misc.py:254 +#: ../meld/misc.py:237 #, python-format msgid "Couldn’t find colour scheme details for %s-%s; this is a bad install" msgstr "" "Kunne ikke finde farveskemadetaljer for %s-%s; dette er en dårlig " "installation" -#: ../meld/misc.py:325 +#: ../meld/misc.py:311 msgid "[None]" msgstr "[Ingen]" -#: ../meld/preferences.py:33 +#: ../meld/preferences.py:42 ../meld/preferences.py:135 msgid "label" msgstr "etiket" -#: ../meld/preferences.py:33 +#: ../meld/preferences.py:42 ../meld/preferences.py:135 msgid "pattern" msgstr "mønster" -#: ../meld/recent.py:105 +#: ../meld/recent.py:106 msgid "Version control:" msgstr "Versionsstyring:" # poabc brokker sig hvis de her oversættes -#: ../meld/ui/bufferselectors.py:32 +#: ../meld/ui/bufferselectors.py:114 #, python-brace-format msgid "{name} ({charset})" msgstr "{name} ({charset})" -#: ../meld/ui/bufferselectors.py:65 ../meld/ui/bufferselectors.py:73 +#: ../meld/ui/bufferselectors.py:144 ../meld/ui/bufferselectors.py:152 msgid "Plain Text" msgstr "Klartekst" -#: ../meld/ui/notebooklabel.py:63 -msgid "Close tab" -msgstr "Luk faneblad" - #. 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 "Lin. %i, kol. %i" -#: ../meld/ui/statusbar.py:177 +#: ../meld/ui/statusbar.py:182 msgid "Line you want to move the cursor to" msgstr "Linje du ønsker at flytte markøren til" -#: ../meld/ui/vcdialogs.py:48 +#: ../meld/ui/vcdialogs.py:55 msgid "No files will be committed" msgstr "Ingen filer vil blive commit'et" @@ -2496,144 +2452,144 @@ msgstr "Ingen" msgid "Rev %s" msgstr "Rev. %s" -#: ../meld/vc/_vc.py:54 +#: ../meld/vc/_vc.py:55 msgid "Merged" msgstr "Flettet" -#: ../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 "Lokal" -#: ../meld/vc/_vc.py:54 +#: ../meld/vc/_vc.py:55 msgid "Remote" msgstr "Fjern" # "Vis ikke-versionsstyrede filer" -#: ../meld/vc/_vc.py:70 +#: ../meld/vc/_vc.py:71 msgid "Unversioned" msgstr "Uden versionering" -#: ../meld/vc/_vc.py:73 +#: ../meld/vc/_vc.py:74 msgid "Error" msgstr "Fejl" -#: ../meld/vc/_vc.py:75 +#: ../meld/vc/_vc.py:76 msgid "Newly added" msgstr "Nyligt tilføjet" -#: ../meld/vc/_vc.py:77 +#: ../meld/vc/_vc.py:78 msgid "Renamed" msgstr "Omdøbt" -#: ../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 "Fjernet" # Manglende? -#: ../meld/vc/_vc.py:80 +#: ../meld/vc/_vc.py:81 msgid "Missing" msgstr "Mangler" -#: ../meld/vc/_vc.py:81 +#: ../meld/vc/_vc.py:82 msgid "Not present" msgstr "Ikke tilstedeværende" #. Translators: This error message is shown when a version #. control binary isn't installed. -#: ../meld/vcview.py:248 +#: ../meld/vcview.py:282 #, python-format msgid "%(name)s (%(cmd)s not installed)" msgstr "%(name)s (%(cmd)s ikke installeret)" #. Translators: This error message is shown when a version #. controlled repository is invalid. -#: ../meld/vcview.py:252 +#: ../meld/vcview.py:286 #, python-format msgid "%(name)s (Invalid repository)" msgstr "%(name)s (ugyldigt arkiv)" -#: ../meld/vcview.py:273 +#: ../meld/vcview.py:307 msgid "No valid version control system found in this folder" msgstr "Fandt ikke et gyldigt versionsstyringssystem i denne mappe" -#: ../meld/vcview.py:275 +#: ../meld/vcview.py:309 msgid "Only one version control system found in this folder" msgstr "Fandt kun ét versionsstyringssystem i denne mappe" -#: ../meld/vcview.py:277 +#: ../meld/vcview.py:311 msgid "Choose which version control system to use" msgstr "Vælg hvilket versionsstyringssystem, der skal anvendes" #. TRANSLATORS: This is the location of the directory being viewed -#: ../meld/vcview.py:331 +#: ../meld/vcview.py:366 #, python-format msgid "%s: %s" msgstr "%s: %s" #. Initial yield so when we add this to our tasks, we don't #. create iterators that may be invalidated. -#: ../meld/vcview.py:338 +#: ../meld/vcview.py:373 msgid "Scanning repository" msgstr "Skanner arkiv" -#: ../meld/vcview.py:367 +#: ../meld/vcview.py:402 #, python-format msgid "Scanning %s" msgstr "Skanner %s" -#: ../meld/vcview.py:406 +#: ../meld/vcview.py:441 msgid "(Empty)" msgstr "(tom)" -#: ../meld/vcview.py:450 +#: ../meld/vcview.py:487 #, python-format msgid "%s — local" msgstr "%s — lokal" -#: ../meld/vcview.py:451 +#: ../meld/vcview.py:488 #, python-format msgid "%s — remote" msgstr "%s — fjern" -#: ../meld/vcview.py:459 +#: ../meld/vcview.py:496 #, python-format msgid "%s (local, merge, remote)" msgstr "%s (lokal, flet, fjern)" -#: ../meld/vcview.py:464 +#: ../meld/vcview.py:501 #, python-format msgid "%s (remote, merge, local)" msgstr "%s (fjern, flet, lokal)" -#: ../meld/vcview.py:475 +#: ../meld/vcview.py:512 #, python-format msgid "%s — repository" msgstr "%s — arkiv" # arbejdskopi? -#: ../meld/vcview.py:481 +#: ../meld/vcview.py:518 #, python-format msgid "%s (working, repository)" msgstr "%s (arbejdskopi, arkiv)" -#: ../meld/vcview.py:485 +#: ../meld/vcview.py:522 #, python-format msgid "%s (repository, working)" msgstr "%s (arkiv, arbejdskopi)" -#: ../meld/vcview.py:674 +#: ../meld/vcview.py:688 msgid "Remove folder and all its files?" msgstr "Fjern mappen og alle dens filer?" -#: ../meld/vcview.py:676 +#: ../meld/vcview.py:690 msgid "" "This will remove all selected files and folders, and all files within any " "selected folders, from version control." @@ -2641,9 +2597,60 @@ msgstr "" "Dette vil fjerne alle valgte filer og mapper, samt alle filer i de valgte " "mapper, fra versionsstyring." -#: ../meld/vcview.py:785 +#: ../meld/vcview.py:804 msgid "Clear" msgstr "Ryd" +#~ msgid "Show toolbar" +#~ msgstr "Vis værktøjsbjælken" + +#~ msgid "If true, the window toolbar is visible." +#~ msgstr "Hvis sand er vinduets værktøjsbjælke synlig." + +#~ msgid "Show statusbar" +#~ msgstr "Vis statusbjælke" + +#~ msgid "If true, the window statusbar is visible." +#~ msgstr "Hvis sand er vinduets statujsbjælke synlig." + +#~ msgid "Editable List" +#~ msgstr "Redigerbar liste" + +#~ msgid "Meld Preferences" +#~ msgstr "Indstillinger for Meld" + +#~ msgid "_Save as UTF-8" +#~ msgstr "_Gem som UTF-8" + +#~ msgid "Couldn’t encode text as “%s”" +#~ msgstr "Kunne ikke kode teksten som “%s”" + +#~ msgid "_Toolbar" +#~ msgstr "_Værktøjsbjælke" + +#~ msgid "Show or hide the toolbar" +#~ msgstr "Vis eller skjul værktøjsbjælken" + +#~ msgid "_Meld" +#~ msgstr "_Meld" + +#~ msgid "Quit the program" +#~ msgstr "Afslut programmet" + +#~ msgid "Prefere_nces" +#~ msgstr "_Indstillinger" + +#~ msgid "Configure the application" +#~ msgstr "Konfigurér programmet" + +#~ msgid "_Contents" +#~ msgstr "_Indhold" + +#~ msgid "Open the Meld manual" +#~ msgstr "Åbn manualen til Meld" + +#~ msgid "About this application" +#~ msgstr "Om programmet" + #~ msgid "Error removing %s" #~ msgstr "Fejl ved fjernelse af %s" From 75d91afcddd0faf0651269d811afeafe09452ef1 Mon Sep 17 00:00:00 2001 From: Daniel Mustieles Date: Mon, 28 Jan 2019 15:20:15 +0100 Subject: [PATCH 0815/1316] Updated Spanish translation --- po/es.po | 2004 +++++++++++++++++++++++++++--------------------------- 1 file changed, 1010 insertions(+), 994 deletions(-) diff --git a/po/es.po b/po/es.po index 4e7bf9e9..b6abb4f1 100644 --- a/po/es.po +++ b/po/es.po @@ -8,33 +8,33 @@ # Jorge González , 2004, 2005, 2007, 2008, 2009, 2010, 2011. # # Luisa Ceron , 2016. -# Daniel Mustieles , 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018. +# Daniel Mustieles , 2011-2019. # msgid "" msgstr "" "Project-Id-Version: meld.master\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n" -"POT-Creation-Date: 2018-11-13 20:40+0000\n" -"PO-Revision-Date: 2018-11-15 12:02+0100\n" +"POT-Creation-Date: 2019-01-20 20:13+0000\n" +"PO-Revision-Date: 2019-01-28 13:43+0100\n" "Last-Translator: Daniel Mustieles \n" "Language-Team: es \n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Gtranslator 2.91.7\n" +"X-Generator: Gtranslator 3.31.0\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../bin/meld:194 +#: ../bin/meld:190 msgid "Cannot import: " msgstr "No se pudo importar: " -#: ../bin/meld:197 +#: ../bin/meld:193 #, c-format msgid "Meld requires %s or higher." msgstr "Meld requiere %s o superior." -#: ../bin/meld:243 +#: ../bin/meld:262 #, c-format msgid "" "Couldn’t load Meld-specific CSS (%s)\n" @@ -44,7 +44,8 @@ msgstr "" "%s" #: ../data/org.gnome.meld.desktop.in.h:1 -#: ../data/org.gnome.meld.appdata.xml.in.h:1 ../data/ui/meldapp.ui.h:1 +#: ../data/org.gnome.meld.appdata.xml.in.h:1 +#: ../meld/resources/ui/appwindow.ui.h:1 msgid "Meld" msgstr "Meld" @@ -112,26 +113,10 @@ msgid "Default window fullscreen state" msgstr "Estado predeterminado de la ventana a pantalla completa" #: ../data/org.gnome.meld.gschema.xml.h:5 -msgid "Show toolbar" -msgstr "Mostrar la barra de herramientas" - -#: ../data/org.gnome.meld.gschema.xml.h:6 -msgid "If true, the window toolbar is visible." -msgstr "Si es cierto, la barra de herramientas es visible." - -#: ../data/org.gnome.meld.gschema.xml.h:7 -msgid "Show statusbar" -msgstr "Mostrar la barra de estado" - -#: ../data/org.gnome.meld.gschema.xml.h:8 -msgid "If true, the window statusbar is visible." -msgstr "Si es cierto, la barra de estado es visible." - -#: ../data/org.gnome.meld.gschema.xml.h:9 msgid "Additional automatically detected text encodings" msgstr "Codificaciones del texto detectadas automáticamente" -#: ../data/org.gnome.meld.gschema.xml.h:10 +#: ../data/org.gnome.meld.gschema.xml.h:6 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 " @@ -144,37 +129,38 @@ msgstr "" "de la configuración regional; se pueden probar otras, dependiendo de la " "configuración regional del usuario." -#: ../data/org.gnome.meld.gschema.xml.h:11 +#: ../data/org.gnome.meld.gschema.xml.h:7 msgid "Width of an indentation step" msgstr "Anchura de un único sangrado" -#: ../data/org.gnome.meld.gschema.xml.h:12 +#: ../data/org.gnome.meld.gschema.xml.h:8 msgid "The number of spaces to use for a single indent step" msgstr "El número de espacios que usar para un solo sangrado" -#: ../data/org.gnome.meld.gschema.xml.h:13 +#: ../data/org.gnome.meld.gschema.xml.h:9 msgid "Whether to indent using spaces or tabs" msgstr "Indica si se debe sangrar usando espacios o tabuladores" -#: ../data/org.gnome.meld.gschema.xml.h:14 +#: ../data/org.gnome.meld.gschema.xml.h:10 msgid "If true, any new indentation will use spaces instead of tabs." msgstr "" "Si es cierto, cualquier sangrado nuevo usará espacios en lugar de " "tabuladores." -#: ../data/org.gnome.meld.gschema.xml.h:15 +#: ../data/org.gnome.meld.gschema.xml.h:11 +#: ../meld/resources/ui/statusbar-menu.ui.h:1 msgid "Show line numbers" msgstr "Mostrar los números de línea" -#: ../data/org.gnome.meld.gschema.xml.h:16 +#: ../data/org.gnome.meld.gschema.xml.h:12 msgid "If true, line numbers will be shown in the gutter of file comparisons." msgstr "Si es cierto, los números de línea de mostrarán al comparar archivos." -#: ../data/org.gnome.meld.gschema.xml.h:17 +#: ../data/org.gnome.meld.gschema.xml.h:13 msgid "Highlight syntax" msgstr "Resaltar la sintaxis" -#: ../data/org.gnome.meld.gschema.xml.h:18 +#: ../data/org.gnome.meld.gschema.xml.h:14 msgid "" "Whether to highlight syntax in comparisons. Because of Meld’s own color " "highlighting, this is off by default." @@ -183,21 +169,21 @@ msgstr "" "propio color de resaltado de Meld, esto está desactivado de manera " "predeterminada." -#: ../data/org.gnome.meld.gschema.xml.h:19 +#: ../data/org.gnome.meld.gschema.xml.h:15 msgid "Color scheme to use for syntax highlighting" msgstr "Esquema de color que usar para el resaltado de sintaxis" -#: ../data/org.gnome.meld.gschema.xml.h:20 +#: ../data/org.gnome.meld.gschema.xml.h:16 msgid "Used by GtkSourceView to determine colors for syntax highlighting" msgstr "" "Usado por GtkSourceView para determinar los colores para le resaltado de " "sintaxis" -#: ../data/org.gnome.meld.gschema.xml.h:21 +#: ../data/org.gnome.meld.gschema.xml.h:17 msgid "Displayed whitespace" msgstr "Espacio en blanco mostrado" -#: ../data/org.gnome.meld.gschema.xml.h:22 +#: ../data/org.gnome.meld.gschema.xml.h:18 msgid "" "Selector for individual whitespace character types to be shown. Possible " "values are 'space', 'tab', 'newline' and 'nbsp'." @@ -205,11 +191,11 @@ msgstr "" "Selector para tipos de caracteres de espacios en blanco individuales que " "mostrar. Los valores posibles son «space», «tab», «newline» y «nbsp»." -#: ../data/org.gnome.meld.gschema.xml.h:23 +#: ../data/org.gnome.meld.gschema.xml.h:19 msgid "Wrap mode" msgstr "Volver al principio" -#: ../data/org.gnome.meld.gschema.xml.h:24 +#: ../data/org.gnome.meld.gschema.xml.h:20 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 " @@ -219,11 +205,12 @@ msgstr "" "configuración: ninguna («none»), en cualquier carácter («char») o sólo al " "final de las palabras («word»)." -#: ../data/org.gnome.meld.gschema.xml.h:25 +#: ../data/org.gnome.meld.gschema.xml.h:21 +#: ../meld/resources/ui/statusbar-menu.ui.h:3 msgid "Highlight current line" msgstr "Resaltar la línea actual" -#: ../data/org.gnome.meld.gschema.xml.h:26 +#: ../data/org.gnome.meld.gschema.xml.h:22 msgid "" "If true, the line containing the cursor will be highlighted in file " "comparisons." @@ -231,22 +218,22 @@ msgstr "" "Si es cierto, la línea que contenga el cursos se resaltará en las " "comparaciones de archivos." -#: ../data/org.gnome.meld.gschema.xml.h:27 +#: ../data/org.gnome.meld.gschema.xml.h:23 msgid "Use the system default monospace font" msgstr "Usar la tipografía monoespaciada predeterminada del sistema" -#: ../data/org.gnome.meld.gschema.xml.h:28 +#: ../data/org.gnome.meld.gschema.xml.h:24 msgid "" "If false, custom-font will be used instead of the system monospace font." msgstr "" "Si es falso, se usará la tipografía personalizada en lugar de la tipografía " "monoespaciada del sistema." -#: ../data/org.gnome.meld.gschema.xml.h:29 +#: ../data/org.gnome.meld.gschema.xml.h:25 msgid "Custom font" msgstr "Tipografía personalizada" -#: ../data/org.gnome.meld.gschema.xml.h:30 +#: ../data/org.gnome.meld.gschema.xml.h:26 msgid "" "The custom font to use, stored as a string and parsed as a Pango font " "description." @@ -254,22 +241,22 @@ msgstr "" "La tipografía personalizada que usar, guardad como una cadena y analizada " "como una descripción de tipografía de Pango." -#: ../data/org.gnome.meld.gschema.xml.h:31 +#: ../data/org.gnome.meld.gschema.xml.h:27 msgid "Ignore blank lines when comparing files" msgstr "Ignorar líneas en blanco al comparar archivos" -#: ../data/org.gnome.meld.gschema.xml.h:32 +#: ../data/org.gnome.meld.gschema.xml.h:28 msgid "" "If true, blank lines will be trimmed when highlighting changes between files." msgstr "" "Si es cierto, las líneas en blanco se eliminarán al resaltar los cambios " "entre archivos." -#: ../data/org.gnome.meld.gschema.xml.h:33 +#: ../data/org.gnome.meld.gschema.xml.h:29 msgid "Use the system default editor" msgstr "Usar el editor predeterminado del sistema" -#: ../data/org.gnome.meld.gschema.xml.h:34 +#: ../data/org.gnome.meld.gschema.xml.h:30 msgid "" "If false, custom-editor-command will be used instead of the system editor " "when opening files externally." @@ -277,11 +264,11 @@ msgstr "" "Si es falso, se usará el editor personalizado en lugar del editor del " "sistema al abrir archivos externos." -#: ../data/org.gnome.meld.gschema.xml.h:35 +#: ../data/org.gnome.meld.gschema.xml.h:31 msgid "The custom editor launch command" msgstr "El comando para ejecutar el editor personalizado" -#: ../data/org.gnome.meld.gschema.xml.h:36 +#: ../data/org.gnome.meld.gschema.xml.h:32 msgid "" "The command used to launch a custom editor. Some limited templating is " "supported here; at the moment '{file}' and '{line}' are recognised tokens." @@ -290,11 +277,11 @@ msgstr "" "plantillas limitadas; por el momento, se reconocen las palabras reservadas " "«{file}» y «{line}»." -#: ../data/org.gnome.meld.gschema.xml.h:37 +#: ../data/org.gnome.meld.gschema.xml.h:33 msgid "Columns to display" msgstr "Columnas que mostrar" -#: ../data/org.gnome.meld.gschema.xml.h:38 +#: ../data/org.gnome.meld.gschema.xml.h:34 msgid "" "List of column names in folder comparison and whether they should be " "displayed." @@ -302,11 +289,12 @@ msgstr "" "Lista de nombres de columnas en comparación de carpetas y si deberían " "mostrarse." -#: ../data/org.gnome.meld.gschema.xml.h:39 ../data/ui/preferences.ui.h:25 +#: ../data/org.gnome.meld.gschema.xml.h:35 +#: ../meld/resources/ui/preferences.ui.h:25 msgid "Ignore symbolic links" msgstr "Ignorar enlaces simbólicos" -#: ../data/org.gnome.meld.gschema.xml.h:40 +#: ../data/org.gnome.meld.gschema.xml.h:36 msgid "" "If true, folder comparisons do not follow symbolic links when traversing the " "folder tree." @@ -314,11 +302,11 @@ msgstr "" "Si es cierto, la comparación de carpetas no seguirá los enlaces simbólicos " "al recorrer el árbol de carpetas." -#: ../data/org.gnome.meld.gschema.xml.h:41 +#: ../data/org.gnome.meld.gschema.xml.h:37 msgid "Use shallow comparison" msgstr "Usar una comparación superficial" -#: ../data/org.gnome.meld.gschema.xml.h:42 +#: ../data/org.gnome.meld.gschema.xml.h:38 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 " @@ -328,11 +316,11 @@ msgstr "" "y la hora de modificación, considerando que los archivos son idénticos si el " "tamaño y la hora de modificación coinciden, y diferentes si no es así." -#: ../data/org.gnome.meld.gschema.xml.h:43 +#: ../data/org.gnome.meld.gschema.xml.h:39 msgid "File timestamp resolution" msgstr "Resolución de marca de tiempo del archivo" -#: ../data/org.gnome.meld.gschema.xml.h:44 +#: ../data/org.gnome.meld.gschema.xml.h:40 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 " @@ -344,11 +332,12 @@ msgstr "" "diferentes horas de modificación. Esto es útil para comparar archivos entre " "sistemas de archivos con diferente resolución de marca de tiempo." -#: ../data/org.gnome.meld.gschema.xml.h:45 ../data/ui/preferences.ui.h:22 +#: ../data/org.gnome.meld.gschema.xml.h:41 +#: ../meld/resources/ui/preferences.ui.h:22 msgid "Apply text filters during folder comparisons" msgstr "Aplicar filtros de texto durante la comparación de carpetas" -#: ../data/org.gnome.meld.gschema.xml.h:46 +#: ../data/org.gnome.meld.gschema.xml.h:42 msgid "" "If true, folder comparisons that compare file contents also apply active " "text filters and the blank line trimming option, and ignore newline " @@ -358,21 +347,21 @@ msgstr "" "archivos también aplica filtros de texto activos y la opción de eliminar " "líneas en blanco, e ignorar las diferencias entre líneas nuevas." -#: ../data/org.gnome.meld.gschema.xml.h:47 +#: ../data/org.gnome.meld.gschema.xml.h:43 msgid "File status filters" msgstr "Filtros del estado del archivo" -#: ../data/org.gnome.meld.gschema.xml.h:48 +#: ../data/org.gnome.meld.gschema.xml.h:44 msgid "List of statuses used to filter visible files in folder comparison." msgstr "" "Lista de estados usados para filtrar los archivos visibles en la comparación " "de carpetas." -#: ../data/org.gnome.meld.gschema.xml.h:49 +#: ../data/org.gnome.meld.gschema.xml.h:45 msgid "Show the version control console output" msgstr "Mostrar la salida de la consola del control de versiones" -#: ../data/org.gnome.meld.gschema.xml.h:50 +#: ../data/org.gnome.meld.gschema.xml.h:46 msgid "" "If true, a console output section will be shown in version control views, " "showing the commands run for version control operations." @@ -381,11 +370,11 @@ msgstr "" "control de versiones, que mostrará el comando ejecutado en las operaciones " "del control de versiones." -#: ../data/org.gnome.meld.gschema.xml.h:51 +#: ../data/org.gnome.meld.gschema.xml.h:47 msgid "Version control pane position" msgstr "Posición del panel de control de versiones" -#: ../data/org.gnome.meld.gschema.xml.h:52 +#: ../data/org.gnome.meld.gschema.xml.h:48 msgid "" "This is the height of the main version control tree when the console pane is " "shown." @@ -393,12 +382,12 @@ msgstr "" "Esto es la altura del árbol de control de versiones principal cuando se " "muestra el panel de la consola." -#: ../data/org.gnome.meld.gschema.xml.h:53 +#: ../data/org.gnome.meld.gschema.xml.h:49 msgid "Present version comparisons as left-local/right-remote" msgstr "" "Presentar la comparación de versiones como izquierda-local/derecha-remoto" -#: ../data/org.gnome.meld.gschema.xml.h:54 +#: ../data/org.gnome.meld.gschema.xml.h:50 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, " @@ -409,13 +398,13 @@ msgstr "" "presentar los archivos en los paneles. De otro modo, se usará el esquema " "«izquierda es el otro», «derecha es el mío»." -#: ../data/org.gnome.meld.gschema.xml.h:55 +#: ../data/org.gnome.meld.gschema.xml.h:51 msgid "Order for files in three-way version control merge comparisons" msgstr "" "Orden de los archivos en comparaciones de mezcla de control de versiones de " "tres vías" -#: ../data/org.gnome.meld.gschema.xml.h:56 +#: ../data/org.gnome.meld.gschema.xml.h:52 msgid "" "Choices for file order are remote/merged/local and local/merged/remote. This " "preference only affects three-way comparisons launched from the version " @@ -426,11 +415,11 @@ msgstr "" "lanzadas desde la vista del control de versiones, por lo que se usa " "solamente para la resolución de mezclas/conflictos en Meld." -#: ../data/org.gnome.meld.gschema.xml.h:57 +#: ../data/org.gnome.meld.gschema.xml.h:53 msgid "Show margin in commit message editor" msgstr "Mostrar el margen en el editor de mensajes de «commit»" -#: ../data/org.gnome.meld.gschema.xml.h:58 +#: ../data/org.gnome.meld.gschema.xml.h:54 msgid "" "If true, a guide will be displayed to show what column the margin is at in " "the version control commit message editor." @@ -438,11 +427,11 @@ msgstr "" "Si es cierto, se mostrará una guía para indicar en qué columna está el " "margen en el editor de mensajes de «commit» del control de versiones." -#: ../data/org.gnome.meld.gschema.xml.h:59 +#: ../data/org.gnome.meld.gschema.xml.h:55 msgid "Margin column in commit message editor" msgstr "Columna de margen en el editor de mensajes de «commit»" -#: ../data/org.gnome.meld.gschema.xml.h:60 +#: ../data/org.gnome.meld.gschema.xml.h:56 msgid "" "The column at which to show the margin in the version control commit message " "editor." @@ -450,11 +439,11 @@ msgstr "" "La columna en la que mostrar el margen en el editor de mensajes de «commit» " "del control de versiones." -#: ../data/org.gnome.meld.gschema.xml.h:61 +#: ../data/org.gnome.meld.gschema.xml.h:57 msgid "Automatically hard-wrap commit messages" msgstr "Recortar automáticamente los mensajes de «commit»" -#: ../data/org.gnome.meld.gschema.xml.h:62 +#: ../data/org.gnome.meld.gschema.xml.h:58 msgid "" "If true, the version control commit message editor will hard-wrap (i.e., " "insert line breaks) at the commit margin before commit." @@ -463,22 +452,22 @@ msgstr "" "recortará los mensajes (es decir, insertará saltos de línea) en el margen " "definido antes de aplicar." -#: ../data/org.gnome.meld.gschema.xml.h:63 +#: ../data/org.gnome.meld.gschema.xml.h:59 msgid "Version control status filters" msgstr "Filtros del estado del control de versiones" -#: ../data/org.gnome.meld.gschema.xml.h:64 +#: ../data/org.gnome.meld.gschema.xml.h:60 msgid "" "List of statuses used to filter visible files in version control comparison." msgstr "" "Lista de estados usados para filtrar los archivos visibles en la comparación " "del control de versiones." -#: ../data/org.gnome.meld.gschema.xml.h:65 +#: ../data/org.gnome.meld.gschema.xml.h:61 msgid "Filename-based filters" msgstr "Filtros basados en el nombre del archivo" -#: ../data/org.gnome.meld.gschema.xml.h:66 +#: ../data/org.gnome.meld.gschema.xml.h:62 msgid "" "List of predefined filename-based filters that, if active, will remove " "matching files from a folder comparison." @@ -486,11 +475,11 @@ msgstr "" "Lista de filtros de expresiones basadas en nombres de archivos que, si está " "activa, eliminará los archivos coincidentes en una comparación de carpetas." -#: ../data/org.gnome.meld.gschema.xml.h:67 +#: ../data/org.gnome.meld.gschema.xml.h:63 msgid "Text-based filters" msgstr "Filtros basados en texto" -#: ../data/org.gnome.meld.gschema.xml.h:68 +#: ../data/org.gnome.meld.gschema.xml.h:64 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,401 +505,626 @@ msgstr "Esquema oscuro de Meld" msgid "Dark color scheme for Meld highlighting" msgstr "Esquema de color oscuro para el resaltado de Meld" -#: ../data/ui/application.ui.h:1 -msgid "About Meld" -msgstr "Acerca de Meld" +#: ../meld/resources/gtk/help-overlay.ui.h:1 +msgctxt "shortcut window" +msgid "General" +msgstr "General" -#: ../data/ui/application.ui.h:2 -msgid "" -"Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2017 Kai Willadsen" -msgstr "" -"Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2017 Kai Willadsen" +#: ../meld/resources/gtk/help-overlay.ui.h:2 +msgctxt "shortcut window" +msgid "New comparison" +msgstr "Nueva comparación" -#: ../data/ui/application.ui.h:4 -msgid "Website" -msgstr "Página web" +#: ../meld/resources/gtk/help-overlay.ui.h:3 +msgctxt "shortcut window" +msgid "Close a comparison" +msgstr "Cerrar comparación" -#: ../data/ui/application.ui.h:5 -msgid "translator-credits" -msgstr "" -"Daniel Mustieles , 2011 - 2013\n" -"Jorge González , 2004-2011\n" -"Francisco Javier F. Serrador , 2004-2006" +#: ../meld/resources/gtk/help-overlay.ui.h:4 +msgctxt "shortcut window" +msgid "Quit Meld" +msgstr "Salir de Meld" -#: ../data/ui/application.ui.h:6 -msgid "_Preferences" -msgstr "Prefere_ncias" +#: ../meld/resources/gtk/help-overlay.ui.h:5 +msgctxt "shortcut window" +msgid "Stop the current action" +msgstr "Detener la acción actual" -#: ../data/ui/application.ui.h:7 -msgid "_Help" -msgstr "Ay_uda" +#: ../meld/resources/gtk/help-overlay.ui.h:6 +msgctxt "shortcut window" +msgid "Refresh comparison" +msgstr "Actualizar comparación" -#: ../data/ui/application.ui.h:8 -msgid "Keyboard Shortcuts" -msgstr "Atajos del teclado" +#: ../meld/resources/gtk/help-overlay.ui.h:7 +msgctxt "shortcut window" +msgid "Fullscreen" +msgstr "Pantalla completa" -#: ../data/ui/application.ui.h:9 -msgid "_About" -msgstr "_Acerca de" +#: ../meld/resources/gtk/help-overlay.ui.h:8 +msgctxt "shortcut window" +msgid "Tabs" +msgstr "Pestañas" -#: ../data/ui/application.ui.h:10 -msgid "_Quit" -msgstr "_Salir" +#: ../meld/resources/gtk/help-overlay.ui.h:9 +msgctxt "shortcut window" +msgid "Go to previous tab" +msgstr "Ir a la pestaña anterior" -#: ../data/ui/dirdiff.ui.h:1 ../data/ui/vcview.ui.h:1 -msgid "_Compare" -msgstr "_Comparar" +#: ../meld/resources/gtk/help-overlay.ui.h:10 +msgctxt "shortcut window" +msgid "Go to next tab" +msgstr "Ir a la siguiente pestaña" -#: ../data/ui/dirdiff.ui.h:2 ../data/ui/vcview.ui.h:2 -msgid "Compare selected files" -msgstr "Comparar los archivos seleccionados" +#: ../meld/resources/gtk/help-overlay.ui.h:11 +msgctxt "shortcut window" +msgid "Switch to tab" +msgstr "Cambiar a la pestaña" -#: ../data/ui/dirdiff.ui.h:3 -msgid "Collapse Recursively" -msgstr "Contraer recursivamente" +#: ../meld/resources/gtk/help-overlay.ui.h:12 +msgctxt "shortcut window" +msgid "Move tab left" +msgstr "Mover la pestaña a la izquierda" -#: ../data/ui/dirdiff.ui.h:4 -msgid "Collapse selected folder and all subfolders" -msgstr "Contraer la carpeta seleccionada y todas sus subcarpetas" +#: ../meld/resources/gtk/help-overlay.ui.h:13 +msgctxt "shortcut window" +msgid "Move tab right" +msgstr "Mover la pestaña a la derecha" -#: ../data/ui/dirdiff.ui.h:5 -msgid "Expand Recursively" -msgstr "Expandir recursivamente" +#: ../meld/resources/gtk/help-overlay.ui.h:14 +msgctxt "shortcut window" +msgid "Changes" +msgstr "Cambios" -#: ../data/ui/dirdiff.ui.h:6 -msgid "Expand selected folder and all subfolders" -msgstr "Expandir la carpeta seleccionada y todas sus subcarpetas" +#: ../meld/resources/gtk/help-overlay.ui.h:15 +msgctxt "shortcut window" +msgid "Go to previous change" +msgstr "Ir al cambio anterior" -#: ../data/ui/dirdiff.ui.h:7 -msgid "Copy to _Left" -msgstr "Copiar a la _izquierda" +#: ../meld/resources/gtk/help-overlay.ui.h:16 +msgctxt "shortcut window" +msgid "Go to next change" +msgstr "Ir al siguiente cambio" -#: ../data/ui/dirdiff.ui.h:8 -msgid "Copy to left" -msgstr "Copiar a la izquierda" +#: ../meld/resources/gtk/help-overlay.ui.h:17 +msgctxt "shortcut window" +msgid "Editing" +msgstr "Edición" -#: ../data/ui/dirdiff.ui.h:9 -msgid "Copy to _Right" -msgstr "Copiar a la _derecha" +#: ../meld/resources/gtk/help-overlay.ui.h:18 +msgctxt "shortcut window" +msgid "Undo" +msgstr "Deshacer" -#: ../data/ui/dirdiff.ui.h:10 -msgid "Copy to right" -msgstr "Copiar a la derecha" +#: ../meld/resources/gtk/help-overlay.ui.h:19 +msgctxt "shortcut window" +msgid "Redo" +msgstr "Rehacer" -#: ../data/ui/dirdiff.ui.h:11 -msgid "Delete selected" -msgstr "Eliminar seleccionados" +#: ../meld/resources/gtk/help-overlay.ui.h:20 +msgctxt "shortcut window" +msgid "Cut" +msgstr "Cortar" -#: ../data/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:920 ../meld/filediff.py:1489 -msgid "Hide" -msgstr "Ocultar" +#: ../meld/resources/gtk/help-overlay.ui.h:21 +msgctxt "shortcut window" +msgid "Copy" +msgstr "Copiar" -#: ../data/ui/dirdiff.ui.h:13 -msgid "Hide selected" -msgstr "Ocultar lo seleccionado" +#: ../meld/resources/gtk/help-overlay.ui.h:22 +msgctxt "shortcut window" +msgid "Paste" +msgstr "Pegar" -#: ../data/ui/dirdiff.ui.h:14 -msgid "Ignore Filename Case" -msgstr "Ignorar capitalización en nombres de archivos" +#: ../meld/resources/gtk/help-overlay.ui.h:23 +msgctxt "shortcut window" +msgid "Find" +msgstr "Buscar" -#: ../data/ui/dirdiff.ui.h:15 -msgid "" -"Consider differently-cased filenames that are otherwise-identical to be the " -"same" -msgstr "" -"Considerar casos diferentes los nombres de archivo que de otro modo serían " -"idénticos" +#: ../meld/resources/gtk/help-overlay.ui.h:24 +msgctxt "shortcut window" +msgid "Find Next" +msgstr "Buscar siguiente" -#: ../data/ui/dirdiff.ui.h:16 -msgid "Same" -msgstr "Iguales" +#: ../meld/resources/gtk/help-overlay.ui.h:25 +msgctxt "shortcut window" +msgid "Find Previous" +msgstr "Buscar anterior" -#: ../data/ui/dirdiff.ui.h:17 -msgid "Show identical" -msgstr "Mostrar idénticos" +#: ../meld/resources/gtk/help-overlay.ui.h:26 +msgctxt "shortcut window" +msgid "Replace" +msgstr "Reemplazar" -#: ../data/ui/dirdiff.ui.h:18 -msgid "New" -msgstr "Nuevo" +#: ../meld/resources/gtk/help-overlay.ui.h:27 +msgctxt "shortcut window" +msgid "File comparison" +msgstr "Comparación de archivos" -#: ../data/ui/dirdiff.ui.h:19 -msgid "Show new" -msgstr "Mostrar nuevos" +#: ../meld/resources/gtk/help-overlay.ui.h:28 +msgctxt "shortcut window" +msgid "Save current file" +msgstr "Guardar archivo actual" -#: ../data/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:76 -msgid "Modified" -msgstr "Modificado" +#: ../meld/resources/gtk/help-overlay.ui.h:29 +msgctxt "shortcut window" +msgid "Save current file to new path" +msgstr "Guardar el archivo actual en la nueva ruta" -#: ../data/ui/dirdiff.ui.h:21 -msgid "Show modified" -msgstr "Mostrar modificados" +#: ../meld/resources/gtk/help-overlay.ui.h:30 +msgctxt "shortcut window" +msgid "Save all files in comparison" +msgstr "Guardar todos los archivos comparados" -#: ../data/ui/dirdiff.ui.h:22 -msgid "Filters" -msgstr "Filtros" +#: ../meld/resources/gtk/help-overlay.ui.h:31 +msgctxt "shortcut window" +msgid "Previous conflict" +msgstr "Conflicto previo" -#: ../data/ui/dirdiff.ui.h:23 -msgid "Set active filters" -msgstr "Establecer filtros activos" +#: ../meld/resources/gtk/help-overlay.ui.h:32 +msgctxt "shortcut window" +msgid "Next conflict" +msgstr "Próximo conflicto" + +#: ../meld/resources/gtk/help-overlay.ui.h:33 +msgctxt "shortcut window" +msgid "Push change to left" +msgstr "Pasar el cambio a la izquierda" + +#: ../meld/resources/gtk/help-overlay.ui.h:34 +msgctxt "shortcut window" +msgid "Push change to right" +msgstr "Pasar el cambio a la derecha" + +#: ../meld/resources/gtk/help-overlay.ui.h:35 +msgctxt "shortcut window" +msgid "Pull change from left" +msgstr "Traer el cambio desde la izquierda" + +#: ../meld/resources/gtk/help-overlay.ui.h:36 +msgctxt "shortcut window" +msgid "Pull change from right" +msgstr "Traer el cambio desde la derecha" + +#: ../meld/resources/gtk/help-overlay.ui.h:37 +msgctxt "shortcut window" +msgid "Copy change above left" +msgstr "Copiar el cambio de arriba a la izquierda" + +#: ../meld/resources/gtk/help-overlay.ui.h:38 +msgctxt "shortcut window" +msgid "Copy change below left" +msgstr "Copiar el cambio de abajo a la izquierda" + +#: ../meld/resources/gtk/help-overlay.ui.h:39 +msgctxt "shortcut window" +msgid "Copy change above right" +msgstr "Copiar el cambio de arriba a la derecha" + +#: ../meld/resources/gtk/help-overlay.ui.h:40 +msgctxt "shortcut window" +msgid "Copy change below right" +msgstr "Copiar el cambio de abajo a la derecha" + +#: ../meld/resources/gtk/help-overlay.ui.h:41 +msgctxt "shortcut window" +msgid "Delete change" +msgstr "Eliminar 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 "Siguiente panel de comparación" + +#: ../meld/resources/gtk/help-overlay.ui.h:44 +msgctxt "shortcut window" +msgid "Folder comparison" +msgstr "Comparación de la carpeta" + +#: ../meld/resources/gtk/help-overlay.ui.h:45 +msgctxt "shortcut window" +msgid "Copy to left" +msgstr "Copia a la izquierda" + +#: ../meld/resources/gtk/help-overlay.ui.h:46 +msgctxt "shortcut window" +msgid "Copy to right" +msgstr "Copia a la derecha" + +#: ../meld/resources/gtk/help-overlay.ui.h:47 +msgctxt "shortcut window" +msgid "Version control comparison" +msgstr "Comparación de control de versiones" + +#: ../meld/resources/gtk/help-overlay.ui.h:48 +msgctxt "shortcut window" +msgid "Commit to version control" +msgstr "Subir al control de versiones" + +#: ../meld/resources/gtk/help-overlay.ui.h:49 +msgctxt "shortcut window" +msgid "Show/hide console output" +msgstr "Mostrar/ocultar la salida de la consola" + +#: ../meld/resources/gtk/menus.ui.h:1 +msgid "_Preferences" +msgstr "Prefere_ncias" + +#: ../meld/resources/gtk/menus.ui.h:2 +msgid "_Help" +msgstr "Ay_uda" + +#: ../meld/resources/gtk/menus.ui.h:3 +msgid "Keyboard Shortcuts" +msgstr "Atajos del teclado" + +#: ../meld/resources/gtk/menus.ui.h:4 +msgid "_About" +msgstr "_Acerca de" + +#: ../meld/resources/gtk/menus.ui.h:5 +msgid "_Quit" +msgstr "_Salir" + +#: ../meld/resources/ui/about-dialog.ui.h:1 +msgid "About Meld" +msgstr "Acerca de Meld" + +#: ../meld/resources/ui/about-dialog.ui.h:2 +msgid "" +"Copyright © 2002-2009 Stephen Kennedy\n" +"Copyright © 2009-2017 Kai Willadsen" +msgstr "" +"Copyright © 2002-2009 Stephen Kennedy\n" +"Copyright © 2009-2017 Kai Willadsen" + +#: ../meld/resources/ui/about-dialog.ui.h:4 +msgid "Website" +msgstr "Página web" -#: ../data/ui/EditableList.ui.h:1 -msgid "Editable List" -msgstr "Lista editable" +#: ../meld/resources/ui/about-dialog.ui.h:5 +msgid "translator-credits" +msgstr "" +"Daniel Mustieles , 2011 - 2013\n" +"Jorge González , 2004-2011\n" +"Francisco Javier F. Serrador , 2004-2006" -#: ../data/ui/EditableList.ui.h:2 +#: ../meld/resources/ui/column-list.ui.h:1 +#: ../meld/resources/ui/filter-list.ui.h:1 msgid "Active" msgstr "Activar" -#: ../data/ui/EditableList.ui.h:3 +#: ../meld/resources/ui/column-list.ui.h:2 msgid "Column Name" msgstr "Nombre de la columna" -#: ../data/ui/EditableList.ui.h:4 ../data/ui/vcview.ui.h:9 -msgid "_Add" -msgstr "_Añadir" - -#: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11 -#: ../meld/vcview.py:680 +#: ../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 msgid "_Remove" msgstr "_Eliminar" -#: ../data/ui/EditableList.ui.h:6 +#: ../meld/resources/ui/column-list.ui.h:4 +#: ../meld/resources/ui/filter-list.ui.h:8 msgid "Move item up" msgstr "Subir elemento" -#: ../data/ui/EditableList.ui.h:7 +#: ../meld/resources/ui/column-list.ui.h:5 +#: ../meld/resources/ui/filter-list.ui.h:9 msgid "Move _Up" msgstr "_Subir" -#: ../data/ui/EditableList.ui.h:8 +#: ../meld/resources/ui/column-list.ui.h:6 +#: ../meld/resources/ui/filter-list.ui.h:10 msgid "Move item down" msgstr "Bajar elemento" -#: ../data/ui/EditableList.ui.h:9 +#: ../meld/resources/ui/column-list.ui.h:7 +#: ../meld/resources/ui/filter-list.ui.h:11 msgid "Move _Down" msgstr "_Bajar" -#. Create icon and filename CellRenderer -#: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35 -#: ../meld/dirdiff.py:416 -msgid "Name" -msgstr "Nombre" +#: ../meld/resources/ui/commit-dialog.ui.h:1 +msgid "Commit" +msgstr "Efectuar" -#: ../data/ui/EditableList.ui.h:11 -msgid "Pattern" -msgstr "Patrón" +#: ../meld/resources/ui/commit-dialog.ui.h:2 +msgid "Commit Files" +msgstr "Efectuar a los archivos" -#: ../data/ui/EditableList.ui.h:12 -msgid "Add new filter" -msgstr "Añadir filtro nuevo" +#: ../meld/resources/ui/commit-dialog.ui.h:3 +msgid "Log Message" +msgstr "Mensaje de registro" -#: ../data/ui/EditableList.ui.h:13 -msgid "Remove selected filter" -msgstr "Quitar el filtro seleccionado" +#: ../meld/resources/ui/commit-dialog.ui.h:4 +msgid "Previous logs:" +msgstr "Registros anteriores:" + +#: ../meld/resources/ui/commit-dialog.ui.h:5 +msgid "Co_mmit" +msgstr "E_fectuar" + +#: ../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 los archivos seleccionados" + +#: ../meld/resources/ui/dirdiff.ui.h:3 +msgid "Collapse Recursively" +msgstr "Contraer recursivamente" + +#: ../meld/resources/ui/dirdiff.ui.h:4 +msgid "Collapse selected folder and all subfolders" +msgstr "Contraer la carpeta seleccionada y todas sus subcarpetas" + +#: ../meld/resources/ui/dirdiff.ui.h:5 +msgid "Expand Recursively" +msgstr "Expandir recursivamente" + +#: ../meld/resources/ui/dirdiff.ui.h:6 +msgid "Expand selected folder and all subfolders" +msgstr "Expandir la carpeta seleccionada y todas sus subcarpetas" -#: ../data/ui/encoding-selector.ui.h:1 +#: ../meld/resources/ui/dirdiff.ui.h:7 +msgid "Copy to _Left" +msgstr "Copiar a la _izquierda" + +#: ../meld/resources/ui/dirdiff.ui.h:8 +msgid "Copy to left" +msgstr "Copiar a la izquierda" + +#: ../meld/resources/ui/dirdiff.ui.h:9 +msgid "Copy to _Right" +msgstr "Copiar a la _derecha" + +#: ../meld/resources/ui/dirdiff.ui.h:10 +msgid "Copy to right" +msgstr "Copiar a la derecha" + +#: ../meld/resources/ui/dirdiff.ui.h:11 +msgid "Delete selected" +msgstr "Eliminar seleccionados" + +#: ../meld/resources/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:959 +#: ../meld/filediff.py:1601 +msgid "Hide" +msgstr "Ocultar" + +#: ../meld/resources/ui/dirdiff.ui.h:13 +msgid "Hide selected" +msgstr "Ocultar lo seleccionado" + +#: ../meld/resources/ui/dirdiff.ui.h:14 +msgid "Ignore Filename Case" +msgstr "Ignorar capitalización en nombres de archivos" + +#: ../meld/resources/ui/dirdiff.ui.h:15 +msgid "" +"Consider differently-cased filenames that are otherwise-identical to be the " +"same" +msgstr "" +"Considerar casos diferentes los nombres de archivo que de otro modo serían " +"idénticos" + +#: ../meld/resources/ui/dirdiff.ui.h:16 +msgid "Same" +msgstr "Iguales" + +#: ../meld/resources/ui/dirdiff.ui.h:17 +msgid "Show identical" +msgstr "Mostrar idénticos" + +#: ../meld/resources/ui/dirdiff.ui.h:18 +msgid "New" +msgstr "Nuevo" + +#: ../meld/resources/ui/dirdiff.ui.h:19 +msgid "Show new" +msgstr "Mostrar nuevos" + +#: ../meld/resources/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:77 +msgid "Modified" +msgstr "Modificado" + +#: ../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 "Establecer filtros activos" + +#: ../meld/resources/ui/encoding-selector.ui.h:1 msgid "Search text encoding…" msgstr "Codificación de texto de la búsqueda…" -#: ../data/ui/filediff.ui.h:1 +#: ../meld/resources/ui/filediff.ui.h:1 msgid "Format as Patch…" msgstr "Formatear como parche…" -#: ../data/ui/filediff.ui.h:2 +#: ../meld/resources/ui/filediff.ui.h:2 msgid "Create a patch using differences between files" msgstr "Crear un parche usando las diferencias entre los archivos" -#: ../data/ui/filediff.ui.h:3 +#: ../meld/resources/ui/filediff.ui.h:3 msgid "Save A_ll" msgstr "Guardar _todo" -#: ../data/ui/filediff.ui.h:4 +#: ../meld/resources/ui/filediff.ui.h:4 msgid "Save all files in the current comparison" msgstr "Guardar todos los archivos en la comparación actual" -#: ../data/ui/filediff.ui.h:5 +#: ../meld/resources/ui/filediff.ui.h:5 msgid "Revert files to their saved versions" msgstr "Revertir los archivos a sus versiones guardadas" -#: ../data/ui/filediff.ui.h:6 +#: ../meld/resources/ui/filediff.ui.h:6 msgid "Add Synchronization Point" msgstr "Añadir punto de sincronización" -#: ../data/ui/filediff.ui.h:7 +#: ../meld/resources/ui/filediff.ui.h:7 msgid "Add a synchronization point for changes between files" msgstr "Añadir un punto de sincronización de cambios entre archivos" -#: ../data/ui/filediff.ui.h:8 +#: ../meld/resources/ui/filediff.ui.h:8 msgid "Clear Synchronization Points" msgstr "Limpiar puntos de sincronización" -#: ../data/ui/filediff.ui.h:9 +#: ../meld/resources/ui/filediff.ui.h:9 msgid "Clear sychronization points for changes between files" msgstr "" "Limpiar los puntos manuales de sincronización de cambios entre archivos" -#: ../data/ui/filediff.ui.h:10 +#: ../meld/resources/ui/filediff.ui.h:10 msgid "Previous Conflict" msgstr "Conflicto anterior" -#: ../data/ui/filediff.ui.h:11 +#: ../meld/resources/ui/filediff.ui.h:11 msgid "Go to the previous conflict" msgstr "Ir al conflicto anterior" -#: ../data/ui/filediff.ui.h:12 +#: ../meld/resources/ui/filediff.ui.h:12 msgid "Next Conflict" msgstr "Siguiente conflicto" -#: ../data/ui/filediff.ui.h:13 +#: ../meld/resources/ui/filediff.ui.h:13 msgid "Go to the next conflict" msgstr "Ir al siguiente conflicto" -#: ../data/ui/filediff.ui.h:14 +#: ../meld/resources/ui/filediff.ui.h:14 msgid "Push to Left" msgstr "Pasar a la izquierda" -#: ../data/ui/filediff.ui.h:15 +#: ../meld/resources/ui/filediff.ui.h:15 msgid "Push current change to the left" msgstr "Pasar el cambio actual a la izquierda" -#: ../data/ui/filediff.ui.h:16 +#: ../meld/resources/ui/filediff.ui.h:16 msgid "Push to Right" msgstr "Pasar a la derecha" -#: ../data/ui/filediff.ui.h:17 +#: ../meld/resources/ui/filediff.ui.h:17 msgid "Push current change to the right" msgstr "Pasar el cambio actual a la derecha" -#: ../data/ui/filediff.ui.h:18 +#: ../meld/resources/ui/filediff.ui.h:18 msgid "Pull from Left" msgstr "Traer desde la izquierda" -#: ../data/ui/filediff.ui.h:19 +#: ../meld/resources/ui/filediff.ui.h:19 msgid "Pull change from the left" msgstr "Traer el cambio actual desde la izquierda" -#: ../data/ui/filediff.ui.h:20 +#: ../meld/resources/ui/filediff.ui.h:20 msgid "Pull from Right" msgstr "Traer desde la derecha" -#: ../data/ui/filediff.ui.h:21 +#: ../meld/resources/ui/filediff.ui.h:21 msgid "Pull change from the right" msgstr "Traer el cambio actual desde la derecha" -#: ../data/ui/filediff.ui.h:22 +#: ../meld/resources/ui/filediff.ui.h:22 msgid "Copy Above Left" msgstr "Copiar por encima de la izquierda" -#: ../data/ui/filediff.ui.h:23 +#: ../meld/resources/ui/filediff.ui.h:23 msgid "Copy change above the left chunk" msgstr "Copiar el cambio por encima de la parte izquierda" -#: ../data/ui/filediff.ui.h:24 +#: ../meld/resources/ui/filediff.ui.h:24 msgid "Copy Below Left" msgstr "Copiar por debajo de la izquierda" -#: ../data/ui/filediff.ui.h:25 +#: ../meld/resources/ui/filediff.ui.h:25 msgid "Copy change below the left chunk" msgstr "Copiar el cambio por debajo de la parte izquierda" -#: ../data/ui/filediff.ui.h:26 +#: ../meld/resources/ui/filediff.ui.h:26 msgid "Copy Above Right" msgstr "Copiar por encima de la derecha" -#: ../data/ui/filediff.ui.h:27 +#: ../meld/resources/ui/filediff.ui.h:27 msgid "Copy change above the right chunk" msgstr "Copiar el cambio por encima de la parte derecha" -#: ../data/ui/filediff.ui.h:28 +#: ../meld/resources/ui/filediff.ui.h:28 msgid "Copy Below Right" msgstr "Copiar por debajo de la derecha" -#: ../data/ui/filediff.ui.h:29 +#: ../meld/resources/ui/filediff.ui.h:29 msgid "Copy change below the right chunk" msgstr "Copiar el cambio por debajo de la parte derecha" -#: ../data/ui/filediff.ui.h:30 +#: ../meld/resources/ui/filediff.ui.h:30 msgid "Delete" msgstr "Eliminar" -#: ../data/ui/filediff.ui.h:31 +#: ../meld/resources/ui/filediff.ui.h:31 msgid "Delete change" msgstr "Eliminar el cambio" -#: ../data/ui/filediff.ui.h:32 +#: ../meld/resources/ui/filediff.ui.h:32 msgid "Merge All from Left" msgstr "Mezclar desde la izquierda" -#: ../data/ui/filediff.ui.h:33 +#: ../meld/resources/ui/filediff.ui.h:33 msgid "Merge all non-conflicting changes from the left" msgstr "Mezclar todos los cambios sin conflicto de la izquierda" -#: ../data/ui/filediff.ui.h:34 +#: ../meld/resources/ui/filediff.ui.h:34 msgid "Merge All from Right" msgstr "Mezclar desde la derecha" -#: ../data/ui/filediff.ui.h:35 +#: ../meld/resources/ui/filediff.ui.h:35 msgid "Merge all non-conflicting changes from the right" msgstr "Mezclar todos los cambios sin conflicto de la derecha" -#: ../data/ui/filediff.ui.h:36 +#: ../meld/resources/ui/filediff.ui.h:36 msgid "Merge All" msgstr "Mezclar todo" -#: ../data/ui/filediff.ui.h:37 +#: ../meld/resources/ui/filediff.ui.h:37 msgid "Merge all non-conflicting changes from left and right panes" msgstr "" "Mezclar todos los cambios sin conflicto de los paneles de la izquierda y " "derecha" -#: ../data/ui/filediff.ui.h:38 +#: ../meld/resources/ui/filediff.ui.h:38 msgid "Previous Pane" msgstr "Panel anterior" -#: ../data/ui/filediff.ui.h:39 +#: ../meld/resources/ui/filediff.ui.h:39 msgid "Move keyboard focus to the previous document in this comparison" msgstr "Mover el foco del teclado al documento anterior de esta comparación" -#: ../data/ui/filediff.ui.h:40 +#: ../meld/resources/ui/filediff.ui.h:40 msgid "Next Pane" msgstr "Siguiente panel" -#: ../data/ui/filediff.ui.h:41 +#: ../meld/resources/ui/filediff.ui.h:41 msgid "Move keyboard focus to the next document in this comparison" msgstr "Mover el foco del teclado al siguiente documento de esta comparación" -#: ../data/ui/filediff.ui.h:42 +#: ../meld/resources/ui/filediff.ui.h:42 msgid "Lock Scrolling" msgstr "Bloquear el desplazamiento" -#: ../data/ui/filediff.ui.h:43 +#: ../meld/resources/ui/filediff.ui.h:43 msgid "Lock scrolling of all panes" msgstr "Bloquear el desplazamiento de todos los paneles" -#: ../data/ui/filediff.ui.h:44 -msgid "Save changes to documents before closing?" -msgstr "¿Guardar los cambios de los documentos antes de cerrar?" - -#: ../data/ui/filediff.ui.h:45 -msgid "If you don’t save, changes will be permanently lost." -msgstr "Los cambios se perderán permanentemente si no los guarda." - -#: ../data/ui/filediff.ui.h:46 -msgid "Close _without Saving" -msgstr "Cerrar _sin guardar" - -#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:1001 ../meld/iohelpers.py:50 -#: ../meld/iohelpers.py:100 -msgid "_Cancel" -msgstr "_Cancelar" - -#: ../data/ui/filediff.ui.h:48 -msgid "_Save" -msgstr "_Guardar" - -#: ../data/ui/filediff.ui.h:49 +#: ../meld/resources/ui/filediff.ui.h:44 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." @@ -919,767 +1133,567 @@ msgstr "" "archivo y realizar los cambios, pero estos cambios se deben guardar en un " "archivo nuevo." -#: ../data/ui/filediff.ui.h:50 +#: ../meld/resources/ui/filediff.ui.h:45 msgid "File 3" msgstr "Fila 3" -#: ../data/ui/filediff.ui.h:51 +#: ../meld/resources/ui/filediff.ui.h:46 msgid "File 2" msgstr "Fila 2" -#: ../data/ui/filediff.ui.h:52 +#: ../meld/resources/ui/filediff.ui.h:47 msgid "File 1" msgstr "Fila 1" -#: ../data/ui/filediff.ui.h:53 -msgid "Discard unsaved changes to documents?" -msgstr "¿Descartar los cambios no guardados a los documentos?" +#. Create icon and filename CellRenderer +#: ../meld/resources/ui/filter-list.ui.h:2 ../meld/resources/ui/vcview.ui.h:30 +#: ../meld/dirdiff.py:455 +msgid "Name" +msgstr "Nombre" -#: ../data/ui/filediff.ui.h:54 -msgid "Changes made to the following documents will be permanently lost:" -msgstr "" -"Los cambios realizados a los siguientes documentos se perderán para siempre:" +#: ../meld/resources/ui/filter-list.ui.h:3 +msgid "Pattern" +msgstr "Patrón" -#: ../data/ui/filediff.ui.h:55 -msgid "_Discard" -msgstr "_Descartar" +#: ../meld/resources/ui/filter-list.ui.h:4 +msgid "Add new filter" +msgstr "Añadir filtro nuevo" + +#: ../meld/resources/ui/filter-list.ui.h:5 ../meld/resources/ui/vcview.ui.h:9 +msgid "_Add" +msgstr "_Añadir" -#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:1002 ../meld/iohelpers.py:101 +#: ../meld/resources/ui/filter-list.ui.h:6 +msgid "Remove selected filter" +msgstr "Quitar el filtro seleccionado" + +#: ../meld/resources/ui/findbar.ui.h:1 ../meld/dirdiff.py:1041 +#: ../meld/iohelpers.py:113 msgid "_Replace" msgstr "_Reemplazar" -#: ../data/ui/findbar.ui.h:2 +#: ../meld/resources/ui/findbar.ui.h:2 msgid "Replace _All" msgstr "Reemplazar _todo" -#: ../data/ui/findbar.ui.h:3 +#: ../meld/resources/ui/findbar.ui.h:3 msgid "_Previous" msgstr "_Anterior" -#: ../data/ui/findbar.ui.h:4 +#: ../meld/resources/ui/findbar.ui.h:4 msgid "_Next" msgstr "_Siguiente" -#: ../data/ui/findbar.ui.h:5 +#: ../meld/resources/ui/findbar.ui.h:5 msgid "Find:" msgstr "Buscar:" -#: ../data/ui/findbar.ui.h:6 +#: ../meld/resources/ui/findbar.ui.h:6 msgid "Replace _with:" msgstr "Reemplazar _con:" -#: ../data/ui/findbar.ui.h:7 +#: ../meld/resources/ui/findbar.ui.h:7 msgid "_Match case" msgstr "Coi_ncidir con capitalización" -#: ../data/ui/findbar.ui.h:8 +#: ../meld/resources/ui/findbar.ui.h:8 msgid "Who_le word" msgstr "Pa_labra completa" -#: ../data/ui/findbar.ui.h:9 +#: ../meld/resources/ui/findbar.ui.h:9 msgid "Regular e_xpression" msgstr "E_xpresión regular" -#: ../data/ui/findbar.ui.h:10 +#: ../meld/resources/ui/findbar.ui.h:10 msgid "Wrapped" msgstr "Ajustada" -#: ../data/ui/language-selector.ui.h:1 +#: ../meld/resources/ui/language-selector.ui.h:1 msgid "Search highlight mode…" msgstr "Modo de resaltado de la búsqueda…" -#: ../data/ui/patch-dialog.ui.h:1 +#: ../meld/resources/ui/new-diff-tab.ui.h:1 ../meld/meldwindow.py:532 +#: ../meld/newdifftab.py:53 +msgid "New comparison" +msgstr "Nueva comparación" + +#: ../meld/resources/ui/new-diff-tab.ui.h:2 +msgid "File comparison" +msgstr "Comparación de archivos" + +#: ../meld/resources/ui/new-diff-tab.ui.h:3 +msgid "Directory comparison" +msgstr "Comparación de carpetas" + +#: ../meld/resources/ui/new-diff-tab.ui.h:4 +msgid "Version control view" +msgstr "Vista de control de versión" + +#: ../meld/resources/ui/new-diff-tab.ui.h:5 +msgid "_3-way comparison" +msgstr "Comparación de _3 vías" + +#: ../meld/resources/ui/new-diff-tab.ui.h:6 +msgid "Select Third File" +msgstr "Seleccionar el tercer archivo" + +#: ../meld/resources/ui/new-diff-tab.ui.h:7 +msgid "Select Second File" +msgstr "Seleccionar el segundo archivo" + +#: ../meld/resources/ui/new-diff-tab.ui.h:8 +msgid "Select First File" +msgstr "Seleccionar el primer archivo" + +#: ../meld/resources/ui/new-diff-tab.ui.h:9 +msgid "Select First Folder" +msgstr "Seleccionar la primera carpeta" + +#: ../meld/resources/ui/new-diff-tab.ui.h:10 +msgid "Select Second Folder" +msgstr "Seleccionar la segunda carpeta" + +#: ../meld/resources/ui/new-diff-tab.ui.h:11 +msgid "Select Third Folder" +msgstr "Seleccionar la tercera carpeta" + +#: ../meld/resources/ui/new-diff-tab.ui.h:12 +msgid "Select A Version-Controlled Folder" +msgstr "Seleccionar una carpeta bajo control de versiones" + +#: ../meld/resources/ui/new-diff-tab.ui.h:13 +msgid "_Blank comparison" +msgstr "_Comparación en blanco" + +#: ../meld/resources/ui/new-diff-tab.ui.h:14 +msgid "C_ompare" +msgstr "_Comparar" + +#: ../meld/resources/ui/notebook-label.ui.h:1 +#, fuzzy +#| msgid "Close tab" +msgid "Close Tab" +msgstr "Cerrar pestaña" + +#: ../meld/resources/ui/patch-dialog.ui.h:1 msgid "Format as Patch" msgstr "Formatear como parche" -#: ../data/ui/patch-dialog.ui.h:2 +#: ../meld/resources/ui/patch-dialog.ui.h:2 msgid "Copy to Clipboard" msgstr "Copiar al portapapeles" -#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:152 +#: ../meld/resources/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:165 msgid "Save Patch" msgstr "Guardar parche" -#: ../data/ui/patch-dialog.ui.h:4 +#: ../meld/resources/ui/patch-dialog.ui.h:4 msgid "Use differences between:" msgstr "Usar las diferencias entre:" -#: ../data/ui/patch-dialog.ui.h:5 +#: ../meld/resources/ui/patch-dialog.ui.h:5 msgid "Left and middle panes" msgstr "Paneles izquierdo y del medio" -#: ../data/ui/patch-dialog.ui.h:6 +#: ../meld/resources/ui/patch-dialog.ui.h:6 msgid "Middle and right panes" msgstr "Paneles derecho y del medio" -#: ../data/ui/patch-dialog.ui.h:7 +#: ../meld/resources/ui/patch-dialog.ui.h:7 msgid "_Reverse patch direction" msgstr "Dirección in_versa del parche" -#: ../data/ui/preferences.ui.h:1 -msgid "Meld Preferences" -msgstr "Preferencias de Meld" +#: ../meld/resources/ui/preferences.ui.h:1 +#, fuzzy +#| msgid "_Preferences" +msgid "Preferences" +msgstr "Preferencias" -#: ../data/ui/preferences.ui.h:2 +#: ../meld/resources/ui/preferences.ui.h:2 msgid "Font" msgstr "Tipografía" -#: ../data/ui/preferences.ui.h:3 +#: ../meld/resources/ui/preferences.ui.h:3 msgid "_Use the system fixed width font" msgstr "Usar la tipografía de anchura fija del sistema" -#: ../data/ui/preferences.ui.h:4 +#: ../meld/resources/ui/preferences.ui.h:4 msgid "_Editor font:" msgstr "Tipogra_fía del editor: " -#: ../data/ui/preferences.ui.h:5 +#. 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 msgid "Display" msgstr "Visor" -#: ../data/ui/preferences.ui.h:6 +#: ../meld/resources/ui/preferences.ui.h:6 msgid "_Tab width:" msgstr "Anchura del _tabulador:" -#: ../data/ui/preferences.ui.h:7 +#: ../meld/resources/ui/preferences.ui.h:7 msgid "_Insert spaces instead of tabs" msgstr "Insertar e_spacios en lugar de tabuladores" -#: ../data/ui/preferences.ui.h:8 +#: ../meld/resources/ui/preferences.ui.h:8 msgid "Enable text _wrapping" msgstr "Activar a_juste de texto" -#: ../data/ui/preferences.ui.h:9 +#: ../meld/resources/ui/preferences.ui.h:9 msgid "Do not _split words over two lines" msgstr "No _dividir palabras en dos líneas" -#: ../data/ui/preferences.ui.h:10 +#: ../meld/resources/ui/preferences.ui.h:10 msgid "Highlight _current line" msgstr "Resaltar la línea a_ctual" -#: ../data/ui/preferences.ui.h:11 +#: ../meld/resources/ui/preferences.ui.h:11 msgid "Show _line numbers" msgstr "Mostrar los números de _línea" -#: ../data/ui/preferences.ui.h:12 +#: ../meld/resources/ui/preferences.ui.h:12 msgid "Show w_hitespace" msgstr "Mostrar espacios en _blanco" -#: ../data/ui/preferences.ui.h:13 +#: ../meld/resources/ui/preferences.ui.h:13 msgid "Use s_yntax highlighting" msgstr "Usar resaltado de _sintaxis" -#: ../data/ui/preferences.ui.h:14 +#: ../meld/resources/ui/preferences.ui.h:14 msgid "Syntax highlighting color scheme:" msgstr "Esquema de color para el resaltado de sintaxis:" -#: ../data/ui/preferences.ui.h:15 +#: ../meld/resources/ui/preferences.ui.h:15 msgid "External Editor" msgstr "Editor externo" -#: ../data/ui/preferences.ui.h:16 +#: ../meld/resources/ui/preferences.ui.h:16 msgid "Use _default system editor" msgstr "Usar el editor pre_determinado del sistema" -#: ../data/ui/preferences.ui.h:17 +#: ../meld/resources/ui/preferences.ui.h:17 msgid "Edito_r command:" msgstr "Comando del edito_r:" -#: ../data/ui/preferences.ui.h:18 +#: ../meld/resources/ui/preferences.ui.h:18 msgid "Editor" msgstr "Editor" -#: ../data/ui/preferences.ui.h:19 +#: ../meld/resources/ui/preferences.ui.h:19 msgid "Shallow Comparison" msgstr "Comparación superficial" -#: ../data/ui/preferences.ui.h:20 +#: ../meld/resources/ui/preferences.ui.h:20 msgid "C_ompare files based only on size and timestamp" msgstr "C_omparar archivos basándose sólo en el tamaño y en la marca de tiempo" -#: ../data/ui/preferences.ui.h:21 +#: ../meld/resources/ui/preferences.ui.h:21 msgid "_Timestamp resolution:" msgstr "_Resolución de marca de _tiempo:" -#: ../data/ui/preferences.ui.h:23 +#: ../meld/resources/ui/preferences.ui.h:23 msgid "Note: enabling text filters may make comparing large files much slower" msgstr "" "Nota: activar los filtros de texto puede ralentizar mucho la comparación de " "archivos grandes" -#: ../data/ui/preferences.ui.h:24 +#: ../meld/resources/ui/preferences.ui.h:24 msgid "Symbolic Links" msgstr "Enlaces simbólicos" -#: ../data/ui/preferences.ui.h:26 +#: ../meld/resources/ui/preferences.ui.h:26 msgid "Visible Columns" msgstr "Columnas visibles" -#: ../data/ui/preferences.ui.h:27 +#: ../meld/resources/ui/preferences.ui.h:27 msgid "Folder Comparisons" msgstr "Comparación de carpetas" -#: ../data/ui/preferences.ui.h:28 +#: ../meld/resources/ui/preferences.ui.h:28 msgid "Version Comparisons" msgstr "Comparación de versiones" -#: ../data/ui/preferences.ui.h:29 +#: ../meld/resources/ui/preferences.ui.h:29 msgid "_Order when comparing file revisions:" msgstr "_Orden al comprar revisiones de archivos:" -#: ../data/ui/preferences.ui.h:30 +#: ../meld/resources/ui/preferences.ui.h:30 msgid "Order when _merging files:" msgstr "Orden al _mezclar archivos:" -#: ../data/ui/preferences.ui.h:31 +#: ../meld/resources/ui/preferences.ui.h:31 msgid "Commit Messages" msgstr "Mensaje de registro" -#: ../data/ui/preferences.ui.h:32 -msgid "Show _right margin at:" -msgstr "Mostrar margen de_recho en:" - -#: ../data/ui/preferences.ui.h:33 -msgid "Automatically _break lines at right margin on commit" -msgstr "_Dividir las líneas automáticamente en el margen derecho al efectuar" - -#: ../data/ui/preferences.ui.h:34 -msgid "Version Control" -msgstr "Control de versión" - -#: ../data/ui/preferences.ui.h:35 -msgid "Filename filters" -msgstr "Filtros basados en el nombre del archivo" - -#: ../data/ui/preferences.ui.h:36 -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 "" -"Al efectuar comparaciones de carpetas, quizá quiera filtrar los archivos y " -"carpetas por nombre. Cada patrón es una lista de comodines al estilo shell " -"separados por espacios." - -#: ../data/ui/preferences.ui.h:37 ../meld/meldwindow.py:105 -msgid "File Filters" -msgstr "Filtros de archivos" - -#: ../data/ui/preferences.ui.h:38 -msgid "Change trimming" -msgstr "Cambiar recortado" - -#: ../data/ui/preferences.ui.h:39 -msgid "Trim blank line differences from the start and end of changes" -msgstr "" -"Recortar las diferencias de líneas en blanco desde el principio hasta el " -"final de los cambios" - -#: ../data/ui/preferences.ui.h:40 -msgid "Text filters" -msgstr "Filtros de texto" - -#: ../data/ui/preferences.ui.h:41 -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 "" -"Cuando realice comparaciones de archivos quizá quiera ignorar ciertos tipos " -"de cambios. Cada patrón es una expresión regular en Python que reemplaza el " -"texto coincidente con una cadena vacía antes de hacer la comparación. Si la " -"expresión contiene grupos, sólo los grupos se reemplazan. Vea el manual de " -"usuario para más detalles." - -#: ../data/ui/preferences.ui.h:42 -msgid "Text Filters" -msgstr "Filtros de texto" - -#: ../data/ui/preferences.ui.h:43 -msgid "Left is remote, right is local" -msgstr "Remoto a la izquierda, local a la derecha" - -#: ../data/ui/preferences.ui.h:44 -msgid "Left is local, right is remote" -msgstr "Local a la izquierda, remoto a la derecha" - -#: ../data/ui/preferences.ui.h:45 -msgid "Remote, merge, local" -msgstr "Remoto, mezcla, local" - -#: ../data/ui/preferences.ui.h:46 -msgid "Local, merge, remote" -msgstr "Local, mezcla, remoto" - -#: ../data/ui/preferences.ui.h:47 -msgid "1ns (ext4)" -msgstr "1ns (ext4)" - -#: ../data/ui/preferences.ui.h:48 -msgid "100ns (NTFS)" -msgstr "100ns (NTFS)" - -#: ../data/ui/preferences.ui.h:49 -msgid "1s (ext2/ext3)" -msgstr "1s (ext2/ext3)" - -#: ../data/ui/preferences.ui.h:50 -msgid "2s (VFAT)" -msgstr "2s (VFAT)" - -#: ../data/ui/shortcuts.ui.h:1 -msgctxt "shortcut window" -msgid "General" -msgstr "General" - -#: ../data/ui/shortcuts.ui.h:2 -msgctxt "shortcut window" -msgid "New comparison" -msgstr "Nueva comparación" - -#: ../data/ui/shortcuts.ui.h:3 -msgctxt "shortcut window" -msgid "Close a comparison" -msgstr "Cerrar comparación" - -#: ../data/ui/shortcuts.ui.h:4 -msgctxt "shortcut window" -msgid "Quit Meld" -msgstr "Salir de Meld" - -#: ../data/ui/shortcuts.ui.h:5 -msgctxt "shortcut window" -msgid "Stop the current action" -msgstr "Detener la acción actual" - -#: ../data/ui/shortcuts.ui.h:6 -msgctxt "shortcut window" -msgid "Refresh comparison" -msgstr "Actualizar comparación" - -#: ../data/ui/shortcuts.ui.h:7 -msgctxt "shortcut window" -msgid "Fullscreen" -msgstr "Pantalla completa" - -#: ../data/ui/shortcuts.ui.h:8 -msgctxt "shortcut window" -msgid "Tabs" -msgstr "Pestañas" - -#: ../data/ui/shortcuts.ui.h:9 -msgctxt "shortcut window" -msgid "Go to previous tab" -msgstr "Ir a la pestaña anterior" - -#: ../data/ui/shortcuts.ui.h:10 -msgctxt "shortcut window" -msgid "Go to next tab" -msgstr "Ir a la siguiente pestaña" - -#: ../data/ui/shortcuts.ui.h:11 -msgctxt "shortcut window" -msgid "Switch to tab" -msgstr "Cambiar a la pestaña" - -#: ../data/ui/shortcuts.ui.h:12 -msgctxt "shortcut window" -msgid "Move tab left" -msgstr "Mover la pestaña a la izquierda" - -#: ../data/ui/shortcuts.ui.h:13 -msgctxt "shortcut window" -msgid "Move tab right" -msgstr "Mover la pestaña a la derecha" - -#: ../data/ui/shortcuts.ui.h:14 -msgctxt "shortcut window" -msgid "Changes" -msgstr "Cambios" - -#: ../data/ui/shortcuts.ui.h:15 -msgctxt "shortcut window" -msgid "Go to previous change" -msgstr "Ir al cambio anterior" - -#: ../data/ui/shortcuts.ui.h:16 -msgctxt "shortcut window" -msgid "Go to next change" -msgstr "Ir al siguiente cambio" - -#: ../data/ui/shortcuts.ui.h:17 -msgctxt "shortcut window" -msgid "Editing" -msgstr "Edición" - -#: ../data/ui/shortcuts.ui.h:18 -msgctxt "shortcut window" -msgid "Undo" -msgstr "Deshacer" - -#: ../data/ui/shortcuts.ui.h:19 -msgctxt "shortcut window" -msgid "Redo" -msgstr "Rehacer" - -#: ../data/ui/shortcuts.ui.h:20 -msgctxt "shortcut window" -msgid "Cut" -msgstr "Cortar" - -#: ../data/ui/shortcuts.ui.h:21 -msgctxt "shortcut window" -msgid "Copy" -msgstr "Copiar" - -#: ../data/ui/shortcuts.ui.h:22 -msgctxt "shortcut window" -msgid "Paste" -msgstr "Pegar" - -#: ../data/ui/shortcuts.ui.h:23 -msgctxt "shortcut window" -msgid "Find" -msgstr "Buscar" - -#: ../data/ui/shortcuts.ui.h:24 -msgctxt "shortcut window" -msgid "Find Next" -msgstr "Buscar siguiente" - -#: ../data/ui/shortcuts.ui.h:25 -msgctxt "shortcut window" -msgid "Find Previous" -msgstr "Buscar anterior" - -#: ../data/ui/shortcuts.ui.h:26 -msgctxt "shortcut window" -msgid "Replace" -msgstr "Reemplazar" - -#: ../data/ui/shortcuts.ui.h:27 -msgctxt "shortcut window" -msgid "File comparison" -msgstr "Comparación de archivos" - -#: ../data/ui/shortcuts.ui.h:28 -msgctxt "shortcut window" -msgid "Save current file" -msgstr "Guardar archivo actual" - -#: ../data/ui/shortcuts.ui.h:29 -msgctxt "shortcut window" -msgid "Save current file to new path" -msgstr "Guardar el archivo actual en la nueva ruta" - -#: ../data/ui/shortcuts.ui.h:30 -msgctxt "shortcut window" -msgid "Save all files in comparison" -msgstr "Guardar todos los archivos comparados" - -#: ../data/ui/shortcuts.ui.h:31 -msgctxt "shortcut window" -msgid "Previous conflict" -msgstr "Conflicto previo" - -#: ../data/ui/shortcuts.ui.h:32 -msgctxt "shortcut window" -msgid "Next conflict" -msgstr "Próximo conflicto" +#: ../meld/resources/ui/preferences.ui.h:32 +msgid "Show _right margin at:" +msgstr "Mostrar margen de_recho en:" -#: ../data/ui/shortcuts.ui.h:33 -msgctxt "shortcut window" -msgid "Push change to left" -msgstr "Pasar el cambio a la izquierda" +#: ../meld/resources/ui/preferences.ui.h:33 +msgid "Automatically _break lines at right margin on commit" +msgstr "_Dividir las líneas automáticamente en el margen derecho al efectuar" -#: ../data/ui/shortcuts.ui.h:34 -msgctxt "shortcut window" -msgid "Push change to right" -msgstr "Pasar el cambio a la derecha" +#: ../meld/resources/ui/preferences.ui.h:34 +msgid "Version Control" +msgstr "Control de versión" -#: ../data/ui/shortcuts.ui.h:35 -msgctxt "shortcut window" -msgid "Pull change from left" -msgstr "Traer el cambio desde la izquierda" +#: ../meld/resources/ui/preferences.ui.h:35 +msgid "Filename filters" +msgstr "Filtros basados en el nombre del archivo" -#: ../data/ui/shortcuts.ui.h:36 -msgctxt "shortcut window" -msgid "Pull change from right" -msgstr "Traer el cambio desde la derecha" +#: ../meld/resources/ui/preferences.ui.h:36 +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 "" +"Al efectuar comparaciones de carpetas, quizá quiera filtrar los archivos y " +"carpetas por nombre. Cada patrón es una lista de comodines al estilo shell " +"separados por espacios." -#: ../data/ui/shortcuts.ui.h:37 -msgctxt "shortcut window" -msgid "Copy change above left" -msgstr "Copiar el cambio de arriba a la izquierda" +#: ../meld/resources/ui/preferences.ui.h:37 ../meld/meldwindow.py:114 +msgid "File Filters" +msgstr "Filtros de archivos" -#: ../data/ui/shortcuts.ui.h:38 -msgctxt "shortcut window" -msgid "Copy change below left" -msgstr "Copiar el cambio de abajo a la izquierda" +#: ../meld/resources/ui/preferences.ui.h:38 +msgid "Change trimming" +msgstr "Cambiar recortado" -#: ../data/ui/shortcuts.ui.h:39 -msgctxt "shortcut window" -msgid "Copy change above right" -msgstr "Copiar el cambio de arriba a la derecha" +#: ../meld/resources/ui/preferences.ui.h:39 +msgid "Trim blank line differences from the start and end of changes" +msgstr "" +"Recortar las diferencias de líneas en blanco desde el principio hasta el " +"final de los cambios" -#: ../data/ui/shortcuts.ui.h:40 -msgctxt "shortcut window" -msgid "Copy change below right" -msgstr "Copiar el cambio de abajo a la derecha" +#: ../meld/resources/ui/preferences.ui.h:40 +msgid "Text filters" +msgstr "Filtros de texto" -#: ../data/ui/shortcuts.ui.h:41 -msgctxt "shortcut window" -msgid "Delete change" -msgstr "Eliminar cambio" +#: ../meld/resources/ui/preferences.ui.h:41 +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 "" +"Cuando realice comparaciones de archivos quizá quiera ignorar ciertos tipos " +"de cambios. Cada patrón es una expresión regular en Python que reemplaza el " +"texto coincidente con una cadena vacía antes de hacer la comparación. Si la " +"expresión contiene grupos, sólo los grupos se reemplazan. Vea el manual de " +"usuario para más detalles." -#: ../data/ui/shortcuts.ui.h:42 -msgctxt "shortcut window" -msgid "Previous comparison pane" -msgstr "Panel de comparación anterior" +#: ../meld/resources/ui/preferences.ui.h:42 +msgid "Text Filters" +msgstr "Filtros de texto" -#: ../data/ui/shortcuts.ui.h:43 -msgctxt "shortcut window" -msgid "Next comparison pane" -msgstr "Siguiente panel de comparación" +#: ../meld/resources/ui/preferences.ui.h:43 +msgid "Left is remote, right is local" +msgstr "Remoto a la izquierda, local a la derecha" -#: ../data/ui/shortcuts.ui.h:44 -msgctxt "shortcut window" -msgid "Folder comparison" -msgstr "Comparación de la carpeta" +#: ../meld/resources/ui/preferences.ui.h:44 +msgid "Left is local, right is remote" +msgstr "Local a la izquierda, remoto a la derecha" -#: ../data/ui/shortcuts.ui.h:45 -msgctxt "shortcut window" -msgid "Copy to left" -msgstr "Copia a la izquierda" +#: ../meld/resources/ui/preferences.ui.h:45 +msgid "Remote, merge, local" +msgstr "Remoto, mezcla, local" -#: ../data/ui/shortcuts.ui.h:46 -msgctxt "shortcut window" -msgid "Copy to right" -msgstr "Copia a la derecha" +#: ../meld/resources/ui/preferences.ui.h:46 +msgid "Local, merge, remote" +msgstr "Local, mezcla, remoto" -#: ../data/ui/shortcuts.ui.h:47 -msgctxt "shortcut window" -msgid "Version control comparison" -msgstr "Comparación de control de versiones" +#: ../meld/resources/ui/preferences.ui.h:47 +msgid "1ns (ext4)" +msgstr "1ns (ext4)" -#: ../data/ui/shortcuts.ui.h:48 -msgctxt "shortcut window" -msgid "Commit to version control" -msgstr "Subir al control de versiones" +#: ../meld/resources/ui/preferences.ui.h:48 +msgid "100ns (NTFS)" +msgstr "100ns (NTFS)" -#: ../data/ui/shortcuts.ui.h:49 -msgctxt "shortcut window" -msgid "Show/hide console output" -msgstr "Mostrar/ocultar la salida de la consola" +#: ../meld/resources/ui/preferences.ui.h:49 +msgid "1s (ext2/ext3)" +msgstr "1s (ext2/ext3)" -#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:567 -#: ../meld/newdifftab.py:49 -msgid "New comparison" -msgstr "Nueva comparación" +#: ../meld/resources/ui/preferences.ui.h:50 +msgid "2s (VFAT)" +msgstr "2s (VFAT)" -#: ../data/ui/tab-placeholder.ui.h:2 -msgid "File comparison" -msgstr "Comparación de archivos" +#: ../meld/resources/ui/push-dialog.ui.h:1 +msgid "Push local commits to remote?" +msgstr "¿Empujar los cambios locales al equipo remoto?" -#: ../data/ui/tab-placeholder.ui.h:3 -msgid "Directory comparison" -msgstr "Comparación de carpetas" +#: ../meld/resources/ui/push-dialog.ui.h:2 +msgid "The commits to be pushed are determined by your version control system." +msgstr "" +"Los cambios que empujar los determina su sistema de control de versiones." -#: ../data/ui/tab-placeholder.ui.h:4 -msgid "Version control view" -msgstr "Vista de control de versión" +#: ../meld/resources/ui/push-dialog.ui.h:3 +msgid "_Push commits" +msgstr "_Empujar cambios" -#: ../data/ui/tab-placeholder.ui.h:5 -msgid "_3-way comparison" -msgstr "Comparación de _3 vías" +#: ../meld/resources/ui/revert-dialog.ui.h:1 +msgid "Discard unsaved changes to documents?" +msgstr "¿Descartar los cambios no guardados a los documentos?" -#: ../data/ui/tab-placeholder.ui.h:6 -msgid "Select Third File" -msgstr "Seleccionar el tercer archivo" +#: ../meld/resources/ui/revert-dialog.ui.h:2 +msgid "Changes made to the following documents will be permanently lost:" +msgstr "" +"Los cambios realizados a los siguientes documentos se perderán para siempre:" -#: ../data/ui/tab-placeholder.ui.h:7 -msgid "Select Second File" -msgstr "Seleccionar el segundo archivo" +#: ../meld/resources/ui/revert-dialog.ui.h:3 +msgid "_Discard" +msgstr "_Descartar" -#: ../data/ui/tab-placeholder.ui.h:8 -msgid "Select First File" -msgstr "Seleccionar el primer archivo" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:1 +msgid "Save changes to documents before closing?" +msgstr "¿Guardar los cambios de los documentos antes de cerrar?" -#: ../data/ui/tab-placeholder.ui.h:9 -msgid "Select First Folder" -msgstr "Seleccionar la primera carpeta" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:2 +msgid "If you don’t save, changes will be permanently lost." +msgstr "Los cambios se perderán permanentemente si no los guarda." -#: ../data/ui/tab-placeholder.ui.h:10 -msgid "Select Second Folder" -msgstr "Seleccionar la segunda carpeta" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:3 +msgid "Close _without Saving" +msgstr "Cerrar _sin guardar" -#: ../data/ui/tab-placeholder.ui.h:11 -msgid "Select Third Folder" -msgstr "Seleccionar la tercera carpeta" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:4 ../meld/dirdiff.py:1040 +#: ../meld/iohelpers.py:58 ../meld/iohelpers.py:112 +msgid "_Cancel" +msgstr "_Cancelar" -#: ../data/ui/tab-placeholder.ui.h:12 -msgid "Select A Version-Controlled Folder" -msgstr "Seleccionar una carpeta bajo control de versiones" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:5 +msgid "_Save" +msgstr "_Guardar" -#: ../data/ui/tab-placeholder.ui.h:13 -msgid "_Blank comparison" -msgstr "_Comparación en blanco" +#: ../meld/resources/ui/statusbar-menu.ui.h:2 +#| msgid "Show w_hitespace" +msgid "Show whitespace" +msgstr "Mostrar espacios en blanco" -#: ../data/ui/tab-placeholder.ui.h:14 -msgid "C_ompare" -msgstr "_Comparar" +#: ../meld/resources/ui/statusbar-menu.ui.h:4 +#, fuzzy +#| msgid "Enable text _wrapping" +msgid "Text wrapping" +msgstr "Ajuste del texto" -#: ../data/ui/vcview.ui.h:3 +#: ../meld/resources/ui/vcview.ui.h:3 msgid "Co_mmit…" msgstr "Co_mmit…" -#: ../data/ui/vcview.ui.h:4 +#: ../meld/resources/ui/vcview.ui.h:4 msgid "Commit changes to version control" msgstr "Efectuar cambios en el control de versiones" -#: ../data/ui/vcview.ui.h:5 +#: ../meld/resources/ui/vcview.ui.h:5 msgid "_Update" msgstr "_Actualizar" -#: ../data/ui/vcview.ui.h:6 +#: ../meld/resources/ui/vcview.ui.h:6 msgid "Update working copy from version control" msgstr "Actualizar la copia de trabajo desde el control de versiones" -#: ../data/ui/vcview.ui.h:7 +#: ../meld/resources/ui/vcview.ui.h:7 msgid "_Push" msgstr "_Empujar" -#: ../data/ui/vcview.ui.h:8 +#: ../meld/resources/ui/vcview.ui.h:8 msgid "Push local changes to remote" msgstr "Empujar los cambios locales al equipo remoto" -#: ../data/ui/vcview.ui.h:10 +#: ../meld/resources/ui/vcview.ui.h:10 msgid "Add to version control" msgstr "Añadir al control de versiones" -#: ../data/ui/vcview.ui.h:12 +#: ../meld/resources/ui/vcview.ui.h:12 msgid "Remove from version control" msgstr "Quitar del control de versiones" -#: ../data/ui/vcview.ui.h:13 +#: ../meld/resources/ui/vcview.ui.h:13 msgid "Mar_k as Resolved" msgstr "Mar_car como resuelto" -#: ../data/ui/vcview.ui.h:14 +#: ../meld/resources/ui/vcview.ui.h:14 msgid "Mark as resolved in version control" msgstr "Marcar como resuelto en el control de versiones" -#: ../data/ui/vcview.ui.h:15 +#: ../meld/resources/ui/vcview.ui.h:15 msgid "Re_vert" msgstr "Re_vertir" -#: ../data/ui/vcview.ui.h:16 +#: ../meld/resources/ui/vcview.ui.h:16 msgid "Revert working copy to original state" msgstr "Revertir la copia de trabajo al estado original" -#: ../data/ui/vcview.ui.h:17 +#: ../meld/resources/ui/vcview.ui.h:17 msgid "Delete from working copy" msgstr "Eliminar de la copia de trabajo" -#: ../data/ui/vcview.ui.h:18 +#: ../meld/resources/ui/vcview.ui.h:18 msgid "Console" msgstr "Consola" -#: ../data/ui/vcview.ui.h:19 +#: ../meld/resources/ui/vcview.ui.h:19 msgid "Show or hide the version control console output pane" msgstr "" "Mostrar u ocultar el panel de salida de la consola del control de versiones" -#: ../data/ui/vcview.ui.h:20 +#: ../meld/resources/ui/vcview.ui.h:20 msgid "_Flatten" msgstr "_Aplanar" -#: ../data/ui/vcview.ui.h:21 +#: ../meld/resources/ui/vcview.ui.h:21 msgid "Flatten directories" msgstr "Aplanar carpetas" -#: ../data/ui/vcview.ui.h:22 +#: ../meld/resources/ui/vcview.ui.h:22 msgid "_Modified" msgstr "_Modificados" -#: ../data/ui/vcview.ui.h:23 +#: ../meld/resources/ui/vcview.ui.h:23 msgid "Show modified files" msgstr "Mostrar los archivos modificados" -#: ../data/ui/vcview.ui.h:24 +#: ../meld/resources/ui/vcview.ui.h:24 msgid "_Normal" msgstr "_Normal" -#: ../data/ui/vcview.ui.h:25 +#: ../meld/resources/ui/vcview.ui.h:25 msgid "Show normal files" msgstr "Mostrar los archivos normales" -#: ../data/ui/vcview.ui.h:26 +#: ../meld/resources/ui/vcview.ui.h:26 msgid "Un_versioned" msgstr "Sin _versión" -#: ../data/ui/vcview.ui.h:27 +#: ../meld/resources/ui/vcview.ui.h:27 msgid "Show unversioned files" msgstr "Mostrar archivos sin versión" -#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69 +#: ../meld/resources/ui/vcview.ui.h:28 ../meld/vc/_vc.py:70 msgid "Ignored" msgstr "Ignorado" -#: ../data/ui/vcview.ui.h:29 +#: ../meld/resources/ui/vcview.ui.h:29 msgid "Show ignored files" msgstr "Mostrar archivos ignorados" -#: ../data/ui/vcview.ui.h:30 -msgid "Commit" -msgstr "Efectuar" - -#: ../data/ui/vcview.ui.h:31 -msgid "Commit Files" -msgstr "Efectuar a los archivos" - -#: ../data/ui/vcview.ui.h:32 -msgid "Log Message" -msgstr "Mensaje de registro" - -#: ../data/ui/vcview.ui.h:33 -msgid "Previous logs:" -msgstr "Registros anteriores:" - -#: ../data/ui/vcview.ui.h:34 -msgid "Co_mmit" -msgstr "E_fectuar" - -#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:331 +#: ../meld/resources/ui/vcview.ui.h:31 ../meld/vcview.py:366 msgid "Location" msgstr "Lugar" -#: ../data/ui/vcview.ui.h:37 +#: ../meld/resources/ui/vcview.ui.h:32 msgid "Status" msgstr "Estado" -#: ../data/ui/vcview.ui.h:38 +#: ../meld/resources/ui/vcview.ui.h:33 msgid "Extra" msgstr "Adicional" -#: ../data/ui/vcview.ui.h:39 +#: ../meld/resources/ui/vcview.ui.h:34 msgid "Console output" msgstr "Salida de la consola" -#: ../data/ui/vcview.ui.h:40 -msgid "Push local commits to remote?" -msgstr "¿Empujar los cambios locales al equipo remoto?" - -#: ../data/ui/vcview.ui.h:41 -msgid "The commits to be pushed are determined by your version control system." -msgstr "" -"Los cambios que empujar los determina su sistema de control de versiones." - -#: ../data/ui/vcview.ui.h:42 -msgid "_Push commits" -msgstr "_Empujar cambios" - #: ../meld/const.py:12 msgid "UNIX (LF)" msgstr "UNIX (LF)" @@ -1693,44 +1707,44 @@ msgid "Mac OS (CR)" msgstr "Mac OS (CR)" #. Create file size CellRenderer -#: ../meld/dirdiff.py:437 ../meld/preferences.py:81 +#: ../meld/dirdiff.py:476 ../meld/preferences.py:138 msgid "Size" msgstr "Tamaño" #. Create date-time CellRenderer -#: ../meld/dirdiff.py:445 ../meld/preferences.py:82 +#: ../meld/dirdiff.py:484 ../meld/preferences.py:139 msgid "Modification time" msgstr "Hora de modificación" #. Create permissions CellRenderer -#: ../meld/dirdiff.py:453 ../meld/preferences.py:83 +#: ../meld/dirdiff.py:492 ../meld/preferences.py:140 msgid "Permissions" msgstr "Permisos" -#: ../meld/dirdiff.py:588 +#: ../meld/dirdiff.py:626 #, python-format msgid "Hide %s" msgstr "Ocultar %s" -#: ../meld/dirdiff.py:729 ../meld/dirdiff.py:752 +#: ../meld/dirdiff.py:768 ../meld/dirdiff.py:791 #, python-format msgid "[%s] Scanning %s" msgstr "[%s] Buscando %s" -#: ../meld/dirdiff.py:887 +#: ../meld/dirdiff.py:926 #, python-format msgid "[%s] Done" msgstr "[%s] Hecho" -#: ../meld/dirdiff.py:895 +#: ../meld/dirdiff.py:934 msgid "Folders have no differences" msgstr "No hay diferencias entre las carpetas" -#: ../meld/dirdiff.py:897 +#: ../meld/dirdiff.py:936 msgid "Contents of scanned files in folders are identical." msgstr "El contenido de los archivos analizados en carpetas es idéntico." -#: ../meld/dirdiff.py:899 +#: ../meld/dirdiff.py:938 msgid "" "Scanned files in folders appear identical, but contents have not been " "scanned." @@ -1738,44 +1752,44 @@ msgstr "" "Los archivos analizados en las carpetas parecen idénticos, pero no se ha " "analizado el contenido." -#: ../meld/dirdiff.py:902 +#: ../meld/dirdiff.py:941 msgid "File filters are in use, so not all files have been scanned." msgstr "" "Se están usando filtros de archivos, por lo que no se han analizado todos " "los archivos." -#: ../meld/dirdiff.py:904 +#: ../meld/dirdiff.py:943 msgid "Text filters are in use and may be masking content differences." msgstr "" "Se están usando filtros de texto, y pueden estar ocultando diferencias entre " "archivos." -#: ../meld/dirdiff.py:922 ../meld/filediff.py:1491 ../meld/filediff.py:1521 -#: ../meld/filediff.py:1523 ../meld/ui/msgarea.py:106 ../meld/ui/msgarea.py:119 +#: ../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 msgid "Hi_de" msgstr "_Ocultar" -#: ../meld/dirdiff.py:931 +#: ../meld/dirdiff.py:970 msgid "Multiple errors occurred while scanning this folder" msgstr "Ocurrieron varios errores al escanear esta carpeta" -#: ../meld/dirdiff.py:932 +#: ../meld/dirdiff.py:971 msgid "Files with invalid encodings found" msgstr "Se encontraron archivos con codificaciones no válidas" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:934 +#: ../meld/dirdiff.py:973 msgid "Some files were in an incorrect encoding. The names are something like:" msgstr "" "Algunos archivos tienen una codificación incorrecta. Los nombres son como " "esto:" -#: ../meld/dirdiff.py:936 +#: ../meld/dirdiff.py:975 msgid "Files hidden by case insensitive comparison" msgstr "Archivos ocultos por una comparación no sensible a capitalización" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:938 +#: ../meld/dirdiff.py:977 msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. The following files in this folder are hidden:" @@ -1784,17 +1798,17 @@ msgstr "" "sensible a capitalización. Los siguientes archivos de esta carpeta archivos " "están ocultos:" -#: ../meld/dirdiff.py:949 +#: ../meld/dirdiff.py:988 #, python-format msgid "“%s” hidden by “%s”" msgstr "«%s» oculto por «%s»" -#: ../meld/dirdiff.py:1005 +#: ../meld/dirdiff.py:1044 #, python-format msgid "Replace folder “%s”?" msgstr "¿Reemplazar la carpeta «%s»?" -#: ../meld/dirdiff.py:1007 +#: ../meld/dirdiff.py:1046 #, python-format msgid "" "Another folder with the same name already exists in “%s”.\n" @@ -1803,11 +1817,11 @@ msgstr "" "Ya existe otra carpeta con el mismo nombre en «%s».\n" "Si reemplaza la carpeta existente, se perderán todos sus archivos." -#: ../meld/dirdiff.py:1020 +#: ../meld/dirdiff.py:1059 msgid "Error copying file" msgstr "Error al copiar el archivo" -#: ../meld/dirdiff.py:1021 +#: ../meld/dirdiff.py:1060 #, python-format msgid "" "Couldn’t copy %s\n" @@ -1820,19 +1834,19 @@ msgstr "" "\n" "%s" -#: ../meld/dirdiff.py:1046 ../meld/vcview.py:703 +#: ../meld/dirdiff.py:1085 ../meld/vcview.py:720 msgid "Error deleting {}" msgstr "Error al eliminar {}" -#: ../meld/dirdiff.py:1577 +#: ../meld/dirdiff.py:1597 msgid "No folder" msgstr "No hay ninguna carpeta" -#: ../meld/filediff.py:834 +#: ../meld/filediff.py:920 msgid "Comparison results will be inaccurate" msgstr "Los resultados de la comparación pueden no ser precisos" -#: ../meld/filediff.py:836 +#: ../meld/filediff.py:922 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1840,65 +1854,65 @@ msgstr "" "Un filtro cambia el número de líneas en el archivo, lo que no está " "soportado. La comparación no será exacta." -#: ../meld/filediff.py:893 +#: ../meld/filediff.py:994 msgid "Mark conflict as resolved?" msgstr "¿Marcar conflicto como resuelto?" -#: ../meld/filediff.py:895 +#: ../meld/filediff.py:996 msgid "" "If the conflict was resolved successfully, you may mark it as resolved now." msgstr "" "Si el conflicto se ha resuelto con éxito, debe marcarlo como resuelto ahora." -#: ../meld/filediff.py:897 +#: ../meld/filediff.py:998 msgid "Cancel" msgstr "Cancelar" -#: ../meld/filediff.py:898 +#: ../meld/filediff.py:999 msgid "Mark _Resolved" msgstr "Mar_car como resuelto" -#: ../meld/filediff.py:1206 +#: ../meld/filediff.py:1318 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Ha habido un problema al abrir el archivo «%s»." -#: ../meld/filediff.py:1214 +#: ../meld/filediff.py:1326 #, python-format msgid "File %s appears to be a binary file." msgstr "El archivo %s parece ser un archivo binario." -#: ../meld/filediff.py:1216 +#: ../meld/filediff.py:1328 msgid "Do you want to open the file using the default application?" msgstr "¿Quiere abrir el archivo usando la aplicación predeterminada?" -#: ../meld/filediff.py:1218 +#: ../meld/filediff.py:1330 msgid "Open" msgstr "Abrir" -#: ../meld/filediff.py:1234 +#: ../meld/filediff.py:1346 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Calculando las diferencias" -#: ../meld/filediff.py:1295 +#: ../meld/filediff.py:1407 #, python-format msgid "File %s has changed on disk" msgstr "El archivo %s ha cambiado en el disco" -#: ../meld/filediff.py:1296 +#: ../meld/filediff.py:1408 msgid "Do you want to reload the file?" msgstr "¿Quiere recargar el archivo?" -#: ../meld/filediff.py:1298 +#: ../meld/filediff.py:1410 msgid "_Reload" msgstr "_Recargar" -#: ../meld/filediff.py:1454 +#: ../meld/filediff.py:1566 msgid "Files are identical" msgstr "Los campos son idénticos" -#: ../meld/filediff.py:1467 +#: ../meld/filediff.py:1579 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1906,11 +1920,11 @@ msgstr "" "Se están usando filtros de texto, y pueden estar ocultando diferencias entre " "archivos. ¿Quiere comprar los archivos no filtrados?" -#: ../meld/filediff.py:1472 +#: ../meld/filediff.py:1584 msgid "Files differ in line endings only" msgstr "Los archivos difieren en los finales de línea" -#: ../meld/filediff.py:1474 +#: ../meld/filediff.py:1586 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1919,15 +1933,15 @@ msgstr "" "Los archivos son idénticos excepto por los finales de línea:\n" "%s" -#: ../meld/filediff.py:1494 +#: ../meld/filediff.py:1606 msgid "Show without filters" msgstr "Mostrar sin filtros" -#: ../meld/filediff.py:1516 +#: ../meld/filediff.py:1628 msgid "Change highlighting incomplete" msgstr "Cambiar el resaltado incompleto" -#: ../meld/filediff.py:1517 +#: ../meld/filediff.py:1629 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." @@ -1936,19 +1950,19 @@ msgstr "" "forzar a Meld para que resalte los cambios largos, aunque esto haga que sea " "más lento." -#: ../meld/filediff.py:1525 +#: ../meld/filediff.py:1637 msgid "Keep highlighting" msgstr "Mantener el resaltado" -#: ../meld/filediff.py:1527 +#: ../meld/filediff.py:1639 msgid "_Keep highlighting" msgstr "_Mantener el resaltado" -#: ../meld/filediff.py:1540 +#: ../meld/filediff.py:1652 msgid "Saving failed" msgstr "Falló al guardar" -#: ../meld/filediff.py:1541 +#: ../meld/filediff.py:1653 msgid "" "Please consider copying any critical changes to another program or file to " "avoid data loss." @@ -1956,39 +1970,36 @@ msgstr "" "Considere copiar cualquier cambio crítico a otro programa o archivo para " "evitar pérdida de datos." -#: ../meld/filediff.py:1550 +#: ../meld/filediff.py:1662 msgid "Save Left Pane As" msgstr "Guardar panel izquierdo como" -#: ../meld/filediff.py:1552 +#: ../meld/filediff.py:1664 msgid "Save Middle Pane As" msgstr "Guardar el panel central como" -#: ../meld/filediff.py:1554 +#: ../meld/filediff.py:1666 msgid "Save Right Pane As" msgstr "Guardar el panel derecho como" -#: ../meld/filediff.py:1567 +#: ../meld/filediff.py:1679 #, python-format msgid "File %s has changed on disk since it was opened" msgstr "El archivo %s ha cambiado en el disco desde que se abrió" -#: ../meld/filediff.py:1569 +#: ../meld/filediff.py:1681 msgid "If you save it, any external changes will be lost." msgstr "Si lo guarda, los cambios externos se perderán." -#: ../meld/filediff.py:1572 +#: ../meld/filediff.py:1684 msgid "Save Anyway" msgstr "Guardar de todas formas" -#: ../meld/filediff.py:1573 +#: ../meld/filediff.py:1685 msgid "Don’t Save" msgstr "No guardar" -#: ../meld/filediff.py:1615 -#| 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:1727 msgid "" "File “{}” contains characters that can’t be encoded using its current " "encoding “{}”." @@ -1996,7 +2007,7 @@ msgstr "" "El archivo «{}» contiene caracteres no codificables con la codificación «{}» " "actual." -#: ../meld/filediff.py:1619 ../meld/patchdialog.py:131 +#: ../meld/filediff.py:1731 ../meld/patchdialog.py:144 #, python-format msgid "" "Couldn’t save file due to:\n" @@ -2005,16 +2016,16 @@ msgstr "" "No se pudo guardar el archivo debido a:\n" "%s" -#: ../meld/filediff.py:1623 ../meld/patchdialog.py:130 +#: ../meld/filediff.py:1735 ../meld/patchdialog.py:143 #, python-format msgid "Could not save file %s." msgstr "No se pudo guardar el archivo %s." -#: ../meld/filediff.py:1998 +#: ../meld/filediff.py:2128 msgid "Live comparison updating disabled" msgstr "Actualización de la comparación en directo desactivada" -#: ../meld/filediff.py:1999 +#: ../meld/filediff.py:2129 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -2030,40 +2041,40 @@ msgstr "" msgid "[%s] Merging files" msgstr "[%s] Mezclando archivos" -#: ../meld/gutterrendererchunk.py:216 +#: ../meld/gutterrendererchunk.py:220 msgid "Copy _up" msgstr "Copiar hacia _arriba" -#: ../meld/gutterrendererchunk.py:217 +#: ../meld/gutterrendererchunk.py:221 msgid "Copy _down" msgstr "Copiar hacia a_bajo" -#: ../meld/iohelpers.py:35 +#: ../meld/iohelpers.py:43 msgid "Deleting remote folders is not supported" msgstr "No se soporta eliminar carpetas remotas" -#: ../meld/iohelpers.py:37 +#: ../meld/iohelpers.py:45 msgid "Not a file or directory" msgstr "No es un archivo ni una carpeta" -#: ../meld/iohelpers.py:41 +#: ../meld/iohelpers.py:49 msgid "“{}” can’t be put in the trash. Do you want to delete it immediately?" msgstr "No puede mover «{}» a la papelera. ¿Quiere eliminarlo inmediatamente?" -#: ../meld/iohelpers.py:46 +#: ../meld/iohelpers.py:54 msgid "This remote location does not support sending items to the trash." msgstr "Este lugar remoto no soporta enviar elementos a la papelera." -#: ../meld/iohelpers.py:51 +#: ../meld/iohelpers.py:59 msgid "_Delete Permanently" msgstr "_Eliminar permanentemente" -#: ../meld/iohelpers.py:94 +#: ../meld/iohelpers.py:106 #, python-format msgid "Replace file “%s”?" msgstr "¿Reemplazar el archivo «%s»?" -#: ../meld/iohelpers.py:96 +#: ../meld/iohelpers.py:108 #, python-format msgid "" "A file with this name already exists in “%s”.\n" @@ -2072,316 +2083,280 @@ msgstr "" "Ya existe un archivo con el mismo nombre en «%s».\n" "Si reemplaza el archivo existente, se perderá su contenido." -#: ../meld/meldapp.py:181 +#: ../meld/meldapp.py:169 msgid "wrong number of arguments supplied to --diff" msgstr "el número de argumentos proporcionados para --diff es erróneo" -#: ../meld/meldapp.py:186 +#: ../meld/meldapp.py:174 msgid "Start with an empty window" msgstr "Iniciar con una ventana vacía" -#: ../meld/meldapp.py:187 ../meld/meldapp.py:189 +#: ../meld/meldapp.py:175 ../meld/meldapp.py:177 msgid "file" msgstr "archivo" -#: ../meld/meldapp.py:187 ../meld/meldapp.py:191 +#: ../meld/meldapp.py:175 ../meld/meldapp.py:179 msgid "folder" msgstr "carpeta" -#: ../meld/meldapp.py:188 +#: ../meld/meldapp.py:176 msgid "Start a version control comparison" msgstr "Iniciar una comparación de control de versiones" -#: ../meld/meldapp.py:190 +#: ../meld/meldapp.py:178 msgid "Start a 2- or 3-way file comparison" msgstr "Iniciar una comparación de archivo de 2 ó 3 vías" -#: ../meld/meldapp.py:192 +#: ../meld/meldapp.py:180 msgid "Start a 2- or 3-way folder comparison" msgstr "Iniciar una comparación de carpetas de 2 ó 3 vías" -#: ../meld/meldapp.py:235 +#: ../meld/meldapp.py:223 #, python-format msgid "Error: %s\n" msgstr "Error: %s\n" -#: ../meld/meldapp.py:242 +#: ../meld/meldapp.py:230 msgid "Meld is a file and directory comparison tool." msgstr "Meld es una herramienta de comparación de archivos y carpetas" -#: ../meld/meldapp.py:246 +#: ../meld/meldapp.py:234 msgid "Set label to use instead of file name" msgstr "Establecer etiqueta que usar en vez del nombre del archivo" -#: ../meld/meldapp.py:249 +#: ../meld/meldapp.py:237 msgid "Open a new tab in an already running instance" msgstr "Abrir una pestaña nueva en una instancia en ejecución" -#: ../meld/meldapp.py:252 +#: ../meld/meldapp.py:240 msgid "Automatically compare all differing files on startup" msgstr "Comparar automáticamente al inicio todos los archivos que difieran" -#: ../meld/meldapp.py:255 +#: ../meld/meldapp.py:243 msgid "Ignored for compatibility" msgstr "Ignorado por compatibilidad" -#: ../meld/meldapp.py:259 +#: ../meld/meldapp.py:247 msgid "Set the target file for saving a merge result" msgstr "Establecer el archivo de destino para guardar el resultado del cambio" -#: ../meld/meldapp.py:262 +#: ../meld/meldapp.py:250 msgid "Automatically merge files" msgstr "Mezclar archivos automáticamente" -#: ../meld/meldapp.py:266 +#: ../meld/meldapp.py:254 msgid "Load a saved comparison from a Meld comparison file" msgstr "" "Cargar un archivo de comparación guardado desde un archivo de comparación de " "Meld" -#: ../meld/meldapp.py:270 +#: ../meld/meldapp.py:258 msgid "Create a diff tab for the supplied files or folders" msgstr "Crea una pestaña «diff» para los archivos o carpetas proporcionadas." -#: ../meld/meldapp.py:290 +#: ../meld/meldapp.py:278 #, python-format msgid "too many arguments (wanted 0-3, got %d)" msgstr "demasiados argumentos (se esperaban 0-3, se obtuvieron %d)" -#: ../meld/meldapp.py:293 +#: ../meld/meldapp.py:281 msgid "can’t auto-merge less than 3 files" msgstr "no se pueden mezclar automáticamente menos de 3 archivos" -#: ../meld/meldapp.py:295 +#: ../meld/meldapp.py:283 msgid "can’t auto-merge directories" msgstr "no se pueden mezclar carpetas automáticamente" -#: ../meld/meldapp.py:309 +#: ../meld/meldapp.py:297 msgid "Error reading saved comparison file" msgstr "Error al leer el archivo de comparación guardado" -#: ../meld/meldapp.py:326 +#: ../meld/meldapp.py:314 #, python-format msgid "invalid path or URI “%s”" msgstr "ruta o URI «%s» no válido" -#: ../meld/meldapp.py:332 +#: ../meld/meldapp.py:320 msgid "remote folder “{}” not supported" msgstr "carpeta remota «{}» no soportada" #. TRANSLATORS: This is the label of a new, currently-unnamed file. -#: ../meld/meldbuffer.py:124 +#: ../meld/meldbuffer.py:123 msgid "" msgstr "" -#: ../meld/melddoc.py:68 +#: ../meld/melddoc.py:63 msgid "untitled" msgstr "sin título" -#: ../meld/meldwindow.py:47 +#: ../meld/meldwindow.py:56 msgid "_File" msgstr "_Archivo" -#: ../meld/meldwindow.py:48 +#: ../meld/meldwindow.py:57 msgid "_New Comparison…" msgstr "_Nueva comparación…" -#: ../meld/meldwindow.py:49 +#: ../meld/meldwindow.py:58 msgid "Start a new comparison" msgstr "Iniciar una nueva comparación" -#: ../meld/meldwindow.py:52 +#: ../meld/meldwindow.py:61 msgid "Save the current file" msgstr "Guardar el archivo actual" -#: ../meld/meldwindow.py:54 +#: ../meld/meldwindow.py:63 msgid "Save As…" msgstr "Guardar como…" -#: ../meld/meldwindow.py:55 +#: ../meld/meldwindow.py:64 msgid "Save the current file with a different name" msgstr "Guardar el archivo actual con un nombre diferente" -#: ../meld/meldwindow.py:58 +#: ../meld/meldwindow.py:67 msgid "Close the current file" msgstr "Cerrar el archivo actual" -#: ../meld/meldwindow.py:61 +#: ../meld/meldwindow.py:70 msgid "_Edit" msgstr "_Editar" -#: ../meld/meldwindow.py:63 +#: ../meld/meldwindow.py:72 msgid "Undo the last action" msgstr "Deshacer la última acción" -#: ../meld/meldwindow.py:66 +#: ../meld/meldwindow.py:75 msgid "Redo the last undone action" msgstr "Rehacer la última acción deshecha" -#: ../meld/meldwindow.py:68 +#: ../meld/meldwindow.py:77 msgid "Cut the selection" msgstr "Cortar la selección" -#: ../meld/meldwindow.py:70 +#: ../meld/meldwindow.py:79 msgid "Copy the selection" msgstr "Copiar la selección" -#: ../meld/meldwindow.py:72 +#: ../meld/meldwindow.py:81 msgid "Paste the clipboard" msgstr "Pegar del portapapeles" -#: ../meld/meldwindow.py:74 +#: ../meld/meldwindow.py:83 msgid "Find…" msgstr "Buscar…" -#: ../meld/meldwindow.py:74 +#: ../meld/meldwindow.py:83 msgid "Search for text" msgstr "Buscar el texto" -#: ../meld/meldwindow.py:76 +#: ../meld/meldwindow.py:85 msgid "Find Ne_xt" msgstr "Buscar _siguiente" -#: ../meld/meldwindow.py:77 +#: ../meld/meldwindow.py:86 msgid "Search forwards for the same text" msgstr "Buscar el mismo texto hacia adelante" -#: ../meld/meldwindow.py:79 +#: ../meld/meldwindow.py:88 msgid "Find _Previous" msgstr "Buscar _anterior" -#: ../meld/meldwindow.py:80 +#: ../meld/meldwindow.py:89 msgid "Search backwards for the same text" msgstr "Buscar hacia atrás el mismo texto" -#: ../meld/meldwindow.py:83 +#: ../meld/meldwindow.py:92 msgid "_Replace…" msgstr "_Reemplazar…" -#: ../meld/meldwindow.py:84 +#: ../meld/meldwindow.py:93 msgid "Find and replace text" msgstr "Buscar y reemplazar texto" -#: ../meld/meldwindow.py:86 +#: ../meld/meldwindow.py:95 msgid "Go to _Line" msgstr "Ir a la _línea" -#: ../meld/meldwindow.py:87 +#: ../meld/meldwindow.py:96 msgid "Go to a specific line" msgstr "Ir a una línea específica" -#: ../meld/meldwindow.py:90 +#: ../meld/meldwindow.py:99 msgid "_Changes" msgstr "_Cambios" -#: ../meld/meldwindow.py:91 +#: ../meld/meldwindow.py:100 msgid "Next Change" msgstr "Siguiente cambio" -#: ../meld/meldwindow.py:92 +#: ../meld/meldwindow.py:101 msgid "Go to the next change" msgstr "Ir al siguiente cambio" -#: ../meld/meldwindow.py:94 +#: ../meld/meldwindow.py:103 msgid "Previous Change" msgstr "Cambio anterior" -#: ../meld/meldwindow.py:95 +#: ../meld/meldwindow.py:104 msgid "Go to the previous change" msgstr "Ir al cambio anterior" -#: ../meld/meldwindow.py:97 +#: ../meld/meldwindow.py:106 msgid "Open Externally" msgstr "Abrir externamente" -#: ../meld/meldwindow.py:98 +#: ../meld/meldwindow.py:107 msgid "Open selected file or directory in the default external application" msgstr "" "Abrir el archivo o la carpeta seleccionada en la aplicación externa " "predeterminada" -#: ../meld/meldwindow.py:102 +#: ../meld/meldwindow.py:111 msgid "_View" msgstr "_Ver" -#: ../meld/meldwindow.py:103 +#: ../meld/meldwindow.py:112 msgid "File Status" msgstr "Estado del archivo" -#: ../meld/meldwindow.py:104 +#: ../meld/meldwindow.py:113 msgid "Version Status" msgstr "Estado de la versión" -#: ../meld/meldwindow.py:107 +#: ../meld/meldwindow.py:116 msgid "Stop the current action" msgstr "Parar la acción actual" -#: ../meld/meldwindow.py:110 +#: ../meld/meldwindow.py:119 msgid "Refresh the view" msgstr "Actualizar la vista" -#: ../meld/meldwindow.py:114 +#: ../meld/meldwindow.py:123 msgid "Fullscreen" msgstr "Pantalla completa" -#: ../meld/meldwindow.py:115 +#: ../meld/meldwindow.py:124 msgid "View the comparison in fullscreen" msgstr "Ver la comparación a pantalla completa" -#: ../meld/meldwindow.py:117 -msgid "_Toolbar" -msgstr "Barra de _herramientas" - -#: ../meld/meldwindow.py:118 -msgid "Show or hide the toolbar" -msgstr "Mostrar u ocultar la barra de herramientas" - -#: ../meld/meldwindow.py:127 +#: ../meld/meldwindow.py:133 msgid "Open Recent" msgstr "Abrir recientes" -#: ../meld/meldwindow.py:128 +#: ../meld/meldwindow.py:134 msgid "Open recent files" msgstr "Abrir archivos recientes" -#: ../meld/meldwindow.py:150 -msgid "_Meld" -msgstr "_Meld" - -#: ../meld/meldwindow.py:151 -msgid "Quit the program" -msgstr "Salir del programa" - -#: ../meld/meldwindow.py:153 -msgid "Prefere_nces" -msgstr "Prefere_ncias" - -#: ../meld/meldwindow.py:154 -msgid "Configure the application" -msgstr "Configurar la aplicación" - -#: ../meld/meldwindow.py:156 -msgid "_Contents" -msgstr "Índ_ice" - -#: ../meld/meldwindow.py:157 -msgid "Open the Meld manual" -msgstr "Abrir el manual de Meld" - -#: ../meld/meldwindow.py:159 -msgid "About this application" -msgstr "Acerca de esta aplicación" - -#: ../meld/meldwindow.py:602 +#: ../meld/meldwindow.py:567 #, python-format msgid "Need three files to auto-merge, got: %r" msgstr "Se necesita tres archivos para la mezcla automática, se obtuvieron: %r" -#: ../meld/meldwindow.py:623 +#: ../meld/meldwindow.py:588 msgid "Cannot compare a mixture of files and directories" msgstr "No se puede comparar una mezcla de archivos y carpetas" -#: ../meld/misc.py:135 +#: ../meld/misc.py:155 msgid "" "{}\n" "\n" @@ -2393,53 +2368,49 @@ msgstr "" "Meld ha encontrado un error crítico al ejecutar:\n" "{}" -#: ../meld/misc.py:254 +#: ../meld/misc.py:237 #, python-format msgid "Couldn’t find colour scheme details for %s-%s; this is a bad install" msgstr "" "No se pudieron encontrar los detalles del esquema de color para %s-%s; es " "una instalación incorrecta" -#: ../meld/misc.py:325 +#: ../meld/misc.py:311 msgid "[None]" msgstr "[Ninguno]" -#: ../meld/preferences.py:33 +#: ../meld/preferences.py:42 ../meld/preferences.py:135 msgid "label" msgstr "etiqueta" -#: ../meld/preferences.py:33 +#: ../meld/preferences.py:42 ../meld/preferences.py:135 msgid "pattern" msgstr "patrón" -#: ../meld/recent.py:105 +#: ../meld/recent.py:106 msgid "Version control:" msgstr "Control de versión:" -#: ../meld/ui/bufferselectors.py:32 +#: ../meld/ui/bufferselectors.py:114 #, python-brace-format msgid "{name} ({charset})" msgstr "{name} ({charset})" -#: ../meld/ui/bufferselectors.py:65 ../meld/ui/bufferselectors.py:73 +#: ../meld/ui/bufferselectors.py:144 ../meld/ui/bufferselectors.py:152 msgid "Plain Text" msgstr "Texto plano" -#: ../meld/ui/notebooklabel.py:63 -msgid "Close tab" -msgstr "Cerrar pestaña" - #. 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 "Lín %i, Col %i" -#: ../meld/ui/statusbar.py:177 +#: ../meld/ui/statusbar.py:182 msgid "Line you want to move the cursor to" msgstr "Línea a la que quiere mover el cursor" -#: ../meld/ui/vcdialogs.py:48 +#: ../meld/ui/vcdialogs.py:55 msgid "No files will be committed" msgstr "No se efectuarán cambios en archivos" @@ -2490,143 +2461,143 @@ msgstr "Ninguno" msgid "Rev %s" msgstr "Rev. %s" -#: ../meld/vc/_vc.py:54 +#: ../meld/vc/_vc.py:55 msgid "Merged" msgstr "Mezclados" -#: ../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:70 +#: ../meld/vc/_vc.py:71 msgid "Unversioned" msgstr "Sin versión" -#: ../meld/vc/_vc.py:73 +#: ../meld/vc/_vc.py:74 msgid "Error" msgstr "Error" -#: ../meld/vc/_vc.py:75 +#: ../meld/vc/_vc.py:76 msgid "Newly added" msgstr "Nuevo añadido" -#: ../meld/vc/_vc.py:77 +#: ../meld/vc/_vc.py:78 msgid "Renamed" msgstr "Renombrado" -#: ../meld/vc/_vc.py:78 +#: ../meld/vc/_vc.py:79 msgid "Conflict" msgstr "Conflicto" -#: ../meld/vc/_vc.py:79 +#: ../meld/vc/_vc.py:80 msgid "Removed" msgstr "Eliminado" -#: ../meld/vc/_vc.py:80 +#: ../meld/vc/_vc.py:81 msgid "Missing" msgstr "Falta" -#: ../meld/vc/_vc.py:81 +#: ../meld/vc/_vc.py:82 msgid "Not present" msgstr "No presente" #. Translators: This error message is shown when a version #. control binary isn't installed. -#: ../meld/vcview.py:248 +#: ../meld/vcview.py:282 #, python-format msgid "%(name)s (%(cmd)s not installed)" msgstr "%(name)s (%(cmd)s no está instalado)" #. Translators: This error message is shown when a version #. controlled repository is invalid. -#: ../meld/vcview.py:252 +#: ../meld/vcview.py:286 #, python-format msgid "%(name)s (Invalid repository)" msgstr "%(name)s (Repositorio no válido)" -#: ../meld/vcview.py:273 +#: ../meld/vcview.py:307 msgid "No valid version control system found in this folder" msgstr "" "No se ha encontrado un sistema de control de versiones válido en esta carpeta" -#: ../meld/vcview.py:275 +#: ../meld/vcview.py:309 msgid "Only one version control system found in this folder" msgstr "" "Sólo se ha encontrado un sistema de control de versiones en esta carpeta" -#: ../meld/vcview.py:277 +#: ../meld/vcview.py:311 msgid "Choose which version control system to use" msgstr "Elegir qué sistema de control de versiones usar" #. TRANSLATORS: This is the location of the directory being viewed -#: ../meld/vcview.py:331 +#: ../meld/vcview.py:366 #, python-format msgid "%s: %s" msgstr "%s: %s" #. Initial yield so when we add this to our tasks, we don't #. create iterators that may be invalidated. -#: ../meld/vcview.py:338 +#: ../meld/vcview.py:373 msgid "Scanning repository" msgstr "Analizando repositorio" -#: ../meld/vcview.py:367 +#: ../meld/vcview.py:402 #, python-format msgid "Scanning %s" msgstr "Analizando %s" -#: ../meld/vcview.py:406 +#: ../meld/vcview.py:441 msgid "(Empty)" msgstr "(Vacío)" -#: ../meld/vcview.py:450 +#: ../meld/vcview.py:487 #, python-format msgid "%s — local" msgstr "%s — local" -#: ../meld/vcview.py:451 +#: ../meld/vcview.py:488 #, python-format msgid "%s — remote" msgstr "%s — remoto" -#: ../meld/vcview.py:459 +#: ../meld/vcview.py:496 #, python-format msgid "%s (local, merge, remote)" msgstr "%s (local, mezcla, remoto)" -#: ../meld/vcview.py:464 +#: ../meld/vcview.py:501 #, python-format msgid "%s (remote, merge, local)" msgstr "%s (remoto, mezcla, local)" -#: ../meld/vcview.py:475 +#: ../meld/vcview.py:512 #, python-format msgid "%s — repository" msgstr "%s — repositorio" -#: ../meld/vcview.py:481 +#: ../meld/vcview.py:518 #, python-format msgid "%s (working, repository)" msgstr "%s (funcionando, repositorio)" -#: ../meld/vcview.py:485 +#: ../meld/vcview.py:522 #, python-format msgid "%s (repository, working)" msgstr "%s (repositorio, funcionando)" -#: ../meld/vcview.py:674 +#: ../meld/vcview.py:688 msgid "Remove folder and all its files?" msgstr "¿Quitar la carpeta y todos sus archivos?" -#: ../meld/vcview.py:676 +#: ../meld/vcview.py:690 msgid "" "This will remove all selected files and folders, and all files within any " "selected folders, from version control." @@ -2634,10 +2605,55 @@ msgstr "" "Esto quitará todos los archivos y carpetas seleccionadas, y todos los " "archivos de las carpetas seleccionadas, del control de versiones." -#: ../meld/vcview.py:785 +#: ../meld/vcview.py:804 msgid "Clear" msgstr "Limpiar" +#~ msgid "Show toolbar" +#~ msgstr "Mostrar la barra de herramientas" + +#~ msgid "If true, the window toolbar is visible." +#~ msgstr "Si es cierto, la barra de herramientas es visible." + +#~ msgid "Show statusbar" +#~ msgstr "Mostrar la barra de estado" + +#~ msgid "If true, the window statusbar is visible." +#~ msgstr "Si es cierto, la barra de estado es visible." + +#~ msgid "Editable List" +#~ msgstr "Lista editable" + +#~ msgid "Meld Preferences" +#~ msgstr "Preferencias de Meld" + +#~ msgid "_Toolbar" +#~ msgstr "Barra de _herramientas" + +#~ msgid "Show or hide the toolbar" +#~ msgstr "Mostrar u ocultar la barra de herramientas" + +#~ msgid "_Meld" +#~ msgstr "_Meld" + +#~ msgid "Quit the program" +#~ msgstr "Salir del programa" + +#~ msgid "Prefere_nces" +#~ msgstr "Prefere_ncias" + +#~ msgid "Configure the application" +#~ msgstr "Configurar la aplicación" + +#~ msgid "_Contents" +#~ msgstr "Índ_ice" + +#~ msgid "Open the Meld manual" +#~ msgstr "Abrir el manual de Meld" + +#~ msgid "About this application" +#~ msgstr "Acerca de esta aplicación" + #~ msgid "_Save as UTF-8" #~ msgstr "_Guardar como UTF-8" From 433d15085052904d02dd0826991e299eb70b5437 Mon Sep 17 00:00:00 2001 From: Rafael Fontenelle Date: Mon, 28 Jan 2019 19:30:38 +0000 Subject: [PATCH 0816/1316] Update Brazilian Portuguese translation --- po/pt_BR.po | 2018 ++++++++++++++++++++++++++------------------------- 1 file changed, 1016 insertions(+), 1002 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 294d2451..971cbe0e 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -9,33 +9,34 @@ # Gabriel Speckhahn , 2011. # Florêncio Neves , 2012. # Enrico Nicoletto , 2013, 2018. -# Rafael Fontenelle , 2013-2018. +# Rafael Fontenelle , 2013-2019. +# msgid "" msgstr "" "Project-Id-Version: meld\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n" -"POT-Creation-Date: 2018-11-18 12:06+0000\n" -"PO-Revision-Date: 2018-11-22 07:06-0200\n" +"POT-Creation-Date: 2019-01-20 20:13+0000\n" +"PO-Revision-Date: 2019-01-28 17:18-0200\n" "Last-Translator: Rafael Fontenelle \n" -"Language-Team: Brazilian Portuguese \n" +"Language-Team: Portuguese - Brazil \n" "Language: pt_BR\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: Virtaal 1.0.0-beta1\n" +"Plural-Forms: nplurals=2; plural=(n > 1)\n" +"X-Generator: Gtranslator 3.31.0\n" "X-Project-Style: gnome\n" -#: ../bin/meld:194 +#: ../bin/meld:190 msgid "Cannot import: " msgstr "Não foi possível importar: " -#: ../bin/meld:197 +#: ../bin/meld:193 #, c-format msgid "Meld requires %s or higher." msgstr "Meld requer %s ou superior." -#: ../bin/meld:243 +#: ../bin/meld:262 #, c-format msgid "" "Couldn’t load Meld-specific CSS (%s)\n" @@ -45,7 +46,8 @@ msgstr "" "%s" #: ../data/org.gnome.meld.desktop.in.h:1 -#: ../data/org.gnome.meld.appdata.xml.in.h:1 ../data/ui/meldapp.ui.h:1 +#: ../data/org.gnome.meld.appdata.xml.in.h:1 +#: ../meld/resources/ui/appwindow.ui.h:1 msgid "Meld" msgstr "Meld" @@ -113,26 +115,10 @@ msgid "Default window fullscreen state" msgstr "Estado tela cheia padrão da janela" #: ../data/org.gnome.meld.gschema.xml.h:5 -msgid "Show toolbar" -msgstr "Mostra a barra de ferramentas" - -#: ../data/org.gnome.meld.gschema.xml.h:6 -msgid "If true, the window toolbar is visible." -msgstr "Se verdadeiro, a barra de ferramentas da janela fica visível." - -#: ../data/org.gnome.meld.gschema.xml.h:7 -msgid "Show statusbar" -msgstr "Mostra a barra de status" - -#: ../data/org.gnome.meld.gschema.xml.h:8 -msgid "If true, the window statusbar is visible." -msgstr "Se verdadeiro, a barra de status da janela fica visível." - -#: ../data/org.gnome.meld.gschema.xml.h:9 msgid "Additional automatically detected text encodings" msgstr "Codificações de texto adicionais detectadas automaticamente" -#: ../data/org.gnome.meld.gschema.xml.h:10 +#: ../data/org.gnome.meld.gschema.xml.h:6 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 " @@ -145,38 +131,39 @@ msgstr "" "será sempre usada; outras codificações também podem ser tentadas, dependendo " "da localidade do usuário." -#: ../data/org.gnome.meld.gschema.xml.h:11 +#: ../data/org.gnome.meld.gschema.xml.h:7 msgid "Width of an indentation step" msgstr "Largura de uma etapa de recuo" -#: ../data/org.gnome.meld.gschema.xml.h:12 +#: ../data/org.gnome.meld.gschema.xml.h:8 msgid "The number of spaces to use for a single indent step" msgstr "O número de espaços a serem usados para uma única etapa de recuo" -#: ../data/org.gnome.meld.gschema.xml.h:13 +#: ../data/org.gnome.meld.gschema.xml.h:9 msgid "Whether to indent using spaces or tabs" msgstr "Se deve ser recuado usando espaços ou tabulações" -#: ../data/org.gnome.meld.gschema.xml.h:14 +#: ../data/org.gnome.meld.gschema.xml.h:10 msgid "If true, any new indentation will use spaces instead of tabs." msgstr "" "Se verdadeiro, qualquer novo recuo vai usar espaços ao invés de tabulações." -#: ../data/org.gnome.meld.gschema.xml.h:15 +#: ../data/org.gnome.meld.gschema.xml.h:11 +#: ../meld/resources/ui/statusbar-menu.ui.h:1 msgid "Show line numbers" msgstr "Mostra números de linhas" -#: ../data/org.gnome.meld.gschema.xml.h:16 +#: ../data/org.gnome.meld.gschema.xml.h:12 msgid "If true, line numbers will be shown in the gutter of file comparisons." msgstr "" "Se verdadeiro, números de linhas serão mostrados nas margens das comparações " "de arquivos." -#: ../data/org.gnome.meld.gschema.xml.h:17 +#: ../data/org.gnome.meld.gschema.xml.h:13 msgid "Highlight syntax" msgstr "Destaque de linha" -#: ../data/org.gnome.meld.gschema.xml.h:18 +#: ../data/org.gnome.meld.gschema.xml.h:14 msgid "" "Whether to highlight syntax in comparisons. Because of Meld’s own color " "highlighting, this is off by default." @@ -184,19 +171,19 @@ msgstr "" "Se deve destacar linhas nas comparações. Por causa do destaque de cores " "próprio do Meld, isso está desativado por padrão." -#: ../data/org.gnome.meld.gschema.xml.h:19 +#: ../data/org.gnome.meld.gschema.xml.h:15 msgid "Color scheme to use for syntax highlighting" msgstr "Esquema de cores a ser usada para realce de sintaxe" -#: ../data/org.gnome.meld.gschema.xml.h:20 +#: ../data/org.gnome.meld.gschema.xml.h:16 msgid "Used by GtkSourceView to determine colors for syntax highlighting" msgstr "Usado pelo GtkSourceView para determinar cores para realce de sintaxe" -#: ../data/org.gnome.meld.gschema.xml.h:21 +#: ../data/org.gnome.meld.gschema.xml.h:17 msgid "Displayed whitespace" msgstr "Espaço em branco exibido" -#: ../data/org.gnome.meld.gschema.xml.h:22 +#: ../data/org.gnome.meld.gschema.xml.h:18 msgid "" "Selector for individual whitespace character types to be shown. Possible " "values are 'space', 'tab', 'newline' and 'nbsp'." @@ -204,11 +191,11 @@ msgstr "" "Seletor para tipos de caracteres de espaço em branco individuais a serem " "mostrados. Valores possíveis são “space”, “tab”, “newline” e “nbsp”." -#: ../data/org.gnome.meld.gschema.xml.h:23 +#: ../data/org.gnome.meld.gschema.xml.h:19 msgid "Wrap mode" msgstr "Quebra de linha" -#: ../data/org.gnome.meld.gschema.xml.h:24 +#: ../data/org.gnome.meld.gschema.xml.h:20 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 " @@ -218,11 +205,12 @@ msgstr "" "configuração, seja nenhuma (“none”), seja em qualquer caractere (“char”), " "seja apenas ao final das palavras (“word”)." -#: ../data/org.gnome.meld.gschema.xml.h:25 +#: ../data/org.gnome.meld.gschema.xml.h:21 +#: ../meld/resources/ui/statusbar-menu.ui.h:3 msgid "Highlight current line" msgstr "Destacar a linha atual" -#: ../data/org.gnome.meld.gschema.xml.h:26 +#: ../data/org.gnome.meld.gschema.xml.h:22 msgid "" "If true, the line containing the cursor will be highlighted in file " "comparisons." @@ -230,22 +218,22 @@ msgstr "" "Se verdadeiro, a linha contendo o cursor será destacada nas comparações de " "arquivos." -#: ../data/org.gnome.meld.gschema.xml.h:27 +#: ../data/org.gnome.meld.gschema.xml.h:23 msgid "Use the system default monospace font" msgstr "Usa a fonte mono-espaçada padrão do sistema" -#: ../data/org.gnome.meld.gschema.xml.h:28 +#: ../data/org.gnome.meld.gschema.xml.h:24 msgid "" "If false, custom-font will be used instead of the system monospace font." msgstr "" "Se falso, a fonte personalizada será usada ao invés da fonte monoespaçada do " "sistema." -#: ../data/org.gnome.meld.gschema.xml.h:29 +#: ../data/org.gnome.meld.gschema.xml.h:25 msgid "Custom font" msgstr "Fonte personalizada" -#: ../data/org.gnome.meld.gschema.xml.h:30 +#: ../data/org.gnome.meld.gschema.xml.h:26 msgid "" "The custom font to use, stored as a string and parsed as a Pango font " "description." @@ -253,22 +241,22 @@ msgstr "" "A fonte personalizada para usar, armazenada como um texto e interpretada " "como uma descrição de fonte Pango." -#: ../data/org.gnome.meld.gschema.xml.h:31 +#: ../data/org.gnome.meld.gschema.xml.h:27 msgid "Ignore blank lines when comparing files" msgstr "Ignorar linhas vazias ao comparar arquivos" -#: ../data/org.gnome.meld.gschema.xml.h:32 +#: ../data/org.gnome.meld.gschema.xml.h:28 msgid "" "If true, blank lines will be trimmed when highlighting changes between files." msgstr "" "Se verdadeiro, linhas vazias serão aparadas ao destacar alterações entre " "arquivos." -#: ../data/org.gnome.meld.gschema.xml.h:33 +#: ../data/org.gnome.meld.gschema.xml.h:29 msgid "Use the system default editor" msgstr "Usar o editor padrão do sistema" -#: ../data/org.gnome.meld.gschema.xml.h:34 +#: ../data/org.gnome.meld.gschema.xml.h:30 msgid "" "If false, custom-editor-command will be used instead of the system editor " "when opening files externally." @@ -276,11 +264,11 @@ msgstr "" "Se falso, o comando de editor personalizado será usado ao invés do editor do " "sistema ao abrir arquivos externamente." -#: ../data/org.gnome.meld.gschema.xml.h:35 +#: ../data/org.gnome.meld.gschema.xml.h:31 msgid "The custom editor launch command" msgstr "O comando para iniciar o editor personalizado" -#: ../data/org.gnome.meld.gschema.xml.h:36 +#: ../data/org.gnome.meld.gschema.xml.h:32 msgid "" "The command used to launch a custom editor. Some limited templating is " "supported here; at the moment '{file}' and '{line}' are recognised tokens." @@ -289,11 +277,11 @@ msgstr "" "limitados têm suporte aqui; no momento “{file}” e “{line}” são tokens " "reconhecidos." -#: ../data/org.gnome.meld.gschema.xml.h:37 +#: ../data/org.gnome.meld.gschema.xml.h:33 msgid "Columns to display" msgstr "Coluna para exibir" -#: ../data/org.gnome.meld.gschema.xml.h:38 +#: ../data/org.gnome.meld.gschema.xml.h:34 msgid "" "List of column names in folder comparison and whether they should be " "displayed." @@ -301,11 +289,12 @@ msgstr "" "Lista de nomes de colunas na comparação de diretórios e se eles deveriam ser " "exibidos." -#: ../data/org.gnome.meld.gschema.xml.h:39 ../data/ui/preferences.ui.h:25 +#: ../data/org.gnome.meld.gschema.xml.h:35 +#: ../meld/resources/ui/preferences.ui.h:25 msgid "Ignore symbolic links" msgstr "Ignorar ligações simbólicas" -#: ../data/org.gnome.meld.gschema.xml.h:40 +#: ../data/org.gnome.meld.gschema.xml.h:36 msgid "" "If true, folder comparisons do not follow symbolic links when traversing the " "folder tree." @@ -313,11 +302,11 @@ msgstr "" "Se verdadeiro, comparações de pastas não seguirão ligações simbólicas ao " "atravessar a árvore de pastas." -#: ../data/org.gnome.meld.gschema.xml.h:41 +#: ../data/org.gnome.meld.gschema.xml.h:37 msgid "Use shallow comparison" msgstr "Usa comparação superficial" -#: ../data/org.gnome.meld.gschema.xml.h:42 +#: ../data/org.gnome.meld.gschema.xml.h:38 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 " @@ -327,11 +316,11 @@ msgstr "" "tamanho e mtime, considerando arquivos como sendo idênticos se seu tamanho e " "mtime corresponderem; do contrário, diferentes." -#: ../data/org.gnome.meld.gschema.xml.h:43 +#: ../data/org.gnome.meld.gschema.xml.h:39 msgid "File timestamp resolution" msgstr "Resolução da marca de tempo de arquivo" -#: ../data/org.gnome.meld.gschema.xml.h:44 +#: ../data/org.gnome.meld.gschema.xml.h:40 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 " @@ -343,11 +332,12 @@ msgstr "" "mtimes diferentes. Isso é útil quando se está comparando arquivos entre " "sistemas de arquivos com diferentes resolução de marca de tempo." -#: ../data/org.gnome.meld.gschema.xml.h:45 ../data/ui/preferences.ui.h:22 +#: ../data/org.gnome.meld.gschema.xml.h:41 +#: ../meld/resources/ui/preferences.ui.h:22 msgid "Apply text filters during folder comparisons" msgstr "Aplicar filtros de texto durante comparação de pastas" -#: ../data/org.gnome.meld.gschema.xml.h:46 +#: ../data/org.gnome.meld.gschema.xml.h:42 msgid "" "If true, folder comparisons that compare file contents also apply active " "text filters and the blank line trimming option, and ignore newline " @@ -357,21 +347,21 @@ msgstr "" "também se aplicarão a filtros de texto ativos e à opção de aparar linhas " "vazias, e ignorar diferenças de nova linha." -#: ../data/org.gnome.meld.gschema.xml.h:47 +#: ../data/org.gnome.meld.gschema.xml.h:43 msgid "File status filters" msgstr "Filtros de status de arquivo" -#: ../data/org.gnome.meld.gschema.xml.h:48 +#: ../data/org.gnome.meld.gschema.xml.h:44 msgid "List of statuses used to filter visible files in folder comparison." msgstr "" "Lista de status usados para filtrar arquivos visíveis na comparação de " "pastas." -#: ../data/org.gnome.meld.gschema.xml.h:49 +#: ../data/org.gnome.meld.gschema.xml.h:45 msgid "Show the version control console output" msgstr "Mostra a saída de console de controle de versão" -#: ../data/org.gnome.meld.gschema.xml.h:50 +#: ../data/org.gnome.meld.gschema.xml.h:46 msgid "" "If true, a console output section will be shown in version control views, " "showing the commands run for version control operations." @@ -380,11 +370,11 @@ msgstr "" "controle de versão, mostrando os comandos executados para operações de " "controle de versão." -#: ../data/org.gnome.meld.gschema.xml.h:51 +#: ../data/org.gnome.meld.gschema.xml.h:47 msgid "Version control pane position" msgstr "Posição do painel de controle de versão" -#: ../data/org.gnome.meld.gschema.xml.h:52 +#: ../data/org.gnome.meld.gschema.xml.h:48 msgid "" "This is the height of the main version control tree when the console pane is " "shown." @@ -392,11 +382,11 @@ msgstr "" "Essa é a altura da árvore principal de controle de versão quando o painel de " "console é mostrado." -#: ../data/org.gnome.meld.gschema.xml.h:53 +#: ../data/org.gnome.meld.gschema.xml.h:49 msgid "Present version comparisons as left-local/right-remote" msgstr "Apresenta comparações de versão como esquerda-local/direita-remoto" -#: ../data/org.gnome.meld.gschema.xml.h:54 +#: ../data/org.gnome.meld.gschema.xml.h:50 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, " @@ -407,11 +397,11 @@ msgstr "" "apresentados arquivos nos painéis. Do contrário, um esquema esquerda-é-deles " "e direita-é-meu é usado." -#: ../data/org.gnome.meld.gschema.xml.h:55 +#: ../data/org.gnome.meld.gschema.xml.h:51 msgid "Order for files in three-way version control merge comparisons" msgstr "Ordena por arquivos em comparações de controle de versão em três-vias" -#: ../data/org.gnome.meld.gschema.xml.h:56 +#: ../data/org.gnome.meld.gschema.xml.h:52 msgid "" "Choices for file order are remote/merged/local and local/merged/remote. This " "preference only affects three-way comparisons launched from the version " @@ -422,11 +412,11 @@ msgstr "" "visão de controle de versão, de forma que seja usado apenas para resolução " "de conflitos/mesclagem dentro do Meld." -#: ../data/org.gnome.meld.gschema.xml.h:57 +#: ../data/org.gnome.meld.gschema.xml.h:53 msgid "Show margin in commit message editor" msgstr "Mostra margem no editor de mensagens de commit" -#: ../data/org.gnome.meld.gschema.xml.h:58 +#: ../data/org.gnome.meld.gschema.xml.h:54 msgid "" "If true, a guide will be displayed to show what column the margin is at in " "the version control commit message editor." @@ -434,11 +424,11 @@ msgstr "" "Se verdadeiro, um guia será exibido para mostrar em qual coluna a margem " "está no editor de mensagens de commit de controle de versão." -#: ../data/org.gnome.meld.gschema.xml.h:59 +#: ../data/org.gnome.meld.gschema.xml.h:55 msgid "Margin column in commit message editor" msgstr "Coluna margem no editor de mensagens de commit" -#: ../data/org.gnome.meld.gschema.xml.h:60 +#: ../data/org.gnome.meld.gschema.xml.h:56 msgid "" "The column at which to show the margin in the version control commit message " "editor." @@ -446,11 +436,11 @@ msgstr "" "A coluna na qual deve ser mostrada a margem do editor de mensagens de commit " "de controle de versão." -#: ../data/org.gnome.meld.gschema.xml.h:61 +#: ../data/org.gnome.meld.gschema.xml.h:57 msgid "Automatically hard-wrap commit messages" msgstr "Inserir quebra de linha automaticamente em mensagens de commit" -#: ../data/org.gnome.meld.gschema.xml.h:62 +#: ../data/org.gnome.meld.gschema.xml.h:58 msgid "" "If true, the version control commit message editor will hard-wrap (i.e., " "insert line breaks) at the commit margin before commit." @@ -458,22 +448,22 @@ msgstr "" "Se verdadeiro, o editor de mensagens de commit de controle de versão vai " "inserir quebra de linha na margem de commit antes de fazer o commit." -#: ../data/org.gnome.meld.gschema.xml.h:63 +#: ../data/org.gnome.meld.gschema.xml.h:59 msgid "Version control status filters" msgstr "Filtros de status de controle de versão" -#: ../data/org.gnome.meld.gschema.xml.h:64 +#: ../data/org.gnome.meld.gschema.xml.h:60 msgid "" "List of statuses used to filter visible files in version control comparison." msgstr "" "Lista de status usados para filtrar arquivos visíveis me comparação de " "controle de versão." -#: ../data/org.gnome.meld.gschema.xml.h:65 +#: ../data/org.gnome.meld.gschema.xml.h:61 msgid "Filename-based filters" msgstr "Filtros baseados em nome de arquivo" -#: ../data/org.gnome.meld.gschema.xml.h:66 +#: ../data/org.gnome.meld.gschema.xml.h:62 msgid "" "List of predefined filename-based filters that, if active, will remove " "matching files from a folder comparison." @@ -481,11 +471,11 @@ msgstr "" "Lista de filtros pré-determinados baseados em nome de arquivo que, se ativa, " "vai remover arquivos correspondentes de uma comparação de pastas." -#: ../data/org.gnome.meld.gschema.xml.h:67 +#: ../data/org.gnome.meld.gschema.xml.h:63 msgid "Text-based filters" msgstr "Filtros baseados em texto" -#: ../data/org.gnome.meld.gschema.xml.h:68 +#: ../data/org.gnome.meld.gschema.xml.h:64 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, " @@ -511,404 +501,629 @@ msgstr "Esquema escruto do Meld" msgid "Dark color scheme for Meld highlighting" msgstr "Esquema de cores escuras para realce no Meld" -#: ../data/ui/application.ui.h:1 -msgid "About Meld" -msgstr "Sobre o Meld" +#: ../meld/resources/gtk/help-overlay.ui.h:1 +msgctxt "shortcut window" +msgid "General" +msgstr "Geral" -#: ../data/ui/application.ui.h:2 -msgid "" -"Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2017 Kai Willadsen" -msgstr "" -"Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2017 Kai Willadsen" +#: ../meld/resources/gtk/help-overlay.ui.h:2 +msgctxt "shortcut window" +msgid "New comparison" +msgstr "Nova comparação" -#: ../data/ui/application.ui.h:4 -msgid "Website" -msgstr "Página web" +#: ../meld/resources/gtk/help-overlay.ui.h:3 +msgctxt "shortcut window" +msgid "Close a comparison" +msgstr "Fechar uma comparação" -#: ../data/ui/application.ui.h:5 -msgid "translator-credits" -msgstr "" -"Raphael Higino \n" -"Djavan Fagundes \n" -"César Veiga \n" -"Fabrício Godoy \n" -"Leonardo Ferreira Fontenelle \n" -"Gabriel Speckhahn \n" -"Florêncio Neves \n" -"Enrico Nicoletto \n" -"Rafael Fontenelle \n" -"Reginaldo Izidório " +#: ../meld/resources/gtk/help-overlay.ui.h:4 +msgctxt "shortcut window" +msgid "Quit Meld" +msgstr "Sair do Meld" -#: ../data/ui/application.ui.h:6 -msgid "_Preferences" -msgstr "Preferê_ncias" +#: ../meld/resources/gtk/help-overlay.ui.h:5 +msgctxt "shortcut window" +msgid "Stop the current action" +msgstr "Interromper a ação atual" -#: ../data/ui/application.ui.h:7 -msgid "_Help" -msgstr "Aj_uda" +#: ../meld/resources/gtk/help-overlay.ui.h:6 +msgctxt "shortcut window" +msgid "Refresh comparison" +msgstr "Atualizar comparação" -#: ../data/ui/application.ui.h:8 -msgid "Keyboard Shortcuts" -msgstr "Atalhos de teclado" +#: ../meld/resources/gtk/help-overlay.ui.h:7 +msgctxt "shortcut window" +msgid "Fullscreen" +msgstr "Tela cheia" -#: ../data/ui/application.ui.h:9 -msgid "_About" -msgstr "_Sobre" +#: ../meld/resources/gtk/help-overlay.ui.h:8 +msgctxt "shortcut window" +msgid "Tabs" +msgstr "Abas" -#: ../data/ui/application.ui.h:10 -msgid "_Quit" -msgstr "_Sair" +#: ../meld/resources/gtk/help-overlay.ui.h:9 +msgctxt "shortcut window" +msgid "Go to previous tab" +msgstr "Ir para a aba anterior" -#: ../data/ui/dirdiff.ui.h:1 ../data/ui/vcview.ui.h:1 -msgid "_Compare" -msgstr "_Comparar" +#: ../meld/resources/gtk/help-overlay.ui.h:10 +msgctxt "shortcut window" +msgid "Go to next tab" +msgstr "Ir para a próxima aba" -#: ../data/ui/dirdiff.ui.h:2 ../data/ui/vcview.ui.h:2 -msgid "Compare selected files" -msgstr "Compara os arquivos selecionados" +#: ../meld/resources/gtk/help-overlay.ui.h:11 +msgctxt "shortcut window" +msgid "Switch to tab" +msgstr "Alternar para aba" -#: ../data/ui/dirdiff.ui.h:3 -msgid "Collapse Recursively" -msgstr "Recolher recursivamente" +#: ../meld/resources/gtk/help-overlay.ui.h:12 +msgctxt "shortcut window" +msgid "Move tab left" +msgstr "Mover aba para a esquerda" -#: ../data/ui/dirdiff.ui.h:4 -msgid "Collapse selected folder and all subfolders" -msgstr "Recolhe a pasta selecionada e todas as subpastas" +#: ../meld/resources/gtk/help-overlay.ui.h:13 +msgctxt "shortcut window" +msgid "Move tab right" +msgstr "Mover aba para a direita" -#: ../data/ui/dirdiff.ui.h:5 -msgid "Expand Recursively" -msgstr "Expandir recursivamente" +#: ../meld/resources/gtk/help-overlay.ui.h:14 +msgctxt "shortcut window" +msgid "Changes" +msgstr "Alterações" -#: ../data/ui/dirdiff.ui.h:6 -msgid "Expand selected folder and all subfolders" -msgstr "Expandir a pasta selecionada e todas as subpastas" +#: ../meld/resources/gtk/help-overlay.ui.h:15 +msgctxt "shortcut window" +msgid "Go to previous change" +msgstr "Ir para a alteração anterior" -#: ../data/ui/dirdiff.ui.h:7 -msgid "Copy to _Left" -msgstr "Copia para a _esquerda" +#: ../meld/resources/gtk/help-overlay.ui.h:16 +msgctxt "shortcut window" +msgid "Go to next change" +msgstr "Ir para a próxima alteração" -#: ../data/ui/dirdiff.ui.h:8 -msgid "Copy to left" -msgstr "Copia para a esquerda" +#: ../meld/resources/gtk/help-overlay.ui.h:17 +msgctxt "shortcut window" +msgid "Editing" +msgstr "Edição" -#: ../data/ui/dirdiff.ui.h:9 -msgid "Copy to _Right" -msgstr "Copia para a _direita" +#: ../meld/resources/gtk/help-overlay.ui.h:18 +msgctxt "shortcut window" +msgid "Undo" +msgstr "Desfazer" -#: ../data/ui/dirdiff.ui.h:10 -msgid "Copy to right" -msgstr "Copia para a direita" +#: ../meld/resources/gtk/help-overlay.ui.h:19 +msgctxt "shortcut window" +msgid "Redo" +msgstr "Refazer" -#: ../data/ui/dirdiff.ui.h:11 -msgid "Delete selected" -msgstr "Exclui os selecionados" +#: ../meld/resources/gtk/help-overlay.ui.h:20 +msgctxt "shortcut window" +msgid "Cut" +msgstr "Recortar" -#: ../data/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:920 ../meld/filediff.py:1489 -msgid "Hide" -msgstr "Ocultar" +#: ../meld/resources/gtk/help-overlay.ui.h:21 +msgctxt "shortcut window" +msgid "Copy" +msgstr "Copiar" -#: ../data/ui/dirdiff.ui.h:13 -msgid "Hide selected" -msgstr "Oculta os selecionados" +#: ../meld/resources/gtk/help-overlay.ui.h:22 +msgctxt "shortcut window" +msgid "Paste" +msgstr "Colar" -#: ../data/ui/dirdiff.ui.h:14 -msgid "Ignore Filename Case" -msgstr "Ignorar maiúsculas/minúsculas em nomes de arquivos" +#: ../meld/resources/gtk/help-overlay.ui.h:23 +msgctxt "shortcut window" +msgid "Find" +msgstr "Localizar" -#: ../data/ui/dirdiff.ui.h:15 -msgid "" -"Consider differently-cased filenames that are otherwise-identical to be the " -"same" -msgstr "Não distingue nomes de arquivo que diferem apenas pela maiusculização" +#: ../meld/resources/gtk/help-overlay.ui.h:24 +msgctxt "shortcut window" +msgid "Find Next" +msgstr "Localizar próximo" -#: ../data/ui/dirdiff.ui.h:16 -msgid "Same" -msgstr "Iguais" +#: ../meld/resources/gtk/help-overlay.ui.h:25 +msgctxt "shortcut window" +msgid "Find Previous" +msgstr "Localizar anterior" -#: ../data/ui/dirdiff.ui.h:17 -msgid "Show identical" -msgstr "Mostra os iguais" +#: ../meld/resources/gtk/help-overlay.ui.h:26 +msgctxt "shortcut window" +msgid "Replace" +msgstr "Substituir" -#: ../data/ui/dirdiff.ui.h:18 -msgid "New" -msgstr "Novos" +#: ../meld/resources/gtk/help-overlay.ui.h:27 +msgctxt "shortcut window" +msgid "File comparison" +msgstr "Comparação de arquivos" -#: ../data/ui/dirdiff.ui.h:19 -msgid "Show new" -msgstr "Mostra os novos" +#: ../meld/resources/gtk/help-overlay.ui.h:28 +msgctxt "shortcut window" +msgid "Save current file" +msgstr "Salvar o arquivo atual" -#: ../data/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:76 -msgid "Modified" -msgstr "Modificados" +#: ../meld/resources/gtk/help-overlay.ui.h:29 +msgctxt "shortcut window" +msgid "Save current file to new path" +msgstr "Salvar o arquivo atual em novo caminho" -#: ../data/ui/dirdiff.ui.h:21 -msgid "Show modified" -msgstr "Mostra os modificados" +#: ../meld/resources/gtk/help-overlay.ui.h:30 +msgctxt "shortcut window" +msgid "Save all files in comparison" +msgstr "Salvar todos os arquivos na comparação" -#: ../data/ui/dirdiff.ui.h:22 -msgid "Filters" -msgstr "Filtros" +#: ../meld/resources/gtk/help-overlay.ui.h:31 +msgctxt "shortcut window" +msgid "Previous conflict" +msgstr "Conflito anterior" -#: ../data/ui/dirdiff.ui.h:23 -msgid "Set active filters" -msgstr "Definir filtros ativos" +#: ../meld/resources/gtk/help-overlay.ui.h:32 +msgctxt "shortcut window" +msgid "Next conflict" +msgstr "Próximo conflito" + +#: ../meld/resources/gtk/help-overlay.ui.h:33 +msgctxt "shortcut window" +msgid "Push change to left" +msgstr "Levar a alteração atual para a esquerda" + +#: ../meld/resources/gtk/help-overlay.ui.h:34 +msgctxt "shortcut window" +msgid "Push change to right" +msgstr "Levar a alteração atual para a direita" + +#: ../meld/resources/gtk/help-overlay.ui.h:35 +msgctxt "shortcut window" +msgid "Pull change from left" +msgstr "Trazer a alteração da esquerda" + +#: ../meld/resources/gtk/help-overlay.ui.h:36 +msgctxt "shortcut window" +msgid "Pull change from right" +msgstr "Trazer a alteração da direita" + +#: ../meld/resources/gtk/help-overlay.ui.h:37 +msgctxt "shortcut window" +msgid "Copy change above left" +msgstr "Copiar a alteração acima para a esquerda" + +#: ../meld/resources/gtk/help-overlay.ui.h:38 +msgctxt "shortcut window" +msgid "Copy change below left" +msgstr "Copiar a alteração abaixo para a esquerda" + +#: ../meld/resources/gtk/help-overlay.ui.h:39 +msgctxt "shortcut window" +msgid "Copy change above right" +msgstr "Copiar a alteração acima para a direita" + +#: ../meld/resources/gtk/help-overlay.ui.h:40 +msgctxt "shortcut window" +msgid "Copy change below right" +msgstr "Copiar a alteração abaixo para a direita" + +#: ../meld/resources/gtk/help-overlay.ui.h:41 +msgctxt "shortcut window" +msgid "Delete change" +msgstr "Excluir a alteração" + +#: ../meld/resources/gtk/help-overlay.ui.h:42 +msgctxt "shortcut window" +msgid "Previous comparison pane" +msgstr "Painel de comparação anterior" + +#: ../meld/resources/gtk/help-overlay.ui.h:43 +msgctxt "shortcut window" +msgid "Next comparison pane" +msgstr "Próximo painel de comparação" + +#: ../meld/resources/gtk/help-overlay.ui.h:44 +msgctxt "shortcut window" +msgid "Folder comparison" +msgstr "Comparação de pastas" + +#: ../meld/resources/gtk/help-overlay.ui.h:45 +msgctxt "shortcut window" +msgid "Copy to left" +msgstr "Copiar para a esquerda" + +#: ../meld/resources/gtk/help-overlay.ui.h:46 +msgctxt "shortcut window" +msgid "Copy to right" +msgstr "Copiar para a direita" + +#: ../meld/resources/gtk/help-overlay.ui.h:47 +msgctxt "shortcut window" +msgid "Version control comparison" +msgstr "Comparação de controle de versão" + +#: ../meld/resources/gtk/help-overlay.ui.h:48 +msgctxt "shortcut window" +msgid "Commit to version control" +msgstr "Submeter para um controle de versão" + +#: ../meld/resources/gtk/help-overlay.ui.h:49 +msgctxt "shortcut window" +msgid "Show/hide console output" +msgstr "Mostrar/ocultar saída de console" + +#: ../meld/resources/gtk/menus.ui.h:1 +msgid "_Preferences" +msgstr "Preferê_ncias" + +#: ../meld/resources/gtk/menus.ui.h:2 +msgid "_Help" +msgstr "Aj_uda" + +#: ../meld/resources/gtk/menus.ui.h:3 +msgid "Keyboard Shortcuts" +msgstr "Atalhos de teclado" + +#: ../meld/resources/gtk/menus.ui.h:4 +msgid "_About" +msgstr "_Sobre" + +#: ../meld/resources/gtk/menus.ui.h:5 +msgid "_Quit" +msgstr "_Sair" + +#: ../meld/resources/ui/about-dialog.ui.h:1 +msgid "About Meld" +msgstr "Sobre o Meld" + +#: ../meld/resources/ui/about-dialog.ui.h:2 +msgid "" +"Copyright © 2002-2009 Stephen Kennedy\n" +"Copyright © 2009-2017 Kai Willadsen" +msgstr "" +"Copyright © 2002-2009 Stephen Kennedy\n" +"Copyright © 2009-2017 Kai Willadsen" + +#: ../meld/resources/ui/about-dialog.ui.h:4 +msgid "Website" +msgstr "Página web" -#: ../data/ui/EditableList.ui.h:1 -msgid "Editable List" -msgstr "Lista editável" +#: ../meld/resources/ui/about-dialog.ui.h:5 +msgid "translator-credits" +msgstr "" +"Raphael Higino \n" +"Djavan Fagundes \n" +"César Veiga \n" +"Fabrício Godoy \n" +"Leonardo Ferreira Fontenelle \n" +"Gabriel Speckhahn \n" +"Florêncio Neves \n" +"Enrico Nicoletto \n" +"Rafael Fontenelle \n" +"Reginaldo Izidório " -#: ../data/ui/EditableList.ui.h:2 +#: ../meld/resources/ui/column-list.ui.h:1 +#: ../meld/resources/ui/filter-list.ui.h:1 msgid "Active" msgstr "Ativo" -#: ../data/ui/EditableList.ui.h:3 +#: ../meld/resources/ui/column-list.ui.h:2 msgid "Column Name" msgstr "Nome da coluna" -#: ../data/ui/EditableList.ui.h:4 ../data/ui/vcview.ui.h:9 -msgid "_Add" -msgstr "_Adicionar" - -#: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11 -#: ../meld/vcview.py:680 +#: ../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 msgid "_Remove" msgstr "_Remover" -#: ../data/ui/EditableList.ui.h:6 +#: ../meld/resources/ui/column-list.ui.h:4 +#: ../meld/resources/ui/filter-list.ui.h:8 msgid "Move item up" msgstr "Move o item para cima" -#: ../data/ui/EditableList.ui.h:7 +#: ../meld/resources/ui/column-list.ui.h:5 +#: ../meld/resources/ui/filter-list.ui.h:9 msgid "Move _Up" msgstr "Mover para _cima" -#: ../data/ui/EditableList.ui.h:8 +#: ../meld/resources/ui/column-list.ui.h:6 +#: ../meld/resources/ui/filter-list.ui.h:10 msgid "Move item down" msgstr "Move o item para baixo" -#: ../data/ui/EditableList.ui.h:9 +#: ../meld/resources/ui/column-list.ui.h:7 +#: ../meld/resources/ui/filter-list.ui.h:11 msgid "Move _Down" msgstr "Mover para _baixo" -#. Create icon and filename CellRenderer -#: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35 -#: ../meld/dirdiff.py:416 -msgid "Name" -msgstr "Nome" +#: ../meld/resources/ui/commit-dialog.ui.h:1 +msgid "Commit" +msgstr "Submete" -#: ../data/ui/EditableList.ui.h:11 -msgid "Pattern" -msgstr "Padrão" +#: ../meld/resources/ui/commit-dialog.ui.h:2 +msgid "Commit Files" +msgstr "Fazer commit de arquivos" -#: ../data/ui/EditableList.ui.h:12 -msgid "Add new filter" -msgstr "Adiciona novo filtro" +#: ../meld/resources/ui/commit-dialog.ui.h:3 +msgid "Log Message" +msgstr "Mensagens de log" -#: ../data/ui/EditableList.ui.h:13 -msgid "Remove selected filter" -msgstr "Remove o filtro selecionado" +#: ../meld/resources/ui/commit-dialog.ui.h:4 +msgid "Previous logs:" +msgstr "Logs anteriores:" + +#: ../meld/resources/ui/commit-dialog.ui.h:5 +msgid "Co_mmit" +msgstr "Sub_meter" + +#: ../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 "Compara os arquivos selecionados" + +#: ../meld/resources/ui/dirdiff.ui.h:3 +msgid "Collapse Recursively" +msgstr "Recolher recursivamente" + +#: ../meld/resources/ui/dirdiff.ui.h:4 +msgid "Collapse selected folder and all subfolders" +msgstr "Recolhe a pasta selecionada e todas as subpastas" + +#: ../meld/resources/ui/dirdiff.ui.h:5 +msgid "Expand Recursively" +msgstr "Expandir recursivamente" + +#: ../meld/resources/ui/dirdiff.ui.h:6 +msgid "Expand selected folder and all subfolders" +msgstr "Expandir a pasta selecionada e todas as subpastas" + +#: ../meld/resources/ui/dirdiff.ui.h:7 +msgid "Copy to _Left" +msgstr "Copia para a _esquerda" + +#: ../meld/resources/ui/dirdiff.ui.h:8 +msgid "Copy to left" +msgstr "Copia para a esquerda" + +#: ../meld/resources/ui/dirdiff.ui.h:9 +msgid "Copy to _Right" +msgstr "Copia para a _direita" + +#: ../meld/resources/ui/dirdiff.ui.h:10 +msgid "Copy to right" +msgstr "Copia para a direita" + +#: ../meld/resources/ui/dirdiff.ui.h:11 +msgid "Delete selected" +msgstr "Exclui os selecionados" + +#: ../meld/resources/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:959 +#: ../meld/filediff.py:1601 +msgid "Hide" +msgstr "Ocultar" + +#: ../meld/resources/ui/dirdiff.ui.h:13 +msgid "Hide selected" +msgstr "Oculta os selecionados" + +#: ../meld/resources/ui/dirdiff.ui.h:14 +msgid "Ignore Filename Case" +msgstr "Ignorar maiúsculas/minúsculas em nomes de arquivos" + +#: ../meld/resources/ui/dirdiff.ui.h:15 +msgid "" +"Consider differently-cased filenames that are otherwise-identical to be the " +"same" +msgstr "Não distingue nomes de arquivo que diferem apenas pela maiusculização" + +#: ../meld/resources/ui/dirdiff.ui.h:16 +msgid "Same" +msgstr "Iguais" + +#: ../meld/resources/ui/dirdiff.ui.h:17 +msgid "Show identical" +msgstr "Mostra os iguais" + +#: ../meld/resources/ui/dirdiff.ui.h:18 +msgid "New" +msgstr "Novos" + +#: ../meld/resources/ui/dirdiff.ui.h:19 +msgid "Show new" +msgstr "Mostra os novos" + +#: ../meld/resources/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:77 +msgid "Modified" +msgstr "Modificados" + +#: ../meld/resources/ui/dirdiff.ui.h:21 +msgid "Show modified" +msgstr "Mostra os modificados" + +#: ../meld/resources/ui/dirdiff.ui.h:22 +msgid "Filters" +msgstr "Filtros" + +#: ../meld/resources/ui/dirdiff.ui.h:23 +msgid "Set active filters" +msgstr "Definir filtros ativos" -#: ../data/ui/encoding-selector.ui.h:1 +#: ../meld/resources/ui/encoding-selector.ui.h:1 msgid "Search text encoding…" msgstr "Pesquisando codificação de texto…" -#: ../data/ui/filediff.ui.h:1 +#: ../meld/resources/ui/filediff.ui.h:1 msgid "Format as Patch…" msgstr "Formatar como patch…" -#: ../data/ui/filediff.ui.h:2 +#: ../meld/resources/ui/filediff.ui.h:2 msgid "Create a patch using differences between files" msgstr "Cria um patch usando as diferenças entre os arquivos" -#: ../data/ui/filediff.ui.h:3 +#: ../meld/resources/ui/filediff.ui.h:3 msgid "Save A_ll" msgstr "Salvar _todos" -#: ../data/ui/filediff.ui.h:4 +#: ../meld/resources/ui/filediff.ui.h:4 msgid "Save all files in the current comparison" msgstr "Salva todos os arquivos na comparação atual" -#: ../data/ui/filediff.ui.h:5 +#: ../meld/resources/ui/filediff.ui.h:5 msgid "Revert files to their saved versions" msgstr "Reverte arquivos para suas versões salvas" -#: ../data/ui/filediff.ui.h:6 +#: ../meld/resources/ui/filediff.ui.h:6 msgid "Add Synchronization Point" msgstr "Adicionar ponto de sincronização" -#: ../data/ui/filediff.ui.h:7 +#: ../meld/resources/ui/filediff.ui.h:7 msgid "Add a synchronization point for changes between files" msgstr "Adiciona um ponto de sincronização das alterações entre arquivos" -#: ../data/ui/filediff.ui.h:8 +#: ../meld/resources/ui/filediff.ui.h:8 msgid "Clear Synchronization Points" msgstr "Limpar pontos de sincronização" -#: ../data/ui/filediff.ui.h:9 +#: ../meld/resources/ui/filediff.ui.h:9 msgid "Clear sychronization points for changes between files" msgstr "Limpa pontos de sincronização das alterações entre arquivos" -#: ../data/ui/filediff.ui.h:10 +#: ../meld/resources/ui/filediff.ui.h:10 msgid "Previous Conflict" msgstr "Conflito anterior" -#: ../data/ui/filediff.ui.h:11 +#: ../meld/resources/ui/filediff.ui.h:11 msgid "Go to the previous conflict" msgstr "Vai ao conflito anterior" -#: ../data/ui/filediff.ui.h:12 +#: ../meld/resources/ui/filediff.ui.h:12 msgid "Next Conflict" msgstr "Próximo conflito" -#: ../data/ui/filediff.ui.h:13 +#: ../meld/resources/ui/filediff.ui.h:13 msgid "Go to the next conflict" msgstr "Vai ao próximo conflito" -#: ../data/ui/filediff.ui.h:14 +#: ../meld/resources/ui/filediff.ui.h:14 msgid "Push to Left" msgstr "Levar para a esquerda" -#: ../data/ui/filediff.ui.h:15 +#: ../meld/resources/ui/filediff.ui.h:15 msgid "Push current change to the left" msgstr "Leva a alteração atual para a esquerda" -#: ../data/ui/filediff.ui.h:16 +#: ../meld/resources/ui/filediff.ui.h:16 msgid "Push to Right" msgstr "Levar para a direita" -#: ../data/ui/filediff.ui.h:17 +#: ../meld/resources/ui/filediff.ui.h:17 msgid "Push current change to the right" msgstr "Leva a alteração atual para a direita" -#: ../data/ui/filediff.ui.h:18 +#: ../meld/resources/ui/filediff.ui.h:18 msgid "Pull from Left" msgstr "Trazer da esquerda" -#: ../data/ui/filediff.ui.h:19 +#: ../meld/resources/ui/filediff.ui.h:19 msgid "Pull change from the left" msgstr "Traz a alteração da esquerda" -#: ../data/ui/filediff.ui.h:20 +#: ../meld/resources/ui/filediff.ui.h:20 msgid "Pull from Right" msgstr "Trazer da direita" -#: ../data/ui/filediff.ui.h:21 +#: ../meld/resources/ui/filediff.ui.h:21 msgid "Pull change from the right" msgstr "Traz a alteração da direita" -#: ../data/ui/filediff.ui.h:22 +#: ../meld/resources/ui/filediff.ui.h:22 msgid "Copy Above Left" msgstr "Copiar acima da esquerda" -#: ../data/ui/filediff.ui.h:23 +#: ../meld/resources/ui/filediff.ui.h:23 msgid "Copy change above the left chunk" msgstr "Copia a alteração acima do trecho à esquerda" -#: ../data/ui/filediff.ui.h:24 +#: ../meld/resources/ui/filediff.ui.h:24 msgid "Copy Below Left" msgstr "Copiar abaixo da esquerda" -#: ../data/ui/filediff.ui.h:25 +#: ../meld/resources/ui/filediff.ui.h:25 msgid "Copy change below the left chunk" msgstr "Copia a alteração abaixo do trecho à esquerda" -#: ../data/ui/filediff.ui.h:26 +#: ../meld/resources/ui/filediff.ui.h:26 msgid "Copy Above Right" msgstr "Copiar acima da direita" -#: ../data/ui/filediff.ui.h:27 +#: ../meld/resources/ui/filediff.ui.h:27 msgid "Copy change above the right chunk" msgstr "Copia a alteração acima do trecho à direita" -#: ../data/ui/filediff.ui.h:28 +#: ../meld/resources/ui/filediff.ui.h:28 msgid "Copy Below Right" msgstr "Copiar abaixo da direita" -#: ../data/ui/filediff.ui.h:29 +#: ../meld/resources/ui/filediff.ui.h:29 msgid "Copy change below the right chunk" msgstr "Copia a alteração abaixo do trecho à direita" -#: ../data/ui/filediff.ui.h:30 +#: ../meld/resources/ui/filediff.ui.h:30 msgid "Delete" msgstr "Excluir" -#: ../data/ui/filediff.ui.h:31 +#: ../meld/resources/ui/filediff.ui.h:31 msgid "Delete change" msgstr "Exclui a alteração" -#: ../data/ui/filediff.ui.h:32 +#: ../meld/resources/ui/filediff.ui.h:32 msgid "Merge All from Left" msgstr "Mesclar todas da esquerda" -#: ../data/ui/filediff.ui.h:33 +#: ../meld/resources/ui/filediff.ui.h:33 msgid "Merge all non-conflicting changes from the left" msgstr "Mescla todas as alterações não conflitantes da esquerda" -#: ../data/ui/filediff.ui.h:34 +#: ../meld/resources/ui/filediff.ui.h:34 msgid "Merge All from Right" msgstr "Mesclar todas da direita" -#: ../data/ui/filediff.ui.h:35 +#: ../meld/resources/ui/filediff.ui.h:35 msgid "Merge all non-conflicting changes from the right" msgstr "Mescla todas as alterações não conflitantes da direita" -#: ../data/ui/filediff.ui.h:36 +#: ../meld/resources/ui/filediff.ui.h:36 msgid "Merge All" msgstr "Mesclar todas" -#: ../data/ui/filediff.ui.h:37 +#: ../meld/resources/ui/filediff.ui.h:37 msgid "Merge all non-conflicting changes from left and right panes" msgstr "" "Mescla todas as alterações não conflitantes dos painéis esquerdo e direito" -#: ../data/ui/filediff.ui.h:38 +#: ../meld/resources/ui/filediff.ui.h:38 msgid "Previous Pane" msgstr "Painel anterior" -#: ../data/ui/filediff.ui.h:39 +#: ../meld/resources/ui/filediff.ui.h:39 msgid "Move keyboard focus to the previous document in this comparison" msgstr "Move o foco do teclado ao documento anterior nesta comparação" -#: ../data/ui/filediff.ui.h:40 +#: ../meld/resources/ui/filediff.ui.h:40 msgid "Next Pane" msgstr "Próximo painel" -#: ../data/ui/filediff.ui.h:41 +#: ../meld/resources/ui/filediff.ui.h:41 msgid "Move keyboard focus to the next document in this comparison" msgstr "Move o foco do teclado ao próximo documento nesta comparação" -#: ../data/ui/filediff.ui.h:42 +#: ../meld/resources/ui/filediff.ui.h:42 msgid "Lock Scrolling" msgstr "Bloquear rolagem" -#: ../data/ui/filediff.ui.h:43 +#: ../meld/resources/ui/filediff.ui.h:43 msgid "Lock scrolling of all panes" msgstr "Bloqueia a rolagem de todos os painéis" -#: ../data/ui/filediff.ui.h:44 -msgid "Save changes to documents before closing?" -msgstr "Salvar mudanças em documentos antes de fechar?" - -#: ../data/ui/filediff.ui.h:45 -msgid "If you don’t save, changes will be permanently lost." -msgstr "Se você não salvar, as mudanças serão perdidas permanentemente." - -#: ../data/ui/filediff.ui.h:46 -msgid "Close _without Saving" -msgstr "_Fechar sem salvar" - -#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:1001 ../meld/iohelpers.py:50 -#: ../meld/iohelpers.py:100 -msgid "_Cancel" -msgstr "_Cancelar" - -#: ../data/ui/filediff.ui.h:48 -msgid "_Save" -msgstr "_Salvar" - -#: ../data/ui/filediff.ui.h:49 +#: ../meld/resources/ui/filediff.ui.h:44 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." @@ -917,765 +1132,562 @@ msgstr "" "esse arquivo e fazer as mudanças de qualquer forma, mas elas devem ser " "salvas em um novo arquivo." -#: ../data/ui/filediff.ui.h:50 +#: ../meld/resources/ui/filediff.ui.h:45 msgid "File 3" msgstr "Arquivo 3" -#: ../data/ui/filediff.ui.h:51 +#: ../meld/resources/ui/filediff.ui.h:46 msgid "File 2" msgstr "Arquivo 2" -#: ../data/ui/filediff.ui.h:52 +#: ../meld/resources/ui/filediff.ui.h:47 msgid "File 1" msgstr "Arquivo 1" -#: ../data/ui/filediff.ui.h:53 -msgid "Discard unsaved changes to documents?" -msgstr "Descartar alterações não salvas em documentos?" +#. Create icon and filename CellRenderer +#: ../meld/resources/ui/filter-list.ui.h:2 ../meld/resources/ui/vcview.ui.h:30 +#: ../meld/dirdiff.py:455 +msgid "Name" +msgstr "Nome" -#: ../data/ui/filediff.ui.h:54 -msgid "Changes made to the following documents will be permanently lost:" -msgstr "" -"As alterações feitas nos documentos a seguir serão perdidas permanentemente:" +#: ../meld/resources/ui/filter-list.ui.h:3 +msgid "Pattern" +msgstr "Padrão" -#: ../data/ui/filediff.ui.h:55 -msgid "_Discard" -msgstr "_Descartar" +#: ../meld/resources/ui/filter-list.ui.h:4 +msgid "Add new filter" +msgstr "Adiciona novo filtro" + +#: ../meld/resources/ui/filter-list.ui.h:5 ../meld/resources/ui/vcview.ui.h:9 +msgid "_Add" +msgstr "_Adicionar" + +#: ../meld/resources/ui/filter-list.ui.h:6 +msgid "Remove selected filter" +msgstr "Remove o filtro selecionado" -#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:1002 ../meld/iohelpers.py:101 +#: ../meld/resources/ui/findbar.ui.h:1 ../meld/dirdiff.py:1041 +#: ../meld/iohelpers.py:113 msgid "_Replace" msgstr "_Substituir" -#: ../data/ui/findbar.ui.h:2 +#: ../meld/resources/ui/findbar.ui.h:2 msgid "Replace _All" msgstr "Substituir _todos" -#: ../data/ui/findbar.ui.h:3 +#: ../meld/resources/ui/findbar.ui.h:3 msgid "_Previous" msgstr "_Anterior" -#: ../data/ui/findbar.ui.h:4 +#: ../meld/resources/ui/findbar.ui.h:4 msgid "_Next" msgstr "_Próximo" -#: ../data/ui/findbar.ui.h:5 +#: ../meld/resources/ui/findbar.ui.h:5 msgid "Find:" msgstr "Localizar:" -#: ../data/ui/findbar.ui.h:6 +#: ../meld/resources/ui/findbar.ui.h:6 msgid "Replace _with:" msgstr "Substituir _por:" -#: ../data/ui/findbar.ui.h:7 +#: ../meld/resources/ui/findbar.ui.h:7 msgid "_Match case" msgstr "Diferenciar _maiúsculas de minúsculas" -#: ../data/ui/findbar.ui.h:8 +#: ../meld/resources/ui/findbar.ui.h:8 msgid "Who_le word" msgstr "Pa_lavra inteira" -#: ../data/ui/findbar.ui.h:9 +#: ../meld/resources/ui/findbar.ui.h:9 msgid "Regular e_xpression" msgstr "E_xpressão regular" -#: ../data/ui/findbar.ui.h:10 +#: ../meld/resources/ui/findbar.ui.h:10 msgid "Wrapped" msgstr "Voltou ao início" -#: ../data/ui/language-selector.ui.h:1 +#: ../meld/resources/ui/language-selector.ui.h:1 msgid "Search highlight mode…" msgstr "Pesquisar modo de destaque…" -#: ../data/ui/patch-dialog.ui.h:1 +#: ../meld/resources/ui/new-diff-tab.ui.h:1 ../meld/meldwindow.py:532 +#: ../meld/newdifftab.py:53 +msgid "New comparison" +msgstr "Nova comparação" + +#: ../meld/resources/ui/new-diff-tab.ui.h:2 +msgid "File comparison" +msgstr "Comparação de arquivos" + +#: ../meld/resources/ui/new-diff-tab.ui.h:3 +msgid "Directory comparison" +msgstr "Comparação de diretórios" + +#: ../meld/resources/ui/new-diff-tab.ui.h:4 +msgid "Version control view" +msgstr "Visão de controle de versão" + +#: ../meld/resources/ui/new-diff-tab.ui.h:5 +msgid "_3-way comparison" +msgstr "Comparação em _3-vias" + +#: ../meld/resources/ui/new-diff-tab.ui.h:6 +msgid "Select Third File" +msgstr "Selecione o terceiro arquivo" + +#: ../meld/resources/ui/new-diff-tab.ui.h:7 +msgid "Select Second File" +msgstr "Selecione o segundo arquivo" + +#: ../meld/resources/ui/new-diff-tab.ui.h:8 +msgid "Select First File" +msgstr "Selecione o primeiro arquivo" + +#: ../meld/resources/ui/new-diff-tab.ui.h:9 +msgid "Select First Folder" +msgstr "Selecione a primeira pasta" + +#: ../meld/resources/ui/new-diff-tab.ui.h:10 +msgid "Select Second Folder" +msgstr "Selecione a segunda pasta" + +#: ../meld/resources/ui/new-diff-tab.ui.h:11 +msgid "Select Third Folder" +msgstr "Selecione a terceira pasta" + +#: ../meld/resources/ui/new-diff-tab.ui.h:12 +msgid "Select A Version-Controlled Folder" +msgstr "Selecione uma pasta com controle de versão" + +#: ../meld/resources/ui/new-diff-tab.ui.h:13 +msgid "_Blank comparison" +msgstr "_Limpar comparação" + +#: ../meld/resources/ui/new-diff-tab.ui.h:14 +msgid "C_ompare" +msgstr "_Comparar" + +#: ../meld/resources/ui/notebook-label.ui.h:1 +#| msgid "Close tab" +msgid "Close Tab" +msgstr "Fechar aba" + +#: ../meld/resources/ui/patch-dialog.ui.h:1 msgid "Format as Patch" msgstr "Formatar como patch" -#: ../data/ui/patch-dialog.ui.h:2 +#: ../meld/resources/ui/patch-dialog.ui.h:2 msgid "Copy to Clipboard" msgstr "Copiar para a área de transferência" -#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:152 +#: ../meld/resources/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:165 msgid "Save Patch" msgstr "Salvar patch" -#: ../data/ui/patch-dialog.ui.h:4 +#: ../meld/resources/ui/patch-dialog.ui.h:4 msgid "Use differences between:" msgstr "Usar as diferenças entre:" -#: ../data/ui/patch-dialog.ui.h:5 +#: ../meld/resources/ui/patch-dialog.ui.h:5 msgid "Left and middle panes" msgstr "Painéis esquerdo e central" -#: ../data/ui/patch-dialog.ui.h:6 +#: ../meld/resources/ui/patch-dialog.ui.h:6 msgid "Middle and right panes" msgstr "Painéis central e direito" -#: ../data/ui/patch-dialog.ui.h:7 +#: ../meld/resources/ui/patch-dialog.ui.h:7 msgid "_Reverse patch direction" msgstr "_Reverter direção do patch" -#: ../data/ui/preferences.ui.h:1 -msgid "Meld Preferences" -msgstr "Preferências do Meld" +#: ../meld/resources/ui/preferences.ui.h:1 +#| msgid "_Preferences" +msgid "Preferences" +msgstr "Preferências" -#: ../data/ui/preferences.ui.h:2 +#: ../meld/resources/ui/preferences.ui.h:2 msgid "Font" msgstr "Fonte" -#: ../data/ui/preferences.ui.h:3 +#: ../meld/resources/ui/preferences.ui.h:3 msgid "_Use the system fixed width font" msgstr "_Usar a fonte de largura fixa do sistema" -#: ../data/ui/preferences.ui.h:4 +#: ../meld/resources/ui/preferences.ui.h:4 msgid "_Editor font:" msgstr "_Fonte do editor:" -#: ../data/ui/preferences.ui.h:5 +#. 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 msgid "Display" msgstr "Exibição" -#: ../data/ui/preferences.ui.h:6 +#: ../meld/resources/ui/preferences.ui.h:6 msgid "_Tab width:" msgstr "_Largura da tabulação:" -#: ../data/ui/preferences.ui.h:7 +#: ../meld/resources/ui/preferences.ui.h:7 msgid "_Insert spaces instead of tabs" msgstr "_Inserir espaços em vez de tabulações" -#: ../data/ui/preferences.ui.h:8 +#: ../meld/resources/ui/preferences.ui.h:8 msgid "Enable text _wrapping" msgstr "Habilitar _quebra de texto" -#: ../data/ui/preferences.ui.h:9 +#: ../meld/resources/ui/preferences.ui.h:9 msgid "Do not _split words over two lines" msgstr "Não _dividir uma palavra em duas linhas" -#: ../data/ui/preferences.ui.h:10 +#: ../meld/resources/ui/preferences.ui.h:10 msgid "Highlight _current line" msgstr "Desta_car a linha atual" -#: ../data/ui/preferences.ui.h:11 +#: ../meld/resources/ui/preferences.ui.h:11 msgid "Show _line numbers" msgstr "Mostrar números de _linhas" -#: ../data/ui/preferences.ui.h:12 +#: ../meld/resources/ui/preferences.ui.h:12 msgid "Show w_hitespace" msgstr "Mostrar _espaço em branco" -#: ../data/ui/preferences.ui.h:13 +#: ../meld/resources/ui/preferences.ui.h:13 msgid "Use s_yntax highlighting" msgstr "Usar de_staque de sintaxe" -#: ../data/ui/preferences.ui.h:14 +#: ../meld/resources/ui/preferences.ui.h:14 msgid "Syntax highlighting color scheme:" msgstr "Esquema de cores de realce de sintaxe:" -#: ../data/ui/preferences.ui.h:15 +#: ../meld/resources/ui/preferences.ui.h:15 msgid "External Editor" msgstr "Editor externo" -#: ../data/ui/preferences.ui.h:16 +#: ../meld/resources/ui/preferences.ui.h:16 msgid "Use _default system editor" msgstr "Usar o e_ditor padrão do sistema" -#: ../data/ui/preferences.ui.h:17 +#: ../meld/resources/ui/preferences.ui.h:17 msgid "Edito_r command:" msgstr "Comando do edito_r:" -#: ../data/ui/preferences.ui.h:18 +#: ../meld/resources/ui/preferences.ui.h:18 msgid "Editor" msgstr "Editor" -#: ../data/ui/preferences.ui.h:19 +#: ../meld/resources/ui/preferences.ui.h:19 msgid "Shallow Comparison" msgstr "Comparação superficial" -#: ../data/ui/preferences.ui.h:20 +#: ../meld/resources/ui/preferences.ui.h:20 msgid "C_ompare files based only on size and timestamp" msgstr "C_omparar arquivos baseando-se apenas no tamanho e marca de tempo" -#: ../data/ui/preferences.ui.h:21 +#: ../meld/resources/ui/preferences.ui.h:21 msgid "_Timestamp resolution:" msgstr "Resolução da marca de _tempo:" -#: ../data/ui/preferences.ui.h:23 +#: ../meld/resources/ui/preferences.ui.h:23 msgid "Note: enabling text filters may make comparing large files much slower" msgstr "" "Nota: habilitar filtros de texto pode atrasar em muito a comparação entre " "arquivos grandes" -#: ../data/ui/preferences.ui.h:24 +#: ../meld/resources/ui/preferences.ui.h:24 msgid "Symbolic Links" msgstr "Ligações simbólicas" -#: ../data/ui/preferences.ui.h:26 +#: ../meld/resources/ui/preferences.ui.h:26 msgid "Visible Columns" msgstr "Colunas visíveis" -#: ../data/ui/preferences.ui.h:27 +#: ../meld/resources/ui/preferences.ui.h:27 msgid "Folder Comparisons" msgstr "Comparação de pastas" -#: ../data/ui/preferences.ui.h:28 +#: ../meld/resources/ui/preferences.ui.h:28 msgid "Version Comparisons" msgstr "Comparação de versão" -#: ../data/ui/preferences.ui.h:29 +#: ../meld/resources/ui/preferences.ui.h:29 msgid "_Order when comparing file revisions:" msgstr "_Ordenar ao comparar revisões de arquivo:" -#: ../data/ui/preferences.ui.h:30 +#: ../meld/resources/ui/preferences.ui.h:30 msgid "Order when _merging files:" msgstr "Ordenar ao _mesclar arquivos:" -#: ../data/ui/preferences.ui.h:31 +#: ../meld/resources/ui/preferences.ui.h:31 msgid "Commit Messages" -msgstr "Mensagens de commit" - -#: ../data/ui/preferences.ui.h:32 -msgid "Show _right margin at:" -msgstr "Mostrar ma_rgem esquerda em:" - -#: ../data/ui/preferences.ui.h:33 -msgid "Automatically _break lines at right margin on commit" -msgstr "Que_brar linhas automaticamente na margem esquerda no commit" - -#: ../data/ui/preferences.ui.h:34 -msgid "Version Control" -msgstr "Controle de versão" - -#: ../data/ui/preferences.ui.h:35 -msgid "Filename filters" -msgstr "Filtros de nome de arquivo" - -#: ../data/ui/preferences.ui.h:36 -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 "" -"Ao fazer comparações de diretórios, você pode usar um filtro para ignorar " -"arquivos e diretórios por nome. Cada padrão é um lista com caracteres " -"curingas (* ou ?) separados por espaços." - -#: ../data/ui/preferences.ui.h:37 ../meld/meldwindow.py:105 -msgid "File Filters" -msgstr "Filtros de arquivos" - -#: ../data/ui/preferences.ui.h:38 -msgid "Change trimming" -msgstr "Aparar alterações" - -#: ../data/ui/preferences.ui.h:39 -msgid "Trim blank line differences from the start and end of changes" -msgstr "Aparar diferenças de linhas vazias do início e fim de alterações" - -#: ../data/ui/preferences.ui.h:40 -msgid "Text filters" -msgstr "Filtros de texto" - -#: ../data/ui/preferences.ui.h:41 -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 "" -"Ao fazer comparações de arquivos, você pode ignorar certos tipos de " -"alterações. Cada padrão aqui é uma expressão regular em python que " -"substituirá o texto correspondente com uma expressão vazia após a realização " -"da comparação. Se a expressão contém grupos, somente os grupos são " -"substituídos. Veja o manual do usuário para maiores detalhes." - -#: ../data/ui/preferences.ui.h:42 -msgid "Text Filters" -msgstr "Filtros de texto" - -#: ../data/ui/preferences.ui.h:43 -msgid "Left is remote, right is local" -msgstr "Esquerda é remoto, direita é local" - -#: ../data/ui/preferences.ui.h:44 -msgid "Left is local, right is remote" -msgstr "Esquerda é local, direita é remoto" - -#: ../data/ui/preferences.ui.h:45 -msgid "Remote, merge, local" -msgstr "Remoto, mesclagem, local" - -#: ../data/ui/preferences.ui.h:46 -msgid "Local, merge, remote" -msgstr "Local, mesclagem, remoto" - -#: ../data/ui/preferences.ui.h:47 -msgid "1ns (ext4)" -msgstr "1ns (ext4)" - -#: ../data/ui/preferences.ui.h:48 -msgid "100ns (NTFS)" -msgstr "100ns (NTFS)" - -#: ../data/ui/preferences.ui.h:49 -msgid "1s (ext2/ext3)" -msgstr "1s (ext2/ext3)" - -#: ../data/ui/preferences.ui.h:50 -msgid "2s (VFAT)" -msgstr "2s (VFAT)" - -#: ../data/ui/shortcuts.ui.h:1 -msgctxt "shortcut window" -msgid "General" -msgstr "Geral" - -#: ../data/ui/shortcuts.ui.h:2 -msgctxt "shortcut window" -msgid "New comparison" -msgstr "Nova comparação" - -#: ../data/ui/shortcuts.ui.h:3 -msgctxt "shortcut window" -msgid "Close a comparison" -msgstr "Fechar uma comparação" - -#: ../data/ui/shortcuts.ui.h:4 -msgctxt "shortcut window" -msgid "Quit Meld" -msgstr "Sair do Meld" - -#: ../data/ui/shortcuts.ui.h:5 -msgctxt "shortcut window" -msgid "Stop the current action" -msgstr "Interromper a ação atual" - -#: ../data/ui/shortcuts.ui.h:6 -msgctxt "shortcut window" -msgid "Refresh comparison" -msgstr "Atualizar comparação" - -#: ../data/ui/shortcuts.ui.h:7 -msgctxt "shortcut window" -msgid "Fullscreen" -msgstr "Tela cheia" - -#: ../data/ui/shortcuts.ui.h:8 -msgctxt "shortcut window" -msgid "Tabs" -msgstr "Abas" - -#: ../data/ui/shortcuts.ui.h:9 -msgctxt "shortcut window" -msgid "Go to previous tab" -msgstr "Ir para a aba anterior" - -#: ../data/ui/shortcuts.ui.h:10 -msgctxt "shortcut window" -msgid "Go to next tab" -msgstr "Ir para a próxima aba" - -#: ../data/ui/shortcuts.ui.h:11 -msgctxt "shortcut window" -msgid "Switch to tab" -msgstr "Alternar para aba" - -#: ../data/ui/shortcuts.ui.h:12 -msgctxt "shortcut window" -msgid "Move tab left" -msgstr "Mover aba para a esquerda" - -#: ../data/ui/shortcuts.ui.h:13 -msgctxt "shortcut window" -msgid "Move tab right" -msgstr "Mover aba para a direita" - -#: ../data/ui/shortcuts.ui.h:14 -msgctxt "shortcut window" -msgid "Changes" -msgstr "Alterações" - -#: ../data/ui/shortcuts.ui.h:15 -msgctxt "shortcut window" -msgid "Go to previous change" -msgstr "Ir para a alteração anterior" - -#: ../data/ui/shortcuts.ui.h:16 -msgctxt "shortcut window" -msgid "Go to next change" -msgstr "Ir para a próxima alteração" - -#: ../data/ui/shortcuts.ui.h:17 -msgctxt "shortcut window" -msgid "Editing" -msgstr "Edição" - -#: ../data/ui/shortcuts.ui.h:18 -msgctxt "shortcut window" -msgid "Undo" -msgstr "Desfazer" - -#: ../data/ui/shortcuts.ui.h:19 -msgctxt "shortcut window" -msgid "Redo" -msgstr "Refazer" - -#: ../data/ui/shortcuts.ui.h:20 -msgctxt "shortcut window" -msgid "Cut" -msgstr "Recortar" - -#: ../data/ui/shortcuts.ui.h:21 -msgctxt "shortcut window" -msgid "Copy" -msgstr "Copiar" - -#: ../data/ui/shortcuts.ui.h:22 -msgctxt "shortcut window" -msgid "Paste" -msgstr "Colar" - -#: ../data/ui/shortcuts.ui.h:23 -msgctxt "shortcut window" -msgid "Find" -msgstr "Localizar" - -#: ../data/ui/shortcuts.ui.h:24 -msgctxt "shortcut window" -msgid "Find Next" -msgstr "Localizar próximo" - -#: ../data/ui/shortcuts.ui.h:25 -msgctxt "shortcut window" -msgid "Find Previous" -msgstr "Localizar anterior" - -#: ../data/ui/shortcuts.ui.h:26 -msgctxt "shortcut window" -msgid "Replace" -msgstr "Substituir" - -#: ../data/ui/shortcuts.ui.h:27 -msgctxt "shortcut window" -msgid "File comparison" -msgstr "Comparação de arquivos" - -#: ../data/ui/shortcuts.ui.h:28 -msgctxt "shortcut window" -msgid "Save current file" -msgstr "Salvar o arquivo atual" - -#: ../data/ui/shortcuts.ui.h:29 -msgctxt "shortcut window" -msgid "Save current file to new path" -msgstr "Salvar o arquivo atual em novo caminho" - -#: ../data/ui/shortcuts.ui.h:30 -msgctxt "shortcut window" -msgid "Save all files in comparison" -msgstr "Salvar todos os arquivos na comparação" - -#: ../data/ui/shortcuts.ui.h:31 -msgctxt "shortcut window" -msgid "Previous conflict" -msgstr "Conflito anterior" - -#: ../data/ui/shortcuts.ui.h:32 -msgctxt "shortcut window" -msgid "Next conflict" -msgstr "Próximo conflito" +msgstr "Mensagens de commit" -#: ../data/ui/shortcuts.ui.h:33 -msgctxt "shortcut window" -msgid "Push change to left" -msgstr "Levar a alteração atual para a esquerda" +#: ../meld/resources/ui/preferences.ui.h:32 +msgid "Show _right margin at:" +msgstr "Mostrar ma_rgem esquerda em:" -#: ../data/ui/shortcuts.ui.h:34 -msgctxt "shortcut window" -msgid "Push change to right" -msgstr "Levar a alteração atual para a direita" +#: ../meld/resources/ui/preferences.ui.h:33 +msgid "Automatically _break lines at right margin on commit" +msgstr "Que_brar linhas automaticamente na margem esquerda no commit" -#: ../data/ui/shortcuts.ui.h:35 -msgctxt "shortcut window" -msgid "Pull change from left" -msgstr "Trazer a alteração da esquerda" +#: ../meld/resources/ui/preferences.ui.h:34 +msgid "Version Control" +msgstr "Controle de versão" -#: ../data/ui/shortcuts.ui.h:36 -msgctxt "shortcut window" -msgid "Pull change from right" -msgstr "Trazer a alteração da direita" +#: ../meld/resources/ui/preferences.ui.h:35 +msgid "Filename filters" +msgstr "Filtros de nome de arquivo" -#: ../data/ui/shortcuts.ui.h:37 -msgctxt "shortcut window" -msgid "Copy change above left" -msgstr "Copiar a alteração acima para a esquerda" +#: ../meld/resources/ui/preferences.ui.h:36 +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 "" +"Ao fazer comparações de diretórios, você pode usar um filtro para ignorar " +"arquivos e diretórios por nome. Cada padrão é um lista com caracteres " +"curingas (* ou ?) separados por espaços." -#: ../data/ui/shortcuts.ui.h:38 -msgctxt "shortcut window" -msgid "Copy change below left" -msgstr "Copiar a alteração abaixo para a esquerda" +#: ../meld/resources/ui/preferences.ui.h:37 ../meld/meldwindow.py:114 +msgid "File Filters" +msgstr "Filtros de arquivos" -#: ../data/ui/shortcuts.ui.h:39 -msgctxt "shortcut window" -msgid "Copy change above right" -msgstr "Copiar a alteração acima para a direita" +#: ../meld/resources/ui/preferences.ui.h:38 +msgid "Change trimming" +msgstr "Aparar alterações" -#: ../data/ui/shortcuts.ui.h:40 -msgctxt "shortcut window" -msgid "Copy change below right" -msgstr "Copiar a alteração abaixo para a direita" +#: ../meld/resources/ui/preferences.ui.h:39 +msgid "Trim blank line differences from the start and end of changes" +msgstr "Aparar diferenças de linhas vazias do início e fim de alterações" -#: ../data/ui/shortcuts.ui.h:41 -msgctxt "shortcut window" -msgid "Delete change" -msgstr "Excluir a alteração" +#: ../meld/resources/ui/preferences.ui.h:40 +msgid "Text filters" +msgstr "Filtros de texto" -#: ../data/ui/shortcuts.ui.h:42 -msgctxt "shortcut window" -msgid "Previous comparison pane" -msgstr "Painel de comparação anterior" +#: ../meld/resources/ui/preferences.ui.h:41 +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 "" +"Ao fazer comparações de arquivos, você pode ignorar certos tipos de " +"alterações. Cada padrão aqui é uma expressão regular em python que " +"substituirá o texto correspondente com uma expressão vazia após a realização " +"da comparação. Se a expressão contém grupos, somente os grupos são " +"substituídos. Veja o manual do usuário para maiores detalhes." -#: ../data/ui/shortcuts.ui.h:43 -msgctxt "shortcut window" -msgid "Next comparison pane" -msgstr "Próximo painel de comparação" +#: ../meld/resources/ui/preferences.ui.h:42 +msgid "Text Filters" +msgstr "Filtros de texto" -#: ../data/ui/shortcuts.ui.h:44 -msgctxt "shortcut window" -msgid "Folder comparison" -msgstr "Comparação de pastas" +#: ../meld/resources/ui/preferences.ui.h:43 +msgid "Left is remote, right is local" +msgstr "Esquerda é remoto, direita é local" -#: ../data/ui/shortcuts.ui.h:45 -msgctxt "shortcut window" -msgid "Copy to left" -msgstr "Copiar para a esquerda" +#: ../meld/resources/ui/preferences.ui.h:44 +msgid "Left is local, right is remote" +msgstr "Esquerda é local, direita é remoto" -#: ../data/ui/shortcuts.ui.h:46 -msgctxt "shortcut window" -msgid "Copy to right" -msgstr "Copiar para a direita" +#: ../meld/resources/ui/preferences.ui.h:45 +msgid "Remote, merge, local" +msgstr "Remoto, mesclagem, local" -#: ../data/ui/shortcuts.ui.h:47 -msgctxt "shortcut window" -msgid "Version control comparison" -msgstr "Comparação de controle de versão" +#: ../meld/resources/ui/preferences.ui.h:46 +msgid "Local, merge, remote" +msgstr "Local, mesclagem, remoto" -#: ../data/ui/shortcuts.ui.h:48 -msgctxt "shortcut window" -msgid "Commit to version control" -msgstr "Submeter para um controle de versão" +#: ../meld/resources/ui/preferences.ui.h:47 +msgid "1ns (ext4)" +msgstr "1ns (ext4)" -#: ../data/ui/shortcuts.ui.h:49 -msgctxt "shortcut window" -msgid "Show/hide console output" -msgstr "Mostrar/ocultar saída de console" +#: ../meld/resources/ui/preferences.ui.h:48 +msgid "100ns (NTFS)" +msgstr "100ns (NTFS)" -#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:567 -#: ../meld/newdifftab.py:49 -msgid "New comparison" -msgstr "Nova comparação" +#: ../meld/resources/ui/preferences.ui.h:49 +msgid "1s (ext2/ext3)" +msgstr "1s (ext2/ext3)" -#: ../data/ui/tab-placeholder.ui.h:2 -msgid "File comparison" -msgstr "Comparação de arquivos" +#: ../meld/resources/ui/preferences.ui.h:50 +msgid "2s (VFAT)" +msgstr "2s (VFAT)" -#: ../data/ui/tab-placeholder.ui.h:3 -msgid "Directory comparison" -msgstr "Comparação de diretórios" +#: ../meld/resources/ui/push-dialog.ui.h:1 +msgid "Push local commits to remote?" +msgstr "Levar as alterações locais para remoto?" -#: ../data/ui/tab-placeholder.ui.h:4 -msgid "Version control view" -msgstr "Visão de controle de versão" +#: ../meld/resources/ui/push-dialog.ui.h:2 +msgid "The commits to be pushed are determined by your version control system." +msgstr "" +"Os commits para serem enviados são determinados pelo seu sistema de controle " +"de versão." -#: ../data/ui/tab-placeholder.ui.h:5 -msgid "_3-way comparison" -msgstr "Comparação em _3-vias" +#: ../meld/resources/ui/push-dialog.ui.h:3 +msgid "_Push commits" +msgstr "En_viar commits (push)" -#: ../data/ui/tab-placeholder.ui.h:6 -msgid "Select Third File" -msgstr "Selecione o terceiro arquivo" +#: ../meld/resources/ui/revert-dialog.ui.h:1 +msgid "Discard unsaved changes to documents?" +msgstr "Descartar alterações não salvas em documentos?" -#: ../data/ui/tab-placeholder.ui.h:7 -msgid "Select Second File" -msgstr "Selecione o segundo arquivo" +#: ../meld/resources/ui/revert-dialog.ui.h:2 +msgid "Changes made to the following documents will be permanently lost:" +msgstr "" +"As alterações feitas nos documentos a seguir serão perdidas permanentemente:" -#: ../data/ui/tab-placeholder.ui.h:8 -msgid "Select First File" -msgstr "Selecione o primeiro arquivo" +#: ../meld/resources/ui/revert-dialog.ui.h:3 +msgid "_Discard" +msgstr "_Descartar" -#: ../data/ui/tab-placeholder.ui.h:9 -msgid "Select First Folder" -msgstr "Selecione a primeira pasta" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:1 +msgid "Save changes to documents before closing?" +msgstr "Salvar mudanças em documentos antes de fechar?" -#: ../data/ui/tab-placeholder.ui.h:10 -msgid "Select Second Folder" -msgstr "Selecione a segunda pasta" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:2 +msgid "If you don’t save, changes will be permanently lost." +msgstr "Se você não salvar, as mudanças serão perdidas permanentemente." -#: ../data/ui/tab-placeholder.ui.h:11 -msgid "Select Third Folder" -msgstr "Selecione a terceira pasta" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:3 +msgid "Close _without Saving" +msgstr "_Fechar sem salvar" -#: ../data/ui/tab-placeholder.ui.h:12 -msgid "Select A Version-Controlled Folder" -msgstr "Selecione uma pasta com controle de versão" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:4 ../meld/dirdiff.py:1040 +#: ../meld/iohelpers.py:58 ../meld/iohelpers.py:112 +msgid "_Cancel" +msgstr "_Cancelar" -#: ../data/ui/tab-placeholder.ui.h:13 -msgid "_Blank comparison" -msgstr "_Limpar comparação" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:5 +msgid "_Save" +msgstr "_Salvar" -#: ../data/ui/tab-placeholder.ui.h:14 -msgid "C_ompare" -msgstr "_Comparar" +#: ../meld/resources/ui/statusbar-menu.ui.h:2 +#| msgid "Show w_hitespace" +msgid "Show whitespace" +msgstr "Mostrar espaço em branco" + +#: ../meld/resources/ui/statusbar-menu.ui.h:4 +#| msgid "Enable text _wrapping" +msgid "Text wrapping" +msgstr "Habilitar quebra de texto" -#: ../data/ui/vcview.ui.h:3 +#: ../meld/resources/ui/vcview.ui.h:3 msgid "Co_mmit…" msgstr "Sub_meter…" -#: ../data/ui/vcview.ui.h:4 +#: ../meld/resources/ui/vcview.ui.h:4 msgid "Commit changes to version control" msgstr "Submete alterações para um controle de versão" -#: ../data/ui/vcview.ui.h:5 +#: ../meld/resources/ui/vcview.ui.h:5 msgid "_Update" msgstr "At_ualizar" -#: ../data/ui/vcview.ui.h:6 +#: ../meld/resources/ui/vcview.ui.h:6 msgid "Update working copy from version control" msgstr "Atualiza a cópia de trabalho do controle de versão" -#: ../data/ui/vcview.ui.h:7 +#: ../meld/resources/ui/vcview.ui.h:7 msgid "_Push" msgstr "_Enviar" -#: ../data/ui/vcview.ui.h:8 +#: ../meld/resources/ui/vcview.ui.h:8 msgid "Push local changes to remote" msgstr "Envia as alterações locais para remoto" -#: ../data/ui/vcview.ui.h:10 +#: ../meld/resources/ui/vcview.ui.h:10 msgid "Add to version control" msgstr "Adiciona a um controle de versão" -#: ../data/ui/vcview.ui.h:12 +#: ../meld/resources/ui/vcview.ui.h:12 msgid "Remove from version control" msgstr "Remover de um controle de versão" -#: ../data/ui/vcview.ui.h:13 +#: ../meld/resources/ui/vcview.ui.h:13 msgid "Mar_k as Resolved" msgstr "Ma_rcar como resolvido" -#: ../data/ui/vcview.ui.h:14 +#: ../meld/resources/ui/vcview.ui.h:14 msgid "Mark as resolved in version control" msgstr "Marca como resolvido no controle de versão" -#: ../data/ui/vcview.ui.h:15 +#: ../meld/resources/ui/vcview.ui.h:15 msgid "Re_vert" msgstr "Re_verter" -#: ../data/ui/vcview.ui.h:16 +#: ../meld/resources/ui/vcview.ui.h:16 msgid "Revert working copy to original state" msgstr "Reverte uma cópia de trabalho para o estado original" -#: ../data/ui/vcview.ui.h:17 +#: ../meld/resources/ui/vcview.ui.h:17 msgid "Delete from working copy" msgstr "Exclui da cópia de trabalho" -#: ../data/ui/vcview.ui.h:18 +#: ../meld/resources/ui/vcview.ui.h:18 msgid "Console" msgstr "Console" -#: ../data/ui/vcview.ui.h:19 +#: ../meld/resources/ui/vcview.ui.h:19 msgid "Show or hide the version control console output pane" msgstr "Mostra e oculta o painel de saída de console de controle de versão" -#: ../data/ui/vcview.ui.h:20 +#: ../meld/resources/ui/vcview.ui.h:20 msgid "_Flatten" msgstr "Ac_hatar" -#: ../data/ui/vcview.ui.h:21 +#: ../meld/resources/ui/vcview.ui.h:21 msgid "Flatten directories" msgstr "Achata diretórios" -#: ../data/ui/vcview.ui.h:22 +#: ../meld/resources/ui/vcview.ui.h:22 msgid "_Modified" msgstr "_Modificado" -#: ../data/ui/vcview.ui.h:23 +#: ../meld/resources/ui/vcview.ui.h:23 msgid "Show modified files" msgstr "Mostra arquivos modificados" -#: ../data/ui/vcview.ui.h:24 +#: ../meld/resources/ui/vcview.ui.h:24 msgid "_Normal" msgstr "_Normal" -#: ../data/ui/vcview.ui.h:25 +#: ../meld/resources/ui/vcview.ui.h:25 msgid "Show normal files" msgstr "Mostra os arquivos normais" -#: ../data/ui/vcview.ui.h:26 +#: ../meld/resources/ui/vcview.ui.h:26 msgid "Un_versioned" msgstr "Sem controle de _versão" -#: ../data/ui/vcview.ui.h:27 +#: ../meld/resources/ui/vcview.ui.h:27 msgid "Show unversioned files" msgstr "Mostra os arquivos sem controle de versão" -#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69 +#: ../meld/resources/ui/vcview.ui.h:28 ../meld/vc/_vc.py:70 msgid "Ignored" msgstr "Ignorado" -#: ../data/ui/vcview.ui.h:29 +#: ../meld/resources/ui/vcview.ui.h:29 msgid "Show ignored files" msgstr "Mostra os arquivos ignorados" -#: ../data/ui/vcview.ui.h:30 -msgid "Commit" -msgstr "Submete" - -#: ../data/ui/vcview.ui.h:31 -msgid "Commit Files" -msgstr "Fazer commit de arquivos" - -#: ../data/ui/vcview.ui.h:32 -msgid "Log Message" -msgstr "Mensagens de log" - -#: ../data/ui/vcview.ui.h:33 -msgid "Previous logs:" -msgstr "Logs anteriores:" - -#: ../data/ui/vcview.ui.h:34 -msgid "Co_mmit" -msgstr "Sub_meter" - -#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:331 +#: ../meld/resources/ui/vcview.ui.h:31 ../meld/vcview.py:366 msgid "Location" msgstr "Localização" -#: ../data/ui/vcview.ui.h:37 +#: ../meld/resources/ui/vcview.ui.h:32 msgid "Status" msgstr "Status" -#: ../data/ui/vcview.ui.h:38 +#: ../meld/resources/ui/vcview.ui.h:33 msgid "Extra" msgstr "Extra" -#: ../data/ui/vcview.ui.h:39 +#: ../meld/resources/ui/vcview.ui.h:34 msgid "Console output" msgstr "Saída de console" -#: ../data/ui/vcview.ui.h:40 -msgid "Push local commits to remote?" -msgstr "Levar as alterações locais para remoto?" - -#: ../data/ui/vcview.ui.h:41 -msgid "The commits to be pushed are determined by your version control system." -msgstr "" -"Os commits para serem enviados são determinados pelo seu sistema de controle " -"de versão." - -#: ../data/ui/vcview.ui.h:42 -msgid "_Push commits" -msgstr "En_viar commits (push)" - #: ../meld/const.py:12 msgid "UNIX (LF)" msgstr "UNIX (LF)" @@ -1689,44 +1701,44 @@ msgid "Mac OS (CR)" msgstr "Mac OS (CR)" #. Create file size CellRenderer -#: ../meld/dirdiff.py:437 ../meld/preferences.py:81 +#: ../meld/dirdiff.py:476 ../meld/preferences.py:138 msgid "Size" msgstr "Tamanho" #. Create date-time CellRenderer -#: ../meld/dirdiff.py:445 ../meld/preferences.py:82 +#: ../meld/dirdiff.py:484 ../meld/preferences.py:139 msgid "Modification time" msgstr "Hora da modificação" #. Create permissions CellRenderer -#: ../meld/dirdiff.py:453 ../meld/preferences.py:83 +#: ../meld/dirdiff.py:492 ../meld/preferences.py:140 msgid "Permissions" msgstr "Permissões" -#: ../meld/dirdiff.py:588 +#: ../meld/dirdiff.py:626 #, python-format msgid "Hide %s" msgstr "Ocultar %s" -#: ../meld/dirdiff.py:729 ../meld/dirdiff.py:752 +#: ../meld/dirdiff.py:768 ../meld/dirdiff.py:791 #, python-format msgid "[%s] Scanning %s" msgstr "[%s] Varrendo %s" -#: ../meld/dirdiff.py:887 +#: ../meld/dirdiff.py:926 #, python-format msgid "[%s] Done" msgstr "[%s] Concluído" -#: ../meld/dirdiff.py:895 +#: ../meld/dirdiff.py:934 msgid "Folders have no differences" msgstr "As pastas têm nenhuma diferença" -#: ../meld/dirdiff.py:897 +#: ../meld/dirdiff.py:936 msgid "Contents of scanned files in folders are identical." msgstr "Conteúdos de arquivos verificados em pastas são idênticos." -#: ../meld/dirdiff.py:899 +#: ../meld/dirdiff.py:938 msgid "" "Scanned files in folders appear identical, but contents have not been " "scanned." @@ -1734,44 +1746,44 @@ msgstr "" "Arquivos verificados em pastas parecem ser idênticos, mas conteúdos não " "foram verificados." -#: ../meld/dirdiff.py:902 +#: ../meld/dirdiff.py:941 msgid "File filters are in use, so not all files have been scanned." msgstr "" "Filtros de arquivo estão em uso, portanto nem todos os arquivos foram " "verificados." -#: ../meld/dirdiff.py:904 +#: ../meld/dirdiff.py:943 msgid "Text filters are in use and may be masking content differences." msgstr "" "Filtros de texto estão sendo usados e podem estar escondendo diferenças no " "conteúdo." -#: ../meld/dirdiff.py:922 ../meld/filediff.py:1491 ../meld/filediff.py:1521 -#: ../meld/filediff.py:1523 ../meld/ui/msgarea.py:106 ../meld/ui/msgarea.py:119 +#: ../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 msgid "Hi_de" msgstr "Ocu_ltar" -#: ../meld/dirdiff.py:931 +#: ../meld/dirdiff.py:970 msgid "Multiple errors occurred while scanning this folder" msgstr "Ocorreram vários erros ao varrer este diretório" -#: ../meld/dirdiff.py:932 +#: ../meld/dirdiff.py:971 msgid "Files with invalid encodings found" msgstr "Arquivos com codificações inválidas encontrados" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:934 +#: ../meld/dirdiff.py:973 msgid "Some files were in an incorrect encoding. The names are something like:" msgstr "" "Alguns arquivos estavam com uma codificação incorreta. Os nomes são algo " "como:" -#: ../meld/dirdiff.py:936 +#: ../meld/dirdiff.py:975 msgid "Files hidden by case insensitive comparison" msgstr "Arquivos ocultos pela comparação não sensível a maiusculização" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:938 +#: ../meld/dirdiff.py:977 msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. The following files in this folder are hidden:" @@ -1780,17 +1792,17 @@ msgstr "" "minúsculas em um sistema de arquivos que diferencia. Os seguintes arquivos " "neste diretório ficam ocultos:" -#: ../meld/dirdiff.py:949 +#: ../meld/dirdiff.py:988 #, python-format msgid "“%s” hidden by “%s”" msgstr "“%s” ocultado por “%s”" -#: ../meld/dirdiff.py:1005 +#: ../meld/dirdiff.py:1044 #, python-format msgid "Replace folder “%s”?" msgstr "Substituir pasta “%s”?" -#: ../meld/dirdiff.py:1007 +#: ../meld/dirdiff.py:1046 #, python-format msgid "" "Another folder with the same name already exists in “%s”.\n" @@ -1799,11 +1811,11 @@ msgstr "" "Uma outra pasta com o mesmo nome já existe em “%s”.\n" "Se você substituir a pasta existente, todos os arquivos nela serão perdidos." -#: ../meld/dirdiff.py:1020 +#: ../meld/dirdiff.py:1059 msgid "Error copying file" msgstr "Erro ao copiar arquivo" -#: ../meld/dirdiff.py:1021 +#: ../meld/dirdiff.py:1060 #, python-format msgid "" "Couldn’t copy %s\n" @@ -1816,19 +1828,19 @@ msgstr "" "\n" "%s" -#: ../meld/dirdiff.py:1046 ../meld/vcview.py:703 +#: ../meld/dirdiff.py:1085 ../meld/vcview.py:720 msgid "Error deleting {}" msgstr "Erro ao excluir {}" -#: ../meld/dirdiff.py:1577 +#: ../meld/dirdiff.py:1597 msgid "No folder" msgstr "Nenhum pasta" -#: ../meld/filediff.py:834 +#: ../meld/filediff.py:920 msgid "Comparison results will be inaccurate" msgstr "Resultados da comparação será imprecisa" -#: ../meld/filediff.py:836 +#: ../meld/filediff.py:922 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1836,66 +1848,66 @@ 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:893 +#: ../meld/filediff.py:994 msgid "Mark conflict as resolved?" msgstr "Marcar como resolvido?" -#: ../meld/filediff.py:895 +#: ../meld/filediff.py:996 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:897 +#: ../meld/filediff.py:998 msgid "Cancel" msgstr "Cancelar" -#: ../meld/filediff.py:898 +#: ../meld/filediff.py:999 msgid "Mark _Resolved" msgstr "Marcar como _resolvido" -#: ../meld/filediff.py:1206 +#: ../meld/filediff.py:1318 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Ocorreu um problema ao abrir o arquivo “%s”." -#: ../meld/filediff.py:1214 +#: ../meld/filediff.py:1326 #, python-format msgid "File %s appears to be a binary file." msgstr "O arquivo %s parece ser um arquivo binário." -#: ../meld/filediff.py:1216 +#: ../meld/filediff.py:1328 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:1218 +#: ../meld/filediff.py:1330 msgid "Open" msgstr "Abrir" -#: ../meld/filediff.py:1234 +#: ../meld/filediff.py:1346 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Analisando diferenças" -#: ../meld/filediff.py:1295 +#: ../meld/filediff.py:1407 #, python-format msgid "File %s has changed on disk" msgstr "O arquivo %s foi alterado em disco" -#: ../meld/filediff.py:1296 +#: ../meld/filediff.py:1408 msgid "Do you want to reload the file?" msgstr "Deseja recarregar o arquivo?" -#: ../meld/filediff.py:1298 +#: ../meld/filediff.py:1410 msgid "_Reload" msgstr "_Recarregar" -#: ../meld/filediff.py:1454 +#: ../meld/filediff.py:1566 msgid "Files are identical" msgstr "Os arquivos são idênticos" -#: ../meld/filediff.py:1467 +#: ../meld/filediff.py:1579 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1903,11 +1915,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:1472 +#: ../meld/filediff.py:1584 msgid "Files differ in line endings only" msgstr "Arquivos se diferenciam nos fins de linha apenas" -#: ../meld/filediff.py:1474 +#: ../meld/filediff.py:1586 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1916,15 +1928,15 @@ msgstr "" "Arquivos são idênticos, exceto pela diferença entre fins de linha:\n" "%s" -#: ../meld/filediff.py:1494 +#: ../meld/filediff.py:1606 msgid "Show without filters" msgstr "Mostrar sem filtros" -#: ../meld/filediff.py:1516 +#: ../meld/filediff.py:1628 msgid "Change highlighting incomplete" msgstr "Alteração de destaque incompleta" -#: ../meld/filediff.py:1517 +#: ../meld/filediff.py:1629 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." @@ -1933,19 +1945,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:1525 +#: ../meld/filediff.py:1637 msgid "Keep highlighting" msgstr "Manter destaque" -#: ../meld/filediff.py:1527 +#: ../meld/filediff.py:1639 msgid "_Keep highlighting" msgstr "_Manter destaque" -#: ../meld/filediff.py:1540 +#: ../meld/filediff.py:1652 msgid "Saving failed" msgstr "Salvamento falhou" -#: ../meld/filediff.py:1541 +#: ../meld/filediff.py:1653 msgid "" "Please consider copying any critical changes to another program or file to " "avoid data loss." @@ -1953,39 +1965,36 @@ msgstr "" "Por favor, considere copiar quaisquer alterações críticas para outro " "programa ou arquivo para evita perda de dados." -#: ../meld/filediff.py:1550 +#: ../meld/filediff.py:1662 msgid "Save Left Pane As" msgstr "Salvar o painel esquerdo como" -#: ../meld/filediff.py:1552 +#: ../meld/filediff.py:1664 msgid "Save Middle Pane As" msgstr "Salvar o painel do meio como" -#: ../meld/filediff.py:1554 +#: ../meld/filediff.py:1666 msgid "Save Right Pane As" msgstr "Salvar o painel direito como" -#: ../meld/filediff.py:1567 +#: ../meld/filediff.py:1679 #, 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:1569 +#: ../meld/filediff.py:1681 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:1572 +#: ../meld/filediff.py:1684 msgid "Save Anyway" msgstr "Salvar mesmo assim" -#: ../meld/filediff.py:1573 +#: ../meld/filediff.py:1685 msgid "Don’t Save" msgstr "Não salvar" -#: ../meld/filediff.py:1615 -#| 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:1727 msgid "" "File “{}” contains characters that can’t be encoded using its current " "encoding “{}”." @@ -1993,7 +2002,7 @@ msgstr "" "O arquivo “{}” contém caracteres que não pode ser codificado usando " "codificação “{}”." -#: ../meld/filediff.py:1619 ../meld/patchdialog.py:131 +#: ../meld/filediff.py:1731 ../meld/patchdialog.py:144 #, python-format msgid "" "Couldn’t save file due to:\n" @@ -2002,16 +2011,16 @@ msgstr "" "Não foi possível salvar o arquivo pois:\n" "%s" -#: ../meld/filediff.py:1623 ../meld/patchdialog.py:130 +#: ../meld/filediff.py:1735 ../meld/patchdialog.py:143 #, python-format msgid "Could not save file %s." msgstr "Não foi possível salvar o arquivo %s." -#: ../meld/filediff.py:1998 +#: ../meld/filediff.py:2128 msgid "Live comparison updating disabled" msgstr "Atualização em tempo real de comparação desabilitada" -#: ../meld/filediff.py:1999 +#: ../meld/filediff.py:2129 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -2027,41 +2036,41 @@ msgstr "" msgid "[%s] Merging files" msgstr "[%s] Mesclando arquivos" -#: ../meld/gutterrendererchunk.py:216 +#: ../meld/gutterrendererchunk.py:220 msgid "Copy _up" msgstr "Copiar para ci_ma" -#: ../meld/gutterrendererchunk.py:217 +#: ../meld/gutterrendererchunk.py:221 msgid "Copy _down" msgstr "Copiar para bai_xo" -#: ../meld/iohelpers.py:35 +#: ../meld/iohelpers.py:43 msgid "Deleting remote folders is not supported" msgstr "Não há suporte à exclusão de pastas remotas" -#: ../meld/iohelpers.py:37 +#: ../meld/iohelpers.py:45 msgid "Not a file or directory" msgstr "Não é um arquivo ou diretório" -#: ../meld/iohelpers.py:41 +#: ../meld/iohelpers.py:49 msgid "“{}” can’t be put in the trash. Do you want to delete it immediately?" msgstr "" "“{}” não pode ser colocado na lixeira. Você deseja excluí-lo imediatamente?" -#: ../meld/iohelpers.py:46 +#: ../meld/iohelpers.py:54 msgid "This remote location does not support sending items to the trash." msgstr "Este local remoto não possui suporte ao envio de itens para a lixeira." -#: ../meld/iohelpers.py:51 +#: ../meld/iohelpers.py:59 msgid "_Delete Permanently" msgstr "_Excluir permanentemente" -#: ../meld/iohelpers.py:94 +#: ../meld/iohelpers.py:106 #, python-format msgid "Replace file “%s”?" msgstr "Substituir arquivo “%s”?" -#: ../meld/iohelpers.py:96 +#: ../meld/iohelpers.py:108 #, python-format msgid "" "A file with this name already exists in “%s”.\n" @@ -2070,314 +2079,278 @@ msgstr "" "Um arquivo com esse nome já existe em “%s”.\n" "Se você substituir o arquivo existente, seu conteúdo será perdido." -#: ../meld/meldapp.py:181 +#: ../meld/meldapp.py:169 msgid "wrong number of arguments supplied to --diff" msgstr "número incorreto de argumentos fornecidos para --diff" -#: ../meld/meldapp.py:186 +#: ../meld/meldapp.py:174 msgid "Start with an empty window" msgstr "Iniciar com a janela vazia" -#: ../meld/meldapp.py:187 ../meld/meldapp.py:189 +#: ../meld/meldapp.py:175 ../meld/meldapp.py:177 msgid "file" msgstr "arquivo" -#: ../meld/meldapp.py:187 ../meld/meldapp.py:191 +#: ../meld/meldapp.py:175 ../meld/meldapp.py:179 msgid "folder" msgstr "pasta" -#: ../meld/meldapp.py:188 +#: ../meld/meldapp.py:176 msgid "Start a version control comparison" msgstr "Inicia uma comparação de controle de versão" -#: ../meld/meldapp.py:190 +#: ../meld/meldapp.py:178 msgid "Start a 2- or 3-way file comparison" msgstr "Inicia uma comparação de arquivo em 2 ou 3 vias" -#: ../meld/meldapp.py:192 +#: ../meld/meldapp.py:180 msgid "Start a 2- or 3-way folder comparison" msgstr "Inicia uma comparação de pasta em 2 ou 3 vias" -#: ../meld/meldapp.py:235 +#: ../meld/meldapp.py:223 #, python-format msgid "Error: %s\n" msgstr "Erro: %s\n" -#: ../meld/meldapp.py:242 +#: ../meld/meldapp.py:230 msgid "Meld is a file and directory comparison tool." msgstr "O Meld é uma ferramenta de comparação de arquivos e diretórios." -#: ../meld/meldapp.py:246 +#: ../meld/meldapp.py:234 msgid "Set label to use instead of file name" msgstr "Definir rótulo para usar no lugar do nome do arquivo" -#: ../meld/meldapp.py:249 +#: ../meld/meldapp.py:237 msgid "Open a new tab in an already running instance" msgstr "Abrir em uma nova aba de uma instância existente" -#: ../meld/meldapp.py:252 +#: ../meld/meldapp.py:240 msgid "Automatically compare all differing files on startup" msgstr "Compara automaticamente todos os arquivos diferentes na inicialização" -#: ../meld/meldapp.py:255 +#: ../meld/meldapp.py:243 msgid "Ignored for compatibility" msgstr "Ignorado por questão de compatibilidade" -#: ../meld/meldapp.py:259 +#: ../meld/meldapp.py:247 msgid "Set the target file for saving a merge result" msgstr "Define o arquivo destino para salvar um resultado de mesclagem" -#: ../meld/meldapp.py:262 +#: ../meld/meldapp.py:250 msgid "Automatically merge files" msgstr "Mescla arquivos automaticamente" -#: ../meld/meldapp.py:266 +#: ../meld/meldapp.py:254 msgid "Load a saved comparison from a Meld comparison file" msgstr "Carrega uma comparação salva de um arquivo de comparação" -#: ../meld/meldapp.py:270 +#: ../meld/meldapp.py:258 msgid "Create a diff tab for the supplied files or folders" msgstr "Cria uma aba de diff para os arquivos e pastas fornecidos" -#: ../meld/meldapp.py:290 +#: ../meld/meldapp.py:278 #, python-format msgid "too many arguments (wanted 0-3, got %d)" msgstr "muitos argumentos (esperava 0-3, obteve %d)" -#: ../meld/meldapp.py:293 +#: ../meld/meldapp.py:281 msgid "can’t auto-merge less than 3 files" msgstr "não é possível mesclar automaticamente menos que 3 arquivos" -#: ../meld/meldapp.py:295 +#: ../meld/meldapp.py:283 msgid "can’t auto-merge directories" msgstr "não é possível mesclar diretórios automaticamente" -#: ../meld/meldapp.py:309 +#: ../meld/meldapp.py:297 msgid "Error reading saved comparison file" msgstr "Erro ao ler arquivo de comparação salvo" -#: ../meld/meldapp.py:326 +#: ../meld/meldapp.py:314 #, python-format msgid "invalid path or URI “%s”" msgstr "caminho inválido ou URI “%s”" -#: ../meld/meldapp.py:332 +#: ../meld/meldapp.py:320 msgid "remote folder “{}” not supported" msgstr "sem suporte à pasta remota “{}”" #. TRANSLATORS: This is the label of a new, currently-unnamed file. -#: ../meld/meldbuffer.py:124 +#: ../meld/meldbuffer.py:123 msgid "" msgstr "" -#: ../meld/melddoc.py:68 +#: ../meld/melddoc.py:63 msgid "untitled" msgstr "sem título" -#: ../meld/meldwindow.py:47 +#: ../meld/meldwindow.py:56 msgid "_File" msgstr "_Arquivo" -#: ../meld/meldwindow.py:48 +#: ../meld/meldwindow.py:57 msgid "_New Comparison…" msgstr "_Nova comparação…" -#: ../meld/meldwindow.py:49 +#: ../meld/meldwindow.py:58 msgid "Start a new comparison" msgstr "Inicia uma nova comparação" -#: ../meld/meldwindow.py:52 +#: ../meld/meldwindow.py:61 msgid "Save the current file" msgstr "Salva o arquivo atual" -#: ../meld/meldwindow.py:54 +#: ../meld/meldwindow.py:63 msgid "Save As…" msgstr "Salvar como…" -#: ../meld/meldwindow.py:55 +#: ../meld/meldwindow.py:64 msgid "Save the current file with a different name" msgstr "Salva o arquivo atual com um nome diferente" -#: ../meld/meldwindow.py:58 +#: ../meld/meldwindow.py:67 msgid "Close the current file" msgstr "Fecha o arquivo atual" -#: ../meld/meldwindow.py:61 +#: ../meld/meldwindow.py:70 msgid "_Edit" msgstr "_Editar" -#: ../meld/meldwindow.py:63 +#: ../meld/meldwindow.py:72 msgid "Undo the last action" msgstr "Desfaz a última ação" -#: ../meld/meldwindow.py:66 +#: ../meld/meldwindow.py:75 msgid "Redo the last undone action" msgstr "Refaz a última ação desfeita" -#: ../meld/meldwindow.py:68 +#: ../meld/meldwindow.py:77 msgid "Cut the selection" msgstr "Recortar a seleção" -#: ../meld/meldwindow.py:70 +#: ../meld/meldwindow.py:79 msgid "Copy the selection" msgstr "Copiar a seleção" -#: ../meld/meldwindow.py:72 +#: ../meld/meldwindow.py:81 msgid "Paste the clipboard" msgstr "Cola da área de transferência" -#: ../meld/meldwindow.py:74 +#: ../meld/meldwindow.py:83 msgid "Find…" msgstr "Localizar…" -#: ../meld/meldwindow.py:74 +#: ../meld/meldwindow.py:83 msgid "Search for text" msgstr "Pesquisa por texto" -#: ../meld/meldwindow.py:76 +#: ../meld/meldwindow.py:85 msgid "Find Ne_xt" msgstr "Localizar pró_ximo" -#: ../meld/meldwindow.py:77 +#: ../meld/meldwindow.py:86 msgid "Search forwards for the same text" msgstr "Pesquisa pelo mesmo texto em frente" -#: ../meld/meldwindow.py:79 +#: ../meld/meldwindow.py:88 msgid "Find _Previous" msgstr "Localizar _anterior" -#: ../meld/meldwindow.py:80 +#: ../meld/meldwindow.py:89 msgid "Search backwards for the same text" msgstr "Pesquisa o mesmo texto para trás" -#: ../meld/meldwindow.py:83 +#: ../meld/meldwindow.py:92 msgid "_Replace…" msgstr "_Substituir…" -#: ../meld/meldwindow.py:84 +#: ../meld/meldwindow.py:93 msgid "Find and replace text" msgstr "Localiza e substitui texto" -#: ../meld/meldwindow.py:86 +#: ../meld/meldwindow.py:95 msgid "Go to _Line" msgstr "Ir para a _linha" -#: ../meld/meldwindow.py:87 +#: ../meld/meldwindow.py:96 msgid "Go to a specific line" msgstr "Vai para uma linha específica" -#: ../meld/meldwindow.py:90 +#: ../meld/meldwindow.py:99 msgid "_Changes" msgstr "_Alterações" -#: ../meld/meldwindow.py:91 +#: ../meld/meldwindow.py:100 msgid "Next Change" msgstr "Próxima alteração" -#: ../meld/meldwindow.py:92 +#: ../meld/meldwindow.py:101 msgid "Go to the next change" msgstr "Vai à próxima alteração" -#: ../meld/meldwindow.py:94 +#: ../meld/meldwindow.py:103 msgid "Previous Change" msgstr "Alteração anterior" -#: ../meld/meldwindow.py:95 +#: ../meld/meldwindow.py:104 msgid "Go to the previous change" msgstr "Vai à alteração anterior" -#: ../meld/meldwindow.py:97 +#: ../meld/meldwindow.py:106 msgid "Open Externally" msgstr "Abrir externamente" -#: ../meld/meldwindow.py:98 +#: ../meld/meldwindow.py:107 msgid "Open selected file or directory in the default external application" msgstr "" "Abre o arquivo ou diretório selecionado com o aplicativo externo padrão" -#: ../meld/meldwindow.py:102 +#: ../meld/meldwindow.py:111 msgid "_View" msgstr "E_xibir" -#: ../meld/meldwindow.py:103 +#: ../meld/meldwindow.py:112 msgid "File Status" msgstr "Status do arquivo" -#: ../meld/meldwindow.py:104 +#: ../meld/meldwindow.py:113 msgid "Version Status" msgstr "Status da versão" -#: ../meld/meldwindow.py:107 +#: ../meld/meldwindow.py:116 msgid "Stop the current action" msgstr "Interrompe a ação atual" -#: ../meld/meldwindow.py:110 +#: ../meld/meldwindow.py:119 msgid "Refresh the view" msgstr "Atualiza a visão" -#: ../meld/meldwindow.py:114 +#: ../meld/meldwindow.py:123 msgid "Fullscreen" msgstr "Tela cheia" -#: ../meld/meldwindow.py:115 +#: ../meld/meldwindow.py:124 msgid "View the comparison in fullscreen" msgstr "Visualiza a comparação em tela cheia" -#: ../meld/meldwindow.py:117 -msgid "_Toolbar" -msgstr "Barra de _ferramentas" - -#: ../meld/meldwindow.py:118 -msgid "Show or hide the toolbar" -msgstr "Mostra ou oculta a barra de ferramentas" - -#: ../meld/meldwindow.py:127 +#: ../meld/meldwindow.py:133 msgid "Open Recent" msgstr "Abrir recente" -#: ../meld/meldwindow.py:128 +#: ../meld/meldwindow.py:134 msgid "Open recent files" msgstr "Abre arquivos recentes" -#: ../meld/meldwindow.py:150 -msgid "_Meld" -msgstr "_Meld" - -#: ../meld/meldwindow.py:151 -msgid "Quit the program" -msgstr "Sai do programa" - -#: ../meld/meldwindow.py:153 -msgid "Prefere_nces" -msgstr "Preferê_ncias" - -#: ../meld/meldwindow.py:154 -msgid "Configure the application" -msgstr "Configura o aplicativo" - -#: ../meld/meldwindow.py:156 -msgid "_Contents" -msgstr "S_umário" - -#: ../meld/meldwindow.py:157 -msgid "Open the Meld manual" -msgstr "Abre o manual do Meld" - -#: ../meld/meldwindow.py:159 -msgid "About this application" -msgstr "Sobre esse aplicativo" - -#: ../meld/meldwindow.py:602 +#: ../meld/meldwindow.py:567 #, python-format msgid "Need three files to auto-merge, got: %r" msgstr "" "É necessário ter três arquivos para mesclar automaticamente, obtive: %r" -#: ../meld/meldwindow.py:623 +#: ../meld/meldwindow.py:588 msgid "Cannot compare a mixture of files and directories" msgstr "Não foi possível comparar uma mistura de arquivos e diretórios" -#: ../meld/misc.py:135 +#: ../meld/misc.py:155 msgid "" "{}\n" "\n" @@ -2389,53 +2362,49 @@ msgstr "" "Meld encontrou um erro crítico na execução:\n" "{}" -#: ../meld/misc.py:254 +#: ../meld/misc.py:237 #, python-format msgid "Couldn’t find colour scheme details for %s-%s; this is a bad install" msgstr "" "Não foi possível localizar detalhes de esquema de cores para %s-%s; esta é " "uma instalação ruim" -#: ../meld/misc.py:325 +#: ../meld/misc.py:311 msgid "[None]" msgstr "[Nenhum]" -#: ../meld/preferences.py:33 +#: ../meld/preferences.py:42 ../meld/preferences.py:135 msgid "label" msgstr "rótulo" -#: ../meld/preferences.py:33 +#: ../meld/preferences.py:42 ../meld/preferences.py:135 msgid "pattern" msgstr "padrão" -#: ../meld/recent.py:105 +#: ../meld/recent.py:106 msgid "Version control:" msgstr "Controle de versão:" -#: ../meld/ui/bufferselectors.py:32 +#: ../meld/ui/bufferselectors.py:114 #, python-brace-format msgid "{name} ({charset})" msgstr "{name} ({charset})" -#: ../meld/ui/bufferselectors.py:65 ../meld/ui/bufferselectors.py:73 +#: ../meld/ui/bufferselectors.py:144 ../meld/ui/bufferselectors.py:152 msgid "Plain Text" msgstr "Texto simples" -#: ../meld/ui/notebooklabel.py:63 -msgid "Close tab" -msgstr "Fechar aba" - #. 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 "Lin %i, Col %i" -#: ../meld/ui/statusbar.py:177 +#: ../meld/ui/statusbar.py:182 msgid "Line you want to move the cursor to" msgstr "Linha para onde você deseja mover o cursor" -#: ../meld/ui/vcdialogs.py:48 +#: ../meld/ui/vcdialogs.py:55 msgid "No files will be committed" msgstr "Nenhuma arquivo para submeter (commit)" @@ -2486,141 +2455,141 @@ 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:70 +#: ../meld/vc/_vc.py:71 msgid "Unversioned" msgstr "Sem controle de versão" -#: ../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" #. Translators: This error message is shown when a version #. control binary isn't installed. -#: ../meld/vcview.py:248 +#: ../meld/vcview.py:282 #, python-format msgid "%(name)s (%(cmd)s not installed)" msgstr "%(name)s (%(cmd)s não instalado)" #. Translators: This error message is shown when a version #. controlled repository is invalid. -#: ../meld/vcview.py:252 +#: ../meld/vcview.py:286 #, python-format msgid "%(name)s (Invalid repository)" msgstr "%(name)s (Repositório inválido)" -#: ../meld/vcview.py:273 +#: ../meld/vcview.py:307 msgid "No valid version control system found in this folder" msgstr "Nenhum sistema de controle de versão válido localizado nesta pasta" -#: ../meld/vcview.py:275 +#: ../meld/vcview.py:309 msgid "Only one version control system found in this folder" msgstr "Apenas um sistema de controle de versão foi localizado nesta pasta" -#: ../meld/vcview.py:277 +#: ../meld/vcview.py:311 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:331 +#: ../meld/vcview.py:366 #, python-format msgid "%s: %s" msgstr "%s: %s" #. Initial yield so when we add this to our tasks, we don't #. create iterators that may be invalidated. -#: ../meld/vcview.py:338 +#: ../meld/vcview.py:373 msgid "Scanning repository" msgstr "Varrendo repositório" -#: ../meld/vcview.py:367 +#: ../meld/vcview.py:402 #, python-format msgid "Scanning %s" msgstr "Varrendo %s" -#: ../meld/vcview.py:406 +#: ../meld/vcview.py:441 msgid "(Empty)" msgstr "(Vazio)" -#: ../meld/vcview.py:450 +#: ../meld/vcview.py:487 #, python-format msgid "%s — local" msgstr "%s — local" -#: ../meld/vcview.py:451 +#: ../meld/vcview.py:488 #, python-format msgid "%s — remote" msgstr "%s — remoto" -#: ../meld/vcview.py:459 +#: ../meld/vcview.py:496 #, python-format msgid "%s (local, merge, remote)" msgstr "%s (local, mesclagem, remoto)" -#: ../meld/vcview.py:464 +#: ../meld/vcview.py:501 #, python-format msgid "%s (remote, merge, local)" msgstr "%s (remoto, mesclagem, local)" -#: ../meld/vcview.py:475 +#: ../meld/vcview.py:512 #, python-format msgid "%s — repository" msgstr "%s — repositório" -#: ../meld/vcview.py:481 +#: ../meld/vcview.py:518 #, python-format msgid "%s (working, repository)" msgstr "%s (em trabalho, repositório)" -#: ../meld/vcview.py:485 +#: ../meld/vcview.py:522 #, python-format msgid "%s (repository, working)" msgstr "%s (repositório, em trabalho)" -#: ../meld/vcview.py:674 +#: ../meld/vcview.py:688 msgid "Remove folder and all its files?" msgstr "Remover pasta e todos seus arquivos?" -#: ../meld/vcview.py:676 +#: ../meld/vcview.py:690 msgid "" "This will remove all selected files and folders, and all files within any " "selected folders, from version control." @@ -2628,10 +2597,55 @@ 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:785 +#: ../meld/vcview.py:804 msgid "Clear" msgstr "Limpar" +#~ msgid "Show toolbar" +#~ msgstr "Mostra a barra de ferramentas" + +#~ msgid "If true, the window toolbar is visible." +#~ msgstr "Se verdadeiro, a barra de ferramentas da janela fica visível." + +#~ msgid "Show statusbar" +#~ msgstr "Mostra a barra de status" + +#~ msgid "If true, the window statusbar is visible." +#~ msgstr "Se verdadeiro, a barra de status da janela fica visível." + +#~ msgid "Editable List" +#~ msgstr "Lista editável" + +#~ msgid "Meld Preferences" +#~ msgstr "Preferências do Meld" + +#~ msgid "_Toolbar" +#~ msgstr "Barra de _ferramentas" + +#~ msgid "Show or hide the toolbar" +#~ msgstr "Mostra ou oculta a barra de ferramentas" + +#~ msgid "_Meld" +#~ msgstr "_Meld" + +#~ msgid "Quit the program" +#~ msgstr "Sai do programa" + +#~ msgid "Prefere_nces" +#~ msgstr "Preferê_ncias" + +#~ msgid "Configure the application" +#~ msgstr "Configura o aplicativo" + +#~ msgid "_Contents" +#~ msgstr "S_umário" + +#~ msgid "Open the Meld manual" +#~ msgstr "Abre o manual do Meld" + +#~ msgid "About this application" +#~ msgstr "Sobre esse aplicativo" + #~ msgid "_Save as UTF-8" #~ msgstr "_Salvar como UTF-8" From 7c173866adf1bc21f20beffb86d323dbdbbf1896 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bal=C3=A1zs=20=C3=9Ar?= Date: Mon, 28 Jan 2019 23:31:27 +0000 Subject: [PATCH 0817/1316] Update Hungarian translation (cherry picked from commit 6166eb606a8580ba177095718f03b78647e0110c) --- po/hu.po | 571 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 308 insertions(+), 263 deletions(-) diff --git a/po/hu.po b/po/hu.po index be8d06bd..bbd9c0db 100644 --- a/po/hu.po +++ b/po/hu.po @@ -1,35 +1,35 @@ # Hungarian translation for meld. -# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018. Free Software Foundation, Inc. +# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019. Free Software Foundation, Inc. # This file is distributed under the same license as the meld package. # # Csécsy László , 2005. # Gabor Kelemen , 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013, 2014, 2015, 2016. -# Balázs Úr , 2017, 2018. +# Balázs Úr , 2017, 2018, 2019. msgid "" msgstr "" "Project-Id-Version: meld master\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n" -"POT-Creation-Date: 2018-02-08 21:15+0000\n" -"PO-Revision-Date: 2018-03-05 13:41+0100\n" -"Last-Translator: Meskó Balázs \n" -"Language-Team: Hungarian \n" +"POT-Creation-Date: 2019-01-07 09:44+0000\n" +"PO-Revision-Date: 2019-01-29 00:30+0100\n" +"Last-Translator: Balázs Úr \n" +"Language-Team: Hungarian \n" "Language: hu\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.0.6\n" +"X-Generator: Lokalize 1.2\n" -#: ../bin/meld:185 +#: ../bin/meld:194 msgid "Cannot import: " msgstr "Nem importálható: " -#: ../bin/meld:188 +#: ../bin/meld:197 #, c-format msgid "Meld requires %s or higher." msgstr "A Meld futásához %s vagy újabb szükséges." -#: ../bin/meld:240 +#: ../bin/meld:243 #, c-format msgid "" "Couldn’t load Meld-specific CSS (%s)\n" @@ -38,29 +38,30 @@ msgstr "" "Nem sikerült betölteni a Meld-specifikus CSS-t (%s)\n" "%s" -#: ../data/meld.desktop.in.h:1 ../data/meld.appdata.xml.in.h:1 -#: ../data/ui/meldapp.ui.h:1 +#: ../data/org.gnome.meld.desktop.in.h:1 +#: ../data/org.gnome.meld.appdata.xml.in.h:1 ../data/ui/meldapp.ui.h:1 msgid "Meld" msgstr "Meld" -#: ../data/meld.desktop.in.h:2 +#: ../data/org.gnome.meld.desktop.in.h:2 msgid "Diff Viewer" msgstr "Eltérésmegjelenítő" -#: ../data/meld.desktop.in.h:3 +#: ../data/org.gnome.meld.desktop.in.h:3 msgid "Meld Diff Viewer" msgstr "Meld eltérésmegjelenítő" -#: ../data/meld.desktop.in.h:4 ../data/meld.appdata.xml.in.h:2 +#: ../data/org.gnome.meld.desktop.in.h:4 +#: ../data/org.gnome.meld.appdata.xml.in.h:2 msgid "Compare and merge your files" msgstr "Fájlok összehasonlítása és összefésülése" #. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! -#: ../data/meld.desktop.in.h:6 +#: ../data/org.gnome.meld.desktop.in.h:6 msgid "diff;merge;" msgstr "diff;merge;különbség;patch;folt;" -#: ../data/meld.appdata.xml.in.h:3 +#: ../data/org.gnome.meld.appdata.xml.in.h:3 msgid "" "Meld is a visual diff and merge tool targeted at developers. Meld helps you " "compare files, directories, and version controlled projects. It provides " @@ -73,7 +74,7 @@ msgstr "" "sok verziókövető rendszert is támogat, beleértve a Git, Mercurial, Bazaar és " "Subversion rendszereket." -#: ../data/meld.appdata.xml.in.h:4 +#: ../data/org.gnome.meld.appdata.xml.in.h:4 msgid "" "Meld helps you review code changes, understand patches, and makes enormous " "merge conflicts slightly less painful." @@ -81,11 +82,11 @@ msgstr "" "A Meld segít kódváltozások áttekintésében, foltok megértésében és a hatalmas " "összefésülési ütközéseket valamivel fájdalommentesebbé teszi." -#: ../data/meld.appdata.xml.in.h:5 +#: ../data/org.gnome.meld.appdata.xml.in.h:5 msgid "The GNOME Project" msgstr "A GNOME projekt" -#: ../data/mime/meld.xml.in.h:1 +#: ../data/mime/org.gnome.meld.xml.in.h:1 msgid "Meld comparison description" msgstr "Meld összehasonlítás-leírás" @@ -550,38 +551,54 @@ msgid "Compare selected files" msgstr "Kijelölt fájlok összehasonlítása" #: ../data/ui/dirdiff.ui.h:3 +msgid "Collapse Recursively" +msgstr "Összecsukás rekurzívan" + +#: ../data/ui/dirdiff.ui.h:4 +msgid "Collapse selected folder and all subfolders" +msgstr "A kijelölt mappák és az összes almappa összecsukása" + +#: ../data/ui/dirdiff.ui.h:5 +msgid "Expand Recursively" +msgstr "Kinyitás rekurzívan" + +#: ../data/ui/dirdiff.ui.h:6 +msgid "Expand selected folder and all subfolders" +msgstr "A kijelölt mappák és az összes almappa kinyitása" + +#: ../data/ui/dirdiff.ui.h:7 msgid "Copy to _Left" msgstr "Másolás _balra" -#: ../data/ui/dirdiff.ui.h:4 +#: ../data/ui/dirdiff.ui.h:8 msgid "Copy to left" msgstr "Másolás a bal oldalra" -#: ../data/ui/dirdiff.ui.h:5 +#: ../data/ui/dirdiff.ui.h:9 msgid "Copy to _Right" msgstr "Másolás j_obbra" -#: ../data/ui/dirdiff.ui.h:6 +#: ../data/ui/dirdiff.ui.h:10 msgid "Copy to right" msgstr "Másolás a jobb oldalra" -#: ../data/ui/dirdiff.ui.h:7 +#: ../data/ui/dirdiff.ui.h:11 msgid "Delete selected" msgstr "Kijelölt törlése" -#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:872 ../meld/filediff.py:1446 +#: ../data/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:907 ../meld/filediff.py:1497 msgid "Hide" msgstr "Elrejtés" -#: ../data/ui/dirdiff.ui.h:9 +#: ../data/ui/dirdiff.ui.h:13 msgid "Hide selected" msgstr "Kijelölt elrejtése" -#: ../data/ui/dirdiff.ui.h:10 +#: ../data/ui/dirdiff.ui.h:14 msgid "Ignore Filename Case" msgstr "Kis- és nagybetűk nem különböznek a fájlnévben" -#: ../data/ui/dirdiff.ui.h:11 +#: ../data/ui/dirdiff.ui.h:15 msgid "" "Consider differently-cased filenames that are otherwise-identical to be the " "same" @@ -589,35 +606,35 @@ msgstr "" "Tartalmukban azonos, csak a fájlnév kis- és nagybetűiben eltérő fájlok " "azonosnak tekintése" -#: ../data/ui/dirdiff.ui.h:12 +#: ../data/ui/dirdiff.ui.h:16 msgid "Same" msgstr "Egyezik" -#: ../data/ui/dirdiff.ui.h:13 +#: ../data/ui/dirdiff.ui.h:17 msgid "Show identical" msgstr "Azonosak megjelenítése" -#: ../data/ui/dirdiff.ui.h:14 +#: ../data/ui/dirdiff.ui.h:18 msgid "New" msgstr "Új" -#: ../data/ui/dirdiff.ui.h:15 +#: ../data/ui/dirdiff.ui.h:19 msgid "Show new" msgstr "Újak megjelenítése" -#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:77 +#: ../data/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:76 msgid "Modified" msgstr "Módosítva" -#: ../data/ui/dirdiff.ui.h:17 +#: ../data/ui/dirdiff.ui.h:21 msgid "Show modified" msgstr "Módosítottak megjelenítése" -#: ../data/ui/dirdiff.ui.h:18 +#: ../data/ui/dirdiff.ui.h:22 msgid "Filters" msgstr "Szűrők" -#: ../data/ui/dirdiff.ui.h:19 +#: ../data/ui/dirdiff.ui.h:23 msgid "Set active filters" msgstr "Aktív szűrők beállítása" @@ -638,7 +655,7 @@ msgid "_Add" msgstr "Hozzá_adás" #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11 -#: ../meld/vcview.py:681 +#: ../meld/vcview.py:680 msgid "_Remove" msgstr "_Eltávolítás" @@ -660,7 +677,7 @@ msgstr "Mozgatás _le" #. Create icon and filename CellRenderer #: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35 -#: ../meld/dirdiff.py:372 +#: ../meld/dirdiff.py:407 msgid "Name" msgstr "Név" @@ -864,8 +881,8 @@ 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" -#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:953 ../meld/filediff.py:1517 -#: ../meld/filediff.py:1589 +#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:988 ../meld/iohelpers.py:50 +#: ../meld/iohelpers.py:100 msgid "_Cancel" msgstr "Mé_gse" @@ -905,7 +922,7 @@ msgstr "A következő dokumentumok változásai véglegesen elvesznek:" msgid "_Discard" msgstr "_Eldobás" -#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:954 ../meld/filediff.py:1518 +#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:989 ../meld/iohelpers.py:101 msgid "_Replace" msgstr "_Csere" @@ -957,7 +974,7 @@ msgstr "Formázás foltként" msgid "Copy to Clipboard" msgstr "Másolás vágólapra" -#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:154 +#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:152 msgid "Save Patch" msgstr "Folt mentése" @@ -1121,7 +1138,7 @@ msgstr "" "alapján. Minden minta egy shell-stílusú helyettesítőkarakter-lista " "szóközökkel elválasztva." -#: ../data/ui/preferences.ui.h:37 ../meld/meldwindow.py:103 +#: ../data/ui/preferences.ui.h:37 ../meld/meldwindow.py:105 msgid "File Filters" msgstr "Fájlszűrők" @@ -1432,8 +1449,8 @@ msgctxt "shortcut window" msgid "Show/hide console output" msgstr "Konzolkimenet megjelenítése/elrejtése" -#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:554 -#: ../meld/newdifftab.py:39 +#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:567 +#: ../meld/newdifftab.py:49 msgid "New comparison" msgstr "Új összehasonlítás" @@ -1581,7 +1598,7 @@ msgstr "Ver_zió nélküli" msgid "Show unversioned files" msgstr "Verzió nélküli fájlok megjelenítése" -#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:70 +#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69 msgid "Ignored" msgstr "Mellőzve" @@ -1609,7 +1626,7 @@ msgstr "Előző naplók:" msgid "Co_mmit" msgstr "_Kommit" -#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:332 +#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:331 msgid "Location" msgstr "Hely" @@ -1650,44 +1667,44 @@ msgid "Mac OS (CR)" msgstr "Mac OS (CR)" #. Create file size CellRenderer -#: ../meld/dirdiff.py:393 ../meld/preferences.py:82 +#: ../meld/dirdiff.py:428 ../meld/preferences.py:81 msgid "Size" msgstr "Méret" #. Create date-time CellRenderer -#: ../meld/dirdiff.py:401 ../meld/preferences.py:83 +#: ../meld/dirdiff.py:436 ../meld/preferences.py:82 msgid "Modification time" msgstr "Módosítási idő" #. Create permissions CellRenderer -#: ../meld/dirdiff.py:409 ../meld/preferences.py:84 +#: ../meld/dirdiff.py:444 ../meld/preferences.py:83 msgid "Permissions" msgstr "Jogosultságok" -#: ../meld/dirdiff.py:540 +#: ../meld/dirdiff.py:575 #, python-format msgid "Hide %s" msgstr "%s elrejtése" -#: ../meld/dirdiff.py:681 ../meld/dirdiff.py:704 +#: ../meld/dirdiff.py:716 ../meld/dirdiff.py:739 #, python-format msgid "[%s] Scanning %s" msgstr "[%s] %s beolvasása" -#: ../meld/dirdiff.py:839 +#: ../meld/dirdiff.py:874 #, python-format msgid "[%s] Done" msgstr "[%s] Kész" -#: ../meld/dirdiff.py:847 +#: ../meld/dirdiff.py:882 msgid "Folders have no differences" msgstr "A mappák közt nincs eltérés" -#: ../meld/dirdiff.py:849 +#: ../meld/dirdiff.py:884 msgid "Contents of scanned files in folders are identical." msgstr "A mappákban vizsgált fájlok tartalma azonos." -#: ../meld/dirdiff.py:851 +#: ../meld/dirdiff.py:886 msgid "" "Scanned files in folders appear identical, but contents have not been " "scanned." @@ -1695,42 +1712,42 @@ msgstr "" "A mappákban vizsgált fájlok azonosnak tűnnek, de a tartalom nem lett " "vizsgálva." -#: ../meld/dirdiff.py:854 +#: ../meld/dirdiff.py:889 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:856 +#: ../meld/dirdiff.py:891 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:874 ../meld/filediff.py:1448 ../meld/filediff.py:1478 -#: ../meld/filediff.py:1480 ../meld/ui/msgarea.py:106 ../meld/ui/msgarea.py:119 +#: ../meld/dirdiff.py:909 ../meld/filediff.py:1499 ../meld/filediff.py:1529 +#: ../meld/filediff.py:1531 ../meld/ui/msgarea.py:106 ../meld/ui/msgarea.py:119 msgid "Hi_de" msgstr "_Elrejtés" -#: ../meld/dirdiff.py:883 +#: ../meld/dirdiff.py:918 msgid "Multiple errors occurred while scanning this folder" msgstr "Több hiba történt a mappa vizsgálatakor" -#: ../meld/dirdiff.py:884 +#: ../meld/dirdiff.py:919 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:886 +#: ../meld/dirdiff.py:921 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:888 +#: ../meld/dirdiff.py:923 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:890 +#: ../meld/dirdiff.py:925 msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. The following files in this folder are hidden:" @@ -1738,17 +1755,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:901 +#: ../meld/dirdiff.py:936 #, python-format msgid "“%s” hidden by “%s”" msgstr "„%s” rejtve „%s” által" -#: ../meld/dirdiff.py:957 +#: ../meld/dirdiff.py:992 #, python-format msgid "Replace folder “%s”?" msgstr "Cseréli ezt a mappát: „%s”?" -#: ../meld/dirdiff.py:959 +#: ../meld/dirdiff.py:994 #, python-format msgid "" "Another folder with the same name already exists in “%s”.\n" @@ -1757,11 +1774,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:972 +#: ../meld/dirdiff.py:1007 msgid "Error copying file" msgstr "Hiba a fájl másolásakor" -#: ../meld/dirdiff.py:973 +#: ../meld/dirdiff.py:1008 #, python-format msgid "" "Couldn’t copy %s\n" @@ -1774,20 +1791,19 @@ msgstr "" "\n" "%s" -#: ../meld/dirdiff.py:996 -#, python-format -msgid "Error deleting %s" -msgstr "Hiba %s törlésekor" +#: ../meld/dirdiff.py:1033 ../meld/vcview.py:703 +msgid "Error deleting {}" +msgstr "Hiba a(z) {} törlésekor" -#: ../meld/dirdiff.py:1470 +#: ../meld/dirdiff.py:1546 msgid "No folder" msgstr "Nincs mappa" -#: ../meld/filediff.py:806 +#: ../meld/filediff.py:834 msgid "Comparison results will be inaccurate" msgstr "Az összehasonlítás eredményei pontatlanok lesznek" -#: ../meld/filediff.py:808 +#: ../meld/filediff.py:836 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1795,65 +1811,65 @@ 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:865 +#: ../meld/filediff.py:905 msgid "Mark conflict as resolved?" msgstr "Megjelöli az ütközést feloldottként?" -#: ../meld/filediff.py:867 +#: ../meld/filediff.py:907 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:869 +#: ../meld/filediff.py:909 msgid "Cancel" msgstr "Mégse" -#: ../meld/filediff.py:870 +#: ../meld/filediff.py:910 msgid "Mark _Resolved" msgstr "Megjelölés _feloldottként" -#: ../meld/filediff.py:1163 +#: ../meld/filediff.py:1214 #, 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:1171 +#: ../meld/filediff.py:1222 #, python-format msgid "File %s appears to be a binary file." msgstr "%s bináris fájlnak tűnik." -#: ../meld/filediff.py:1173 +#: ../meld/filediff.py:1224 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:1175 +#: ../meld/filediff.py:1226 msgid "Open" msgstr "Megnyitás" -#: ../meld/filediff.py:1191 +#: ../meld/filediff.py:1242 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Eltérések számítása" -#: ../meld/filediff.py:1252 +#: ../meld/filediff.py:1303 #, python-format msgid "File %s has changed on disk" msgstr "%s fájl megváltozott a lemezen" -#: ../meld/filediff.py:1253 +#: ../meld/filediff.py:1304 msgid "Do you want to reload the file?" msgstr "Újratölti a fájlt?" -#: ../meld/filediff.py:1255 +#: ../meld/filediff.py:1306 msgid "_Reload" msgstr "Új_ratöltés" -#: ../meld/filediff.py:1411 +#: ../meld/filediff.py:1462 msgid "Files are identical" msgstr "A fájlok azonosak" -#: ../meld/filediff.py:1424 +#: ../meld/filediff.py:1475 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1861,11 +1877,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:1429 +#: ../meld/filediff.py:1480 msgid "Files differ in line endings only" msgstr "A fájlok csak a sorvégekben térnek el" -#: ../meld/filediff.py:1431 +#: ../meld/filediff.py:1482 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1874,15 +1890,15 @@ msgstr "" "A fájlok azonosak a sorvégjelektől eltekintve:\n" "%s" -#: ../meld/filediff.py:1451 +#: ../meld/filediff.py:1502 msgid "Show without filters" msgstr "Megjelenítés szűrők nélkül" -#: ../meld/filediff.py:1473 +#: ../meld/filediff.py:1524 msgid "Change highlighting incomplete" msgstr "Részleges kiemelés módosítása" -#: ../meld/filediff.py:1474 +#: ../meld/filediff.py:1525 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." @@ -1890,81 +1906,64 @@ 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:1482 +#: ../meld/filediff.py:1533 msgid "Keep highlighting" msgstr "Kiemelés továbbra is" -#: ../meld/filediff.py:1484 +#: ../meld/filediff.py:1535 msgid "_Keep highlighting" msgstr "_Kiemelés továbbra is" -#: ../meld/filediff.py:1521 -#, python-format -msgid "Replace file “%s”?" -msgstr "Cseréli a fájlt: „%s”?" +#: ../meld/filediff.py:1548 +msgid "Saving failed" +msgstr "A mentés sikertelen" -#: ../meld/filediff.py:1523 -#, python-format +#: ../meld/filediff.py:1549 msgid "" -"A file with this name already exists in “%s”.\n" -"If you replace the existing file, its contents will be lost." +"Please consider copying any critical changes to another program or file to " +"avoid data loss." msgstr "" -"Már létezik ilyen nevű fájl itt: „%s”.\n" -"Ha lecseréli a meglévő fájlt, akkor a tartalma elvész." +"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:1540 +#: ../meld/filediff.py:1558 msgid "Save Left Pane As" msgstr "Bal ablaktábla mentése másként" -#: ../meld/filediff.py:1542 +#: ../meld/filediff.py:1560 msgid "Save Middle Pane As" msgstr "Középső ablaktábla mentése másként" -#: ../meld/filediff.py:1544 +#: ../meld/filediff.py:1562 msgid "Save Right Pane As" msgstr "Jobb ablaktábla mentése másként" -#: ../meld/filediff.py:1558 +#: ../meld/filediff.py:1575 #, 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:1560 +#: ../meld/filediff.py:1577 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:1563 +#: ../meld/filediff.py:1580 msgid "Save Anyway" msgstr "Mentés mindenképp" -#: ../meld/filediff.py:1564 +#: ../meld/filediff.py:1581 msgid "Don’t Save" msgstr "Ne mentse" -#: ../meld/filediff.py:1590 -msgid "_Save as UTF-8" -msgstr "Mentés _UTF-8-ként" - -#: ../meld/filediff.py:1593 -#, python-format -msgid "Couldn’t encode text as “%s”" -msgstr "Nem kódolható a szöveg mint „%s”" - -#: ../meld/filediff.py:1595 -#, python-format +#: ../meld/filediff.py:1623 msgid "" -"File “%s” contains characters that can’t be encoded using encoding “%s”.\n" -"Would you like to save as UTF-8?" +"File “{}” contains characters that can’t be encoded using its current " +"encoding “{}”." msgstr "" -"„%s” a(z) „%s” használatával kódolhatatlan karaktereket tartalmaz.\n" -"Szeretné UTF-8 kódolással menteni?" +"A(z) „{}” fájl olyan karaktereket tartalmaz, amelyek nem kódolhatók a " +"jelenlegi „{}” kódolás használatával." -#: ../meld/filediff.py:1635 ../meld/patchdialog.py:130 -#, python-format -msgid "Could not save file %s." -msgstr "A fájl (%s) nem menthető." - -#: ../meld/filediff.py:1636 ../meld/patchdialog.py:131 +#: ../meld/filediff.py:1627 ../meld/patchdialog.py:131 #, python-format msgid "" "Couldn’t save file due to:\n" @@ -1973,11 +1972,16 @@ msgstr "" "A fájl nem menthető. Ok:\n" "%s" -#: ../meld/filediff.py:2012 +#: ../meld/filediff.py:1631 ../meld/patchdialog.py:130 +#, python-format +msgid "Could not save file %s." +msgstr "A fájl (%s) nem menthető." + +#: ../meld/filediff.py:2014 msgid "Live comparison updating disabled" msgstr "Az élő összehasonlítás-frissítés kikapcsolva" -#: ../meld/filediff.py:2013 +#: ../meld/filediff.py:2015 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -2000,319 +2004,364 @@ msgstr "Másolás _fel" msgid "Copy _down" msgstr "Másolás _le" -#: ../meld/meldapp.py:179 +#: ../meld/iohelpers.py:35 +msgid "Deleting remote folders is not supported" +msgstr "A távoli mappák törlése nem támogatott" + +#: ../meld/iohelpers.py:37 +msgid "Not a file or directory" +msgstr "Nem fájl vagy könyvtár" + +#: ../meld/iohelpers.py:41 +msgid "“{}” can’t be put in the trash. Do you want to delete it immediately?" +msgstr "A(z) „{}” nem tehető a Kukába. Szeretné azonnal törölni?" + +#: ../meld/iohelpers.py:46 +msgid "This remote location does not support sending items to the trash." +msgstr "Ez a távoli hely nem támogatja az elemek Kukába küldését." + +#: ../meld/iohelpers.py:51 +msgid "_Delete Permanently" +msgstr "_Végleges törlés" + +#: ../meld/iohelpers.py:94 +#, python-format +msgid "Replace file “%s”?" +msgstr "Cseréli a fájlt: „%s”?" + +#: ../meld/iohelpers.py:96 +#, 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 "" +"Már létezik ilyen nevű fájl itt: „%s”.\n" +"Ha lecseréli a meglévő fájlt, akkor a tartalma elvész." + +#: ../meld/meldapp.py:181 msgid "wrong number of arguments supplied to --diff" msgstr "Hibás számú argumentum a --diff kapcsolóhoz" -#: ../meld/meldapp.py:184 +#: ../meld/meldapp.py:186 msgid "Start with an empty window" msgstr "Indítás üres ablakkal" -#: ../meld/meldapp.py:185 ../meld/meldapp.py:187 +#: ../meld/meldapp.py:187 ../meld/meldapp.py:189 msgid "file" msgstr "fájl" -#: ../meld/meldapp.py:185 ../meld/meldapp.py:189 +#: ../meld/meldapp.py:187 ../meld/meldapp.py:191 msgid "folder" msgstr "mappa" -#: ../meld/meldapp.py:186 +#: ../meld/meldapp.py:188 msgid "Start a version control comparison" msgstr "Verziókövető-összehasonlítás indítása" -#: ../meld/meldapp.py:188 +#: ../meld/meldapp.py:190 msgid "Start a 2- or 3-way file comparison" msgstr "2 vagy 3 utas fájl-összehasonlítás indítása" -#: ../meld/meldapp.py:190 +#: ../meld/meldapp.py:192 msgid "Start a 2- or 3-way folder comparison" msgstr "2 vagy 3 utas mappa-összehasonlítás indítása" -#: ../meld/meldapp.py:233 +#: ../meld/meldapp.py:235 #, python-format msgid "Error: %s\n" msgstr "Hiba: %s\n" -#: ../meld/meldapp.py:240 +#: ../meld/meldapp.py:242 msgid "Meld is a file and directory comparison tool." msgstr "A Meld egy fájl- és könyvtár-összehasonlító eszköz." -#: ../meld/meldapp.py:244 +#: ../meld/meldapp.py:246 msgid "Set label to use instead of file name" msgstr "A fájlnevek helyett használandó címke beállítása" -#: ../meld/meldapp.py:247 +#: ../meld/meldapp.py:249 msgid "Open a new tab in an already running instance" msgstr "Új lap megnyitása már futó példányban" -#: ../meld/meldapp.py:250 +#: ../meld/meldapp.py:252 msgid "Automatically compare all differing files on startup" msgstr "Minden eltérő fájl automatikus összehasonlítása indításkor" -#: ../meld/meldapp.py:253 +#: ../meld/meldapp.py:255 msgid "Ignored for compatibility" msgstr "Mellőzve a kompatibilitás érdekében" -#: ../meld/meldapp.py:257 +#: ../meld/meldapp.py:259 msgid "Set the target file for saving a merge result" msgstr "Célfájl beállítása összefésülés eredményének mentéséhez" -#: ../meld/meldapp.py:260 +#: ../meld/meldapp.py:262 msgid "Automatically merge files" msgstr "Fájlok automatikus összefésülése" -#: ../meld/meldapp.py:264 +#: ../meld/meldapp.py:266 msgid "Load a saved comparison from a Meld comparison file" msgstr "Mentett összehasonlítás betöltése Meld összehasonlítás-fájlból" -#: ../meld/meldapp.py:268 +#: ../meld/meldapp.py:270 msgid "Create a diff tab for the supplied files or folders" msgstr "Különbséglap létrehozása a megadott fájlokhoz vagy mappákhoz" -#: ../meld/meldapp.py:288 +#: ../meld/meldapp.py:290 #, python-format msgid "too many arguments (wanted 0-3, got %d)" msgstr "túl sok argumentum (0-3 helyett %d)" -#: ../meld/meldapp.py:291 +#: ../meld/meldapp.py:293 msgid "can’t auto-merge less than 3 files" msgstr "nem lehet 3-nál kevesebb fájlt automatikusan összefésülni" -#: ../meld/meldapp.py:293 +#: ../meld/meldapp.py:295 msgid "can’t auto-merge directories" msgstr "könyvtárak nem fésülhetők össze automatikusan" -#: ../meld/meldapp.py:307 +#: ../meld/meldapp.py:309 msgid "Error reading saved comparison file" msgstr "Hiba az elmentett összehasonlítás-fájl olvasása közben" -#: ../meld/meldapp.py:324 +#: ../meld/meldapp.py:326 #, python-format msgid "invalid path or URI “%s”" msgstr "érvénytelen útvonal vagy URI: „%s”" -#: ../meld/meldapp.py:330 +#: ../meld/meldapp.py:332 msgid "remote folder “{}” not supported" msgstr "a „{}” távoli mappa nem támogatott" #. TRANSLATORS: This is the label of a new, currently-unnamed file. -#: ../meld/meldbuffer.py:140 +#: ../meld/meldbuffer.py:124 msgid "" msgstr "" -#: ../meld/melddoc.py:64 +#: ../meld/melddoc.py:68 msgid "untitled" msgstr "névtelen" -#: ../meld/meldwindow.py:45 +#: ../meld/meldwindow.py:47 msgid "_File" msgstr "_Fájl" -#: ../meld/meldwindow.py:46 +#: ../meld/meldwindow.py:48 msgid "_New Comparison…" msgstr "Új össze_hasonlítás…" -#: ../meld/meldwindow.py:47 +#: ../meld/meldwindow.py:49 msgid "Start a new comparison" msgstr "Új összehasonlítás indítása" -#: ../meld/meldwindow.py:50 +#: ../meld/meldwindow.py:52 msgid "Save the current file" msgstr "A jelenlegi fájl mentése" -#: ../meld/meldwindow.py:52 +#: ../meld/meldwindow.py:54 msgid "Save As…" msgstr "Mentés másként…" -#: ../meld/meldwindow.py:53 +#: ../meld/meldwindow.py:55 msgid "Save the current file with a different name" msgstr "A jelenlegi fájl mentése más néven" -#: ../meld/meldwindow.py:56 +#: ../meld/meldwindow.py:58 msgid "Close the current file" msgstr "A jelenlegi fájl bezárása" -#: ../meld/meldwindow.py:59 +#: ../meld/meldwindow.py:61 msgid "_Edit" msgstr "S_zerkesztés" -#: ../meld/meldwindow.py:61 +#: ../meld/meldwindow.py:63 msgid "Undo the last action" msgstr "Az utolsó művelet visszavonása" -#: ../meld/meldwindow.py:64 +#: ../meld/meldwindow.py:66 msgid "Redo the last undone action" msgstr "A visszavont művelet ismételt végrehajtása" -#: ../meld/meldwindow.py:66 +#: ../meld/meldwindow.py:68 msgid "Cut the selection" msgstr "A kijelölés kivágása" -#: ../meld/meldwindow.py:68 +#: ../meld/meldwindow.py:70 msgid "Copy the selection" msgstr "A kijelölés másolása" -#: ../meld/meldwindow.py:70 +#: ../meld/meldwindow.py:72 msgid "Paste the clipboard" msgstr "A vágólap tartalmának beillesztése" -#: ../meld/meldwindow.py:72 +#: ../meld/meldwindow.py:74 msgid "Find…" msgstr "Keresés…" -#: ../meld/meldwindow.py:72 +#: ../meld/meldwindow.py:74 msgid "Search for text" msgstr "Szöveg keresése" -#: ../meld/meldwindow.py:74 +#: ../meld/meldwindow.py:76 msgid "Find Ne_xt" msgstr "Kö_vetkező találat" -#: ../meld/meldwindow.py:75 +#: ../meld/meldwindow.py:77 msgid "Search forwards for the same text" msgstr "Keresés előre ugyanarra a szövegre" -#: ../meld/meldwindow.py:77 +#: ../meld/meldwindow.py:79 msgid "Find _Previous" msgstr "_Előző találat" -#: ../meld/meldwindow.py:78 +#: ../meld/meldwindow.py:80 msgid "Search backwards for the same text" msgstr "Keresés visszafelé ugyanarra a szövegre" -#: ../meld/meldwindow.py:81 +#: ../meld/meldwindow.py:83 msgid "_Replace…" msgstr "_Csere…" -#: ../meld/meldwindow.py:82 +#: ../meld/meldwindow.py:84 msgid "Find and replace text" msgstr "Szöveg keresése és cseréje" -#: ../meld/meldwindow.py:84 +#: ../meld/meldwindow.py:86 msgid "Go to _Line" msgstr "_Ugrás sorra" -#: ../meld/meldwindow.py:85 +#: ../meld/meldwindow.py:87 msgid "Go to a specific line" msgstr "Ugrás a megadott sorra" -#: ../meld/meldwindow.py:88 +#: ../meld/meldwindow.py:90 msgid "_Changes" msgstr "Válto_zások" -#: ../meld/meldwindow.py:89 +#: ../meld/meldwindow.py:91 msgid "Next Change" msgstr "Következő változás" -#: ../meld/meldwindow.py:90 +#: ../meld/meldwindow.py:92 msgid "Go to the next change" msgstr "Ugrás a következő változásra" -#: ../meld/meldwindow.py:92 +#: ../meld/meldwindow.py:94 msgid "Previous Change" msgstr "Előző változás" -#: ../meld/meldwindow.py:93 +#: ../meld/meldwindow.py:95 msgid "Go to the previous change" msgstr "Ugrás az előző változásra" -#: ../meld/meldwindow.py:95 +#: ../meld/meldwindow.py:97 msgid "Open Externally" msgstr "Megnyitás alkalmazással" -#: ../meld/meldwindow.py:96 +#: ../meld/meldwindow.py:98 msgid "Open selected file or directory in the default external application" msgstr "" "Kijelölt fájl vagy könyvtár megnyitása az alapértelmezett külső alkalmazással" -#: ../meld/meldwindow.py:100 +#: ../meld/meldwindow.py:102 msgid "_View" msgstr "_Nézet" -#: ../meld/meldwindow.py:101 +#: ../meld/meldwindow.py:103 msgid "File Status" msgstr "Fájlállapot" -#: ../meld/meldwindow.py:102 +#: ../meld/meldwindow.py:104 msgid "Version Status" msgstr "Verzióállapot" -#: ../meld/meldwindow.py:105 +#: ../meld/meldwindow.py:107 msgid "Stop the current action" msgstr "Jelenlegi művelet leállítása" -#: ../meld/meldwindow.py:108 +#: ../meld/meldwindow.py:110 msgid "Refresh the view" msgstr "A nézet frissítése" -#: ../meld/meldwindow.py:112 +#: ../meld/meldwindow.py:114 msgid "Fullscreen" msgstr "Teljes képernyő" -#: ../meld/meldwindow.py:113 +#: ../meld/meldwindow.py:115 msgid "View the comparison in fullscreen" msgstr "Az összehasonlítás megjelenítése teljes képernyőn" -#: ../meld/meldwindow.py:115 +#: ../meld/meldwindow.py:117 msgid "_Toolbar" msgstr "_Eszköztár" -#: ../meld/meldwindow.py:116 +#: ../meld/meldwindow.py:118 msgid "Show or hide the toolbar" msgstr "Eszköztár megjelenítése vagy elrejtése" -#: ../meld/meldwindow.py:125 +#: ../meld/meldwindow.py:127 msgid "Open Recent" msgstr "Legutóbbi megnyitása" -#: ../meld/meldwindow.py:126 +#: ../meld/meldwindow.py:128 msgid "Open recent files" msgstr "Legutóbbi fájlok megnyitása" -#: ../meld/meldwindow.py:148 +#: ../meld/meldwindow.py:150 msgid "_Meld" msgstr "_Meld" -#: ../meld/meldwindow.py:149 +#: ../meld/meldwindow.py:151 msgid "Quit the program" msgstr "Kilépés a programból" -#: ../meld/meldwindow.py:151 +#: ../meld/meldwindow.py:153 msgid "Prefere_nces" msgstr "B_eállítások" -#: ../meld/meldwindow.py:152 +#: ../meld/meldwindow.py:154 msgid "Configure the application" msgstr "Az alkalmazás beállítása" -#: ../meld/meldwindow.py:154 +#: ../meld/meldwindow.py:156 msgid "_Contents" msgstr "_Tartalom" -#: ../meld/meldwindow.py:155 +#: ../meld/meldwindow.py:157 msgid "Open the Meld manual" msgstr "A Meld kézikönyvének megnyitása" -#: ../meld/meldwindow.py:157 +#: ../meld/meldwindow.py:159 msgid "About this application" msgstr "Az alkalmazás névjegye" -#: ../meld/meldwindow.py:589 +#: ../meld/meldwindow.py:602 #, python-format msgid "Need three files to auto-merge, got: %r" msgstr "Az automatikus összefésüléshez három fájl kell, érkezett: %r" -#: ../meld/meldwindow.py:610 +#: ../meld/meldwindow.py:623 msgid "Cannot compare a mixture of files and directories" msgstr "Fájlok és könyvtárak keveréke nem hasonlítható össze." -#: ../meld/misc.py:207 +#: ../meld/misc.py:135 +msgid "" +"{}\n" +"\n" +"Meld encountered a critical error while running:\n" +"{}" +msgstr "" +"{}\n" +"\n" +"A Meld kritikus hibát észlelt futás közben:\n" +"{}" + +#: ../meld/misc.py:254 #, python-format msgid "Couldn’t find colour scheme details for %s-%s; this is a bad install" msgstr "Nem találhatók a színséma részletei ehhez: %s-%s, ez telepítési hiba" -#. no common path. empty names get changed to "[None]" -#: ../meld/misc.py:268 +#: ../meld/misc.py:325 msgid "[None]" msgstr "[Semmi]" @@ -2324,7 +2373,7 @@ msgstr "címke" msgid "pattern" msgstr "minta" -#: ../meld/recent.py:115 +#: ../meld/recent.py:105 msgid "Version control:" msgstr "Verziókövetés:" @@ -2342,12 +2391,12 @@ msgid "Close tab" msgstr "Lap bezárása" #. Abbreviation for line, column so that it will fit in the status bar -#: ../meld/ui/statusbar.py:133 +#: ../meld/ui/statusbar.py:124 #, python-format msgid "Ln %i, Col %i" msgstr "%i. sor, %i. oszlop" -#: ../meld/ui/statusbar.py:186 +#: ../meld/ui/statusbar.py:177 msgid "Line you want to move the cursor to" msgstr "A sor, amelyre a kurzort szeretné vinni" @@ -2357,186 +2406,186 @@ msgstr "Nem lesznek fájlok kommitolva" #. Translators: First %s is replaced by translated "%d unpushed #. commits", second %s is replaced by translated "%d branches" -#: ../meld/vc/git.py:93 +#: ../meld/vc/git.py:92 #, python-format msgid "%s in %s" msgstr "%s %s" #. 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:101 +#: ../meld/vc/git.py:93 ../meld/vc/git.py:100 #, python-format msgid "%d unpushed commit" msgid_plural "%d unpushed commits" msgstr[0] "%d nem továbbított kommit" msgstr[1] "%d nem továbbított kommit" -#: ../meld/vc/git.py:96 +#: ../meld/vc/git.py:95 #, python-format msgid "%d branch" msgid_plural "%d branches" msgstr[0] "%d ágban" msgstr[1] "%d ágban" -#: ../meld/vc/git.py:332 +#: ../meld/vc/git.py:334 #, python-format msgid "Mode changed from %s to %s" msgstr "Mód megváltoztatva: %s -> %s" -#: ../meld/vc/git.py:340 +#: ../meld/vc/git.py:342 msgid "Partially staged" msgstr "Részben sorba állítva" -#: ../meld/vc/git.py:340 +#: ../meld/vc/git.py:342 msgid "Staged" msgstr "Sorba állítva" #. Translators: This is the displayed name of a version control system #. when no version control system is actually found. -#: ../meld/vc/_null.py:38 +#: ../meld/vc/_null.py:37 msgid "None" msgstr "Nincs" -#: ../meld/vc/svn.py:204 +#: ../meld/vc/svn.py:203 #, python-format msgid "Rev %s" msgstr "%s rev" -#: ../meld/vc/_vc.py:55 +#: ../meld/vc/_vc.py:54 msgid "Merged" msgstr "Egyesítve" -#: ../meld/vc/_vc.py:55 +#: ../meld/vc/_vc.py:54 msgid "Base" msgstr "Alap" -#: ../meld/vc/_vc.py:55 +#: ../meld/vc/_vc.py:54 msgid "Local" msgstr "Helyi" -#: ../meld/vc/_vc.py:55 +#: ../meld/vc/_vc.py:54 msgid "Remote" msgstr "Távoli" -#: ../meld/vc/_vc.py:71 +#: ../meld/vc/_vc.py:70 msgid "Unversioned" msgstr "Verziózatlan" -#: ../meld/vc/_vc.py:74 +#: ../meld/vc/_vc.py:73 msgid "Error" msgstr "Hiba" -#: ../meld/vc/_vc.py:76 +#: ../meld/vc/_vc.py:75 msgid "Newly added" msgstr "Újonnan hozzáadott" -#: ../meld/vc/_vc.py:78 +#: ../meld/vc/_vc.py:77 msgid "Renamed" msgstr "Átnevezve" -#: ../meld/vc/_vc.py:79 +#: ../meld/vc/_vc.py:78 msgid "Conflict" msgstr "Ütközés" -#: ../meld/vc/_vc.py:80 +#: ../meld/vc/_vc.py:79 msgid "Removed" msgstr "Eltávolítva" -#: ../meld/vc/_vc.py:81 +#: ../meld/vc/_vc.py:80 msgid "Missing" msgstr "Hiányzó" -#: ../meld/vc/_vc.py:82 +#: ../meld/vc/_vc.py:81 msgid "Not present" msgstr "Nincs jelen" #. Translators: This error message is shown when a version #. control binary isn't installed. -#: ../meld/vcview.py:249 +#: ../meld/vcview.py:248 #, python-format msgid "%(name)s (%(cmd)s not installed)" msgstr "%(name)s (%(cmd)s nincs telepítve)" #. Translators: This error message is shown when a version #. controlled repository is invalid. -#: ../meld/vcview.py:253 +#: ../meld/vcview.py:252 #, python-format msgid "%(name)s (Invalid repository)" msgstr "%(name)s (Érvénytelen tároló)" -#: ../meld/vcview.py:274 +#: ../meld/vcview.py:273 msgid "No valid version control system found in this folder" msgstr "Nem található használható verziókövető rendszer ebben a mappában" -#: ../meld/vcview.py:276 +#: ../meld/vcview.py:275 msgid "Only one version control system found in this folder" msgstr "Csak egy verziókövető rendszer található ebben a mappában" -#: ../meld/vcview.py:278 +#: ../meld/vcview.py:277 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:332 +#: ../meld/vcview.py:331 #, python-format msgid "%s: %s" msgstr "%s: %s" #. Initial yield so when we add this to our tasks, we don't #. create iterators that may be invalidated. -#: ../meld/vcview.py:339 +#: ../meld/vcview.py:338 msgid "Scanning repository" msgstr "Tároló vizsgálata" -#: ../meld/vcview.py:368 +#: ../meld/vcview.py:367 #, python-format msgid "Scanning %s" msgstr "%s vizsgálata" -#: ../meld/vcview.py:407 +#: ../meld/vcview.py:406 msgid "(Empty)" msgstr "(Üres)" -#: ../meld/vcview.py:451 +#: ../meld/vcview.py:450 #, python-format msgid "%s — local" msgstr "%s – helyi" -#: ../meld/vcview.py:452 +#: ../meld/vcview.py:451 #, python-format msgid "%s — remote" msgstr "%s – távoli" -#: ../meld/vcview.py:460 +#: ../meld/vcview.py:459 #, python-format msgid "%s (local, merge, remote)" msgstr "%s (helyi, összefésült, távoli)" -#: ../meld/vcview.py:465 +#: ../meld/vcview.py:464 #, python-format msgid "%s (remote, merge, local)" msgstr "%s (távoli, összefésült, helyi)" -#: ../meld/vcview.py:476 +#: ../meld/vcview.py:475 #, python-format msgid "%s — repository" msgstr "%s – tároló" -#: ../meld/vcview.py:482 +#: ../meld/vcview.py:481 #, python-format msgid "%s (working, repository)" msgstr "%s (munka, tároló)" -#: ../meld/vcview.py:486 +#: ../meld/vcview.py:485 #, python-format msgid "%s (repository, working)" msgstr "%s (tároló, munka)" -#: ../meld/vcview.py:675 +#: ../meld/vcview.py:674 msgid "Remove folder and all its files?" msgstr "Eltávolítja a mappát és benne minden fájlt?" -#: ../meld/vcview.py:677 +#: ../meld/vcview.py:676 msgid "" "This will remove all selected files and folders, and all files within any " "selected folders, from version control." @@ -2544,11 +2593,7 @@ 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:702 -#, python-format -msgid "Error removing %s" -msgstr "Hiba %s eltávolításakor" - -#: ../meld/vcview.py:780 +#: ../meld/vcview.py:785 msgid "Clear" msgstr "Törlés" + From 397e747d0e2049eb0b90e3b8fd340819b3043c3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bal=C3=A1zs=20=C3=9Ar?= Date: Mon, 28 Jan 2019 23:33:51 +0000 Subject: [PATCH 0818/1316] Update Hungarian translation --- po/hu.po | 1961 +++++++++++++++++++++++++++--------------------------- 1 file changed, 964 insertions(+), 997 deletions(-) diff --git a/po/hu.po b/po/hu.po index bbd9c0db..cb1ce8d5 100644 --- a/po/hu.po +++ b/po/hu.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: meld master\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n" -"POT-Creation-Date: 2019-01-07 09:44+0000\n" -"PO-Revision-Date: 2019-01-29 00:30+0100\n" +"POT-Creation-Date: 2019-01-28 23:32+0000\n" +"PO-Revision-Date: 2019-01-29 00:32+0100\n" "Last-Translator: Balázs Úr \n" "Language-Team: Hungarian \n" "Language: hu\n" @@ -20,16 +20,16 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 1.2\n" -#: ../bin/meld:194 +#: ../bin/meld:190 msgid "Cannot import: " msgstr "Nem importálható: " -#: ../bin/meld:197 +#: ../bin/meld:193 #, c-format msgid "Meld requires %s or higher." msgstr "A Meld futásához %s vagy újabb szükséges." -#: ../bin/meld:243 +#: ../bin/meld:262 #, c-format msgid "" "Couldn’t load Meld-specific CSS (%s)\n" @@ -39,7 +39,8 @@ msgstr "" "%s" #: ../data/org.gnome.meld.desktop.in.h:1 -#: ../data/org.gnome.meld.appdata.xml.in.h:1 ../data/ui/meldapp.ui.h:1 +#: ../data/org.gnome.meld.appdata.xml.in.h:1 +#: ../meld/resources/ui/appwindow.ui.h:1 msgid "Meld" msgstr "Meld" @@ -107,26 +108,10 @@ msgid "Default window fullscreen state" msgstr "Ablak alapértelmezett teljes képernyős állapota" #: ../data/org.gnome.meld.gschema.xml.h:5 -msgid "Show toolbar" -msgstr "Eszköztár megjelenítése" - -#: ../data/org.gnome.meld.gschema.xml.h:6 -msgid "If true, the window toolbar is visible." -msgstr "Az ablak eszköztára látható-e." - -#: ../data/org.gnome.meld.gschema.xml.h:7 -msgid "Show statusbar" -msgstr "Állapotsor megjelenítése" - -#: ../data/org.gnome.meld.gschema.xml.h:8 -msgid "If true, the window statusbar is visible." -msgstr "Az ablak állapotsora látható-e." - -#: ../data/org.gnome.meld.gschema.xml.h:9 msgid "Additional automatically detected text encodings" msgstr "További automatikusan felismert szövegkódolások" -#: ../data/org.gnome.meld.gschema.xml.h:10 +#: ../data/org.gnome.meld.gschema.xml.h:6 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 " @@ -139,38 +124,39 @@ msgstr "" "kódolása mindig felhasználásra kerül, a felhasználó területi beállításától " "függően más kódolások is kipróbálhatók." -#: ../data/org.gnome.meld.gschema.xml.h:11 +#: ../data/org.gnome.meld.gschema.xml.h:7 msgid "Width of an indentation step" msgstr "Behúzási lépés szélessége" -#: ../data/org.gnome.meld.gschema.xml.h:12 +#: ../data/org.gnome.meld.gschema.xml.h:8 msgid "The number of spaces to use for a single indent step" msgstr "Egy behúzási lépéshez használandó szóközök száma" -#: ../data/org.gnome.meld.gschema.xml.h:13 +#: ../data/org.gnome.meld.gschema.xml.h:9 msgid "Whether to indent using spaces or tabs" msgstr "A behúzáshoz szóközök vagy tabok használandók-e" -#: ../data/org.gnome.meld.gschema.xml.h:14 +#: ../data/org.gnome.meld.gschema.xml.h:10 msgid "If true, any new indentation will use spaces instead of tabs." msgstr "" "Ha ez be van állítva, az új behúzás szóközöket fog használni tabok helyett." -#: ../data/org.gnome.meld.gschema.xml.h:15 +#: ../data/org.gnome.meld.gschema.xml.h:11 +#: ../meld/resources/ui/statusbar-menu.ui.h:1 msgid "Show line numbers" msgstr "Sorszámok megjelenítése" -#: ../data/org.gnome.meld.gschema.xml.h:16 +#: ../data/org.gnome.meld.gschema.xml.h:12 msgid "If true, line numbers will be shown in the gutter of file comparisons." msgstr "" "Ha ez be van állítva, a sorszámok meg fognak jelenni a fájl-" "összehasonlítások margóján." -#: ../data/org.gnome.meld.gschema.xml.h:17 +#: ../data/org.gnome.meld.gschema.xml.h:13 msgid "Highlight syntax" msgstr "Szintaxiskiemelés" -#: ../data/org.gnome.meld.gschema.xml.h:18 +#: ../data/org.gnome.meld.gschema.xml.h:14 msgid "" "Whether to highlight syntax in comparisons. Because of Meld’s own color " "highlighting, this is off by default." @@ -178,21 +164,21 @@ msgstr "" "A szintaxis kiemelése az összehasonlításokban. A Meld saját színkiemelése " "miatt ez alapesetben ki van kapcsolva." -#: ../data/org.gnome.meld.gschema.xml.h:19 +#: ../data/org.gnome.meld.gschema.xml.h:15 msgid "Color scheme to use for syntax highlighting" msgstr "Szintaxiskiemeléshez használandó színséma" -#: ../data/org.gnome.meld.gschema.xml.h:20 +#: ../data/org.gnome.meld.gschema.xml.h:16 msgid "Used by GtkSourceView to determine colors for syntax highlighting" msgstr "" "A GtkSourceView használja a szintaxiskiemeléshez használandó színek " "meghatározásához" -#: ../data/org.gnome.meld.gschema.xml.h:21 +#: ../data/org.gnome.meld.gschema.xml.h:17 msgid "Displayed whitespace" msgstr "Megjelenített üres helyek" -#: ../data/org.gnome.meld.gschema.xml.h:22 +#: ../data/org.gnome.meld.gschema.xml.h:18 msgid "" "Selector for individual whitespace character types to be shown. Possible " "values are 'space', 'tab', 'newline' and 'nbsp'." @@ -200,11 +186,11 @@ msgstr "" "A megjelenítendő egyedi üres hely karaktertípusok listája. A lehetséges " "értékek: „space”, „tab”, „newline”, és „nbsp”." -#: ../data/org.gnome.meld.gschema.xml.h:23 +#: ../data/org.gnome.meld.gschema.xml.h:19 msgid "Wrap mode" msgstr "Tördelés módja" -#: ../data/org.gnome.meld.gschema.xml.h:24 +#: ../data/org.gnome.meld.gschema.xml.h:20 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 " @@ -214,33 +200,34 @@ msgstr "" "törni. Lehetséges értékek: „none” (ne törjön), „char” (bármely karakter) " "vagy „word” (csak szavak végén)." -#: ../data/org.gnome.meld.gschema.xml.h:25 +#: ../data/org.gnome.meld.gschema.xml.h:21 +#: ../meld/resources/ui/statusbar-menu.ui.h:3 msgid "Highlight current line" msgstr "Aktuális sor kiemelése" -#: ../data/org.gnome.meld.gschema.xml.h:26 +#: ../data/org.gnome.meld.gschema.xml.h:22 msgid "" "If true, the line containing the cursor will be highlighted in file " "comparisons." msgstr "A kurzort tartalmazó sor kiemelése a fájl-összehasonlításokban." -#: ../data/org.gnome.meld.gschema.xml.h:27 +#: ../data/org.gnome.meld.gschema.xml.h:23 msgid "Use the system default monospace font" msgstr "" "A rendszer alapértelmezett rögzített szélességű betűkészletének használata" -#: ../data/org.gnome.meld.gschema.xml.h:28 +#: ../data/org.gnome.meld.gschema.xml.h:24 msgid "" "If false, custom-font will be used instead of the system monospace font." msgstr "" "A rendszer rögzített szélességű betűkészlete helyett az egyéni lesz " "használva, ha hamis." -#: ../data/org.gnome.meld.gschema.xml.h:29 +#: ../data/org.gnome.meld.gschema.xml.h:25 msgid "Custom font" msgstr "Egyéni betűkészlet" -#: ../data/org.gnome.meld.gschema.xml.h:30 +#: ../data/org.gnome.meld.gschema.xml.h:26 msgid "" "The custom font to use, stored as a string and parsed as a Pango font " "description." @@ -248,21 +235,21 @@ msgstr "" "Használandó egyéni betűkészlet, karakterláncként tárolva és Pango " "betűleírásként feldolgozva." -#: ../data/org.gnome.meld.gschema.xml.h:31 +#: ../data/org.gnome.meld.gschema.xml.h:27 msgid "Ignore blank lines when comparing files" msgstr "Üres sorok figyelmen kívül hagyása fájlok összehasonlításakor" -#: ../data/org.gnome.meld.gschema.xml.h:32 +#: ../data/org.gnome.meld.gschema.xml.h:28 msgid "" "If true, blank lines will be trimmed when highlighting changes between files." msgstr "" "Az üres sorok ki lesznek hagyva a fájlok közti különbségek kiemelésekor." -#: ../data/org.gnome.meld.gschema.xml.h:33 +#: ../data/org.gnome.meld.gschema.xml.h:29 msgid "Use the system default editor" msgstr "A rendszer alapértelmezett szerkesztőjének használata" -#: ../data/org.gnome.meld.gschema.xml.h:34 +#: ../data/org.gnome.meld.gschema.xml.h:30 msgid "" "If false, custom-editor-command will be used instead of the system editor " "when opening files externally." @@ -270,11 +257,11 @@ msgstr "" "Ha hamis, a custom-editor-command lesz a rendszer alapértelmezett " "szerkesztője helyett használva." -#: ../data/org.gnome.meld.gschema.xml.h:35 +#: ../data/org.gnome.meld.gschema.xml.h:31 msgid "The custom editor launch command" msgstr "Az egyéni szerkesztőt indító parancs" -#: ../data/org.gnome.meld.gschema.xml.h:36 +#: ../data/org.gnome.meld.gschema.xml.h:32 msgid "" "The command used to launch a custom editor. Some limited templating is " "supported here; at the moment '{file}' and '{line}' are recognised tokens." @@ -282,22 +269,23 @@ msgstr "" "Az egyéni szerkesztőt indító parancs. Ez a kulcs korlátozottan támogat " "sablonokat is. Jelenleg a {file} és {line} a felismert helyettesítők." -#: ../data/org.gnome.meld.gschema.xml.h:37 +#: ../data/org.gnome.meld.gschema.xml.h:33 msgid "Columns to display" msgstr "Megjelenítendő oszlopok" -#: ../data/org.gnome.meld.gschema.xml.h:38 +#: ../data/org.gnome.meld.gschema.xml.h:34 msgid "" "List of column names in folder comparison and whether they should be " "displayed." msgstr "" "Oszlopnevek listája a mappa-összehasonlításban, és hogy megjelenítendők-e." -#: ../data/org.gnome.meld.gschema.xml.h:39 ../data/ui/preferences.ui.h:25 +#: ../data/org.gnome.meld.gschema.xml.h:35 +#: ../meld/resources/ui/preferences.ui.h:25 msgid "Ignore symbolic links" msgstr "Szimbolikus linkek figyelmen kívül hagyása" -#: ../data/org.gnome.meld.gschema.xml.h:40 +#: ../data/org.gnome.meld.gschema.xml.h:36 msgid "" "If true, folder comparisons do not follow symbolic links when traversing the " "folder tree." @@ -305,11 +293,11 @@ msgstr "" "A mappa-összehasonlítások nem követik a szimbolikus linkeket a mappafa " "bejárásakor." -#: ../data/org.gnome.meld.gschema.xml.h:41 +#: ../data/org.gnome.meld.gschema.xml.h:37 msgid "Use shallow comparison" msgstr "Sekély összehasonlítás használata" -#: ../data/org.gnome.meld.gschema.xml.h:42 +#: ../data/org.gnome.meld.gschema.xml.h:38 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 " @@ -319,11 +307,11 @@ msgstr "" "hasonlítják össze, a fájlokat azonosnak tekintik a méret és módosítási idő " "egyezésekor, és eltérőnek egyébként." -#: ../data/org.gnome.meld.gschema.xml.h:43 +#: ../data/org.gnome.meld.gschema.xml.h:39 msgid "File timestamp resolution" msgstr "Fájlidőbélyeg felbontása" -#: ../data/org.gnome.meld.gschema.xml.h:44 +#: ../data/org.gnome.meld.gschema.xml.h:40 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 " @@ -335,11 +323,12 @@ msgstr "" "számítanának. Ez eltérő időbélyeg-felbontással rendelkező fájlrendszereken " "lévő fájlok összehasonlításakor hasznos." -#: ../data/org.gnome.meld.gschema.xml.h:45 ../data/ui/preferences.ui.h:22 +#: ../data/org.gnome.meld.gschema.xml.h:41 +#: ../meld/resources/ui/preferences.ui.h:22 msgid "Apply text filters during folder comparisons" msgstr "Szövegszűrők alkalmazása mappa-összehasonlításkor" -#: ../data/org.gnome.meld.gschema.xml.h:46 +#: ../data/org.gnome.meld.gschema.xml.h:42 msgid "" "If true, folder comparisons that compare file contents also apply active " "text filters and the blank line trimming option, and ignore newline " @@ -349,21 +338,21 @@ msgstr "" "is alkalmaznak, valamint levágják az üres sorokat, és mellőzik az üreshely-" "különbségeket." -#: ../data/org.gnome.meld.gschema.xml.h:47 +#: ../data/org.gnome.meld.gschema.xml.h:43 msgid "File status filters" msgstr "Fájlállapotszűrők" -#: ../data/org.gnome.meld.gschema.xml.h:48 +#: ../data/org.gnome.meld.gschema.xml.h:44 msgid "List of statuses used to filter visible files in folder comparison." msgstr "" "A mappa-összehasonlításban látható fájlok szűrésére használt állapotok " "listája." -#: ../data/org.gnome.meld.gschema.xml.h:49 +#: ../data/org.gnome.meld.gschema.xml.h:45 msgid "Show the version control console output" msgstr "A verziókövető konzolos kimenetének megjelenítése" -#: ../data/org.gnome.meld.gschema.xml.h:50 +#: ../data/org.gnome.meld.gschema.xml.h:46 msgid "" "If true, a console output section will be shown in version control views, " "showing the commands run for version control operations." @@ -371,21 +360,21 @@ msgstr "" "A verziókövető nézetekben megjelenik egy konzolos kimenet szakasz, amely a " "verziókövetési műveletekhez használt parancsokat jeleníti meg." -#: ../data/org.gnome.meld.gschema.xml.h:51 +#: ../data/org.gnome.meld.gschema.xml.h:47 msgid "Version control pane position" msgstr "Verziókövetés ablaktábla pozíciója" -#: ../data/org.gnome.meld.gschema.xml.h:52 +#: ../data/org.gnome.meld.gschema.xml.h:48 msgid "" "This is the height of the main version control tree when the console pane is " "shown." msgstr "A fő verziókövetési fa magassága, amikor a konzol ablaktábla látható." -#: ../data/org.gnome.meld.gschema.xml.h:53 +#: ../data/org.gnome.meld.gschema.xml.h:49 msgid "Present version comparisons as left-local/right-remote" msgstr "Verzió-összehasonlítások megjelenítése mint bal-helyi / jobb-távoli" -#: ../data/org.gnome.meld.gschema.xml.h:54 +#: ../data/org.gnome.meld.gschema.xml.h:50 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, " @@ -395,13 +384,13 @@ msgstr "" "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." -#: ../data/org.gnome.meld.gschema.xml.h:55 +#: ../data/org.gnome.meld.gschema.xml.h:51 msgid "Order for files in three-way version control merge comparisons" msgstr "" "Fájlok sorrendje a háromutas verziókövetési összefésülési " "összehasonlításokban" -#: ../data/org.gnome.meld.gschema.xml.h:56 +#: ../data/org.gnome.meld.gschema.xml.h:52 msgid "" "Choices for file order are remote/merged/local and local/merged/remote. This " "preference only affects three-way comparisons launched from the version " @@ -412,11 +401,11 @@ msgstr "" "összehasonlításokat befolyásolja, így csak a Melden belüli összefésülésekhez/" "ütközésfeloldásokhoz kerül felhasználásra." -#: ../data/org.gnome.meld.gschema.xml.h:57 +#: ../data/org.gnome.meld.gschema.xml.h:53 msgid "Show margin in commit message editor" msgstr "Margó megjelenítése a kommitüzenet-szerkesztőben" -#: ../data/org.gnome.meld.gschema.xml.h:58 +#: ../data/org.gnome.meld.gschema.xml.h:54 msgid "" "If true, a guide will be displayed to show what column the margin is at in " "the version control commit message editor." @@ -424,11 +413,11 @@ msgstr "" "Megjelenjen-e egy útmutató, jelezve, hogy a margó melyik oszlopban van a " "verziókövetési kommitüzenet-szerkesztőben." -#: ../data/org.gnome.meld.gschema.xml.h:59 +#: ../data/org.gnome.meld.gschema.xml.h:55 msgid "Margin column in commit message editor" msgstr "Margó oszlop a kommitüzenet-szerkesztőben" -#: ../data/org.gnome.meld.gschema.xml.h:60 +#: ../data/org.gnome.meld.gschema.xml.h:56 msgid "" "The column at which to show the margin in the version control commit message " "editor." @@ -436,33 +425,33 @@ msgstr "" "A margó megjelenítése ebben az oszlopban a verziókövető kommitüzenet-" "szerkesztőjében." -#: ../data/org.gnome.meld.gschema.xml.h:61 +#: ../data/org.gnome.meld.gschema.xml.h:57 msgid "Automatically hard-wrap commit messages" msgstr "Kommitüzenetek automatikus törése" -#: ../data/org.gnome.meld.gschema.xml.h:62 +#: ../data/org.gnome.meld.gschema.xml.h:58 msgid "" "If true, the version control commit message editor will hard-wrap (i.e., " "insert line breaks) at the commit margin before commit." msgstr "" "A verziókövető szúrjon-e be sortöréseket a kommit margónál a kommit előtt." -#: ../data/org.gnome.meld.gschema.xml.h:63 +#: ../data/org.gnome.meld.gschema.xml.h:59 msgid "Version control status filters" msgstr "Verziókövetési állapotszűrők" -#: ../data/org.gnome.meld.gschema.xml.h:64 +#: ../data/org.gnome.meld.gschema.xml.h:60 msgid "" "List of statuses used to filter visible files in version control comparison." msgstr "" "A verziókövetési összehasonlításban látható fájlok szűrésére használt " "állapotok listája." -#: ../data/org.gnome.meld.gschema.xml.h:65 +#: ../data/org.gnome.meld.gschema.xml.h:61 msgid "Filename-based filters" msgstr "Fájlnév alapú szűrők" -#: ../data/org.gnome.meld.gschema.xml.h:66 +#: ../data/org.gnome.meld.gschema.xml.h:62 msgid "" "List of predefined filename-based filters that, if active, will remove " "matching files from a folder comparison." @@ -470,11 +459,11 @@ msgstr "" "Előre megadott fájlnév alapú szűrők listája, amelyekre illeszkedő fájlok " "eltávolításra kerülnek a mappa-összehasonlításból." -#: ../data/org.gnome.meld.gschema.xml.h:67 +#: ../data/org.gnome.meld.gschema.xml.h:63 msgid "Text-based filters" msgstr "Szöveg alapú szűrők" -#: ../data/org.gnome.meld.gschema.xml.h:68 +#: ../data/org.gnome.meld.gschema.xml.h:64 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, " @@ -500,397 +489,622 @@ msgstr "Meld sötét séma" msgid "Dark color scheme for Meld highlighting" msgstr "Sötét színséma a Meld kiemeléshez" -#: ../data/ui/application.ui.h:1 -msgid "About Meld" -msgstr "A Meld névjegye" - -#: ../data/ui/application.ui.h:2 -msgid "" -"Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2017 Kai Willadsen" -msgstr "" -"Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2017 Kai Willadsen" +#: ../meld/resources/gtk/help-overlay.ui.h:1 +msgctxt "shortcut window" +msgid "General" +msgstr "Általános" -#: ../data/ui/application.ui.h:4 -msgid "Website" -msgstr "Weboldal" +#: ../meld/resources/gtk/help-overlay.ui.h:2 +msgctxt "shortcut window" +msgid "New comparison" +msgstr "Új összehasonlítás" -#: ../data/ui/application.ui.h:5 -msgid "translator-credits" -msgstr "" -"CSÉCSY László \n" -"Kelemen Gábor " +#: ../meld/resources/gtk/help-overlay.ui.h:3 +msgctxt "shortcut window" +msgid "Close a comparison" +msgstr "Összehasonlítás bezárása" -#: ../data/ui/application.ui.h:6 -msgid "_Preferences" -msgstr "_Beállítások" +#: ../meld/resources/gtk/help-overlay.ui.h:4 +msgctxt "shortcut window" +msgid "Quit Meld" +msgstr "Kilépés a Meldből" -#: ../data/ui/application.ui.h:7 -msgid "_Help" -msgstr "_Súgó" +#: ../meld/resources/gtk/help-overlay.ui.h:5 +msgctxt "shortcut window" +msgid "Stop the current action" +msgstr "Aktuális művelet leállítása" -#: ../data/ui/application.ui.h:8 -msgid "Keyboard Shortcuts" -msgstr "Gyorsbillentyűk" +#: ../meld/resources/gtk/help-overlay.ui.h:6 +msgctxt "shortcut window" +msgid "Refresh comparison" +msgstr "Összehasonlítás frissítése" -#: ../data/ui/application.ui.h:9 -msgid "_About" -msgstr "_Névjegy" +#: ../meld/resources/gtk/help-overlay.ui.h:7 +msgctxt "shortcut window" +msgid "Fullscreen" +msgstr "Teljes képernyő" -#: ../data/ui/application.ui.h:10 -msgid "_Quit" -msgstr "_Kilépés" +#: ../meld/resources/gtk/help-overlay.ui.h:8 +msgctxt "shortcut window" +msgid "Tabs" +msgstr "Lapok" -#: ../data/ui/dirdiff.ui.h:1 ../data/ui/vcview.ui.h:1 -msgid "_Compare" -msgstr "Össze_hasonlítás" +#: ../meld/resources/gtk/help-overlay.ui.h:9 +msgctxt "shortcut window" +msgid "Go to previous tab" +msgstr "Ugrás az előző lapra" -#: ../data/ui/dirdiff.ui.h:2 ../data/ui/vcview.ui.h:2 -msgid "Compare selected files" -msgstr "Kijelölt fájlok összehasonlítása" +#: ../meld/resources/gtk/help-overlay.ui.h:10 +msgctxt "shortcut window" +msgid "Go to next tab" +msgstr "Ugrás a következő lapra" -#: ../data/ui/dirdiff.ui.h:3 -msgid "Collapse Recursively" -msgstr "Összecsukás rekurzívan" +#: ../meld/resources/gtk/help-overlay.ui.h:11 +msgctxt "shortcut window" +msgid "Switch to tab" +msgstr "Váltás lapra" -#: ../data/ui/dirdiff.ui.h:4 -msgid "Collapse selected folder and all subfolders" -msgstr "A kijelölt mappák és az összes almappa összecsukása" +#: ../meld/resources/gtk/help-overlay.ui.h:12 +msgctxt "shortcut window" +msgid "Move tab left" +msgstr "Lap mozgatása balra" -#: ../data/ui/dirdiff.ui.h:5 -msgid "Expand Recursively" -msgstr "Kinyitás rekurzívan" +#: ../meld/resources/gtk/help-overlay.ui.h:13 +msgctxt "shortcut window" +msgid "Move tab right" +msgstr "Lap mozgatása jobbra" -#: ../data/ui/dirdiff.ui.h:6 -msgid "Expand selected folder and all subfolders" -msgstr "A kijelölt mappák és az összes almappa kinyitása" +#: ../meld/resources/gtk/help-overlay.ui.h:14 +msgctxt "shortcut window" +msgid "Changes" +msgstr "Változások" -#: ../data/ui/dirdiff.ui.h:7 -msgid "Copy to _Left" -msgstr "Másolás _balra" +#: ../meld/resources/gtk/help-overlay.ui.h:15 +msgctxt "shortcut window" +msgid "Go to previous change" +msgstr "Ugrás az előző változásra" -#: ../data/ui/dirdiff.ui.h:8 -msgid "Copy to left" -msgstr "Másolás a bal oldalra" +#: ../meld/resources/gtk/help-overlay.ui.h:16 +msgctxt "shortcut window" +msgid "Go to next change" +msgstr "Ugrás a következő változásra" -#: ../data/ui/dirdiff.ui.h:9 -msgid "Copy to _Right" -msgstr "Másolás j_obbra" +#: ../meld/resources/gtk/help-overlay.ui.h:17 +msgctxt "shortcut window" +msgid "Editing" +msgstr "Szerkesztés" -#: ../data/ui/dirdiff.ui.h:10 -msgid "Copy to right" -msgstr "Másolás a jobb oldalra" +#: ../meld/resources/gtk/help-overlay.ui.h:18 +msgctxt "shortcut window" +msgid "Undo" +msgstr "Visszavonás" -#: ../data/ui/dirdiff.ui.h:11 -msgid "Delete selected" -msgstr "Kijelölt törlése" +#: ../meld/resources/gtk/help-overlay.ui.h:19 +msgctxt "shortcut window" +msgid "Redo" +msgstr "Mégis" -#: ../data/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:907 ../meld/filediff.py:1497 -msgid "Hide" -msgstr "Elrejtés" +#: ../meld/resources/gtk/help-overlay.ui.h:20 +msgctxt "shortcut window" +msgid "Cut" +msgstr "Kivágás" -#: ../data/ui/dirdiff.ui.h:13 -msgid "Hide selected" -msgstr "Kijelölt elrejtése" +#: ../meld/resources/gtk/help-overlay.ui.h:21 +msgctxt "shortcut window" +msgid "Copy" +msgstr "Másolás" -#: ../data/ui/dirdiff.ui.h:14 -msgid "Ignore Filename Case" -msgstr "Kis- és nagybetűk nem különböznek a fájlnévben" +#: ../meld/resources/gtk/help-overlay.ui.h:22 +msgctxt "shortcut window" +msgid "Paste" +msgstr "Beillesztés" -#: ../data/ui/dirdiff.ui.h:15 -msgid "" -"Consider differently-cased filenames that are otherwise-identical to be the " -"same" -msgstr "" -"Tartalmukban azonos, csak a fájlnév kis- és nagybetűiben eltérő fájlok " -"azonosnak tekintése" +#: ../meld/resources/gtk/help-overlay.ui.h:23 +msgctxt "shortcut window" +msgid "Find" +msgstr "Keresés" -#: ../data/ui/dirdiff.ui.h:16 -msgid "Same" -msgstr "Egyezik" +#: ../meld/resources/gtk/help-overlay.ui.h:24 +msgctxt "shortcut window" +msgid "Find Next" +msgstr "Következő találat" -#: ../data/ui/dirdiff.ui.h:17 -msgid "Show identical" -msgstr "Azonosak megjelenítése" +#: ../meld/resources/gtk/help-overlay.ui.h:25 +msgctxt "shortcut window" +msgid "Find Previous" +msgstr "Előző találat" -#: ../data/ui/dirdiff.ui.h:18 -msgid "New" -msgstr "Új" +#: ../meld/resources/gtk/help-overlay.ui.h:26 +msgctxt "shortcut window" +msgid "Replace" +msgstr "Csere" -#: ../data/ui/dirdiff.ui.h:19 -msgid "Show new" -msgstr "Újak megjelenítése" +#: ../meld/resources/gtk/help-overlay.ui.h:27 +msgctxt "shortcut window" +msgid "File comparison" +msgstr "Fájl-összehasonlítás" -#: ../data/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:76 -msgid "Modified" -msgstr "Módosítva" +#: ../meld/resources/gtk/help-overlay.ui.h:28 +msgctxt "shortcut window" +msgid "Save current file" +msgstr "Aktuális fájl mentése" -#: ../data/ui/dirdiff.ui.h:21 -msgid "Show modified" -msgstr "Módosítottak megjelenítése" +#: ../meld/resources/gtk/help-overlay.ui.h:29 +msgctxt "shortcut window" +msgid "Save current file to new path" +msgstr "Aktuális fájl mentése új útvonalra" -#: ../data/ui/dirdiff.ui.h:22 -msgid "Filters" -msgstr "Szűrők" +#: ../meld/resources/gtk/help-overlay.ui.h:30 +msgctxt "shortcut window" +msgid "Save all files in comparison" +msgstr "Minden fájl mentése az összehasonlításban" -#: ../data/ui/dirdiff.ui.h:23 -msgid "Set active filters" -msgstr "Aktív szűrők beállítása" +#: ../meld/resources/gtk/help-overlay.ui.h:31 +msgctxt "shortcut window" +msgid "Previous conflict" +msgstr "Előző ütközés" + +#: ../meld/resources/gtk/help-overlay.ui.h:32 +msgctxt "shortcut window" +msgid "Next conflict" +msgstr "Következő ütközés" + +#: ../meld/resources/gtk/help-overlay.ui.h:33 +msgctxt "shortcut window" +msgid "Push change to left" +msgstr "Változás balra küldése" + +#: ../meld/resources/gtk/help-overlay.ui.h:34 +msgctxt "shortcut window" +msgid "Push change to right" +msgstr "Változás jobbra küldése" + +#: ../meld/resources/gtk/help-overlay.ui.h:35 +msgctxt "shortcut window" +msgid "Pull change from left" +msgstr "Változás áthúzása balról" + +#: ../meld/resources/gtk/help-overlay.ui.h:36 +msgctxt "shortcut window" +msgid "Pull change from right" +msgstr "Változás áthúzása jobbról" + +#: ../meld/resources/gtk/help-overlay.ui.h:37 +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.h:38 +msgctxt "shortcut window" +msgid "Copy change below left" +msgstr "Változás másolása a bal oldali alá" -#: ../data/ui/EditableList.ui.h:1 -msgid "Editable List" -msgstr "Szerkeszthető lista" +#: ../meld/resources/gtk/help-overlay.ui.h:39 +msgctxt "shortcut window" +msgid "Copy change above right" +msgstr "Változás másolása a jobb oldali fölé" -#: ../data/ui/EditableList.ui.h:2 +#: ../meld/resources/gtk/help-overlay.ui.h:40 +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.h:41 +msgctxt "shortcut window" +msgid "Delete change" +msgstr "Változás törlése" + +#: ../meld/resources/gtk/help-overlay.ui.h:42 +msgctxt "shortcut window" +msgid "Previous comparison pane" +msgstr "Előző összehasonlító ablaktábla" + +#: ../meld/resources/gtk/help-overlay.ui.h:43 +msgctxt "shortcut window" +msgid "Next comparison pane" +msgstr "Következő összehasonlító ablaktábla" + +#: ../meld/resources/gtk/help-overlay.ui.h:44 +msgctxt "shortcut window" +msgid "Folder comparison" +msgstr "Mappa-összehasonlítás" + +#: ../meld/resources/gtk/help-overlay.ui.h:45 +msgctxt "shortcut window" +msgid "Copy to left" +msgstr "Másolás a bal oldalra" + +#: ../meld/resources/gtk/help-overlay.ui.h:46 +msgctxt "shortcut window" +msgid "Copy to right" +msgstr "Másolás a jobb oldalra" + +#: ../meld/resources/gtk/help-overlay.ui.h:47 +msgctxt "shortcut window" +msgid "Version control comparison" +msgstr "Verziókövető-összehasonlítás" + +#: ../meld/resources/gtk/help-overlay.ui.h:48 +msgctxt "shortcut window" +msgid "Commit to version control" +msgstr "Kommit verziókövetőbe" + +#: ../meld/resources/gtk/help-overlay.ui.h:49 +msgctxt "shortcut window" +msgid "Show/hide console output" +msgstr "Konzolkimenet megjelenítése/elrejtése" + +#: ../meld/resources/gtk/menus.ui.h:1 +msgid "_Preferences" +msgstr "_Beállítások" + +#: ../meld/resources/gtk/menus.ui.h:2 +msgid "_Help" +msgstr "_Súgó" + +#: ../meld/resources/gtk/menus.ui.h:3 +msgid "Keyboard Shortcuts" +msgstr "Gyorsbillentyűk" + +#: ../meld/resources/gtk/menus.ui.h:4 +msgid "_About" +msgstr "_Névjegy" + +#: ../meld/resources/gtk/menus.ui.h:5 +msgid "_Quit" +msgstr "_Kilépés" + +#: ../meld/resources/ui/about-dialog.ui.h:1 +msgid "About Meld" +msgstr "A Meld névjegye" + +#: ../meld/resources/ui/about-dialog.ui.h:2 +msgid "" +"Copyright © 2002-2009 Stephen Kennedy\n" +"Copyright © 2009-2017 Kai Willadsen" +msgstr "" +"Copyright © 2002-2009 Stephen Kennedy\n" +"Copyright © 2009-2017 Kai Willadsen" + +#: ../meld/resources/ui/about-dialog.ui.h:4 +msgid "Website" +msgstr "Weboldal" + +#: ../meld/resources/ui/about-dialog.ui.h:5 +msgid "translator-credits" +msgstr "" +"CSÉCSY László \n" +"Kelemen Gábor " + +#: ../meld/resources/ui/column-list.ui.h:1 +#: ../meld/resources/ui/filter-list.ui.h:1 msgid "Active" msgstr "Aktív" -#: ../data/ui/EditableList.ui.h:3 +#: ../meld/resources/ui/column-list.ui.h:2 msgid "Column Name" msgstr "Oszlopnév" -#: ../data/ui/EditableList.ui.h:4 ../data/ui/vcview.ui.h:9 -msgid "_Add" -msgstr "Hozzá_adás" - -#: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11 -#: ../meld/vcview.py:680 +#: ../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 msgid "_Remove" msgstr "_Eltávolítás" -#: ../data/ui/EditableList.ui.h:6 +#: ../meld/resources/ui/column-list.ui.h:4 +#: ../meld/resources/ui/filter-list.ui.h:8 msgid "Move item up" msgstr "Elem mozgatása fel" -#: ../data/ui/EditableList.ui.h:7 +#: ../meld/resources/ui/column-list.ui.h:5 +#: ../meld/resources/ui/filter-list.ui.h:9 msgid "Move _Up" msgstr "Mozgatás _fel" -#: ../data/ui/EditableList.ui.h:8 +#: ../meld/resources/ui/column-list.ui.h:6 +#: ../meld/resources/ui/filter-list.ui.h:10 msgid "Move item down" msgstr "Elem mozgatása le" -#: ../data/ui/EditableList.ui.h:9 +#: ../meld/resources/ui/column-list.ui.h:7 +#: ../meld/resources/ui/filter-list.ui.h:11 msgid "Move _Down" msgstr "Mozgatás _le" -#. Create icon and filename CellRenderer -#: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35 -#: ../meld/dirdiff.py:407 -msgid "Name" -msgstr "Név" +#: ../meld/resources/ui/commit-dialog.ui.h:1 +msgid "Commit" +msgstr "Kommit" -#: ../data/ui/EditableList.ui.h:11 -msgid "Pattern" -msgstr "Minta" +#: ../meld/resources/ui/commit-dialog.ui.h:2 +msgid "Commit Files" +msgstr "Fájlok kommitolása" -#: ../data/ui/EditableList.ui.h:12 -msgid "Add new filter" -msgstr "Új szűrő hozzáadása" +#: ../meld/resources/ui/commit-dialog.ui.h:3 +msgid "Log Message" +msgstr "Naplóüzenet" -#: ../data/ui/EditableList.ui.h:13 -msgid "Remove selected filter" -msgstr "Kiválasztott szűrő eltávolítása" +#: ../meld/resources/ui/commit-dialog.ui.h:4 +msgid "Previous logs:" +msgstr "Előző naplók:" + +#: ../meld/resources/ui/commit-dialog.ui.h:5 +msgid "Co_mmit" +msgstr "_Kommit" + +#: ../meld/resources/ui/dirdiff.ui.h:1 ../meld/resources/ui/vcview.ui.h:1 +msgid "_Compare" +msgstr "Össze_hasonlítás" + +#: ../meld/resources/ui/dirdiff.ui.h:2 ../meld/resources/ui/vcview.ui.h:2 +msgid "Compare selected files" +msgstr "Kijelölt fájlok összehasonlítása" + +#: ../meld/resources/ui/dirdiff.ui.h:3 +msgid "Collapse Recursively" +msgstr "Összecsukás rekurzívan" + +#: ../meld/resources/ui/dirdiff.ui.h:4 +msgid "Collapse selected folder and all subfolders" +msgstr "A kijelölt mappák és az összes almappa összecsukása" + +#: ../meld/resources/ui/dirdiff.ui.h:5 +msgid "Expand Recursively" +msgstr "Kinyitás rekurzívan" + +#: ../meld/resources/ui/dirdiff.ui.h:6 +msgid "Expand selected folder and all subfolders" +msgstr "A kijelölt mappák és az összes almappa kinyitása" + +#: ../meld/resources/ui/dirdiff.ui.h:7 +msgid "Copy to _Left" +msgstr "Másolás _balra" + +#: ../meld/resources/ui/dirdiff.ui.h:8 +msgid "Copy to left" +msgstr "Másolás a bal oldalra" + +#: ../meld/resources/ui/dirdiff.ui.h:9 +msgid "Copy to _Right" +msgstr "Másolás j_obbra" + +#: ../meld/resources/ui/dirdiff.ui.h:10 +msgid "Copy to right" +msgstr "Másolás a jobb oldalra" + +#: ../meld/resources/ui/dirdiff.ui.h:11 +msgid "Delete selected" +msgstr "Kijelölt törlése" -#: ../data/ui/encoding-selector.ui.h:1 +#: ../meld/resources/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:959 +#: ../meld/filediff.py:1601 +msgid "Hide" +msgstr "Elrejtés" + +#: ../meld/resources/ui/dirdiff.ui.h:13 +msgid "Hide selected" +msgstr "Kijelölt elrejtése" + +#: ../meld/resources/ui/dirdiff.ui.h:14 +msgid "Ignore Filename Case" +msgstr "Kis- és nagybetűk nem különböznek a fájlnévben" + +#: ../meld/resources/ui/dirdiff.ui.h:15 +msgid "" +"Consider differently-cased filenames that are otherwise-identical to be the " +"same" +msgstr "" +"Tartalmukban azonos, csak a fájlnév kis- és nagybetűiben eltérő fájlok " +"azonosnak tekintése" + +#: ../meld/resources/ui/dirdiff.ui.h:16 +msgid "Same" +msgstr "Egyezik" + +#: ../meld/resources/ui/dirdiff.ui.h:17 +msgid "Show identical" +msgstr "Azonosak megjelenítése" + +#: ../meld/resources/ui/dirdiff.ui.h:18 +msgid "New" +msgstr "Új" + +#: ../meld/resources/ui/dirdiff.ui.h:19 +msgid "Show new" +msgstr "Újak megjelenítése" + +#: ../meld/resources/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:77 +msgid "Modified" +msgstr "Módosítva" + +#: ../meld/resources/ui/dirdiff.ui.h:21 +msgid "Show modified" +msgstr "Módosítottak megjelenítése" + +#: ../meld/resources/ui/dirdiff.ui.h:22 +msgid "Filters" +msgstr "Szűrők" + +#: ../meld/resources/ui/dirdiff.ui.h:23 +msgid "Set active filters" +msgstr "Aktív szűrők beállítása" + +#: ../meld/resources/ui/encoding-selector.ui.h:1 msgid "Search text encoding…" msgstr "Szövegkódolás keresése…" -#: ../data/ui/filediff.ui.h:1 +#: ../meld/resources/ui/filediff.ui.h:1 msgid "Format as Patch…" msgstr "Formázás foltként…" -#: ../data/ui/filediff.ui.h:2 +#: ../meld/resources/ui/filediff.ui.h:2 msgid "Create a patch using differences between files" msgstr "Folt létrehozása a fájlok közti különbségeket felhasználva" -#: ../data/ui/filediff.ui.h:3 +#: ../meld/resources/ui/filediff.ui.h:3 msgid "Save A_ll" msgstr "Összes men_tése" -#: ../data/ui/filediff.ui.h:4 +#: ../meld/resources/ui/filediff.ui.h:4 msgid "Save all files in the current comparison" msgstr "Minden fájl mentése a jelenlegi összehasonlításban" -#: ../data/ui/filediff.ui.h:5 +#: ../meld/resources/ui/filediff.ui.h:5 msgid "Revert files to their saved versions" msgstr "Fájlok visszaállítása a mentett verzióikra" -#: ../data/ui/filediff.ui.h:6 +#: ../meld/resources/ui/filediff.ui.h:6 msgid "Add Synchronization Point" msgstr "Szinkronizálási pont hozzáadása" -#: ../data/ui/filediff.ui.h:7 +#: ../meld/resources/ui/filediff.ui.h:7 msgid "Add a synchronization point for changes between files" msgstr "Szinkronizálási pont hozzáadása a fájlok közti változásokhoz" -#: ../data/ui/filediff.ui.h:8 +#: ../meld/resources/ui/filediff.ui.h:8 msgid "Clear Synchronization Points" msgstr "Szinkronizálási pontok törlése" -#: ../data/ui/filediff.ui.h:9 +#: ../meld/resources/ui/filediff.ui.h:9 msgid "Clear sychronization points for changes between files" msgstr "Szinkronizálási pontok törlése a fájlok közti változásokhoz" -#: ../data/ui/filediff.ui.h:10 +#: ../meld/resources/ui/filediff.ui.h:10 msgid "Previous Conflict" msgstr "Előző ütközés" -#: ../data/ui/filediff.ui.h:11 +#: ../meld/resources/ui/filediff.ui.h:11 msgid "Go to the previous conflict" msgstr "Ugrás az előző ütközésre" -#: ../data/ui/filediff.ui.h:12 +#: ../meld/resources/ui/filediff.ui.h:12 msgid "Next Conflict" msgstr "Következő ütközés" -#: ../data/ui/filediff.ui.h:13 +#: ../meld/resources/ui/filediff.ui.h:13 msgid "Go to the next conflict" msgstr "Ugrás a következő ütközésre" -#: ../data/ui/filediff.ui.h:14 +#: ../meld/resources/ui/filediff.ui.h:14 msgid "Push to Left" msgstr "Balra küldés" -#: ../data/ui/filediff.ui.h:15 +#: ../meld/resources/ui/filediff.ui.h:15 msgid "Push current change to the left" msgstr "Jelenlegi változás balra küldése" -#: ../data/ui/filediff.ui.h:16 +#: ../meld/resources/ui/filediff.ui.h:16 msgid "Push to Right" msgstr "Jobbra küldés" -#: ../data/ui/filediff.ui.h:17 +#: ../meld/resources/ui/filediff.ui.h:17 msgid "Push current change to the right" msgstr "Jelenlegi változás jobbra küldése" -#: ../data/ui/filediff.ui.h:18 +#: ../meld/resources/ui/filediff.ui.h:18 msgid "Pull from Left" msgstr "Áthúzás balról" -#: ../data/ui/filediff.ui.h:19 +#: ../meld/resources/ui/filediff.ui.h:19 msgid "Pull change from the left" msgstr "Változás áthúzása balról" -#: ../data/ui/filediff.ui.h:20 +#: ../meld/resources/ui/filediff.ui.h:20 msgid "Pull from Right" msgstr "Áthúzás jobbról" -#: ../data/ui/filediff.ui.h:21 +#: ../meld/resources/ui/filediff.ui.h:21 msgid "Pull change from the right" msgstr "Változás áthúzása jobbról" -#: ../data/ui/filediff.ui.h:22 +#: ../meld/resources/ui/filediff.ui.h:22 msgid "Copy Above Left" msgstr "Másolás balra fel" -#: ../data/ui/filediff.ui.h:23 +#: ../meld/resources/ui/filediff.ui.h:23 msgid "Copy change above the left chunk" msgstr "Változás másolása a bal oldali darab fölé" -#: ../data/ui/filediff.ui.h:24 +#: ../meld/resources/ui/filediff.ui.h:24 msgid "Copy Below Left" msgstr "Másolás balra le" -#: ../data/ui/filediff.ui.h:25 +#: ../meld/resources/ui/filediff.ui.h:25 msgid "Copy change below the left chunk" msgstr "Változás másolása a bal oldali darab alá" -#: ../data/ui/filediff.ui.h:26 +#: ../meld/resources/ui/filediff.ui.h:26 msgid "Copy Above Right" msgstr "Másolás jobbra fel" -#: ../data/ui/filediff.ui.h:27 +#: ../meld/resources/ui/filediff.ui.h:27 msgid "Copy change above the right chunk" msgstr "Változás másolása a jobb oldali darab fölé" -#: ../data/ui/filediff.ui.h:28 +#: ../meld/resources/ui/filediff.ui.h:28 msgid "Copy Below Right" msgstr "Másolás jobbra le" -#: ../data/ui/filediff.ui.h:29 +#: ../meld/resources/ui/filediff.ui.h:29 msgid "Copy change below the right chunk" msgstr "Változás másolása a jobb oldali darab alá" -#: ../data/ui/filediff.ui.h:30 +#: ../meld/resources/ui/filediff.ui.h:30 msgid "Delete" msgstr "Törlés" -#: ../data/ui/filediff.ui.h:31 +#: ../meld/resources/ui/filediff.ui.h:31 msgid "Delete change" msgstr "Változás törlése" -#: ../data/ui/filediff.ui.h:32 +#: ../meld/resources/ui/filediff.ui.h:32 msgid "Merge All from Left" msgstr "Minden egyesítése balról" -#: ../data/ui/filediff.ui.h:33 +#: ../meld/resources/ui/filediff.ui.h:33 msgid "Merge all non-conflicting changes from the left" msgstr "Minden nem ütköző változás egyesítése balról" -#: ../data/ui/filediff.ui.h:34 +#: ../meld/resources/ui/filediff.ui.h:34 msgid "Merge All from Right" msgstr "Minden egyesítése jobbról" -#: ../data/ui/filediff.ui.h:35 +#: ../meld/resources/ui/filediff.ui.h:35 msgid "Merge all non-conflicting changes from the right" msgstr "Minden nem ütköző változás egyesítése jobbról" -#: ../data/ui/filediff.ui.h:36 +#: ../meld/resources/ui/filediff.ui.h:36 msgid "Merge All" msgstr "Minden egyesítése" -#: ../data/ui/filediff.ui.h:37 +#: ../meld/resources/ui/filediff.ui.h:37 msgid "Merge all non-conflicting changes from left and right panes" msgstr "Minden nem ütköző változás egyesítése a bal és jobb ablaktábláról" -#: ../data/ui/filediff.ui.h:38 +#: ../meld/resources/ui/filediff.ui.h:38 msgid "Previous Pane" msgstr "Előző ablaktábla" -#: ../data/ui/filediff.ui.h:39 +#: ../meld/resources/ui/filediff.ui.h:39 msgid "Move keyboard focus to the previous document in this comparison" msgstr "Billentyűzetfókusz átvitele az összehasonlítás előző dokumentumára" -#: ../data/ui/filediff.ui.h:40 +#: ../meld/resources/ui/filediff.ui.h:40 msgid "Next Pane" msgstr "Következő ablaktábla" -#: ../data/ui/filediff.ui.h:41 +#: ../meld/resources/ui/filediff.ui.h:41 msgid "Move keyboard focus to the next document in this comparison" msgstr "Billentyűzetfókusz átvitele az összehasonlítás következő dokumentumára" -#: ../data/ui/filediff.ui.h:42 +#: ../meld/resources/ui/filediff.ui.h:42 msgid "Lock Scrolling" msgstr "Görgetés zárolása" -#: ../data/ui/filediff.ui.h:43 +#: ../meld/resources/ui/filediff.ui.h:43 msgid "Lock scrolling of all panes" msgstr "Minden ablaktábla görgetésének zárolása" -#: ../data/ui/filediff.ui.h:44 -msgid "Save changes to documents before closing?" -msgstr "Menti a dokumentumok változtatásait bezárás előtt?" - -#: ../data/ui/filediff.ui.h:45 -msgid "If you don’t save, changes will be permanently lost." -msgstr "Ha nem ment, akkor a változtatások véglegesen elvesznek." - -#: ../data/ui/filediff.ui.h:46 -msgid "Close _without Saving" -msgstr "Bezárás mentés _nélkül" - -#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:988 ../meld/iohelpers.py:50 -#: ../meld/iohelpers.py:100 -msgid "_Cancel" -msgstr "Mé_gse" - -#: ../data/ui/filediff.ui.h:48 -msgid "_Save" -msgstr "M_entés" - -#: ../data/ui/filediff.ui.h:49 +#: ../meld/resources/ui/filediff.ui.h:44 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." @@ -898,762 +1112,555 @@ msgstr "" "Ebbe a fájlba nem lehet írni. Ide kattintva feloldhatja a fájlt és " "módosításokat végezhet, de ezeket a módosításokat új fájlba kell mentenie." -#: ../data/ui/filediff.ui.h:50 +#: ../meld/resources/ui/filediff.ui.h:45 msgid "File 3" msgstr "3. fájl" -#: ../data/ui/filediff.ui.h:51 +#: ../meld/resources/ui/filediff.ui.h:46 msgid "File 2" msgstr "2. fájl" -#: ../data/ui/filediff.ui.h:52 +#: ../meld/resources/ui/filediff.ui.h:47 msgid "File 1" msgstr "1. fájl" -#: ../data/ui/filediff.ui.h:53 -msgid "Discard unsaved changes to documents?" -msgstr "Eldobja a dokumentumok mentetlen változtatásait?" +#. Create icon and filename CellRenderer +#: ../meld/resources/ui/filter-list.ui.h:2 ../meld/resources/ui/vcview.ui.h:30 +#: ../meld/dirdiff.py:455 +msgid "Name" +msgstr "Név" -#: ../data/ui/filediff.ui.h:54 -msgid "Changes made to the following documents will be permanently lost:" -msgstr "A következő dokumentumok változásai véglegesen elvesznek:" +#: ../meld/resources/ui/filter-list.ui.h:3 +msgid "Pattern" +msgstr "Minta" -#: ../data/ui/filediff.ui.h:55 -msgid "_Discard" -msgstr "_Eldobás" +#: ../meld/resources/ui/filter-list.ui.h:4 +msgid "Add new filter" +msgstr "Új szűrő hozzáadása" + +#: ../meld/resources/ui/filter-list.ui.h:5 ../meld/resources/ui/vcview.ui.h:9 +msgid "_Add" +msgstr "Hozzá_adás" -#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:989 ../meld/iohelpers.py:101 +#: ../meld/resources/ui/filter-list.ui.h:6 +msgid "Remove selected filter" +msgstr "Kiválasztott szűrő eltávolítása" + +#: ../meld/resources/ui/findbar.ui.h:1 ../meld/dirdiff.py:1041 +#: ../meld/iohelpers.py:113 msgid "_Replace" msgstr "_Csere" -#: ../data/ui/findbar.ui.h:2 +#: ../meld/resources/ui/findbar.ui.h:2 msgid "Replace _All" msgstr "Öss_zes cseréje" -#: ../data/ui/findbar.ui.h:3 +#: ../meld/resources/ui/findbar.ui.h:3 msgid "_Previous" msgstr "_Előző" -#: ../data/ui/findbar.ui.h:4 +#: ../meld/resources/ui/findbar.ui.h:4 msgid "_Next" msgstr "_Következő" -#: ../data/ui/findbar.ui.h:5 +#: ../meld/resources/ui/findbar.ui.h:5 msgid "Find:" msgstr "Keresés:" -#: ../data/ui/findbar.ui.h:6 +#: ../meld/resources/ui/findbar.ui.h:6 msgid "Replace _with:" msgstr "C_sere ezzel:" -#: ../data/ui/findbar.ui.h:7 +#: ../meld/resources/ui/findbar.ui.h:7 msgid "_Match case" msgstr "Kis- és _nagybetű" -#: ../data/ui/findbar.ui.h:8 +#: ../meld/resources/ui/findbar.ui.h:8 msgid "Who_le word" msgstr "_Teljes szó" -#: ../data/ui/findbar.ui.h:9 +#: ../meld/resources/ui/findbar.ui.h:9 msgid "Regular e_xpression" msgstr "Reguláris ki_fejezés" -#: ../data/ui/findbar.ui.h:10 +#: ../meld/resources/ui/findbar.ui.h:10 msgid "Wrapped" msgstr "Körbeért" -#: ../data/ui/language-selector.ui.h:1 +#: ../meld/resources/ui/language-selector.ui.h:1 msgid "Search highlight mode…" msgstr "Kiemelési mód keresése…" -#: ../data/ui/patch-dialog.ui.h:1 +#: ../meld/resources/ui/new-diff-tab.ui.h:1 ../meld/meldwindow.py:532 +#: ../meld/newdifftab.py:53 +msgid "New comparison" +msgstr "Új összehasonlítás" + +#: ../meld/resources/ui/new-diff-tab.ui.h:2 +msgid "File comparison" +msgstr "Fájl-összehasonlítás" + +#: ../meld/resources/ui/new-diff-tab.ui.h:3 +msgid "Directory comparison" +msgstr "Könyvtár-összehasonlítás" + +#: ../meld/resources/ui/new-diff-tab.ui.h:4 +msgid "Version control view" +msgstr "Verziókövetés-nézet" + +#: ../meld/resources/ui/new-diff-tab.ui.h:5 +msgid "_3-way comparison" +msgstr "_3 utas összehasonlítás" + +#: ../meld/resources/ui/new-diff-tab.ui.h:6 +msgid "Select Third File" +msgstr "Válasszon harmadik fájlt" + +#: ../meld/resources/ui/new-diff-tab.ui.h:7 +msgid "Select Second File" +msgstr "Válasszon második fájlt" + +#: ../meld/resources/ui/new-diff-tab.ui.h:8 +msgid "Select First File" +msgstr "Válasszon első fájlt" + +#: ../meld/resources/ui/new-diff-tab.ui.h:9 +msgid "Select First Folder" +msgstr "Válasszon első mappát" + +#: ../meld/resources/ui/new-diff-tab.ui.h:10 +msgid "Select Second Folder" +msgstr "Válasszon második mappát" + +#: ../meld/resources/ui/new-diff-tab.ui.h:11 +msgid "Select Third Folder" +msgstr "Válasszon harmadik mappát" + +#: ../meld/resources/ui/new-diff-tab.ui.h:12 +msgid "Select A Version-Controlled Folder" +msgstr "Válasszon egy verziókövetés alatti mappát" + +#: ../meld/resources/ui/new-diff-tab.ui.h:13 +msgid "_Blank comparison" +msgstr "Ü_res összehasonlítás" + +#: ../meld/resources/ui/new-diff-tab.ui.h:14 +msgid "C_ompare" +msgstr "Össze_hasonlítás" + +#: ../meld/resources/ui/notebook-label.ui.h:1 +msgid "Close Tab" +msgstr "Lap bezárása" + +#: ../meld/resources/ui/patch-dialog.ui.h:1 msgid "Format as Patch" msgstr "Formázás foltként" -#: ../data/ui/patch-dialog.ui.h:2 +#: ../meld/resources/ui/patch-dialog.ui.h:2 msgid "Copy to Clipboard" msgstr "Másolás vágólapra" -#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:152 +#: ../meld/resources/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:165 msgid "Save Patch" msgstr "Folt mentése" -#: ../data/ui/patch-dialog.ui.h:4 +#: ../meld/resources/ui/patch-dialog.ui.h:4 msgid "Use differences between:" msgstr "Ezek eltéréseinek használata:" -#: ../data/ui/patch-dialog.ui.h:5 +#: ../meld/resources/ui/patch-dialog.ui.h:5 msgid "Left and middle panes" msgstr "Bal és középső ablaktáblák" -#: ../data/ui/patch-dialog.ui.h:6 +#: ../meld/resources/ui/patch-dialog.ui.h:6 msgid "Middle and right panes" msgstr "Középső és jobb ablaktáblák" -#: ../data/ui/patch-dialog.ui.h:7 +#: ../meld/resources/ui/patch-dialog.ui.h:7 msgid "_Reverse patch direction" msgstr "F_olt irányának megfordítása" -#: ../data/ui/preferences.ui.h:1 -msgid "Meld Preferences" -msgstr "A Meld beállításai" +#: ../meld/resources/ui/preferences.ui.h:1 +msgid "Preferences" +msgstr "Beállítások" -#: ../data/ui/preferences.ui.h:2 +#: ../meld/resources/ui/preferences.ui.h:2 msgid "Font" msgstr "Betűkészlet" -#: ../data/ui/preferences.ui.h:3 +#: ../meld/resources/ui/preferences.ui.h:3 msgid "_Use the system fixed width font" msgstr "A rendszer rögzített szélességű betűkészletének _használata" -#: ../data/ui/preferences.ui.h:4 +#: ../meld/resources/ui/preferences.ui.h:4 msgid "_Editor font:" msgstr "Sz_erkesztő betűkészlete:" -#: ../data/ui/preferences.ui.h:5 +#. 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 msgid "Display" msgstr "Megjelenítés" -#: ../data/ui/preferences.ui.h:6 +#: ../meld/resources/ui/preferences.ui.h:6 msgid "_Tab width:" msgstr "_Tabulátorok szélessége:" -#: ../data/ui/preferences.ui.h:7 +#: ../meld/resources/ui/preferences.ui.h:7 msgid "_Insert spaces instead of tabs" msgstr "Tabulátorok helyett s_zóközök beszúrása" -#: ../data/ui/preferences.ui.h:8 +#: ../meld/resources/ui/preferences.ui.h:8 msgid "Enable text _wrapping" msgstr "_Sortörés engedélyezése" -#: ../data/ui/preferences.ui.h:9 +#: ../meld/resources/ui/preferences.ui.h:9 msgid "Do not _split words over two lines" msgstr "Ne _törje a szavakat két sorba" -#: ../data/ui/preferences.ui.h:10 +#: ../meld/resources/ui/preferences.ui.h:10 msgid "Highlight _current line" msgstr "A jelenlegi s_or kiemelése" -#: ../data/ui/preferences.ui.h:11 +#: ../meld/resources/ui/preferences.ui.h:11 msgid "Show _line numbers" msgstr "S_orszámok megjelenítése" -#: ../data/ui/preferences.ui.h:12 +#: ../meld/resources/ui/preferences.ui.h:12 msgid "Show w_hitespace" msgstr "Ü_res helyek megjelenítése" -#: ../data/ui/preferences.ui.h:13 +#: ../meld/resources/ui/preferences.ui.h:13 msgid "Use s_yntax highlighting" msgstr "S_zintaxiskiemelés használata" -#: ../data/ui/preferences.ui.h:14 +#: ../meld/resources/ui/preferences.ui.h:14 msgid "Syntax highlighting color scheme:" msgstr "Szintaxiskiemelés színsémája:" -#: ../data/ui/preferences.ui.h:15 +#: ../meld/resources/ui/preferences.ui.h:15 msgid "External Editor" msgstr "Külső szerkesztő" -#: ../data/ui/preferences.ui.h:16 +#: ../meld/resources/ui/preferences.ui.h:16 msgid "Use _default system editor" msgstr "Alapértelmezett _rendszerszerkesztő használata" -#: ../data/ui/preferences.ui.h:17 +#: ../meld/resources/ui/preferences.ui.h:17 msgid "Edito_r command:" msgstr "Szerkesztő_parancs:" -#: ../data/ui/preferences.ui.h:18 +#: ../meld/resources/ui/preferences.ui.h:18 msgid "Editor" msgstr "Szerkesztő" -#: ../data/ui/preferences.ui.h:19 +#: ../meld/resources/ui/preferences.ui.h:19 msgid "Shallow Comparison" msgstr "Sekély összehasonlítás" -#: ../data/ui/preferences.ui.h:20 +#: ../meld/resources/ui/preferences.ui.h:20 msgid "C_ompare files based only on size and timestamp" msgstr "_Fájlok összehasonlítása csak méret és időbélyeg alapján" -#: ../data/ui/preferences.ui.h:21 +#: ../meld/resources/ui/preferences.ui.h:21 msgid "_Timestamp resolution:" msgstr "_Időbélyeg felbontása:" -#: ../data/ui/preferences.ui.h:23 +#: ../meld/resources/ui/preferences.ui.h:23 msgid "Note: enabling text filters may make comparing large files much slower" msgstr "" "Megjegyzés: a szövegszűrők engedélyezése sokkal lassabbá teszi a nagy fájlok " "összehasonlítását" -#: ../data/ui/preferences.ui.h:24 +#: ../meld/resources/ui/preferences.ui.h:24 msgid "Symbolic Links" msgstr "Szimbolikus linkek" -#: ../data/ui/preferences.ui.h:26 +#: ../meld/resources/ui/preferences.ui.h:26 msgid "Visible Columns" -msgstr "Látható oszlopok" - -#: ../data/ui/preferences.ui.h:27 -msgid "Folder Comparisons" -msgstr "Mappa-összehasonlítás" - -#: ../data/ui/preferences.ui.h:28 -msgid "Version Comparisons" -msgstr "Verzió-összehasonlítás" - -#: ../data/ui/preferences.ui.h:29 -msgid "_Order when comparing file revisions:" -msgstr "So_rrend fájlrevíziók összehasonlításakor:" - -#: ../data/ui/preferences.ui.h:30 -msgid "Order when _merging files:" -msgstr "Sorrend _fájlok összefésülésekor:" - -#: ../data/ui/preferences.ui.h:31 -msgid "Commit Messages" -msgstr "Kommit üzenetek" - -#: ../data/ui/preferences.ui.h:32 -msgid "Show _right margin at:" -msgstr "_Jobb margó megjelenítése:" - -#: ../data/ui/preferences.ui.h:33 -msgid "Automatically _break lines at right margin on commit" -msgstr "Sorok a_utomatikus tördelése a jobb margónál kommitkor" - -#: ../data/ui/preferences.ui.h:34 -msgid "Version Control" -msgstr "Verziókövetés" - -#: ../data/ui/preferences.ui.h:35 -msgid "Filename filters" -msgstr "Fájlnévszűrők" - -#: ../data/ui/preferences.ui.h:36 -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 "" -"Könyvtárak összehasonlításakor kiszűrhet fájlokat és könyvtárakat a nevük " -"alapján. Minden minta egy shell-stílusú helyettesítőkarakter-lista " -"szóközökkel elválasztva." - -#: ../data/ui/preferences.ui.h:37 ../meld/meldwindow.py:105 -msgid "File Filters" -msgstr "Fájlszűrők" - -#: ../data/ui/preferences.ui.h:38 -msgid "Change trimming" -msgstr "Módosítások nyírása" - -#: ../data/ui/preferences.ui.h:39 -msgid "Trim blank line differences from the start and end of changes" -msgstr "Üres sorokból álló eltérés lenyírása a módosítások elejéről és végéről" - -#: ../data/ui/preferences.ui.h:40 -msgid "Text filters" -msgstr "Szövegszűrők" - -#: ../data/ui/preferences.ui.h:41 -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 "" -"Fájlok összehasonlításakor bizonyos típusú változásokat mellőzhet. Itt " -"minden minta egy python szabályos kifejezés, ami az egyező szöveget az üres " -"karaktersorozatra cseréli az összehasonlítás elvégzése előtt. Ha a kifejezés " -"csoportokat tartalmaz, csak a csoportok lesznek kicserélve. További " -"részletekért lásd a felhasználói kézikönyvet." - -#: ../data/ui/preferences.ui.h:42 -msgid "Text Filters" -msgstr "Szövegszűrők" - -#: ../data/ui/preferences.ui.h:43 -msgid "Left is remote, right is local" -msgstr "Bal a távoli, jobb a helyi" - -#: ../data/ui/preferences.ui.h:44 -msgid "Left is local, right is remote" -msgstr "Bal a helyi, jobb a távoli" - -#: ../data/ui/preferences.ui.h:45 -msgid "Remote, merge, local" -msgstr "Távoli, összefésült, helyi" - -#: ../data/ui/preferences.ui.h:46 -msgid "Local, merge, remote" -msgstr "Helyi, összefésült, távoli" - -#: ../data/ui/preferences.ui.h:47 -msgid "1ns (ext4)" -msgstr "1ns (ext4)" - -#: ../data/ui/preferences.ui.h:48 -msgid "100ns (NTFS)" -msgstr "100ns (NTFS)" - -#: ../data/ui/preferences.ui.h:49 -msgid "1s (ext2/ext3)" -msgstr "1s (ext2/ext3)" - -#: ../data/ui/preferences.ui.h:50 -msgid "2s (VFAT)" -msgstr "2s (VFAT)" - -#: ../data/ui/shortcuts.ui.h:1 -msgctxt "shortcut window" -msgid "General" -msgstr "Általános" - -#: ../data/ui/shortcuts.ui.h:2 -msgctxt "shortcut window" -msgid "New comparison" -msgstr "Új összehasonlítás" - -#: ../data/ui/shortcuts.ui.h:3 -msgctxt "shortcut window" -msgid "Close a comparison" -msgstr "Összehasonlítás bezárása" - -#: ../data/ui/shortcuts.ui.h:4 -msgctxt "shortcut window" -msgid "Quit Meld" -msgstr "Kilépés a Meldből" - -#: ../data/ui/shortcuts.ui.h:5 -msgctxt "shortcut window" -msgid "Stop the current action" -msgstr "Aktuális művelet leállítása" - -#: ../data/ui/shortcuts.ui.h:6 -msgctxt "shortcut window" -msgid "Refresh comparison" -msgstr "Összehasonlítás frissítése" - -#: ../data/ui/shortcuts.ui.h:7 -msgctxt "shortcut window" -msgid "Fullscreen" -msgstr "Teljes képernyő" - -#: ../data/ui/shortcuts.ui.h:8 -msgctxt "shortcut window" -msgid "Tabs" -msgstr "Lapok" - -#: ../data/ui/shortcuts.ui.h:9 -msgctxt "shortcut window" -msgid "Go to previous tab" -msgstr "Ugrás az előző lapra" - -#: ../data/ui/shortcuts.ui.h:10 -msgctxt "shortcut window" -msgid "Go to next tab" -msgstr "Ugrás a következő lapra" - -#: ../data/ui/shortcuts.ui.h:11 -msgctxt "shortcut window" -msgid "Switch to tab" -msgstr "Váltás lapra" - -#: ../data/ui/shortcuts.ui.h:12 -msgctxt "shortcut window" -msgid "Move tab left" -msgstr "Lap mozgatása balra" - -#: ../data/ui/shortcuts.ui.h:13 -msgctxt "shortcut window" -msgid "Move tab right" -msgstr "Lap mozgatása jobbra" - -#: ../data/ui/shortcuts.ui.h:14 -msgctxt "shortcut window" -msgid "Changes" -msgstr "Változások" - -#: ../data/ui/shortcuts.ui.h:15 -msgctxt "shortcut window" -msgid "Go to previous change" -msgstr "Ugrás az előző változásra" - -#: ../data/ui/shortcuts.ui.h:16 -msgctxt "shortcut window" -msgid "Go to next change" -msgstr "Ugrás a következő változásra" - -#: ../data/ui/shortcuts.ui.h:17 -msgctxt "shortcut window" -msgid "Editing" -msgstr "Szerkesztés" - -#: ../data/ui/shortcuts.ui.h:18 -msgctxt "shortcut window" -msgid "Undo" -msgstr "Visszavonás" - -#: ../data/ui/shortcuts.ui.h:19 -msgctxt "shortcut window" -msgid "Redo" -msgstr "Mégis" - -#: ../data/ui/shortcuts.ui.h:20 -msgctxt "shortcut window" -msgid "Cut" -msgstr "Kivágás" - -#: ../data/ui/shortcuts.ui.h:21 -msgctxt "shortcut window" -msgid "Copy" -msgstr "Másolás" - -#: ../data/ui/shortcuts.ui.h:22 -msgctxt "shortcut window" -msgid "Paste" -msgstr "Beillesztés" - -#: ../data/ui/shortcuts.ui.h:23 -msgctxt "shortcut window" -msgid "Find" -msgstr "Keresés" - -#: ../data/ui/shortcuts.ui.h:24 -msgctxt "shortcut window" -msgid "Find Next" -msgstr "Következő találat" - -#: ../data/ui/shortcuts.ui.h:25 -msgctxt "shortcut window" -msgid "Find Previous" -msgstr "Előző találat" - -#: ../data/ui/shortcuts.ui.h:26 -msgctxt "shortcut window" -msgid "Replace" -msgstr "Csere" - -#: ../data/ui/shortcuts.ui.h:27 -msgctxt "shortcut window" -msgid "File comparison" -msgstr "Fájl-összehasonlítás" +msgstr "Látható oszlopok" -#: ../data/ui/shortcuts.ui.h:28 -msgctxt "shortcut window" -msgid "Save current file" -msgstr "Aktuális fájl mentése" +#: ../meld/resources/ui/preferences.ui.h:27 +msgid "Folder Comparisons" +msgstr "Mappa-összehasonlítás" -#: ../data/ui/shortcuts.ui.h:29 -msgctxt "shortcut window" -msgid "Save current file to new path" -msgstr "Aktuális fájl mentése új útvonalra" +#: ../meld/resources/ui/preferences.ui.h:28 +msgid "Version Comparisons" +msgstr "Verzió-összehasonlítás" -#: ../data/ui/shortcuts.ui.h:30 -msgctxt "shortcut window" -msgid "Save all files in comparison" -msgstr "Minden fájl mentése az összehasonlításban" +#: ../meld/resources/ui/preferences.ui.h:29 +msgid "_Order when comparing file revisions:" +msgstr "So_rrend fájlrevíziók összehasonlításakor:" -#: ../data/ui/shortcuts.ui.h:31 -msgctxt "shortcut window" -msgid "Previous conflict" -msgstr "Előző ütközés" +#: ../meld/resources/ui/preferences.ui.h:30 +msgid "Order when _merging files:" +msgstr "Sorrend _fájlok összefésülésekor:" -#: ../data/ui/shortcuts.ui.h:32 -msgctxt "shortcut window" -msgid "Next conflict" -msgstr "Következő ütközés" +#: ../meld/resources/ui/preferences.ui.h:31 +msgid "Commit Messages" +msgstr "Kommit üzenetek" -#: ../data/ui/shortcuts.ui.h:33 -msgctxt "shortcut window" -msgid "Push change to left" -msgstr "Változás balra küldése" +#: ../meld/resources/ui/preferences.ui.h:32 +msgid "Show _right margin at:" +msgstr "_Jobb margó megjelenítése:" -#: ../data/ui/shortcuts.ui.h:34 -msgctxt "shortcut window" -msgid "Push change to right" -msgstr "Változás jobbra küldése" +#: ../meld/resources/ui/preferences.ui.h:33 +msgid "Automatically _break lines at right margin on commit" +msgstr "Sorok a_utomatikus tördelése a jobb margónál kommitkor" -#: ../data/ui/shortcuts.ui.h:35 -msgctxt "shortcut window" -msgid "Pull change from left" -msgstr "Változás áthúzása balról" +#: ../meld/resources/ui/preferences.ui.h:34 +msgid "Version Control" +msgstr "Verziókövetés" -#: ../data/ui/shortcuts.ui.h:36 -msgctxt "shortcut window" -msgid "Pull change from right" -msgstr "Változás áthúzása jobbról" +#: ../meld/resources/ui/preferences.ui.h:35 +msgid "Filename filters" +msgstr "Fájlnévszűrők" -#: ../data/ui/shortcuts.ui.h:37 -msgctxt "shortcut window" -msgid "Copy change above left" -msgstr "Változás másolása a bal oldali fölé" +#: ../meld/resources/ui/preferences.ui.h:36 +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 "" +"Könyvtárak összehasonlításakor kiszűrhet fájlokat és könyvtárakat a nevük " +"alapján. Minden minta egy shell-stílusú helyettesítőkarakter-lista " +"szóközökkel elválasztva." -#: ../data/ui/shortcuts.ui.h:38 -msgctxt "shortcut window" -msgid "Copy change below left" -msgstr "Változás másolása a bal oldali alá" +#: ../meld/resources/ui/preferences.ui.h:37 ../meld/meldwindow.py:114 +msgid "File Filters" +msgstr "Fájlszűrők" -#: ../data/ui/shortcuts.ui.h:39 -msgctxt "shortcut window" -msgid "Copy change above right" -msgstr "Változás másolása a jobb oldali fölé" +#: ../meld/resources/ui/preferences.ui.h:38 +msgid "Change trimming" +msgstr "Módosítások nyírása" -#: ../data/ui/shortcuts.ui.h:40 -msgctxt "shortcut window" -msgid "Copy change below right" -msgstr "Változás másolása a jobb oldali alá" +#: ../meld/resources/ui/preferences.ui.h:39 +msgid "Trim blank line differences from the start and end of changes" +msgstr "Üres sorokból álló eltérés lenyírása a módosítások elejéről és végéről" -#: ../data/ui/shortcuts.ui.h:41 -msgctxt "shortcut window" -msgid "Delete change" -msgstr "Változás törlése" +#: ../meld/resources/ui/preferences.ui.h:40 +msgid "Text filters" +msgstr "Szövegszűrők" -#: ../data/ui/shortcuts.ui.h:42 -msgctxt "shortcut window" -msgid "Previous comparison pane" -msgstr "Előző összehasonlító ablaktábla" +#: ../meld/resources/ui/preferences.ui.h:41 +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 "" +"Fájlok összehasonlításakor bizonyos típusú változásokat mellőzhet. Itt " +"minden minta egy python szabályos kifejezés, ami az egyező szöveget az üres " +"karaktersorozatra cseréli az összehasonlítás elvégzése előtt. Ha a kifejezés " +"csoportokat tartalmaz, csak a csoportok lesznek kicserélve. További " +"részletekért lásd a felhasználói kézikönyvet." -#: ../data/ui/shortcuts.ui.h:43 -msgctxt "shortcut window" -msgid "Next comparison pane" -msgstr "Következő összehasonlító ablaktábla" +#: ../meld/resources/ui/preferences.ui.h:42 +msgid "Text Filters" +msgstr "Szövegszűrők" -#: ../data/ui/shortcuts.ui.h:44 -msgctxt "shortcut window" -msgid "Folder comparison" -msgstr "Mappa-összehasonlítás" +#: ../meld/resources/ui/preferences.ui.h:43 +msgid "Left is remote, right is local" +msgstr "Bal a távoli, jobb a helyi" -#: ../data/ui/shortcuts.ui.h:45 -msgctxt "shortcut window" -msgid "Copy to left" -msgstr "Másolás a bal oldalra" +#: ../meld/resources/ui/preferences.ui.h:44 +msgid "Left is local, right is remote" +msgstr "Bal a helyi, jobb a távoli" -#: ../data/ui/shortcuts.ui.h:46 -msgctxt "shortcut window" -msgid "Copy to right" -msgstr "Másolás a jobb oldalra" +#: ../meld/resources/ui/preferences.ui.h:45 +msgid "Remote, merge, local" +msgstr "Távoli, összefésült, helyi" -#: ../data/ui/shortcuts.ui.h:47 -msgctxt "shortcut window" -msgid "Version control comparison" -msgstr "Verziókövető-összehasonlítás" +#: ../meld/resources/ui/preferences.ui.h:46 +msgid "Local, merge, remote" +msgstr "Helyi, összefésült, távoli" -#: ../data/ui/shortcuts.ui.h:48 -msgctxt "shortcut window" -msgid "Commit to version control" -msgstr "Kommit verziókövetőbe" +#: ../meld/resources/ui/preferences.ui.h:47 +msgid "1ns (ext4)" +msgstr "1ns (ext4)" -#: ../data/ui/shortcuts.ui.h:49 -msgctxt "shortcut window" -msgid "Show/hide console output" -msgstr "Konzolkimenet megjelenítése/elrejtése" +#: ../meld/resources/ui/preferences.ui.h:48 +msgid "100ns (NTFS)" +msgstr "100ns (NTFS)" -#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:567 -#: ../meld/newdifftab.py:49 -msgid "New comparison" -msgstr "Új összehasonlítás" +#: ../meld/resources/ui/preferences.ui.h:49 +msgid "1s (ext2/ext3)" +msgstr "1s (ext2/ext3)" -#: ../data/ui/tab-placeholder.ui.h:2 -msgid "File comparison" -msgstr "Fájl-összehasonlítás" +#: ../meld/resources/ui/preferences.ui.h:50 +msgid "2s (VFAT)" +msgstr "2s (VFAT)" -#: ../data/ui/tab-placeholder.ui.h:3 -msgid "Directory comparison" -msgstr "Könyvtár-összehasonlítás" +#: ../meld/resources/ui/push-dialog.ui.h:1 +msgid "Push local commits to remote?" +msgstr "Elküldi a helyi kommitokat a távoli tárolóba?" -#: ../data/ui/tab-placeholder.ui.h:4 -msgid "Version control view" -msgstr "Verziókövetés-nézet" +#: ../meld/resources/ui/push-dialog.ui.h:2 +msgid "The commits to be pushed are determined by your version control system." +msgstr "Az elküldendő kommitokat a verziókövető rendszer határozza meg." -#: ../data/ui/tab-placeholder.ui.h:5 -msgid "_3-way comparison" -msgstr "_3 utas összehasonlítás" +#: ../meld/resources/ui/push-dialog.ui.h:3 +msgid "_Push commits" +msgstr "_Kommitok elküldése" -#: ../data/ui/tab-placeholder.ui.h:6 -msgid "Select Third File" -msgstr "Válasszon harmadik fájlt" +#: ../meld/resources/ui/revert-dialog.ui.h:1 +msgid "Discard unsaved changes to documents?" +msgstr "Eldobja a dokumentumok mentetlen változtatásait?" -#: ../data/ui/tab-placeholder.ui.h:7 -msgid "Select Second File" -msgstr "Válasszon második fájlt" +#: ../meld/resources/ui/revert-dialog.ui.h:2 +msgid "Changes made to the following documents will be permanently lost:" +msgstr "A következő dokumentumok változásai véglegesen elvesznek:" -#: ../data/ui/tab-placeholder.ui.h:8 -msgid "Select First File" -msgstr "Válasszon első fájlt" +#: ../meld/resources/ui/revert-dialog.ui.h:3 +msgid "_Discard" +msgstr "_Eldobás" -#: ../data/ui/tab-placeholder.ui.h:9 -msgid "Select First Folder" -msgstr "Válasszon első mappát" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:1 +msgid "Save changes to documents before closing?" +msgstr "Menti a dokumentumok változtatásait bezárás előtt?" -#: ../data/ui/tab-placeholder.ui.h:10 -msgid "Select Second Folder" -msgstr "Válasszon második mappát" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:2 +msgid "If you don’t save, changes will be permanently lost." +msgstr "Ha nem ment, akkor a változtatások véglegesen elvesznek." -#: ../data/ui/tab-placeholder.ui.h:11 -msgid "Select Third Folder" -msgstr "Válasszon harmadik mappát" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:3 +msgid "Close _without Saving" +msgstr "Bezárás mentés _nélkül" -#: ../data/ui/tab-placeholder.ui.h:12 -msgid "Select A Version-Controlled Folder" -msgstr "Válasszon egy verziókövetés alatti mappát" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:4 ../meld/dirdiff.py:1040 +#: ../meld/iohelpers.py:58 ../meld/iohelpers.py:112 +msgid "_Cancel" +msgstr "Mé_gse" -#: ../data/ui/tab-placeholder.ui.h:13 -msgid "_Blank comparison" -msgstr "Ü_res összehasonlítás" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:5 +msgid "_Save" +msgstr "M_entés" -#: ../data/ui/tab-placeholder.ui.h:14 -msgid "C_ompare" -msgstr "Össze_hasonlítás" +#: ../meld/resources/ui/statusbar-menu.ui.h:2 +msgid "Show whitespace" +msgstr "Üres helyek megjelenítése" + +#: ../meld/resources/ui/statusbar-menu.ui.h:4 +msgid "Text wrapping" +msgstr "Szöveg tördelése" -#: ../data/ui/vcview.ui.h:3 +#: ../meld/resources/ui/vcview.ui.h:3 msgid "Co_mmit…" msgstr "_Kommit…" -#: ../data/ui/vcview.ui.h:4 +#: ../meld/resources/ui/vcview.ui.h:4 msgid "Commit changes to version control" msgstr "Változtatások kommitolása verziókövetőbe" -#: ../data/ui/vcview.ui.h:5 +#: ../meld/resources/ui/vcview.ui.h:5 msgid "_Update" msgstr "_Frissítés" -#: ../data/ui/vcview.ui.h:6 +#: ../meld/resources/ui/vcview.ui.h:6 msgid "Update working copy from version control" msgstr "Munkapéldány frissítése a verziókövetőből" -#: ../data/ui/vcview.ui.h:7 +#: ../meld/resources/ui/vcview.ui.h:7 msgid "_Push" msgstr "_Push" -#: ../data/ui/vcview.ui.h:8 +#: ../meld/resources/ui/vcview.ui.h:8 msgid "Push local changes to remote" msgstr "Helyi változások elküldése a távoli tárolóba" -#: ../data/ui/vcview.ui.h:10 +#: ../meld/resources/ui/vcview.ui.h:10 msgid "Add to version control" msgstr "Hozzáadás verziókövetéshez" -#: ../data/ui/vcview.ui.h:12 +#: ../meld/resources/ui/vcview.ui.h:12 msgid "Remove from version control" msgstr "Eltávolítás a verziókövetőből" -#: ../data/ui/vcview.ui.h:13 +#: ../meld/resources/ui/vcview.ui.h:13 msgid "Mar_k as Resolved" msgstr "Megjelölés _feloldottként" -#: ../data/ui/vcview.ui.h:14 +#: ../meld/resources/ui/vcview.ui.h:14 msgid "Mark as resolved in version control" msgstr "Megjelölés feloldottként a verziókövetőben" -#: ../data/ui/vcview.ui.h:15 +#: ../meld/resources/ui/vcview.ui.h:15 msgid "Re_vert" msgstr "Vissz_aállítás" -#: ../data/ui/vcview.ui.h:16 +#: ../meld/resources/ui/vcview.ui.h:16 msgid "Revert working copy to original state" msgstr "Munkapéldány visszaállítása az eredeti állapotba" -#: ../data/ui/vcview.ui.h:17 +#: ../meld/resources/ui/vcview.ui.h:17 msgid "Delete from working copy" msgstr "Törlés a munkapéldányból" -#: ../data/ui/vcview.ui.h:18 +#: ../meld/resources/ui/vcview.ui.h:18 msgid "Console" msgstr "Konzol" -#: ../data/ui/vcview.ui.h:19 +#: ../meld/resources/ui/vcview.ui.h:19 msgid "Show or hide the version control console output pane" msgstr "A verziókövetési konzolkimenet ablaktábla megjelenítése/elrejtése" -#: ../data/ui/vcview.ui.h:20 +#: ../meld/resources/ui/vcview.ui.h:20 msgid "_Flatten" msgstr "_Simítás" -#: ../data/ui/vcview.ui.h:21 +#: ../meld/resources/ui/vcview.ui.h:21 msgid "Flatten directories" msgstr "Könyvtárak simítása" -#: ../data/ui/vcview.ui.h:22 +#: ../meld/resources/ui/vcview.ui.h:22 msgid "_Modified" msgstr "Módosít_va" -#: ../data/ui/vcview.ui.h:23 +#: ../meld/resources/ui/vcview.ui.h:23 msgid "Show modified files" msgstr "Módosított fájlok megjelenítése" -#: ../data/ui/vcview.ui.h:24 +#: ../meld/resources/ui/vcview.ui.h:24 msgid "_Normal" msgstr "_Normál" -#: ../data/ui/vcview.ui.h:25 +#: ../meld/resources/ui/vcview.ui.h:25 msgid "Show normal files" msgstr "Normál fájlok megjelenítése" -#: ../data/ui/vcview.ui.h:26 +#: ../meld/resources/ui/vcview.ui.h:26 msgid "Un_versioned" msgstr "Ver_zió nélküli" -#: ../data/ui/vcview.ui.h:27 +#: ../meld/resources/ui/vcview.ui.h:27 msgid "Show unversioned files" msgstr "Verzió nélküli fájlok megjelenítése" -#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69 +#: ../meld/resources/ui/vcview.ui.h:28 ../meld/vc/_vc.py:70 msgid "Ignored" msgstr "Mellőzve" -#: ../data/ui/vcview.ui.h:29 +#: ../meld/resources/ui/vcview.ui.h:29 msgid "Show ignored files" msgstr "Figyelmen kívül hagyott fájlok megjelenítése" -#: ../data/ui/vcview.ui.h:30 -msgid "Commit" -msgstr "Kommit" - -#: ../data/ui/vcview.ui.h:31 -msgid "Commit Files" -msgstr "Fájlok kommitolása" - -#: ../data/ui/vcview.ui.h:32 -msgid "Log Message" -msgstr "Naplóüzenet" - -#: ../data/ui/vcview.ui.h:33 -msgid "Previous logs:" -msgstr "Előző naplók:" - -#: ../data/ui/vcview.ui.h:34 -msgid "Co_mmit" -msgstr "_Kommit" - -#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:331 +#: ../meld/resources/ui/vcview.ui.h:31 ../meld/vcview.py:366 msgid "Location" msgstr "Hely" -#: ../data/ui/vcview.ui.h:37 +#: ../meld/resources/ui/vcview.ui.h:32 msgid "Status" msgstr "Állapot" -#: ../data/ui/vcview.ui.h:38 +#: ../meld/resources/ui/vcview.ui.h:33 msgid "Extra" msgstr "Extra" -#: ../data/ui/vcview.ui.h:39 +#: ../meld/resources/ui/vcview.ui.h:34 msgid "Console output" msgstr "Konzolkimenet" -#: ../data/ui/vcview.ui.h:40 -msgid "Push local commits to remote?" -msgstr "Elküldi a helyi kommitokat a távoli tárolóba?" - -#: ../data/ui/vcview.ui.h:41 -msgid "The commits to be pushed are determined by your version control system." -msgstr "Az elküldendő kommitokat a verziókövető rendszer határozza meg." - -#: ../data/ui/vcview.ui.h:42 -msgid "_Push commits" -msgstr "_Kommitok elküldése" - #: ../meld/const.py:12 msgid "UNIX (LF)" msgstr "UNIX (LF)" @@ -1667,44 +1674,44 @@ msgid "Mac OS (CR)" msgstr "Mac OS (CR)" #. Create file size CellRenderer -#: ../meld/dirdiff.py:428 ../meld/preferences.py:81 +#: ../meld/dirdiff.py:476 ../meld/preferences.py:138 msgid "Size" msgstr "Méret" #. Create date-time CellRenderer -#: ../meld/dirdiff.py:436 ../meld/preferences.py:82 +#: ../meld/dirdiff.py:484 ../meld/preferences.py:139 msgid "Modification time" msgstr "Módosítási idő" #. Create permissions CellRenderer -#: ../meld/dirdiff.py:444 ../meld/preferences.py:83 +#: ../meld/dirdiff.py:492 ../meld/preferences.py:140 msgid "Permissions" msgstr "Jogosultságok" -#: ../meld/dirdiff.py:575 +#: ../meld/dirdiff.py:626 #, python-format msgid "Hide %s" msgstr "%s elrejtése" -#: ../meld/dirdiff.py:716 ../meld/dirdiff.py:739 +#: ../meld/dirdiff.py:768 ../meld/dirdiff.py:791 #, python-format msgid "[%s] Scanning %s" msgstr "[%s] %s beolvasása" -#: ../meld/dirdiff.py:874 +#: ../meld/dirdiff.py:926 #, python-format msgid "[%s] Done" msgstr "[%s] Kész" -#: ../meld/dirdiff.py:882 +#: ../meld/dirdiff.py:934 msgid "Folders have no differences" msgstr "A mappák közt nincs eltérés" -#: ../meld/dirdiff.py:884 +#: ../meld/dirdiff.py:936 msgid "Contents of scanned files in folders are identical." msgstr "A mappákban vizsgált fájlok tartalma azonos." -#: ../meld/dirdiff.py:886 +#: ../meld/dirdiff.py:938 msgid "" "Scanned files in folders appear identical, but contents have not been " "scanned." @@ -1712,42 +1719,42 @@ msgstr "" "A mappákban vizsgált fájlok azonosnak tűnnek, de a tartalom nem lett " "vizsgálva." -#: ../meld/dirdiff.py:889 +#: ../meld/dirdiff.py:941 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:891 +#: ../meld/dirdiff.py:943 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:909 ../meld/filediff.py:1499 ../meld/filediff.py:1529 -#: ../meld/filediff.py:1531 ../meld/ui/msgarea.py:106 ../meld/ui/msgarea.py:119 +#: ../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 msgid "Hi_de" msgstr "_Elrejtés" -#: ../meld/dirdiff.py:918 +#: ../meld/dirdiff.py:970 msgid "Multiple errors occurred while scanning this folder" msgstr "Több hiba történt a mappa vizsgálatakor" -#: ../meld/dirdiff.py:919 +#: ../meld/dirdiff.py:971 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:921 +#: ../meld/dirdiff.py:973 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:923 +#: ../meld/dirdiff.py:975 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:925 +#: ../meld/dirdiff.py:977 msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. The following files in this folder are hidden:" @@ -1755,17 +1762,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:936 +#: ../meld/dirdiff.py:988 #, python-format msgid "“%s” hidden by “%s”" msgstr "„%s” rejtve „%s” által" -#: ../meld/dirdiff.py:992 +#: ../meld/dirdiff.py:1044 #, python-format msgid "Replace folder “%s”?" msgstr "Cseréli ezt a mappát: „%s”?" -#: ../meld/dirdiff.py:994 +#: ../meld/dirdiff.py:1046 #, python-format msgid "" "Another folder with the same name already exists in “%s”.\n" @@ -1774,11 +1781,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:1007 +#: ../meld/dirdiff.py:1059 msgid "Error copying file" msgstr "Hiba a fájl másolásakor" -#: ../meld/dirdiff.py:1008 +#: ../meld/dirdiff.py:1060 #, python-format msgid "" "Couldn’t copy %s\n" @@ -1791,19 +1798,19 @@ msgstr "" "\n" "%s" -#: ../meld/dirdiff.py:1033 ../meld/vcview.py:703 +#: ../meld/dirdiff.py:1085 ../meld/vcview.py:720 msgid "Error deleting {}" msgstr "Hiba a(z) {} törlésekor" -#: ../meld/dirdiff.py:1546 +#: ../meld/dirdiff.py:1597 msgid "No folder" msgstr "Nincs mappa" -#: ../meld/filediff.py:834 +#: ../meld/filediff.py:920 msgid "Comparison results will be inaccurate" msgstr "Az összehasonlítás eredményei pontatlanok lesznek" -#: ../meld/filediff.py:836 +#: ../meld/filediff.py:922 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1811,65 +1818,65 @@ 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:905 +#: ../meld/filediff.py:994 msgid "Mark conflict as resolved?" msgstr "Megjelöli az ütközést feloldottként?" -#: ../meld/filediff.py:907 +#: ../meld/filediff.py:996 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:909 +#: ../meld/filediff.py:998 msgid "Cancel" msgstr "Mégse" -#: ../meld/filediff.py:910 +#: ../meld/filediff.py:999 msgid "Mark _Resolved" msgstr "Megjelölés _feloldottként" -#: ../meld/filediff.py:1214 +#: ../meld/filediff.py:1318 #, 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:1222 +#: ../meld/filediff.py:1326 #, python-format msgid "File %s appears to be a binary file." msgstr "%s bináris fájlnak tűnik." -#: ../meld/filediff.py:1224 +#: ../meld/filediff.py:1328 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:1226 +#: ../meld/filediff.py:1330 msgid "Open" msgstr "Megnyitás" -#: ../meld/filediff.py:1242 +#: ../meld/filediff.py:1346 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Eltérések számítása" -#: ../meld/filediff.py:1303 +#: ../meld/filediff.py:1407 #, python-format msgid "File %s has changed on disk" msgstr "%s fájl megváltozott a lemezen" -#: ../meld/filediff.py:1304 +#: ../meld/filediff.py:1408 msgid "Do you want to reload the file?" msgstr "Újratölti a fájlt?" -#: ../meld/filediff.py:1306 +#: ../meld/filediff.py:1410 msgid "_Reload" msgstr "Új_ratöltés" -#: ../meld/filediff.py:1462 +#: ../meld/filediff.py:1566 msgid "Files are identical" msgstr "A fájlok azonosak" -#: ../meld/filediff.py:1475 +#: ../meld/filediff.py:1579 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1877,11 +1884,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:1480 +#: ../meld/filediff.py:1584 msgid "Files differ in line endings only" msgstr "A fájlok csak a sorvégekben térnek el" -#: ../meld/filediff.py:1482 +#: ../meld/filediff.py:1586 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1890,15 +1897,15 @@ msgstr "" "A fájlok azonosak a sorvégjelektől eltekintve:\n" "%s" -#: ../meld/filediff.py:1502 +#: ../meld/filediff.py:1606 msgid "Show without filters" msgstr "Megjelenítés szűrők nélkül" -#: ../meld/filediff.py:1524 +#: ../meld/filediff.py:1628 msgid "Change highlighting incomplete" msgstr "Részleges kiemelés módosítása" -#: ../meld/filediff.py:1525 +#: ../meld/filediff.py:1629 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." @@ -1906,19 +1913,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:1533 +#: ../meld/filediff.py:1637 msgid "Keep highlighting" msgstr "Kiemelés továbbra is" -#: ../meld/filediff.py:1535 +#: ../meld/filediff.py:1639 msgid "_Keep highlighting" msgstr "_Kiemelés továbbra is" -#: ../meld/filediff.py:1548 +#: ../meld/filediff.py:1652 msgid "Saving failed" msgstr "A mentés sikertelen" -#: ../meld/filediff.py:1549 +#: ../meld/filediff.py:1653 msgid "" "Please consider copying any critical changes to another program or file to " "avoid data loss." @@ -1926,36 +1933,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:1558 +#: ../meld/filediff.py:1662 msgid "Save Left Pane As" msgstr "Bal ablaktábla mentése másként" -#: ../meld/filediff.py:1560 +#: ../meld/filediff.py:1664 msgid "Save Middle Pane As" msgstr "Középső ablaktábla mentése másként" -#: ../meld/filediff.py:1562 +#: ../meld/filediff.py:1666 msgid "Save Right Pane As" msgstr "Jobb ablaktábla mentése másként" -#: ../meld/filediff.py:1575 +#: ../meld/filediff.py:1679 #, 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:1577 +#: ../meld/filediff.py:1681 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:1580 +#: ../meld/filediff.py:1684 msgid "Save Anyway" msgstr "Mentés mindenképp" -#: ../meld/filediff.py:1581 +#: ../meld/filediff.py:1685 msgid "Don’t Save" msgstr "Ne mentse" -#: ../meld/filediff.py:1623 +#: ../meld/filediff.py:1727 msgid "" "File “{}” contains characters that can’t be encoded using its current " "encoding “{}”." @@ -1963,7 +1970,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:1627 ../meld/patchdialog.py:131 +#: ../meld/filediff.py:1731 ../meld/patchdialog.py:144 #, python-format msgid "" "Couldn’t save file due to:\n" @@ -1972,16 +1979,16 @@ msgstr "" "A fájl nem menthető. Ok:\n" "%s" -#: ../meld/filediff.py:1631 ../meld/patchdialog.py:130 +#: ../meld/filediff.py:1735 ../meld/patchdialog.py:143 #, python-format msgid "Could not save file %s." msgstr "A fájl (%s) nem menthető." -#: ../meld/filediff.py:2014 +#: ../meld/filediff.py:2128 msgid "Live comparison updating disabled" msgstr "Az élő összehasonlítás-frissítés kikapcsolva" -#: ../meld/filediff.py:2015 +#: ../meld/filediff.py:2129 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -1996,40 +2003,40 @@ msgstr "" msgid "[%s] Merging files" msgstr "[%s] Fájlok összefésülése" -#: ../meld/gutterrendererchunk.py:216 +#: ../meld/gutterrendererchunk.py:220 msgid "Copy _up" msgstr "Másolás _fel" -#: ../meld/gutterrendererchunk.py:217 +#: ../meld/gutterrendererchunk.py:221 msgid "Copy _down" msgstr "Másolás _le" -#: ../meld/iohelpers.py:35 +#: ../meld/iohelpers.py:43 msgid "Deleting remote folders is not supported" msgstr "A távoli mappák törlése nem támogatott" -#: ../meld/iohelpers.py:37 +#: ../meld/iohelpers.py:45 msgid "Not a file or directory" msgstr "Nem fájl vagy könyvtár" -#: ../meld/iohelpers.py:41 +#: ../meld/iohelpers.py:49 msgid "“{}” can’t be put in the trash. Do you want to delete it immediately?" msgstr "A(z) „{}” nem tehető a Kukába. Szeretné azonnal törölni?" -#: ../meld/iohelpers.py:46 +#: ../meld/iohelpers.py:54 msgid "This remote location does not support sending items to the trash." msgstr "Ez a távoli hely nem támogatja az elemek Kukába küldését." -#: ../meld/iohelpers.py:51 +#: ../meld/iohelpers.py:59 msgid "_Delete Permanently" msgstr "_Végleges törlés" -#: ../meld/iohelpers.py:94 +#: ../meld/iohelpers.py:106 #, python-format msgid "Replace file “%s”?" msgstr "Cseréli a fájlt: „%s”?" -#: ../meld/iohelpers.py:96 +#: ../meld/iohelpers.py:108 #, python-format msgid "" "A file with this name already exists in “%s”.\n" @@ -2038,313 +2045,277 @@ msgstr "" "Már létezik ilyen nevű fájl itt: „%s”.\n" "Ha lecseréli a meglévő fájlt, akkor a tartalma elvész." -#: ../meld/meldapp.py:181 +#: ../meld/meldapp.py:169 msgid "wrong number of arguments supplied to --diff" msgstr "Hibás számú argumentum a --diff kapcsolóhoz" -#: ../meld/meldapp.py:186 +#: ../meld/meldapp.py:174 msgid "Start with an empty window" msgstr "Indítás üres ablakkal" -#: ../meld/meldapp.py:187 ../meld/meldapp.py:189 +#: ../meld/meldapp.py:175 ../meld/meldapp.py:177 msgid "file" msgstr "fájl" -#: ../meld/meldapp.py:187 ../meld/meldapp.py:191 +#: ../meld/meldapp.py:175 ../meld/meldapp.py:179 msgid "folder" msgstr "mappa" -#: ../meld/meldapp.py:188 +#: ../meld/meldapp.py:176 msgid "Start a version control comparison" msgstr "Verziókövető-összehasonlítás indítása" -#: ../meld/meldapp.py:190 +#: ../meld/meldapp.py:178 msgid "Start a 2- or 3-way file comparison" msgstr "2 vagy 3 utas fájl-összehasonlítás indítása" -#: ../meld/meldapp.py:192 +#: ../meld/meldapp.py:180 msgid "Start a 2- or 3-way folder comparison" msgstr "2 vagy 3 utas mappa-összehasonlítás indítása" -#: ../meld/meldapp.py:235 +#: ../meld/meldapp.py:223 #, python-format msgid "Error: %s\n" msgstr "Hiba: %s\n" -#: ../meld/meldapp.py:242 +#: ../meld/meldapp.py:230 msgid "Meld is a file and directory comparison tool." msgstr "A Meld egy fájl- és könyvtár-összehasonlító eszköz." -#: ../meld/meldapp.py:246 +#: ../meld/meldapp.py:234 msgid "Set label to use instead of file name" msgstr "A fájlnevek helyett használandó címke beállítása" -#: ../meld/meldapp.py:249 +#: ../meld/meldapp.py:237 msgid "Open a new tab in an already running instance" msgstr "Új lap megnyitása már futó példányban" -#: ../meld/meldapp.py:252 +#: ../meld/meldapp.py:240 msgid "Automatically compare all differing files on startup" msgstr "Minden eltérő fájl automatikus összehasonlítása indításkor" -#: ../meld/meldapp.py:255 +#: ../meld/meldapp.py:243 msgid "Ignored for compatibility" msgstr "Mellőzve a kompatibilitás érdekében" -#: ../meld/meldapp.py:259 +#: ../meld/meldapp.py:247 msgid "Set the target file for saving a merge result" msgstr "Célfájl beállítása összefésülés eredményének mentéséhez" -#: ../meld/meldapp.py:262 +#: ../meld/meldapp.py:250 msgid "Automatically merge files" msgstr "Fájlok automatikus összefésülése" -#: ../meld/meldapp.py:266 +#: ../meld/meldapp.py:254 msgid "Load a saved comparison from a Meld comparison file" msgstr "Mentett összehasonlítás betöltése Meld összehasonlítás-fájlból" -#: ../meld/meldapp.py:270 +#: ../meld/meldapp.py:258 msgid "Create a diff tab for the supplied files or folders" msgstr "Különbséglap létrehozása a megadott fájlokhoz vagy mappákhoz" -#: ../meld/meldapp.py:290 +#: ../meld/meldapp.py:278 #, python-format msgid "too many arguments (wanted 0-3, got %d)" msgstr "túl sok argumentum (0-3 helyett %d)" -#: ../meld/meldapp.py:293 +#: ../meld/meldapp.py:281 msgid "can’t auto-merge less than 3 files" msgstr "nem lehet 3-nál kevesebb fájlt automatikusan összefésülni" -#: ../meld/meldapp.py:295 +#: ../meld/meldapp.py:283 msgid "can’t auto-merge directories" msgstr "könyvtárak nem fésülhetők össze automatikusan" -#: ../meld/meldapp.py:309 +#: ../meld/meldapp.py:297 msgid "Error reading saved comparison file" msgstr "Hiba az elmentett összehasonlítás-fájl olvasása közben" -#: ../meld/meldapp.py:326 +#: ../meld/meldapp.py:314 #, python-format msgid "invalid path or URI “%s”" msgstr "érvénytelen útvonal vagy URI: „%s”" -#: ../meld/meldapp.py:332 +#: ../meld/meldapp.py:320 msgid "remote folder “{}” not supported" msgstr "a „{}” távoli mappa nem támogatott" #. TRANSLATORS: This is the label of a new, currently-unnamed file. -#: ../meld/meldbuffer.py:124 +#: ../meld/meldbuffer.py:123 msgid "" msgstr "" -#: ../meld/melddoc.py:68 +#: ../meld/melddoc.py:63 msgid "untitled" msgstr "névtelen" -#: ../meld/meldwindow.py:47 +#: ../meld/meldwindow.py:56 msgid "_File" msgstr "_Fájl" -#: ../meld/meldwindow.py:48 +#: ../meld/meldwindow.py:57 msgid "_New Comparison…" msgstr "Új össze_hasonlítás…" -#: ../meld/meldwindow.py:49 +#: ../meld/meldwindow.py:58 msgid "Start a new comparison" msgstr "Új összehasonlítás indítása" -#: ../meld/meldwindow.py:52 +#: ../meld/meldwindow.py:61 msgid "Save the current file" msgstr "A jelenlegi fájl mentése" -#: ../meld/meldwindow.py:54 +#: ../meld/meldwindow.py:63 msgid "Save As…" msgstr "Mentés másként…" -#: ../meld/meldwindow.py:55 +#: ../meld/meldwindow.py:64 msgid "Save the current file with a different name" msgstr "A jelenlegi fájl mentése más néven" -#: ../meld/meldwindow.py:58 +#: ../meld/meldwindow.py:67 msgid "Close the current file" msgstr "A jelenlegi fájl bezárása" -#: ../meld/meldwindow.py:61 +#: ../meld/meldwindow.py:70 msgid "_Edit" msgstr "S_zerkesztés" -#: ../meld/meldwindow.py:63 +#: ../meld/meldwindow.py:72 msgid "Undo the last action" msgstr "Az utolsó művelet visszavonása" -#: ../meld/meldwindow.py:66 +#: ../meld/meldwindow.py:75 msgid "Redo the last undone action" msgstr "A visszavont művelet ismételt végrehajtása" -#: ../meld/meldwindow.py:68 +#: ../meld/meldwindow.py:77 msgid "Cut the selection" msgstr "A kijelölés kivágása" -#: ../meld/meldwindow.py:70 +#: ../meld/meldwindow.py:79 msgid "Copy the selection" msgstr "A kijelölés másolása" -#: ../meld/meldwindow.py:72 +#: ../meld/meldwindow.py:81 msgid "Paste the clipboard" msgstr "A vágólap tartalmának beillesztése" -#: ../meld/meldwindow.py:74 +#: ../meld/meldwindow.py:83 msgid "Find…" msgstr "Keresés…" -#: ../meld/meldwindow.py:74 +#: ../meld/meldwindow.py:83 msgid "Search for text" msgstr "Szöveg keresése" -#: ../meld/meldwindow.py:76 +#: ../meld/meldwindow.py:85 msgid "Find Ne_xt" msgstr "Kö_vetkező találat" -#: ../meld/meldwindow.py:77 +#: ../meld/meldwindow.py:86 msgid "Search forwards for the same text" msgstr "Keresés előre ugyanarra a szövegre" -#: ../meld/meldwindow.py:79 +#: ../meld/meldwindow.py:88 msgid "Find _Previous" msgstr "_Előző találat" -#: ../meld/meldwindow.py:80 +#: ../meld/meldwindow.py:89 msgid "Search backwards for the same text" msgstr "Keresés visszafelé ugyanarra a szövegre" -#: ../meld/meldwindow.py:83 +#: ../meld/meldwindow.py:92 msgid "_Replace…" msgstr "_Csere…" -#: ../meld/meldwindow.py:84 +#: ../meld/meldwindow.py:93 msgid "Find and replace text" msgstr "Szöveg keresése és cseréje" -#: ../meld/meldwindow.py:86 +#: ../meld/meldwindow.py:95 msgid "Go to _Line" msgstr "_Ugrás sorra" -#: ../meld/meldwindow.py:87 +#: ../meld/meldwindow.py:96 msgid "Go to a specific line" msgstr "Ugrás a megadott sorra" -#: ../meld/meldwindow.py:90 +#: ../meld/meldwindow.py:99 msgid "_Changes" msgstr "Válto_zások" -#: ../meld/meldwindow.py:91 +#: ../meld/meldwindow.py:100 msgid "Next Change" msgstr "Következő változás" -#: ../meld/meldwindow.py:92 +#: ../meld/meldwindow.py:101 msgid "Go to the next change" msgstr "Ugrás a következő változásra" -#: ../meld/meldwindow.py:94 +#: ../meld/meldwindow.py:103 msgid "Previous Change" msgstr "Előző változás" -#: ../meld/meldwindow.py:95 +#: ../meld/meldwindow.py:104 msgid "Go to the previous change" msgstr "Ugrás az előző változásra" -#: ../meld/meldwindow.py:97 +#: ../meld/meldwindow.py:106 msgid "Open Externally" msgstr "Megnyitás alkalmazással" -#: ../meld/meldwindow.py:98 +#: ../meld/meldwindow.py:107 msgid "Open selected file or directory in the default external application" msgstr "" "Kijelölt fájl vagy könyvtár megnyitása az alapértelmezett külső alkalmazással" -#: ../meld/meldwindow.py:102 +#: ../meld/meldwindow.py:111 msgid "_View" msgstr "_Nézet" -#: ../meld/meldwindow.py:103 +#: ../meld/meldwindow.py:112 msgid "File Status" msgstr "Fájlállapot" -#: ../meld/meldwindow.py:104 +#: ../meld/meldwindow.py:113 msgid "Version Status" msgstr "Verzióállapot" -#: ../meld/meldwindow.py:107 +#: ../meld/meldwindow.py:116 msgid "Stop the current action" msgstr "Jelenlegi művelet leállítása" -#: ../meld/meldwindow.py:110 +#: ../meld/meldwindow.py:119 msgid "Refresh the view" msgstr "A nézet frissítése" -#: ../meld/meldwindow.py:114 +#: ../meld/meldwindow.py:123 msgid "Fullscreen" msgstr "Teljes képernyő" -#: ../meld/meldwindow.py:115 +#: ../meld/meldwindow.py:124 msgid "View the comparison in fullscreen" msgstr "Az összehasonlítás megjelenítése teljes képernyőn" -#: ../meld/meldwindow.py:117 -msgid "_Toolbar" -msgstr "_Eszköztár" - -#: ../meld/meldwindow.py:118 -msgid "Show or hide the toolbar" -msgstr "Eszköztár megjelenítése vagy elrejtése" - -#: ../meld/meldwindow.py:127 +#: ../meld/meldwindow.py:133 msgid "Open Recent" msgstr "Legutóbbi megnyitása" -#: ../meld/meldwindow.py:128 +#: ../meld/meldwindow.py:134 msgid "Open recent files" msgstr "Legutóbbi fájlok megnyitása" -#: ../meld/meldwindow.py:150 -msgid "_Meld" -msgstr "_Meld" - -#: ../meld/meldwindow.py:151 -msgid "Quit the program" -msgstr "Kilépés a programból" - -#: ../meld/meldwindow.py:153 -msgid "Prefere_nces" -msgstr "B_eállítások" - -#: ../meld/meldwindow.py:154 -msgid "Configure the application" -msgstr "Az alkalmazás beállítása" - -#: ../meld/meldwindow.py:156 -msgid "_Contents" -msgstr "_Tartalom" - -#: ../meld/meldwindow.py:157 -msgid "Open the Meld manual" -msgstr "A Meld kézikönyvének megnyitása" - -#: ../meld/meldwindow.py:159 -msgid "About this application" -msgstr "Az alkalmazás névjegye" - -#: ../meld/meldwindow.py:602 +#: ../meld/meldwindow.py:567 #, python-format msgid "Need three files to auto-merge, got: %r" msgstr "Az automatikus összefésüléshez három fájl kell, érkezett: %r" -#: ../meld/meldwindow.py:623 +#: ../meld/meldwindow.py:588 msgid "Cannot compare a mixture of files and directories" msgstr "Fájlok és könyvtárak keveréke nem hasonlítható össze." -#: ../meld/misc.py:135 +#: ../meld/misc.py:155 msgid "" "{}\n" "\n" @@ -2356,51 +2327,47 @@ msgstr "" "A Meld kritikus hibát észlelt futás közben:\n" "{}" -#: ../meld/misc.py:254 +#: ../meld/misc.py:237 #, python-format msgid "Couldn’t find colour scheme details for %s-%s; this is a bad install" msgstr "Nem találhatók a színséma részletei ehhez: %s-%s, ez telepítési hiba" -#: ../meld/misc.py:325 +#: ../meld/misc.py:311 msgid "[None]" msgstr "[Semmi]" -#: ../meld/preferences.py:33 +#: ../meld/preferences.py:42 ../meld/preferences.py:135 msgid "label" msgstr "címke" -#: ../meld/preferences.py:33 +#: ../meld/preferences.py:42 ../meld/preferences.py:135 msgid "pattern" msgstr "minta" -#: ../meld/recent.py:105 +#: ../meld/recent.py:106 msgid "Version control:" msgstr "Verziókövetés:" -#: ../meld/ui/bufferselectors.py:32 +#: ../meld/ui/bufferselectors.py:114 #, python-brace-format msgid "{name} ({charset})" msgstr "{name} ({charset})" -#: ../meld/ui/bufferselectors.py:65 ../meld/ui/bufferselectors.py:73 +#: ../meld/ui/bufferselectors.py:144 ../meld/ui/bufferselectors.py:152 msgid "Plain Text" msgstr "Egyszerű szöveg" -#: ../meld/ui/notebooklabel.py:63 -msgid "Close tab" -msgstr "Lap bezárása" - #. 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 "%i. sor, %i. oszlop" -#: ../meld/ui/statusbar.py:177 +#: ../meld/ui/statusbar.py:182 msgid "Line you want to move the cursor to" msgstr "A sor, amelyre a kurzort szeretné vinni" -#: ../meld/ui/vcdialogs.py:48 +#: ../meld/ui/vcdialogs.py:55 msgid "No files will be committed" msgstr "Nem lesznek fájlok kommitolva" @@ -2451,141 +2418,141 @@ 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:70 +#: ../meld/vc/_vc.py:71 msgid "Unversioned" msgstr "Verziózatlan" -#: ../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" #. Translators: This error message is shown when a version #. control binary isn't installed. -#: ../meld/vcview.py:248 +#: ../meld/vcview.py:282 #, python-format msgid "%(name)s (%(cmd)s not installed)" msgstr "%(name)s (%(cmd)s nincs telepítve)" #. Translators: This error message is shown when a version #. controlled repository is invalid. -#: ../meld/vcview.py:252 +#: ../meld/vcview.py:286 #, python-format msgid "%(name)s (Invalid repository)" msgstr "%(name)s (Érvénytelen tároló)" -#: ../meld/vcview.py:273 +#: ../meld/vcview.py:307 msgid "No valid version control system found in this folder" msgstr "Nem található használható verziókövető rendszer ebben a mappában" -#: ../meld/vcview.py:275 +#: ../meld/vcview.py:309 msgid "Only one version control system found in this folder" msgstr "Csak egy verziókövető rendszer található ebben a mappában" -#: ../meld/vcview.py:277 +#: ../meld/vcview.py:311 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:331 +#: ../meld/vcview.py:366 #, python-format msgid "%s: %s" msgstr "%s: %s" #. Initial yield so when we add this to our tasks, we don't #. create iterators that may be invalidated. -#: ../meld/vcview.py:338 +#: ../meld/vcview.py:373 msgid "Scanning repository" msgstr "Tároló vizsgálata" -#: ../meld/vcview.py:367 +#: ../meld/vcview.py:402 #, python-format msgid "Scanning %s" msgstr "%s vizsgálata" -#: ../meld/vcview.py:406 +#: ../meld/vcview.py:441 msgid "(Empty)" msgstr "(Üres)" -#: ../meld/vcview.py:450 +#: ../meld/vcview.py:487 #, python-format msgid "%s — local" msgstr "%s – helyi" -#: ../meld/vcview.py:451 +#: ../meld/vcview.py:488 #, python-format msgid "%s — remote" msgstr "%s – távoli" -#: ../meld/vcview.py:459 +#: ../meld/vcview.py:496 #, python-format msgid "%s (local, merge, remote)" msgstr "%s (helyi, összefésült, távoli)" -#: ../meld/vcview.py:464 +#: ../meld/vcview.py:501 #, python-format msgid "%s (remote, merge, local)" msgstr "%s (távoli, összefésült, helyi)" -#: ../meld/vcview.py:475 +#: ../meld/vcview.py:512 #, python-format msgid "%s — repository" msgstr "%s – tároló" -#: ../meld/vcview.py:481 +#: ../meld/vcview.py:518 #, python-format msgid "%s (working, repository)" msgstr "%s (munka, tároló)" -#: ../meld/vcview.py:485 +#: ../meld/vcview.py:522 #, python-format msgid "%s (repository, working)" msgstr "%s (tároló, munka)" -#: ../meld/vcview.py:674 +#: ../meld/vcview.py:688 msgid "Remove folder and all its files?" msgstr "Eltávolítja a mappát és benne minden fájlt?" -#: ../meld/vcview.py:676 +#: ../meld/vcview.py:690 msgid "" "This will remove all selected files and folders, and all files within any " "selected folders, from version control." @@ -2593,7 +2560,7 @@ 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:785 +#: ../meld/vcview.py:804 msgid "Clear" msgstr "Törlés" From a3487b08813f330f5acaa41957c218df1ca14a63 Mon Sep 17 00:00:00 2001 From: Fran Dieguez Date: Tue, 29 Jan 2019 00:16:14 +0000 Subject: [PATCH 0819/1316] Update Galician translation --- po/gl.po | 2075 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 1075 insertions(+), 1000 deletions(-) diff --git a/po/gl.po b/po/gl.po index 14e85c7e..d99329de 100644 --- a/po/gl.po +++ b/po/gl.po @@ -7,33 +7,34 @@ # Antón Méixome , 2009. # Fran Diéguez , 2009, 2010, 2011, 2012. # Leandro Regueiro , 2012. -# Fran Dieguez , 2012, 2013. # Marcos Lans , 2018. +# Fran Dieguez , 2012-2019. +# msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n" -"POT-Creation-Date: 2018-03-11 09:08+0000\n" -"PO-Revision-Date: 2018-03-21 06:05+0200\n" -"Last-Translator: Marcos Lans \n" -"Language-Team: galego\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" "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: Virtaal 0.7.1\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"X-Generator: Gtranslator 3.30.0\n" -#: ../bin/meld:185 +#: ../bin/meld:190 msgid "Cannot import: " msgstr "Non é posíbel importar: " -#: ../bin/meld:188 +#: ../bin/meld:193 #, c-format msgid "Meld requires %s or higher." msgstr "Meld require %s ou superior." -#: ../bin/meld:240 +#: ../bin/meld:262 #, c-format msgid "" "Couldn’t load Meld-specific CSS (%s)\n" @@ -42,29 +43,31 @@ msgstr "" "Non foi posíbel cargar o CSS específico de Meld (%s)\n" "%s" -#: ../data/meld.desktop.in.h:1 ../data/meld.appdata.xml.in.h:1 -#: ../data/ui/meldapp.ui.h:1 +#: ../data/org.gnome.meld.desktop.in.h:1 +#: ../data/org.gnome.meld.appdata.xml.in.h:1 +#: ../meld/resources/ui/appwindow.ui.h:1 msgid "Meld" msgstr "Meld" -#: ../data/meld.desktop.in.h:2 +#: ../data/org.gnome.meld.desktop.in.h:2 msgid "Diff Viewer" msgstr "Visualizador Diff" -#: ../data/meld.desktop.in.h:3 +#: ../data/org.gnome.meld.desktop.in.h:3 msgid "Meld Diff Viewer" msgstr "Visualizador Diff Meld" -#: ../data/meld.desktop.in.h:4 ../data/meld.appdata.xml.in.h:2 +#: ../data/org.gnome.meld.desktop.in.h:4 +#: ../data/org.gnome.meld.appdata.xml.in.h:2 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/meld.desktop.in.h:6 +#: ../data/org.gnome.meld.desktop.in.h:6 msgid "diff;merge;" msgstr "comparar;combinar;" -#: ../data/meld.appdata.xml.in.h:3 +#: ../data/org.gnome.meld.appdata.xml.in.h:3 msgid "" "Meld is a visual diff and merge tool targeted at developers. Meld helps you " "compare files, directories, and version controlled projects. It provides " @@ -77,7 +80,7 @@ msgstr "" "bandas tanto entre ficheiros como entre cartafoles e acepta moitos sistemas " "de control de versións como Git, Bazaar e Subversion." -#: ../data/meld.appdata.xml.in.h:4 +#: ../data/org.gnome.meld.appdata.xml.in.h:4 msgid "" "Meld helps you review code changes, understand patches, and makes enormous " "merge conflicts slightly less painful." @@ -85,11 +88,11 @@ 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/meld.appdata.xml.in.h:5 +#: ../data/org.gnome.meld.appdata.xml.in.h:5 msgid "The GNOME Project" msgstr "O Proxecto GNOME" -#: ../data/mime/meld.xml.in.h:1 +#: ../data/mime/org.gnome.meld.xml.in.h:1 msgid "Meld comparison description" msgstr "Descrición da comparación do Meld" @@ -110,26 +113,10 @@ msgid "Default window fullscreen state" msgstr "Estado de pantalla completa da xanela predeterminada" #: ../data/org.gnome.meld.gschema.xml.h:5 -msgid "Show toolbar" -msgstr "Mostrar a barra de ferramentas" - -#: ../data/org.gnome.meld.gschema.xml.h:6 -msgid "If true, the window toolbar is visible." -msgstr "Se se marca, a barra de ferramenta da xanela será visíbel." - -#: ../data/org.gnome.meld.gschema.xml.h:7 -msgid "Show statusbar" -msgstr "Mostrar a barra de estado" - -#: ../data/org.gnome.meld.gschema.xml.h:8 -msgid "If true, the window statusbar is visible." -msgstr "Se se marca, a barra de estado da xanela será visíbel." - -#: ../data/org.gnome.meld.gschema.xml.h:9 msgid "Additional automatically detected text encodings" msgstr "Codificacións de texto adicionais detectadas automaticamente" -#: ../data/org.gnome.meld.gschema.xml.h:10 +#: ../data/org.gnome.meld.gschema.xml.h:6 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 " @@ -142,35 +129,36 @@ msgstr "" "predeterminada local actual. Poderán usarse outras codificacións dependendo " "do idioma do usuario." -#: ../data/org.gnome.meld.gschema.xml.h:11 +#: ../data/org.gnome.meld.gschema.xml.h:7 msgid "Width of an indentation step" msgstr "Largura da sangría" -#: ../data/org.gnome.meld.gschema.xml.h:12 +#: ../data/org.gnome.meld.gschema.xml.h:8 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:13 +#: ../data/org.gnome.meld.gschema.xml.h:9 msgid "Whether to indent using spaces or tabs" msgstr "Indica se sangrar usando espazos ou tabulacións" -#: ../data/org.gnome.meld.gschema.xml.h:14 +#: ../data/org.gnome.meld.gschema.xml.h:10 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:15 +#: ../data/org.gnome.meld.gschema.xml.h:11 +#: ../meld/resources/ui/statusbar-menu.ui.h:1 msgid "Show line numbers" msgstr "Mostrar os números de liña" -#: ../data/org.gnome.meld.gschema.xml.h:16 +#: ../data/org.gnome.meld.gschema.xml.h:12 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:17 +#: ../data/org.gnome.meld.gschema.xml.h:13 msgid "Highlight syntax" msgstr "Realzar a sintaxe" -#: ../data/org.gnome.meld.gschema.xml.h:18 +#: ../data/org.gnome.meld.gschema.xml.h:14 msgid "" "Whether to highlight syntax in comparisons. Because of Meld’s own color " "highlighting, this is off by default." @@ -178,19 +166,19 @@ 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:19 +#: ../data/org.gnome.meld.gschema.xml.h:15 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:20 +#: ../data/org.gnome.meld.gschema.xml.h:16 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:21 +#: ../data/org.gnome.meld.gschema.xml.h:17 msgid "Displayed whitespace" msgstr "Mostrar espazos en branco" -#: ../data/org.gnome.meld.gschema.xml.h:22 +#: ../data/org.gnome.meld.gschema.xml.h:18 msgid "" "Selector for individual whitespace character types to be shown. Possible " "values are 'space', 'tab', 'newline' and 'nbsp'." @@ -198,11 +186,11 @@ msgstr "" "Selector de tipos de caracteres de espazo en branco a mostrar. Os valores " "posíbeis son : «space», «tab», «newline» e «nbsp»." -#: ../data/org.gnome.meld.gschema.xml.h:23 +#: ../data/org.gnome.meld.gschema.xml.h:19 msgid "Wrap mode" msgstr "Modo axuste de liña" -#: ../data/org.gnome.meld.gschema.xml.h:24 +#: ../data/org.gnome.meld.gschema.xml.h:20 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 " @@ -212,11 +200,12 @@ msgstr "" "axuste (Ningún), en calquera carácter (Carácter) ou só ao final da palabra " "(Palabra)." -#: ../data/org.gnome.meld.gschema.xml.h:25 +#: ../data/org.gnome.meld.gschema.xml.h:21 +#: ../meld/resources/ui/statusbar-menu.ui.h:3 msgid "Highlight current line" msgstr "Realzar a liña actual" -#: ../data/org.gnome.meld.gschema.xml.h:26 +#: ../data/org.gnome.meld.gschema.xml.h:22 msgid "" "If true, the line containing the cursor will be highlighted in file " "comparisons." @@ -224,22 +213,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:27 +#: ../data/org.gnome.meld.gschema.xml.h:23 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:28 +#: ../data/org.gnome.meld.gschema.xml.h:24 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:29 +#: ../data/org.gnome.meld.gschema.xml.h:25 msgid "Custom font" msgstr "Personalizar tipo de letra" -#: ../data/org.gnome.meld.gschema.xml.h:30 +#: ../data/org.gnome.meld.gschema.xml.h:26 msgid "" "The custom font to use, stored as a string and parsed as a Pango font " "description." @@ -247,22 +236,22 @@ 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:31 +#: ../data/org.gnome.meld.gschema.xml.h:27 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:32 +#: ../data/org.gnome.meld.gschema.xml.h:28 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:33 +#: ../data/org.gnome.meld.gschema.xml.h:29 msgid "Use the system default editor" msgstr "Usar o editor predeterminado do sistema" -#: ../data/org.gnome.meld.gschema.xml.h:34 +#: ../data/org.gnome.meld.gschema.xml.h:30 msgid "" "If false, custom-editor-command will be used instead of the system editor " "when opening files externally." @@ -270,11 +259,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:35 +#: ../data/org.gnome.meld.gschema.xml.h:31 msgid "The custom editor launch command" msgstr "Orde para iniciar o editor personalizado" -#: ../data/org.gnome.meld.gschema.xml.h:36 +#: ../data/org.gnome.meld.gschema.xml.h:32 msgid "" "The command used to launch a custom editor. Some limited templating is " "supported here; at the moment '{file}' and '{line}' are recognised tokens." @@ -282,11 +271,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:37 +#: ../data/org.gnome.meld.gschema.xml.h:33 msgid "Columns to display" msgstr "Columnas a mostrar" -#: ../data/org.gnome.meld.gschema.xml.h:38 +#: ../data/org.gnome.meld.gschema.xml.h:34 msgid "" "List of column names in folder comparison and whether they should be " "displayed." @@ -294,11 +283,12 @@ msgstr "" "Lista de nomes de columna na comparación de cartafoles e se se deberían " "mostrar." -#: ../data/org.gnome.meld.gschema.xml.h:39 ../data/ui/preferences.ui.h:25 +#: ../data/org.gnome.meld.gschema.xml.h:35 +#: ../meld/resources/ui/preferences.ui.h:25 msgid "Ignore symbolic links" msgstr "Ignorar as ligazóns simbólicas" -#: ../data/org.gnome.meld.gschema.xml.h:40 +#: ../data/org.gnome.meld.gschema.xml.h:36 msgid "" "If true, folder comparisons do not follow symbolic links when traversing the " "folder tree." @@ -306,11 +296,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:41 +#: ../data/org.gnome.meld.gschema.xml.h:37 msgid "Use shallow comparison" msgstr "Usar unha comparación superficial" -#: ../data/org.gnome.meld.gschema.xml.h:42 +#: ../data/org.gnome.meld.gschema.xml.h:38 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 " @@ -320,11 +310,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:43 +#: ../data/org.gnome.meld.gschema.xml.h:39 msgid "File timestamp resolution" msgstr "Resolución da marca de tempo do ficheiro" -#: ../data/org.gnome.meld.gschema.xml.h:44 +#: ../data/org.gnome.meld.gschema.xml.h:40 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 " @@ -336,11 +326,12 @@ 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:45 ../data/ui/preferences.ui.h:22 +#: ../data/org.gnome.meld.gschema.xml.h:41 +#: ../meld/resources/ui/preferences.ui.h:22 msgid "Apply text filters during folder comparisons" msgstr "Aplicar filtros de texto nas comparacións de cartafoles" -#: ../data/org.gnome.meld.gschema.xml.h:46 +#: ../data/org.gnome.meld.gschema.xml.h:42 msgid "" "If true, folder comparisons that compare file contents also apply active " "text filters and the blank line trimming option, and ignore newline " @@ -351,21 +342,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:47 +#: ../data/org.gnome.meld.gschema.xml.h:43 msgid "File status filters" msgstr "Filtros do estado do ficheiro" -#: ../data/org.gnome.meld.gschema.xml.h:48 +#: ../data/org.gnome.meld.gschema.xml.h:44 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:49 +#: ../data/org.gnome.meld.gschema.xml.h:45 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:50 +#: ../data/org.gnome.meld.gschema.xml.h:46 msgid "" "If true, a console output section will be shown in version control views, " "showing the commands run for version control operations." @@ -374,11 +365,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:51 +#: ../data/org.gnome.meld.gschema.xml.h:47 msgid "Version control pane position" msgstr "Posición do panel de control de versións" -#: ../data/org.gnome.meld.gschema.xml.h:52 +#: ../data/org.gnome.meld.gschema.xml.h:48 msgid "" "This is the height of the main version control tree when the console pane is " "shown." @@ -386,13 +377,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:53 +#: ../data/org.gnome.meld.gschema.xml.h:49 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:54 +#: ../data/org.gnome.meld.gschema.xml.h:50 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, " @@ -403,13 +394,13 @@ msgstr "" "presentación dos ficheiros nos paneis. Noutro caso, usarase o esquema " "«esquerda é seu», «dereita é meu»." -#: ../data/org.gnome.meld.gschema.xml.h:55 +#: ../data/org.gnome.meld.gschema.xml.h:51 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:56 +#: ../data/org.gnome.meld.gschema.xml.h:52 msgid "" "Choices for file order are remote/merged/local and local/merged/remote. This " "preference only affects three-way comparisons launched from the version " @@ -420,11 +411,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:57 +#: ../data/org.gnome.meld.gschema.xml.h:53 msgid "Show margin in commit message editor" msgstr "Mostrar a marxe no editor de mensaxes para remitir" -#: ../data/org.gnome.meld.gschema.xml.h:58 +#: ../data/org.gnome.meld.gschema.xml.h:54 msgid "" "If true, a guide will be displayed to show what column the margin is at in " "the version control commit message editor." @@ -432,11 +423,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:59 +#: ../data/org.gnome.meld.gschema.xml.h:55 msgid "Margin column in commit message editor" msgstr "Columna da marxe no editor de mensaxes para remitir" -#: ../data/org.gnome.meld.gschema.xml.h:60 +#: ../data/org.gnome.meld.gschema.xml.h:56 msgid "" "The column at which to show the margin in the version control commit message " "editor." @@ -444,11 +435,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:61 +#: ../data/org.gnome.meld.gschema.xml.h:57 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:62 +#: ../data/org.gnome.meld.gschema.xml.h:58 msgid "" "If true, the version control commit message editor will hard-wrap (i.e., " "insert line breaks) at the commit margin before commit." @@ -457,22 +448,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:63 +#: ../data/org.gnome.meld.gschema.xml.h:59 msgid "Version control status filters" msgstr "Filtros do estado do control de versións" -#: ../data/org.gnome.meld.gschema.xml.h:64 +#: ../data/org.gnome.meld.gschema.xml.h:60 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:65 +#: ../data/org.gnome.meld.gschema.xml.h:61 msgid "Filename-based filters" msgstr "Filtros baseados nos nomes de fiicheiro" -#: ../data/org.gnome.meld.gschema.xml.h:66 +#: ../data/org.gnome.meld.gschema.xml.h:62 msgid "" "List of predefined filename-based filters that, if active, will remove " "matching files from a folder comparison." @@ -481,11 +472,11 @@ msgstr "" "eliminarán, se están activos, os arquivos coincidentes nas comparacións de " "cartafoles." -#: ../data/org.gnome.meld.gschema.xml.h:67 +#: ../data/org.gnome.meld.gschema.xml.h:63 msgid "Text-based filters" msgstr "Filtros de texto" -#: ../data/org.gnome.meld.gschema.xml.h:68 +#: ../data/org.gnome.meld.gschema.xml.h:64 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, " @@ -511,385 +502,628 @@ msgstr "Esquema escuro de Meld" msgid "Dark color scheme for Meld highlighting" msgstr "Esquema de cor escuro para o realzado de Meld" -#: ../data/ui/application.ui.h:1 -msgid "About Meld" -msgstr "Sobre o Meld" - -#: ../data/ui/application.ui.h:2 -msgid "" -"Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2017 Kai Willadsen" -msgstr "" -"Dereitos de autor © 2002-2009 Stephen Kennedy\n" -"Dereitos de autor © 2009-2017 Kai Willadsen" +#: ../meld/resources/gtk/help-overlay.ui.h:1 +msgctxt "shortcut window" +msgid "General" +msgstr "Xeral" -#: ../data/ui/application.ui.h:4 -msgid "Website" -msgstr "Sitio web" +#: ../meld/resources/gtk/help-overlay.ui.h:2 +msgctxt "shortcut window" +msgid "New comparison" +msgstr "Nova comparación" -#: ../data/ui/application.ui.h:5 -msgid "translator-credits" -msgstr "" -"Leandro Regueiro , 2012\n" -"Fran Diéguez , 2011\n" -"Proxecto Trasno - Tradución de software libre ao galego " -", 1999-2012" +#: ../meld/resources/gtk/help-overlay.ui.h:3 +msgctxt "shortcut window" +msgid "Close a comparison" +msgstr "Pechar unha comparación" -#: ../data/ui/application.ui.h:6 -msgid "_Preferences" -msgstr "Prefere_ncias" +#: ../meld/resources/gtk/help-overlay.ui.h:4 +msgctxt "shortcut window" +msgid "Quit Meld" +msgstr "Saír do Meld" -#: ../data/ui/application.ui.h:7 -msgid "_Help" -msgstr "A_xuda" +#: ../meld/resources/gtk/help-overlay.ui.h:5 +msgctxt "shortcut window" +msgid "Stop the current action" +msgstr "Deter a acción actual" -#: ../data/ui/application.ui.h:8 -msgid "Keyboard Shortcuts" -msgstr "Atallos de teclado" +#: ../meld/resources/gtk/help-overlay.ui.h:6 +msgctxt "shortcut window" +msgid "Refresh comparison" +msgstr "Actualizar comparación" -#: ../data/ui/application.ui.h:9 -msgid "_About" -msgstr "_Sobre" +#: ../meld/resources/gtk/help-overlay.ui.h:7 +msgctxt "shortcut window" +msgid "Fullscreen" +msgstr "Pantalla completa" -#: ../data/ui/application.ui.h:10 -msgid "_Quit" -msgstr "_Saír" +#: ../meld/resources/gtk/help-overlay.ui.h:8 +msgctxt "shortcut window" +msgid "Tabs" +msgstr "Lapelas" -#: ../data/ui/dirdiff.ui.h:1 ../data/ui/vcview.ui.h:1 -msgid "_Compare" -msgstr "_Comparar" +#: ../meld/resources/gtk/help-overlay.ui.h:9 +msgctxt "shortcut window" +msgid "Go to previous tab" +msgstr "Ir á lapela anterior" -#: ../data/ui/dirdiff.ui.h:2 ../data/ui/vcview.ui.h:2 -msgid "Compare selected files" -msgstr "Comparar ficheiros seleccionados" +#: ../meld/resources/gtk/help-overlay.ui.h:10 +msgctxt "shortcut window" +msgid "Go to next tab" +msgstr "Ir á lapela seguinte" -#: ../data/ui/dirdiff.ui.h:3 -msgid "Copy to _Left" -msgstr "Copiar á es_querda" +#: ../meld/resources/gtk/help-overlay.ui.h:11 +msgctxt "shortcut window" +msgid "Switch to tab" +msgstr "Cambiar á lapela" -#: ../data/ui/dirdiff.ui.h:4 -msgid "Copy to left" -msgstr "Copiar á esquerda" +#: ../meld/resources/gtk/help-overlay.ui.h:12 +msgctxt "shortcut window" +msgid "Move tab left" +msgstr "Mover lapela á esquerda" -#: ../data/ui/dirdiff.ui.h:5 -msgid "Copy to _Right" -msgstr "Copiar á de_reita" +#: ../meld/resources/gtk/help-overlay.ui.h:13 +msgctxt "shortcut window" +msgid "Move tab right" +msgstr "Mover lapela á dereita" -#: ../data/ui/dirdiff.ui.h:6 -msgid "Copy to right" -msgstr "Copiar á dereita" +#: ../meld/resources/gtk/help-overlay.ui.h:14 +msgctxt "shortcut window" +msgid "Changes" +msgstr "Cambios" -#: ../data/ui/dirdiff.ui.h:7 -msgid "Delete selected" -msgstr "Eliminar o seleccionado" +#: ../meld/resources/gtk/help-overlay.ui.h:15 +msgctxt "shortcut window" +msgid "Go to previous change" +msgstr "Ir ao cambio anterior" -#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:872 ../meld/filediff.py:1445 -msgid "Hide" -msgstr "Ocultar" +#: ../meld/resources/gtk/help-overlay.ui.h:16 +msgctxt "shortcut window" +msgid "Go to next change" +msgstr "Ir ao seguinte cambio" -#: ../data/ui/dirdiff.ui.h:9 -msgid "Hide selected" -msgstr "Ocultar o seleccionado" +#: ../meld/resources/gtk/help-overlay.ui.h:17 +msgctxt "shortcut window" +msgid "Editing" +msgstr "Edición" -#: ../data/ui/dirdiff.ui.h:10 -msgid "Ignore Filename Case" -msgstr "Ignorar maiúsculas e minúsculas do nome do ficheiro" +#: ../meld/resources/gtk/help-overlay.ui.h:18 +msgctxt "shortcut window" +msgid "Undo" +msgstr "Desfacer" -#: ../data/ui/dirdiff.ui.h:11 -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/gtk/help-overlay.ui.h:19 +msgctxt "shortcut window" +msgid "Redo" +msgstr "Refacer" -#: ../data/ui/dirdiff.ui.h:12 -msgid "Same" -msgstr "Iguais" +#: ../meld/resources/gtk/help-overlay.ui.h:20 +msgctxt "shortcut window" +msgid "Cut" +msgstr "Cortar" -#: ../data/ui/dirdiff.ui.h:13 -msgid "Show identical" -msgstr "Mostrar idénticos" +#: ../meld/resources/gtk/help-overlay.ui.h:21 +msgctxt "shortcut window" +msgid "Copy" +msgstr "Copiar" -#: ../data/ui/dirdiff.ui.h:14 -msgid "New" -msgstr "Novo" +#: ../meld/resources/gtk/help-overlay.ui.h:22 +msgctxt "shortcut window" +msgid "Paste" +msgstr "Pegar" -#: ../data/ui/dirdiff.ui.h:15 -msgid "Show new" -msgstr "Mostrar novo" +#: ../meld/resources/gtk/help-overlay.ui.h:23 +msgctxt "shortcut window" +msgid "Find" +msgstr "Buscar" -#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:77 -msgid "Modified" -msgstr "Modificado" +#: ../meld/resources/gtk/help-overlay.ui.h:24 +msgctxt "shortcut window" +msgid "Find Next" +msgstr "Buscar seguinte" -#: ../data/ui/dirdiff.ui.h:17 -msgid "Show modified" -msgstr "Mostrar modificados" +#: ../meld/resources/gtk/help-overlay.ui.h:25 +msgctxt "shortcut window" +msgid "Find Previous" +msgstr "Buscar anterior" -#: ../data/ui/dirdiff.ui.h:18 -msgid "Filters" -msgstr "Filtros" +#: ../meld/resources/gtk/help-overlay.ui.h:26 +msgctxt "shortcut window" +msgid "Replace" +msgstr "Substituir" -#: ../data/ui/dirdiff.ui.h:19 -msgid "Set active filters" -msgstr "Estabelecer filtros activos" +#: ../meld/resources/gtk/help-overlay.ui.h:27 +msgctxt "shortcut window" +msgid "File comparison" +msgstr "Comparación de ficheiros" + +#: ../meld/resources/gtk/help-overlay.ui.h:28 +msgctxt "shortcut window" +msgid "Save current file" +msgstr "Gardar o ficheiro actual" + +#: ../meld/resources/gtk/help-overlay.ui.h:29 +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 +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 +msgctxt "shortcut window" +msgid "Previous conflict" +msgstr "Conflito anterior" + +#: ../meld/resources/gtk/help-overlay.ui.h:32 +msgctxt "shortcut window" +msgid "Next conflict" +msgstr "Seguinte conflito" + +#: ../meld/resources/gtk/help-overlay.ui.h:33 +msgctxt "shortcut window" +msgid "Push change to left" +msgstr "Empurrar o cambio á esquerda" + +#: ../meld/resources/gtk/help-overlay.ui.h:34 +msgctxt "shortcut window" +msgid "Push change to right" +msgstr "Empurrar o cambio á dereita" + +#: ../meld/resources/gtk/help-overlay.ui.h:35 +msgctxt "shortcut window" +msgid "Pull change from left" +msgstr "Traer o cambio desde a esquerda" + +#: ../meld/resources/gtk/help-overlay.ui.h:36 +msgctxt "shortcut window" +msgid "Pull change from right" +msgstr "Traer o cambio desde a dereita" + +#: ../meld/resources/gtk/help-overlay.ui.h:37 +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 +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 +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 +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 +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 +msgctxt "shortcut window" +msgid "Folder comparison" +msgstr "Comparación de cartafoles" + +#: ../meld/resources/gtk/help-overlay.ui.h:45 +msgctxt "shortcut window" +msgid "Copy to left" +msgstr "Copiar á esquerda" + +#: ../meld/resources/gtk/help-overlay.ui.h:46 +msgctxt "shortcut window" +msgid "Copy to right" +msgstr "Copiar á dereita" + +#: ../meld/resources/gtk/help-overlay.ui.h:47 +msgctxt "shortcut window" +msgid "Version control comparison" +msgstr "Comparación de control de versións" + +#: ../meld/resources/gtk/help-overlay.ui.h:48 +msgctxt "shortcut window" +msgid "Commit to version control" +msgstr "Remitir ao control de versións" + +#: ../meld/resources/gtk/help-overlay.ui.h:49 +msgctxt "shortcut window" +msgid "Show/hide console output" +msgstr "Mostrar/Ocultar saídas da consola" + +#: ../meld/resources/gtk/menus.ui.h:1 +msgid "_Preferences" +msgstr "Prefere_ncias" + +#: ../meld/resources/gtk/menus.ui.h:2 +msgid "_Help" +msgstr "A_xuda" + +#: ../meld/resources/gtk/menus.ui.h:3 +msgid "Keyboard Shortcuts" +msgstr "Atallos de teclado" + +#: ../meld/resources/gtk/menus.ui.h:4 +msgid "_About" +msgstr "_Sobre" + +#: ../meld/resources/gtk/menus.ui.h:5 +msgid "_Quit" +msgstr "_Saír" + +#: ../meld/resources/ui/about-dialog.ui.h:1 +msgid "About Meld" +msgstr "Sobre o Meld" + +#: ../meld/resources/ui/about-dialog.ui.h:2 +msgid "" +"Copyright © 2002-2009 Stephen Kennedy\n" +"Copyright © 2009-2017 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" -#: ../data/ui/EditableList.ui.h:1 -msgid "Editable List" -msgstr "Editar lista" +#: ../meld/resources/ui/about-dialog.ui.h:5 +msgid "translator-credits" +msgstr "" +"Leandro Regueiro , 2012\n" +"Fran Diéguez , 2011\n" +"Proxecto Trasno - Tradución de software libre ao galego , 1999-2012" -#: ../data/ui/EditableList.ui.h:2 +#: ../meld/resources/ui/column-list.ui.h:1 +#: ../meld/resources/ui/filter-list.ui.h:1 msgid "Active" msgstr "Activo" -#: ../data/ui/EditableList.ui.h:3 +#: ../meld/resources/ui/column-list.ui.h:2 msgid "Column Name" msgstr "Nome da columna" -#: ../data/ui/EditableList.ui.h:4 ../data/ui/vcview.ui.h:9 -msgid "_Add" -msgstr "Eng_adir" - -#: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11 -#: ../meld/vcview.py:681 +#: ../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 msgid "_Remove" msgstr "_Retirar" -#: ../data/ui/EditableList.ui.h:6 +#: ../meld/resources/ui/column-list.ui.h:4 +#: ../meld/resources/ui/filter-list.ui.h:8 msgid "Move item up" msgstr "Mover o elemento cara arriba" -#: ../data/ui/EditableList.ui.h:7 +#: ../meld/resources/ui/column-list.ui.h:5 +#: ../meld/resources/ui/filter-list.ui.h:9 msgid "Move _Up" msgstr "S_ubir" -#: ../data/ui/EditableList.ui.h:8 +#: ../meld/resources/ui/column-list.ui.h:6 +#: ../meld/resources/ui/filter-list.ui.h:10 msgid "Move item down" msgstr "Mover o elemento cara abaixo" -#: ../data/ui/EditableList.ui.h:9 +#: ../meld/resources/ui/column-list.ui.h:7 +#: ../meld/resources/ui/filter-list.ui.h:11 msgid "Move _Down" msgstr "_Baixar" -#. Create icon and filename CellRenderer -#: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35 -#: ../meld/dirdiff.py:372 -msgid "Name" -msgstr "Nome" +#: ../meld/resources/ui/commit-dialog.ui.h:1 +msgid "Commit" +msgstr "Remitir" -#: ../data/ui/EditableList.ui.h:11 -msgid "Pattern" -msgstr "Patrón" +#: ../meld/resources/ui/commit-dialog.ui.h:2 +msgid "Commit Files" +msgstr "Remitir os ficheiros" -#: ../data/ui/EditableList.ui.h:12 -msgid "Add new filter" -msgstr "Engadir novo filtro" +#: ../meld/resources/ui/commit-dialog.ui.h:3 +msgid "Log Message" +msgstr "Mensaxe de rexistro" -#: ../data/ui/EditableList.ui.h:13 -msgid "Remove selected filter" -msgstr "Retirar o filtro seleccionado" +#: ../meld/resources/ui/commit-dialog.ui.h:4 +msgid "Previous logs:" +msgstr "Rexistros anteriores:" + +#: ../meld/resources/ui/commit-dialog.ui.h:5 +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 +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 +msgid "Copy to right" +msgstr "Copiar á dereita" + +#: ../meld/resources/ui/dirdiff.ui.h:11 +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.ui.h:13 +msgid "Hide selected" +msgstr "Ocultar o 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.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.ui.h:18 +msgid "New" +msgstr "Novo" + +#: ../meld/resources/ui/dirdiff.ui.h:19 +msgid "Show new" +msgstr "Mostrar novo" + +#: ../meld/resources/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:77 +msgid "Modified" +msgstr "Modificado" + +#: ../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" -#: ../data/ui/encoding-selector.ui.h:1 +#: ../meld/resources/ui/encoding-selector.ui.h:1 msgid "Search text encoding…" msgstr "Buscar a codificación do texto..." -#: ../data/ui/filediff.ui.h:1 +#: ../meld/resources/ui/filediff.ui.h:1 msgid "Format as Patch…" msgstr "Formatar como parche…" -#: ../data/ui/filediff.ui.h:2 +#: ../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" -#: ../data/ui/filediff.ui.h:3 +#: ../meld/resources/ui/filediff.ui.h:3 msgid "Save A_ll" msgstr "G_ardar todo" -#: ../data/ui/filediff.ui.h:4 +#: ../meld/resources/ui/filediff.ui.h:4 msgid "Save all files in the current comparison" msgstr "Garda todos os ficheiros na comparación actual" -#: ../data/ui/filediff.ui.h:5 +#: ../meld/resources/ui/filediff.ui.h:5 msgid "Revert files to their saved versions" msgstr "Reverte os ficheiros ás súas versións gardadas" -#: ../data/ui/filediff.ui.h:6 +#: ../meld/resources/ui/filediff.ui.h:6 msgid "Add Synchronization Point" msgstr "Engadir punto de sincronización" -#: ../data/ui/filediff.ui.h:7 +#: ../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" -#: ../data/ui/filediff.ui.h:8 +#: ../meld/resources/ui/filediff.ui.h:8 msgid "Clear Synchronization Points" msgstr "Limpar puntos de sincronización" -#: ../data/ui/filediff.ui.h:9 +#: ../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" -#: ../data/ui/filediff.ui.h:10 +#: ../meld/resources/ui/filediff.ui.h:10 msgid "Previous Conflict" msgstr "Conflito anterior" -#: ../data/ui/filediff.ui.h:11 +#: ../meld/resources/ui/filediff.ui.h:11 msgid "Go to the previous conflict" msgstr "Ir ao conflito anterior" -#: ../data/ui/filediff.ui.h:12 +#: ../meld/resources/ui/filediff.ui.h:12 msgid "Next Conflict" msgstr "Seguinte conflito" -#: ../data/ui/filediff.ui.h:13 +#: ../meld/resources/ui/filediff.ui.h:13 msgid "Go to the next conflict" msgstr "Ir ao seguinte conflito" -#: ../data/ui/filediff.ui.h:14 +#: ../meld/resources/ui/filediff.ui.h:14 msgid "Push to Left" msgstr "Empurrar á esquerda" -#: ../data/ui/filediff.ui.h:15 +#: ../meld/resources/ui/filediff.ui.h:15 msgid "Push current change to the left" msgstr "Empurrar o cambio actual á esquerda" -#: ../data/ui/filediff.ui.h:16 +#: ../meld/resources/ui/filediff.ui.h:16 msgid "Push to Right" msgstr "Empurrar á dereita" -#: ../data/ui/filediff.ui.h:17 +#: ../meld/resources/ui/filediff.ui.h:17 msgid "Push current change to the right" msgstr "Empurrar o cambio actual á dereita" -#: ../data/ui/filediff.ui.h:18 +#: ../meld/resources/ui/filediff.ui.h:18 msgid "Pull from Left" msgstr "Traer desde á esquerda" -#: ../data/ui/filediff.ui.h:19 +#: ../meld/resources/ui/filediff.ui.h:19 msgid "Pull change from the left" msgstr "Traer o cambio desde á esquerda" -#: ../data/ui/filediff.ui.h:20 +#: ../meld/resources/ui/filediff.ui.h:20 msgid "Pull from Right" msgstr "Traer desde á dereita" -#: ../data/ui/filediff.ui.h:21 +#: ../meld/resources/ui/filediff.ui.h:21 msgid "Pull change from the right" msgstr "Traer o cambio desde á dereita" -#: ../data/ui/filediff.ui.h:22 +#: ../meld/resources/ui/filediff.ui.h:22 msgid "Copy Above Left" msgstr "Copiar por enriba da esquerda" -#: ../data/ui/filediff.ui.h:23 +#: ../meld/resources/ui/filediff.ui.h:23 msgid "Copy change above the left chunk" msgstr "Copiar o cambio por enriba da parte esquerda" -#: ../data/ui/filediff.ui.h:24 +#: ../meld/resources/ui/filediff.ui.h:24 msgid "Copy Below Left" msgstr "Copiar por debaixo da esquerda" -#: ../data/ui/filediff.ui.h:25 +#: ../meld/resources/ui/filediff.ui.h:25 msgid "Copy change below the left chunk" msgstr "Copiar o cambio por embaixo da parte esquerda" -#: ../data/ui/filediff.ui.h:26 +#: ../meld/resources/ui/filediff.ui.h:26 msgid "Copy Above Right" msgstr "Copiar por enriba da dereita" -#: ../data/ui/filediff.ui.h:27 +#: ../meld/resources/ui/filediff.ui.h:27 msgid "Copy change above the right chunk" msgstr "Copiar o cambio por enriba da parte dereita" -#: ../data/ui/filediff.ui.h:28 +#: ../meld/resources/ui/filediff.ui.h:28 msgid "Copy Below Right" msgstr "Copiar por debaixo da dereita" -#: ../data/ui/filediff.ui.h:29 +#: ../meld/resources/ui/filediff.ui.h:29 msgid "Copy change below the right chunk" msgstr "Copiar o cambio por embaixo da parte dereita" -#: ../data/ui/filediff.ui.h:30 +#: ../meld/resources/ui/filediff.ui.h:30 msgid "Delete" msgstr "Eliminar" -#: ../data/ui/filediff.ui.h:31 +#: ../meld/resources/ui/filediff.ui.h:31 msgid "Delete change" msgstr "Eliminar o cambio" -#: ../data/ui/filediff.ui.h:32 +#: ../meld/resources/ui/filediff.ui.h:32 msgid "Merge All from Left" msgstr "Combinar todos os cambios desde a esquerda" -#: ../data/ui/filediff.ui.h:33 +#: ../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" -#: ../data/ui/filediff.ui.h:34 +#: ../meld/resources/ui/filediff.ui.h:34 msgid "Merge All from Right" msgstr "Combinar todos os cambios desde a dereita" -#: ../data/ui/filediff.ui.h:35 +#: ../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" -#: ../data/ui/filediff.ui.h:36 +#: ../meld/resources/ui/filediff.ui.h:36 msgid "Merge All" msgstr "Combinar todos" -#: ../data/ui/filediff.ui.h:37 +#: ../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" -#: ../data/ui/filediff.ui.h:38 +#: ../meld/resources/ui/filediff.ui.h:38 msgid "Previous Pane" msgstr "Panel anterior" -#: ../data/ui/filediff.ui.h:39 +#: ../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" -#: ../data/ui/filediff.ui.h:40 +#: ../meld/resources/ui/filediff.ui.h:40 msgid "Next Pane" msgstr "Panel seguinte" -#: ../data/ui/filediff.ui.h:41 +#: ../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" -#: ../data/ui/filediff.ui.h:42 +#: ../meld/resources/ui/filediff.ui.h:42 msgid "Lock Scrolling" msgstr "Bloquear desprazamento" -#: ../data/ui/filediff.ui.h:43 +#: ../meld/resources/ui/filediff.ui.h:43 msgid "Lock scrolling of all panes" msgstr "Bloquear o desprazamento de todos os paneis" -#: ../data/ui/filediff.ui.h:44 -msgid "Save changes to documents before closing?" -msgstr "Desexa gardar cambios nos documentos antes de gardar?" - -#: ../data/ui/filediff.ui.h:45 -msgid "If you don’t save, changes will be permanently lost." -msgstr "Se non garda o ficheiro, os seus cambios perderanse permanentemente." - -#: ../data/ui/filediff.ui.h:46 -msgid "Close _without Saving" -msgstr "Pechar _sen gardar" - -#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:953 ../meld/filediff.py:1516 -#: ../meld/filediff.py:1588 -msgid "_Cancel" -msgstr "_Cancelar" - -#: ../data/ui/filediff.ui.h:48 -msgid "_Save" -msgstr "_Gardar" - -#: ../data/ui/filediff.ui.h:49 +#: ../meld/resources/ui/filediff.ui.h:44 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." @@ -898,238 +1132,313 @@ msgstr "" "este ficheiro e facer cambios de todas formas, aínda así os cambios debe " "gardalos nun ficheiro novo." -#: ../data/ui/filediff.ui.h:50 +#: ../meld/resources/ui/filediff.ui.h:45 msgid "File 3" msgstr "Ficheiro 3" -#: ../data/ui/filediff.ui.h:51 +#: ../meld/resources/ui/filediff.ui.h:46 msgid "File 2" msgstr "Ficheiro 2" -#: ../data/ui/filediff.ui.h:52 +#: ../meld/resources/ui/filediff.ui.h:47 msgid "File 1" msgstr "Ficheiro 1" -#: ../data/ui/filediff.ui.h:53 -msgid "Discard unsaved changes to documents?" -msgstr "Desexa desbotar os cambios non gardados nos documentos?" +#. Create icon and filename CellRenderer +#: ../meld/resources/ui/filter-list.ui.h:2 ../meld/resources/ui/vcview.ui.h:30 +#: ../meld/dirdiff.py:455 +msgid "Name" +msgstr "Nome" -#: ../data/ui/filediff.ui.h:54 -msgid "Changes made to the following documents will be permanently lost:" -msgstr "" -"Os cambios realizados nos seguintes documentos perderanse permanentemente:" +#: ../meld/resources/ui/filter-list.ui.h:3 +msgid "Pattern" +msgstr "Patrón" -#: ../data/ui/filediff.ui.h:55 -msgid "_Discard" -msgstr "_Desbotar" +#: ../meld/resources/ui/filter-list.ui.h:4 +msgid "Add new filter" +msgstr "Engadir novo filtro" + +#: ../meld/resources/ui/filter-list.ui.h:5 ../meld/resources/ui/vcview.ui.h:9 +msgid "_Add" +msgstr "Eng_adir" + +#: ../meld/resources/ui/filter-list.ui.h:6 +msgid "Remove selected filter" +msgstr "Retirar o filtro seleccionado" -#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:954 ../meld/filediff.py:1517 +#: ../meld/resources/ui/findbar.ui.h:1 ../meld/dirdiff.py:1041 +#: ../meld/iohelpers.py:113 msgid "_Replace" msgstr "Substituí_r" -#: ../data/ui/findbar.ui.h:2 +#: ../meld/resources/ui/findbar.ui.h:2 msgid "Replace _All" msgstr "Substituír _todo" -#: ../data/ui/findbar.ui.h:3 +#: ../meld/resources/ui/findbar.ui.h:3 msgid "_Previous" msgstr "_Anterior" -#: ../data/ui/findbar.ui.h:4 +#: ../meld/resources/ui/findbar.ui.h:4 msgid "_Next" msgstr "Segui_nte" -#: ../data/ui/findbar.ui.h:5 +#: ../meld/resources/ui/findbar.ui.h:5 msgid "Find:" msgstr "Buscar:" -#: ../data/ui/findbar.ui.h:6 +#: ../meld/resources/ui/findbar.ui.h:6 msgid "Replace _with:" msgstr "Substituír _con:" -#: ../data/ui/findbar.ui.h:7 +#: ../meld/resources/ui/findbar.ui.h:7 msgid "_Match case" msgstr "_Coincidir coa capitalización" -#: ../data/ui/findbar.ui.h:8 +#: ../meld/resources/ui/findbar.ui.h:8 msgid "Who_le word" msgstr "Pa_labra completa" -#: ../data/ui/findbar.ui.h:9 +#: ../meld/resources/ui/findbar.ui.h:9 msgid "Regular e_xpression" msgstr "Expresión regular" -#: ../data/ui/findbar.ui.h:10 +#: ../meld/resources/ui/findbar.ui.h:10 msgid "Wrapped" msgstr "Axustado" -#: ../data/ui/language-selector.ui.h:1 +#: ../meld/resources/ui/language-selector.ui.h:1 msgid "Search highlight mode…" msgstr "Modo de realce de busca…" -#: ../data/ui/patch-dialog.ui.h:1 +#: ../meld/resources/ui/new-diff-tab.ui.h:1 ../meld/meldwindow.py:532 +#: ../meld/newdifftab.py:53 +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.h:3 +msgid "Directory comparison" +msgstr "Comparación de directorios" + +#: ../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.h:5 +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.h:7 +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.h:9 +msgid "Select First Folder" +msgstr "Seleccionar primeiro cartafol" + +#: ../meld/resources/ui/new-diff-tab.ui.h:10 +msgid "Select Second Folder" +msgstr "Seleccionar segundo cartafol" + +#: ../meld/resources/ui/new-diff-tab.ui.h:11 +msgid "Select Third Folder" +msgstr "Seleccionar terceiro cartafol" + +#: ../meld/resources/ui/new-diff-tab.ui.h:12 +msgid "Select A Version-Controlled Folder" +msgstr "Seleccionar un cartafol controlado por versións" + +#: ../meld/resources/ui/new-diff-tab.ui.h:13 +msgid "_Blank comparison" +msgstr "Comparación _baleira" + +#: ../meld/resources/ui/new-diff-tab.ui.h:14 +msgid "C_ompare" +msgstr "C_omparar" + +#: ../meld/resources/ui/notebook-label.ui.h:1 +#| msgid "Close tab" +msgid "Close Tab" +msgstr "Pechar lapela" + +#: ../meld/resources/ui/patch-dialog.ui.h:1 msgid "Format as Patch" msgstr "Formatar como parche" -#: ../data/ui/patch-dialog.ui.h:2 +#: ../meld/resources/ui/patch-dialog.ui.h:2 msgid "Copy to Clipboard" msgstr "Copiar ao portapapeis" -#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:154 +#: ../meld/resources/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:165 msgid "Save Patch" msgstr "Gardar parche" -#: ../data/ui/patch-dialog.ui.h:4 +#: ../meld/resources/ui/patch-dialog.ui.h:4 msgid "Use differences between:" msgstr "Usar as diferencias entre:" -#: ../data/ui/patch-dialog.ui.h:5 +#: ../meld/resources/ui/patch-dialog.ui.h:5 msgid "Left and middle panes" msgstr "Paneis esquerdo e do medio" -#: ../data/ui/patch-dialog.ui.h:6 +#: ../meld/resources/ui/patch-dialog.ui.h:6 msgid "Middle and right panes" msgstr "Paneis dereito e do medio" -#: ../data/ui/patch-dialog.ui.h:7 +#: ../meld/resources/ui/patch-dialog.ui.h:7 msgid "_Reverse patch direction" msgstr "Dirección _inversa do parche" -#: ../data/ui/preferences.ui.h:1 -msgid "Meld Preferences" -msgstr "Preferencias de Meld" +#: ../meld/resources/ui/preferences.ui.h:1 +#| msgid "_Preferences" +msgid "Preferences" +msgstr "Preferencias" -#: ../data/ui/preferences.ui.h:2 +#: ../meld/resources/ui/preferences.ui.h:2 msgid "Font" msgstr "Tipo de letra" -#: ../data/ui/preferences.ui.h:3 +#: ../meld/resources/ui/preferences.ui.h:3 msgid "_Use the system fixed width font" msgstr "Usar o tipo de letra de ancho fixo do sistema" -#: ../data/ui/preferences.ui.h:4 +#: ../meld/resources/ui/preferences.ui.h:4 msgid "_Editor font:" msgstr "Tipo de letra do _editor:" -#: ../data/ui/preferences.ui.h:5 +#. 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 msgid "Display" msgstr "Pantalla" -#: ../data/ui/preferences.ui.h:6 +#: ../meld/resources/ui/preferences.ui.h:6 msgid "_Tab width:" msgstr "Ancho do _tabulador:" -#: ../data/ui/preferences.ui.h:7 +#: ../meld/resources/ui/preferences.ui.h:7 msgid "_Insert spaces instead of tabs" msgstr "Insertar e_spazos no lugar de tabuladores" -#: ../data/ui/preferences.ui.h:8 +#: ../meld/resources/ui/preferences.ui.h:8 msgid "Enable text _wrapping" msgstr "Activar o a_xuste de texto" -#: ../data/ui/preferences.ui.h:9 +#: ../meld/resources/ui/preferences.ui.h:9 msgid "Do not _split words over two lines" msgstr "Non _dividir as palabras en dúas liñas" -#: ../data/ui/preferences.ui.h:10 +#: ../meld/resources/ui/preferences.ui.h:10 msgid "Highlight _current line" msgstr "Realzar a liña a_ctual" -#: ../data/ui/preferences.ui.h:11 +#: ../meld/resources/ui/preferences.ui.h:11 msgid "Show _line numbers" msgstr "Mostrar os números de _liña" -#: ../data/ui/preferences.ui.h:12 +#: ../meld/resources/ui/preferences.ui.h:12 msgid "Show w_hitespace" msgstr "Mostrar espazos en _branco" -#: ../data/ui/preferences.ui.h:13 +#: ../meld/resources/ui/preferences.ui.h:13 msgid "Use s_yntax highlighting" msgstr "Usar realce de _sintaxe" -#: ../data/ui/preferences.ui.h:14 +#: ../meld/resources/ui/preferences.ui.h:14 msgid "Syntax highlighting color scheme:" msgstr "Esquema de cor para o realzado da sintaxe:" -#: ../data/ui/preferences.ui.h:15 +#: ../meld/resources/ui/preferences.ui.h:15 msgid "External Editor" msgstr "Editor externo" -#: ../data/ui/preferences.ui.h:16 +#: ../meld/resources/ui/preferences.ui.h:16 msgid "Use _default system editor" msgstr "Usar o editor pre_definido do sistema" -#: ../data/ui/preferences.ui.h:17 +#: ../meld/resources/ui/preferences.ui.h:17 msgid "Edito_r command:" msgstr "Orde do edito_r:" -#: ../data/ui/preferences.ui.h:18 +#: ../meld/resources/ui/preferences.ui.h:18 msgid "Editor" msgstr "Editor" -#: ../data/ui/preferences.ui.h:19 +#: ../meld/resources/ui/preferences.ui.h:19 msgid "Shallow Comparison" msgstr "Comparación superficial" -#: ../data/ui/preferences.ui.h:20 +#: ../meld/resources/ui/preferences.ui.h:20 msgid "C_ompare files based only on size and timestamp" msgstr "C_omparar ficheiros baseándose só no tamaño e marca de tempo" -#: ../data/ui/preferences.ui.h:21 +#: ../meld/resources/ui/preferences.ui.h:21 msgid "_Timestamp resolution:" msgstr "Resolución da _marca de tempo:" -#: ../data/ui/preferences.ui.h:23 +#: ../meld/resources/ui/preferences.ui.h:23 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" -#: ../data/ui/preferences.ui.h:24 +#: ../meld/resources/ui/preferences.ui.h:24 msgid "Symbolic Links" msgstr "Ligazóns simbólicas" -#: ../data/ui/preferences.ui.h:26 +#: ../meld/resources/ui/preferences.ui.h:26 msgid "Visible Columns" msgstr "Columnas visíbeis" -#: ../data/ui/preferences.ui.h:27 +#: ../meld/resources/ui/preferences.ui.h:27 msgid "Folder Comparisons" msgstr "Comparación de cartafoles" -#: ../data/ui/preferences.ui.h:28 +#: ../meld/resources/ui/preferences.ui.h:28 msgid "Version Comparisons" msgstr "Comparacións de versión" -#: ../data/ui/preferences.ui.h:29 +#: ../meld/resources/ui/preferences.ui.h:29 msgid "_Order when comparing file revisions:" msgstr "_Orde ao comparar revisións de ficheiros:" -#: ../data/ui/preferences.ui.h:30 +#: ../meld/resources/ui/preferences.ui.h:30 msgid "Order when _merging files:" msgstr "Orde na co_mbinación de ficheiros:" -#: ../data/ui/preferences.ui.h:31 +#: ../meld/resources/ui/preferences.ui.h:31 msgid "Commit Messages" msgstr "Mensaxe de remisión" -#: ../data/ui/preferences.ui.h:32 +#: ../meld/resources/ui/preferences.ui.h:32 msgid "Show _right margin at:" msgstr "Mostrar a marxe de_reita en:" -#: ../data/ui/preferences.ui.h:33 +#: ../meld/resources/ui/preferences.ui.h:33 msgid "Automatically _break lines at right margin on commit" msgstr "Cor_tar liñas automaticamente na marxe dereita ao remitir" -#: ../data/ui/preferences.ui.h:34 +#: ../meld/resources/ui/preferences.ui.h:34 msgid "Version Control" msgstr "Control de versións" -#: ../data/ui/preferences.ui.h:35 +#: ../meld/resources/ui/preferences.ui.h:35 msgid "Filename filters" msgstr "Filtros por nome de ficheiro" -#: ../data/ui/preferences.ui.h:36 +#: ../meld/resources/ui/preferences.ui.h:36 msgid "" "When performing directory comparisons, you may filter out files and " "directories by name. Each pattern is a list of shell style wildcards " @@ -1139,526 +1448,247 @@ msgstr "" "e cartafoles polo nome. Cada patrón é unha lista de comodíns de shell " "separados por espazos." -#: ../data/ui/preferences.ui.h:37 ../meld/meldwindow.py:105 +#: ../meld/resources/ui/preferences.ui.h:37 ../meld/meldwindow.py:114 msgid "File Filters" msgstr "Filtros de ficheiro" -#: ../data/ui/preferences.ui.h:38 +#: ../meld/resources/ui/preferences.ui.h:38 msgid "Change trimming" msgstr "Cambiar recortado" -#: ../data/ui/preferences.ui.h:39 +#: ../meld/resources/ui/preferences.ui.h:39 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" - -#: ../data/ui/preferences.ui.h:40 -msgid "Text filters" -msgstr "Filtros de texto" - -#: ../data/ui/preferences.ui.h:41 -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 "" -"Ao realizar a comparación de ficheiros, pode ignorar certo tipo de cambios. " -"Aquí cada patrón é unha expresión regular de python que substitúe o texto " -"coincidente coa cadea baleira antes de que a comparación sexa levada a cabo. " -"Se a expresión contén grupos, só o grupos son substituídos. Ver o manual de " -"usuario para máis detalles." - -#: ../data/ui/preferences.ui.h:42 -msgid "Text Filters" -msgstr "Filtros de texto" - -#: ../data/ui/preferences.ui.h:43 -msgid "Left is remote, right is local" -msgstr "Á esquerda está o remoto, á dereita o local" - -#: ../data/ui/preferences.ui.h:44 -msgid "Left is local, right is remote" -msgstr "Á esquerda está o local, á dereita o remoto" - -#: ../data/ui/preferences.ui.h:45 -msgid "Remote, merge, local" -msgstr "Remoto, combinar, local" - -#: ../data/ui/preferences.ui.h:46 -msgid "Local, merge, remote" -msgstr "Local, combinar, remoto" - -#: ../data/ui/preferences.ui.h:47 -msgid "1ns (ext4)" -msgstr "1ns (ext4)" - -#: ../data/ui/preferences.ui.h:48 -msgid "100ns (NTFS)" -msgstr "100ns (NTFS)" - -#: ../data/ui/preferences.ui.h:49 -msgid "1s (ext2/ext3)" -msgstr "1s (ext2/ext3)" - -#: ../data/ui/preferences.ui.h:50 -msgid "2s (VFAT)" -msgstr "2s (VFAT)" - -#: ../data/ui/shortcuts.ui.h:1 -msgctxt "shortcut window" -msgid "General" -msgstr "Xeral" - -#: ../data/ui/shortcuts.ui.h:2 -#| msgid "New comparison" -msgctxt "shortcut window" -msgid "New comparison" -msgstr "Nova comparación" - -#: ../data/ui/shortcuts.ui.h:3 -msgctxt "shortcut window" -msgid "Close a comparison" -msgstr "Pechar unha comparación" - -#: ../data/ui/shortcuts.ui.h:4 -msgctxt "shortcut window" -msgid "Quit Meld" -msgstr "Saír do Meld" - -#: ../data/ui/shortcuts.ui.h:5 -msgctxt "shortcut window" -msgid "Stop the current action" -msgstr "Deter a acción actual" - -#: ../data/ui/shortcuts.ui.h:6 -msgctxt "shortcut window" -msgid "Refresh comparison" -msgstr "Actualizar comparación" - -#: ../data/ui/shortcuts.ui.h:7 -msgctxt "shortcut window" -msgid "Fullscreen" -msgstr "Pantalla completa" - -#: ../data/ui/shortcuts.ui.h:8 -msgctxt "shortcut window" -msgid "Tabs" -msgstr "Lapelas" - -#: ../data/ui/shortcuts.ui.h:9 -msgctxt "shortcut window" -msgid "Go to previous tab" -msgstr "Ir á lapela anterior" - -#: ../data/ui/shortcuts.ui.h:10 -msgctxt "shortcut window" -msgid "Go to next tab" -msgstr "Ir á lapela seguinte" - -#: ../data/ui/shortcuts.ui.h:11 -msgctxt "shortcut window" -msgid "Switch to tab" -msgstr "Cambiar á lapela" - -#: ../data/ui/shortcuts.ui.h:12 -msgctxt "shortcut window" -msgid "Move tab left" -msgstr "Mover lapela á esquerda" - -#: ../data/ui/shortcuts.ui.h:13 -msgctxt "shortcut window" -msgid "Move tab right" -msgstr "Mover lapela á dereita" - -#: ../data/ui/shortcuts.ui.h:14 -msgctxt "shortcut window" -msgid "Changes" -msgstr "Cambios" - -#: ../data/ui/shortcuts.ui.h:15 -msgctxt "shortcut window" -msgid "Go to previous change" -msgstr "Ir ao cambio anterior" - -#: ../data/ui/shortcuts.ui.h:16 -msgctxt "shortcut window" -msgid "Go to next change" -msgstr "Ir ao seguinte cambio" - -#: ../data/ui/shortcuts.ui.h:17 -msgctxt "shortcut window" -msgid "Editing" -msgstr "Edición" - -#: ../data/ui/shortcuts.ui.h:18 -msgctxt "shortcut window" -msgid "Undo" -msgstr "Desfacer" - -#: ../data/ui/shortcuts.ui.h:19 -msgctxt "shortcut window" -msgid "Redo" -msgstr "Refacer" - -#: ../data/ui/shortcuts.ui.h:20 -msgctxt "shortcut window" -msgid "Cut" -msgstr "Cortar" - -#: ../data/ui/shortcuts.ui.h:21 -msgctxt "shortcut window" -msgid "Copy" -msgstr "Copiar" - -#: ../data/ui/shortcuts.ui.h:22 -msgctxt "shortcut window" -msgid "Paste" -msgstr "Pegar" - -#: ../data/ui/shortcuts.ui.h:23 -msgctxt "shortcut window" -msgid "Find" -msgstr "Buscar" - -#: ../data/ui/shortcuts.ui.h:24 -msgctxt "shortcut window" -msgid "Find Next" -msgstr "Buscar seguinte" - -#: ../data/ui/shortcuts.ui.h:25 -msgctxt "shortcut window" -msgid "Find Previous" -msgstr "Buscar anterior" - -#: ../data/ui/shortcuts.ui.h:26 -msgctxt "shortcut window" -msgid "Replace" -msgstr "Substituir" - -#: ../data/ui/shortcuts.ui.h:27 -msgctxt "shortcut window" -msgid "File comparison" -msgstr "Comparación de ficheiros" - -#: ../data/ui/shortcuts.ui.h:28 -msgctxt "shortcut window" -msgid "Save current file" -msgstr "Gardar o ficheiro actual" - -#: ../data/ui/shortcuts.ui.h:29 -msgctxt "shortcut window" -msgid "Save current file to new path" -msgstr "Gardar o ficheiro actual nunha ruta nova" - -#: ../data/ui/shortcuts.ui.h:30 -msgctxt "shortcut window" -msgid "Save all files in comparison" -msgstr "Gardar todos os ficheiros da comparación" - -#: ../data/ui/shortcuts.ui.h:31 -msgctxt "shortcut window" -msgid "Previous conflict" -msgstr "Conflito anterior" - -#: ../data/ui/shortcuts.ui.h:32 -msgctxt "shortcut window" -msgid "Next conflict" -msgstr "Seguinte conflito" - -#: ../data/ui/shortcuts.ui.h:33 -msgctxt "shortcut window" -msgid "Push change to left" -msgstr "Empurrar o cambio á esquerda" - -#: ../data/ui/shortcuts.ui.h:34 -msgctxt "shortcut window" -msgid "Push change to right" -msgstr "Empurrar o cambio á dereita" - -#: ../data/ui/shortcuts.ui.h:35 -msgctxt "shortcut window" -msgid "Pull change from left" -msgstr "Traer o cambio desde a esquerda" - -#: ../data/ui/shortcuts.ui.h:36 -msgctxt "shortcut window" -msgid "Pull change from right" -msgstr "Traer o cambio desde a dereita" - -#: ../data/ui/shortcuts.ui.h:37 -msgctxt "shortcut window" -msgid "Copy change above left" -msgstr "Copiar o cambio por riba da parte esquerda" - -#: ../data/ui/shortcuts.ui.h:38 -msgctxt "shortcut window" -msgid "Copy change below left" -msgstr "Copiar o cambio por debaixo da parte esquerda" - -#: ../data/ui/shortcuts.ui.h:39 -msgctxt "shortcut window" -msgid "Copy change above right" -msgstr "Copiar o cambio por riba da parte dereita" +"cambios" -#: ../data/ui/shortcuts.ui.h:40 -msgctxt "shortcut window" -msgid "Copy change below right" -msgstr "Copiar o cambio por debaixo da parte dereita" +#: ../meld/resources/ui/preferences.ui.h:40 +msgid "Text filters" +msgstr "Filtros de texto" -#: ../data/ui/shortcuts.ui.h:41 -msgctxt "shortcut window" -msgid "Delete change" -msgstr "Eliminar o cambio" +#: ../meld/resources/ui/preferences.ui.h:41 +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 "" +"Ao realizar a comparación de ficheiros, pode ignorar certo tipo de cambios. " +"Aquí cada patrón é unha expresión regular de python que substitúe o texto " +"coincidente coa cadea baleira antes de que a comparación sexa levada a cabo. " +"Se a expresión contén grupos, só o grupos son substituídos. Ver o manual de " +"usuario para máis detalles." -#: ../data/ui/shortcuts.ui.h:42 -msgctxt "shortcut window" -msgid "Previous comparison pane" -msgstr "Panel de comparación anterior" +#: ../meld/resources/ui/preferences.ui.h:42 +msgid "Text Filters" +msgstr "Filtros de texto" -#: ../data/ui/shortcuts.ui.h:43 -msgctxt "shortcut window" -msgid "Next comparison pane" -msgstr "Panel de comparación seguinte" +#: ../meld/resources/ui/preferences.ui.h:43 +msgid "Left is remote, right is local" +msgstr "Á esquerda está o remoto, á dereita o local" -#: ../data/ui/shortcuts.ui.h:44 -msgctxt "shortcut window" -msgid "Folder comparison" -msgstr "Comparación de cartafoles" +#: ../meld/resources/ui/preferences.ui.h:44 +msgid "Left is local, right is remote" +msgstr "Á esquerda está o local, á dereita o remoto" -#: ../data/ui/shortcuts.ui.h:45 -msgctxt "shortcut window" -msgid "Copy to left" -msgstr "Copiar á esquerda" +#: ../meld/resources/ui/preferences.ui.h:45 +msgid "Remote, merge, local" +msgstr "Remoto, combinar, local" -#: ../data/ui/shortcuts.ui.h:46 -msgctxt "shortcut window" -msgid "Copy to right" -msgstr "Copiar á dereita" +#: ../meld/resources/ui/preferences.ui.h:46 +msgid "Local, merge, remote" +msgstr "Local, combinar, remoto" -#: ../data/ui/shortcuts.ui.h:47 -msgctxt "shortcut window" -msgid "Version control comparison" -msgstr "Comparación de control de versións" +#: ../meld/resources/ui/preferences.ui.h:47 +msgid "1ns (ext4)" +msgstr "1ns (ext4)" -#: ../data/ui/shortcuts.ui.h:48 -msgctxt "shortcut window" -msgid "Commit to version control" -msgstr "Remitir ao control de versións" +#: ../meld/resources/ui/preferences.ui.h:48 +msgid "100ns (NTFS)" +msgstr "100ns (NTFS)" -#: ../data/ui/shortcuts.ui.h:49 -msgctxt "shortcut window" -msgid "Show/hide console output" -msgstr "Mostrar/Ocultar saídas da consola" +#: ../meld/resources/ui/preferences.ui.h:49 +msgid "1s (ext2/ext3)" +msgstr "1s (ext2/ext3)" -#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:561 -#: ../meld/newdifftab.py:39 -msgid "New comparison" -msgstr "Nova comparación" +#: ../meld/resources/ui/preferences.ui.h:50 +msgid "2s (VFAT)" +msgstr "2s (VFAT)" -#: ../data/ui/tab-placeholder.ui.h:2 -msgid "File comparison" -msgstr "Comparación de ficheiros" +#: ../meld/resources/ui/push-dialog.ui.h:1 +msgid "Push local commits to remote?" +msgstr "Remitir cambios locais ao remoto?" -#: ../data/ui/tab-placeholder.ui.h:3 -msgid "Directory comparison" -msgstr "Comparación de directorios" +#: ../meld/resources/ui/push-dialog.ui.h:2 +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." -#: ../data/ui/tab-placeholder.ui.h:4 -msgid "Version control view" -msgstr "Mostrar control de versións" +#: ../meld/resources/ui/push-dialog.ui.h:3 +msgid "_Push commits" +msgstr "_Enviar remisións" -#: ../data/ui/tab-placeholder.ui.h:5 -msgid "_3-way comparison" -msgstr "Comparación a _3 bandas" +#: ../meld/resources/ui/revert-dialog.ui.h:1 +msgid "Discard unsaved changes to documents?" +msgstr "Desexa desbotar os cambios non gardados nos documentos?" -#: ../data/ui/tab-placeholder.ui.h:6 -msgid "Select Third File" -msgstr "Seleccionar terceiro ficheiro" +#: ../meld/resources/ui/revert-dialog.ui.h:2 +msgid "Changes made to the following documents will be permanently lost:" +msgstr "" +"Os cambios realizados nos seguintes documentos perderanse permanentemente:" -#: ../data/ui/tab-placeholder.ui.h:7 -msgid "Select Second File" -msgstr "Seleccionar segundo ficheiro" +#: ../meld/resources/ui/revert-dialog.ui.h:3 +msgid "_Discard" +msgstr "_Desbotar" -#: ../data/ui/tab-placeholder.ui.h:8 -msgid "Select First File" -msgstr "Seleccionar primeiro ficheiro" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:1 +msgid "Save changes to documents before closing?" +msgstr "Desexa gardar cambios nos documentos antes de gardar?" -#: ../data/ui/tab-placeholder.ui.h:9 -msgid "Select First Folder" -msgstr "Seleccionar primeiro cartafol" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:2 +msgid "If you don’t save, changes will be permanently lost." +msgstr "Se non garda o ficheiro, os seus cambios perderanse permanentemente." -#: ../data/ui/tab-placeholder.ui.h:10 -msgid "Select Second Folder" -msgstr "Seleccionar segundo cartafol" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:3 +msgid "Close _without Saving" +msgstr "Pechar _sen gardar" -#: ../data/ui/tab-placeholder.ui.h:11 -msgid "Select Third Folder" -msgstr "Seleccionar terceiro cartafol" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:4 ../meld/dirdiff.py:1040 +#: ../meld/iohelpers.py:58 ../meld/iohelpers.py:112 +msgid "_Cancel" +msgstr "_Cancelar" -#: ../data/ui/tab-placeholder.ui.h:12 -msgid "Select A Version-Controlled Folder" -msgstr "Seleccionar un cartafol controlado por versións" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:5 +msgid "_Save" +msgstr "_Gardar" -#: ../data/ui/tab-placeholder.ui.h:13 -msgid "_Blank comparison" -msgstr "Comparación _baleira" +#: ../meld/resources/ui/statusbar-menu.ui.h:2 +#| msgid "Show w_hitespace" +msgid "Show whitespace" +msgstr "Mostrar espazos en branco" -#: ../data/ui/tab-placeholder.ui.h:14 -msgid "C_ompare" -msgstr "C_omparar" +#: ../meld/resources/ui/statusbar-menu.ui.h:4 +#| msgid "Enable text _wrapping" +msgid "Text wrapping" +msgstr "Axuste de texto" -#: ../data/ui/vcview.ui.h:3 +#: ../meld/resources/ui/vcview.ui.h:3 msgid "Co_mmit…" msgstr "Re_mitir…" -#: ../data/ui/vcview.ui.h:4 +#: ../meld/resources/ui/vcview.ui.h:4 msgid "Commit changes to version control" msgstr "Remitir cambios ao control de versións" -#: ../data/ui/vcview.ui.h:5 +#: ../meld/resources/ui/vcview.ui.h:5 msgid "_Update" msgstr "Act_ualizar" -#: ../data/ui/vcview.ui.h:6 +#: ../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" -#: ../data/ui/vcview.ui.h:7 +#: ../meld/resources/ui/vcview.ui.h:7 msgid "_Push" msgstr "_Enviar" -#: ../data/ui/vcview.ui.h:8 +#: ../meld/resources/ui/vcview.ui.h:8 msgid "Push local changes to remote" msgstr "Enviar cambios locais ao remoto" -#: ../data/ui/vcview.ui.h:10 +#: ../meld/resources/ui/vcview.ui.h:10 msgid "Add to version control" msgstr "Engadir ao control de versións" -#: ../data/ui/vcview.ui.h:12 +#: ../meld/resources/ui/vcview.ui.h:12 msgid "Remove from version control" msgstr "Eliminar do control de versións" -#: ../data/ui/vcview.ui.h:13 +#: ../meld/resources/ui/vcview.ui.h:13 msgid "Mar_k as Resolved" msgstr "Marc_ar como solucionado" -#: ../data/ui/vcview.ui.h:14 +#: ../meld/resources/ui/vcview.ui.h:14 msgid "Mark as resolved in version control" msgstr "Marcar como solucionado no control de versións" -#: ../data/ui/vcview.ui.h:15 +#: ../meld/resources/ui/vcview.ui.h:15 msgid "Re_vert" msgstr "Re_verter" -#: ../data/ui/vcview.ui.h:16 +#: ../meld/resources/ui/vcview.ui.h:16 msgid "Revert working copy to original state" msgstr "Reverter a copia local ao seu estado orixinal" -#: ../data/ui/vcview.ui.h:17 +#: ../meld/resources/ui/vcview.ui.h:17 msgid "Delete from working copy" msgstr "Eliminar desde a copia local" -#: ../data/ui/vcview.ui.h:18 +#: ../meld/resources/ui/vcview.ui.h:18 msgid "Console" msgstr "Consola" -#: ../data/ui/vcview.ui.h:19 +#: ../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" -#: ../data/ui/vcview.ui.h:20 +#: ../meld/resources/ui/vcview.ui.h:20 msgid "_Flatten" msgstr "Apl_anar" -#: ../data/ui/vcview.ui.h:21 +#: ../meld/resources/ui/vcview.ui.h:21 msgid "Flatten directories" msgstr "Rasar cartafoles" -#: ../data/ui/vcview.ui.h:22 +#: ../meld/resources/ui/vcview.ui.h:22 msgid "_Modified" msgstr "_Modificado" -#: ../data/ui/vcview.ui.h:23 +#: ../meld/resources/ui/vcview.ui.h:23 msgid "Show modified files" msgstr "Mostrar ficheiros modificados" -#: ../data/ui/vcview.ui.h:24 +#: ../meld/resources/ui/vcview.ui.h:24 msgid "_Normal" msgstr "_Normal" -#: ../data/ui/vcview.ui.h:25 +#: ../meld/resources/ui/vcview.ui.h:25 msgid "Show normal files" msgstr "Mostrar ficheiros normais" -#: ../data/ui/vcview.ui.h:26 +#: ../meld/resources/ui/vcview.ui.h:26 msgid "Un_versioned" msgstr "Sen _versión" -#: ../data/ui/vcview.ui.h:27 +#: ../meld/resources/ui/vcview.ui.h:27 msgid "Show unversioned files" msgstr "Mostrar ficheiros sen versión" -#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:70 +#: ../meld/resources/ui/vcview.ui.h:28 ../meld/vc/_vc.py:70 msgid "Ignored" msgstr "Ignorado" -#: ../data/ui/vcview.ui.h:29 +#: ../meld/resources/ui/vcview.ui.h:29 msgid "Show ignored files" msgstr "Mostrar ficheiros ignorados" -#: ../data/ui/vcview.ui.h:30 -msgid "Commit" -msgstr "Remitir" - -#: ../data/ui/vcview.ui.h:31 -msgid "Commit Files" -msgstr "Remitir os ficheiros" - -#: ../data/ui/vcview.ui.h:32 -msgid "Log Message" -msgstr "Mensaxe de rexistro" - -#: ../data/ui/vcview.ui.h:33 -msgid "Previous logs:" -msgstr "Rexistros anteriores:" - -#: ../data/ui/vcview.ui.h:34 -msgid "Co_mmit" -msgstr "Remitir" - -#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:332 +#: ../meld/resources/ui/vcview.ui.h:31 ../meld/vcview.py:366 msgid "Location" msgstr "Localización" -#: ../data/ui/vcview.ui.h:37 +#: ../meld/resources/ui/vcview.ui.h:32 msgid "Status" msgstr "Estado" -#: ../data/ui/vcview.ui.h:38 +#: ../meld/resources/ui/vcview.ui.h:33 msgid "Extra" msgstr "Adicional" -#: ../data/ui/vcview.ui.h:39 +#: ../meld/resources/ui/vcview.ui.h:34 msgid "Console output" msgstr "Saída da consola" -#: ../data/ui/vcview.ui.h:40 -msgid "Push local commits to remote?" -msgstr "Remitir cambios locais ao remoto?" - -#: ../data/ui/vcview.ui.h:41 -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." - -#: ../data/ui/vcview.ui.h:42 -msgid "_Push commits" -msgstr "_Enviar remisións" - #: ../meld/const.py:12 msgid "UNIX (LF)" msgstr "UNIX (LF)" @@ -1672,44 +1702,44 @@ msgid "Mac OS (CR)" msgstr "Mac OS (CR)" #. Create file size CellRenderer -#: ../meld/dirdiff.py:393 ../meld/preferences.py:82 +#: ../meld/dirdiff.py:476 ../meld/preferences.py:138 msgid "Size" msgstr "Tamaño" #. Create date-time CellRenderer -#: ../meld/dirdiff.py:401 ../meld/preferences.py:83 +#: ../meld/dirdiff.py:484 ../meld/preferences.py:139 msgid "Modification time" msgstr "Hora de modificación" #. Create permissions CellRenderer -#: ../meld/dirdiff.py:409 ../meld/preferences.py:84 +#: ../meld/dirdiff.py:492 ../meld/preferences.py:140 msgid "Permissions" msgstr "Permisos" -#: ../meld/dirdiff.py:540 +#: ../meld/dirdiff.py:626 #, python-format msgid "Hide %s" msgstr "Ocultar %s" -#: ../meld/dirdiff.py:681 ../meld/dirdiff.py:704 +#: ../meld/dirdiff.py:768 ../meld/dirdiff.py:791 #, python-format msgid "[%s] Scanning %s" msgstr "[%s] Analizando %s" -#: ../meld/dirdiff.py:839 +#: ../meld/dirdiff.py:926 #, python-format msgid "[%s] Done" msgstr "[%s] Feito" -#: ../meld/dirdiff.py:847 +#: ../meld/dirdiff.py:934 msgid "Folders have no differences" msgstr "Os cartafoles non teñen diferenzas" -#: ../meld/dirdiff.py:849 +#: ../meld/dirdiff.py:936 msgid "Contents of scanned files in folders are identical." msgstr "Os contidos dos ficheiros analizados nos cartafoles son idénticos." -#: ../meld/dirdiff.py:851 +#: ../meld/dirdiff.py:938 msgid "" "Scanned files in folders appear identical, but contents have not been " "scanned." @@ -1717,43 +1747,43 @@ msgstr "" "Os ficheiros analizados nos cartafoles parecen idénticos pero os contidos " "non se comprobaron." -#: ../meld/dirdiff.py:854 +#: ../meld/dirdiff.py:941 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:856 +#: ../meld/dirdiff.py:943 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:874 ../meld/filediff.py:1447 ../meld/filediff.py:1477 -#: ../meld/filediff.py:1479 ../meld/ui/msgarea.py:106 ../meld/ui/msgarea.py:119 +#: ../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 msgid "Hi_de" msgstr "Ocu_ltar" -#: ../meld/dirdiff.py:883 +#: ../meld/dirdiff.py:970 msgid "Multiple errors occurred while scanning this folder" msgstr "Producíronse varios erros ao analizar este cartafol" -#: ../meld/dirdiff.py:884 +#: ../meld/dirdiff.py:971 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:886 +#: ../meld/dirdiff.py:973 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:888 +#: ../meld/dirdiff.py:975 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:890 +#: ../meld/dirdiff.py:977 msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. The following files in this folder are hidden:" @@ -1762,17 +1792,17 @@ msgstr "" "sistema de ficheiros que diferencia maiúsculas de minúsculas. Algúns " "ficheiros non están visíbeis:" -#: ../meld/dirdiff.py:901 +#: ../meld/dirdiff.py:988 #, python-format msgid "“%s” hidden by “%s”" msgstr "«%s» oculto por «%s»" -#: ../meld/dirdiff.py:957 +#: ../meld/dirdiff.py:1044 #, python-format msgid "Replace folder “%s”?" msgstr "Desexa substituír o cartafol «%s»?" -#: ../meld/dirdiff.py:959 +#: ../meld/dirdiff.py:1046 #, python-format msgid "" "Another folder with the same name already exists in “%s”.\n" @@ -1781,11 +1811,11 @@ 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:972 +#: ../meld/dirdiff.py:1059 msgid "Error copying file" msgstr "Produciuse un erro ao copiar o ficheiro" -#: ../meld/dirdiff.py:973 +#: ../meld/dirdiff.py:1060 #, python-format msgid "" "Couldn’t copy %s\n" @@ -1798,20 +1828,20 @@ msgstr "" "\n" "%s" -#: ../meld/dirdiff.py:996 -#, python-format -msgid "Error deleting %s" -msgstr "Produciuse un erro ao eliminar %s" +#: ../meld/dirdiff.py:1085 ../meld/vcview.py:720 +#| msgid "Error deleting %s" +msgid "Error deleting {}" +msgstr "Produciuse un erro ao eliminar {}" -#: ../meld/dirdiff.py:1470 +#: ../meld/dirdiff.py:1597 msgid "No folder" msgstr "Non hai cartafol" -#: ../meld/filediff.py:805 +#: ../meld/filediff.py:920 msgid "Comparison results will be inaccurate" msgstr "Os resultados da comparación serán inexactos" -#: ../meld/filediff.py:807 +#: ../meld/filediff.py:922 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1819,64 +1849,64 @@ 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:864 +#: ../meld/filediff.py:994 msgid "Mark conflict as resolved?" msgstr "Marcar como solucionado?" -#: ../meld/filediff.py:866 +#: ../meld/filediff.py:996 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:868 +#: ../meld/filediff.py:998 msgid "Cancel" msgstr "Cancelar" -#: ../meld/filediff.py:869 +#: ../meld/filediff.py:999 msgid "Mark _Resolved" msgstr "Marca_r como solucionado" -#: ../meld/filediff.py:1162 +#: ../meld/filediff.py:1318 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Produciuse un erro ao abrir o ficheiro «%s»." -#: ../meld/filediff.py:1170 +#: ../meld/filediff.py:1326 #, python-format msgid "File %s appears to be a binary file." msgstr "O ficheiro %s semella ser un ficheiro binario." -#: ../meld/filediff.py:1172 +#: ../meld/filediff.py:1328 msgid "Do you want to open the file using the default application?" msgstr "Desexa abrir o ficheiro co aplicativo predeterminado?" -#: ../meld/filediff.py:1174 +#: ../meld/filediff.py:1330 msgid "Open" msgstr "Abrir" -#: ../meld/filediff.py:1190 +#: ../meld/filediff.py:1346 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Calculando as diferenzas" -#: ../meld/filediff.py:1251 +#: ../meld/filediff.py:1407 #, python-format msgid "File %s has changed on disk" msgstr "O ficheiro %s cambiou no disco" -#: ../meld/filediff.py:1252 +#: ../meld/filediff.py:1408 msgid "Do you want to reload the file?" msgstr "Desexa recargar o ficheiro?" -#: ../meld/filediff.py:1254 +#: ../meld/filediff.py:1410 msgid "_Reload" msgstr "_Recargar" -#: ../meld/filediff.py:1410 +#: ../meld/filediff.py:1566 msgid "Files are identical" msgstr "Os ficheiros son idénticos" -#: ../meld/filediff.py:1423 +#: ../meld/filediff.py:1579 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1884,11 +1914,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:1428 +#: ../meld/filediff.py:1584 msgid "Files differ in line endings only" msgstr "Os ficheiros só difiren nos finais de liña" -#: ../meld/filediff.py:1430 +#: ../meld/filediff.py:1586 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1897,15 +1927,15 @@ msgstr "" "Os ficheiros son idénticos excepto nos finais de liña:\n" "%s" -#: ../meld/filediff.py:1450 +#: ../meld/filediff.py:1606 msgid "Show without filters" msgstr "Mostrar sen filtros" -#: ../meld/filediff.py:1472 +#: ../meld/filediff.py:1628 msgid "Change highlighting incomplete" msgstr "Cambiar realzado incompleto" -#: ../meld/filediff.py:1473 +#: ../meld/filediff.py:1629 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." @@ -1914,81 +1944,67 @@ msgstr "" "Meld que vote máis tempo realzando cambios máis largos, porén isto pode ser " "lento." -#: ../meld/filediff.py:1481 +#: ../meld/filediff.py:1637 msgid "Keep highlighting" msgstr "Manter realzado" -#: ../meld/filediff.py:1483 +#: ../meld/filediff.py:1639 msgid "_Keep highlighting" msgstr "_Manter realzado" -#: ../meld/filediff.py:1520 -#, python-format -msgid "Replace file “%s”?" -msgstr "Desexa substituír o ficheiro «%s»?" +#: ../meld/filediff.py:1652 +msgid "Saving failed" +msgstr "Fallou o gardado" -#: ../meld/filediff.py:1522 -#, python-format +#: ../meld/filediff.py:1653 msgid "" -"A file with this name already exists in “%s”.\n" -"If you replace the existing file, its contents will be lost." +"Please consider copying any critical changes to another program or file to " +"avoid data loss." msgstr "" -"Xa existe un ficheiro con este nome en «%s».\n" -"Se substitúe o ficheiro existente, perderanse os seus contidos." +"Considere copiar calquera cambios críticos noutros programas ou ficheiros " +"para evitar a perda de datos." -#: ../meld/filediff.py:1539 +#: ../meld/filediff.py:1662 msgid "Save Left Pane As" msgstr "Gardar panel da esquerda como" -#: ../meld/filediff.py:1541 +#: ../meld/filediff.py:1664 msgid "Save Middle Pane As" msgstr "Gardar panel intermedio como" -#: ../meld/filediff.py:1543 +#: ../meld/filediff.py:1666 msgid "Save Right Pane As" msgstr "Gardar panel da dereita como" -#: ../meld/filediff.py:1557 +#: ../meld/filediff.py:1679 #, 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:1559 +#: ../meld/filediff.py:1681 msgid "If you save it, any external changes will be lost." msgstr "Se o garda, perderase calquera cambio externo." -#: ../meld/filediff.py:1562 +#: ../meld/filediff.py:1684 msgid "Save Anyway" msgstr "Gardar de todos os xeitos" -#: ../meld/filediff.py:1563 +#: ../meld/filediff.py:1685 msgid "Don’t Save" msgstr "Non gardar" -#: ../meld/filediff.py:1589 -msgid "_Save as UTF-8" -msgstr "_Gardar como UTF-8" - -#: ../meld/filediff.py:1592 -#, python-format -msgid "Couldn’t encode text as “%s”" -msgstr "Non foi posíbel codificar o texto como «%s»" - -#: ../meld/filediff.py:1594 -#, python-format +#: ../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?" msgid "" -"File “%s” contains characters that can’t be encoded using encoding “%s”.\n" -"Would you like to save as UTF-8?" +"File “{}” contains characters that can’t be encoded using its current " +"encoding “{}”." msgstr "" -"O ficheiro «%s» contén caracteres non codificábeis con «%s»\n" -"Quere gardalo como UTF-8?" - -#: ../meld/filediff.py:1634 ../meld/patchdialog.py:130 -#, python-format -msgid "Could not save file %s." -msgstr "Non foi posíbel gardar o ficheiro %s." +"O ficheiro «{}» contén caracteres non codificábeis usando a codificación " +"«{}» actual." -#: ../meld/filediff.py:1635 ../meld/patchdialog.py:131 +#: ../meld/filediff.py:1731 ../meld/patchdialog.py:144 #, python-format msgid "" "Couldn’t save file due to:\n" @@ -1997,11 +2013,16 @@ msgstr "" "Non foi posíbel gardar debido a:\n" "%s" -#: ../meld/filediff.py:2011 +#: ../meld/filediff.py:1735 ../meld/patchdialog.py:143 +#, python-format +msgid "Could not save file %s." +msgstr "Non foi posíbel gardar o ficheiro %s." + +#: ../meld/filediff.py:2128 msgid "Live comparison updating disabled" msgstr "Actualización de comparación en vivo desactivada" -#: ../meld/filediff.py:2012 +#: ../meld/filediff.py:2129 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -2017,418 +2038,428 @@ msgstr "" msgid "[%s] Merging files" msgstr "[%s] Combinando os ficheiros" -#: ../meld/gutterrendererchunk.py:216 +#: ../meld/gutterrendererchunk.py:220 msgid "Copy _up" msgstr "Copiar _arriba" -#: ../meld/gutterrendererchunk.py:217 +#: ../meld/gutterrendererchunk.py:221 msgid "Copy _down" msgstr "Copiar _abaixo" -#: ../meld/meldapp.py:179 +#: ../meld/iohelpers.py:43 +#| msgid "remote folder “{}” not supported" +msgid "Deleting remote folders is not supported" +msgstr "Non se admite eliminar os cartafoles remotos" + +#: ../meld/iohelpers.py:45 +#| msgid "Two way directory" +msgid "Not a file or directory" +msgstr "Non é un ficheiro ou cartafol" + +#: ../meld/iohelpers.py:49 +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 +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" +msgid "_Delete Permanently" +msgstr "Eliminar de forma _permanente" + +#: ../meld/iohelpers.py:106 +#, python-format +msgid "Replace file “%s”?" +msgstr "Desexa substituír o ficheiro «%s»?" + +#: ../meld/iohelpers.py:108 +#, 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 "" +"Xa existe un ficheiro con este nome en «%s».\n" +"Se substitúe o ficheiro existente, perderanse os seus contidos." + +#: ../meld/meldapp.py:169 msgid "wrong number of arguments supplied to --diff" msgstr "número incorrecto de argumentos proporcionado a --diff" -#: ../meld/meldapp.py:184 +#: ../meld/meldapp.py:174 msgid "Start with an empty window" msgstr "Comezar cunha xanela baleira" -#: ../meld/meldapp.py:185 ../meld/meldapp.py:187 +#: ../meld/meldapp.py:175 ../meld/meldapp.py:177 msgid "file" msgstr "ficheiro" -#: ../meld/meldapp.py:185 ../meld/meldapp.py:189 +#: ../meld/meldapp.py:175 ../meld/meldapp.py:179 msgid "folder" msgstr "cartafol" -#: ../meld/meldapp.py:186 +#: ../meld/meldapp.py:176 msgid "Start a version control comparison" msgstr "Comezar unha comparación no control de versións" -#: ../meld/meldapp.py:188 +#: ../meld/meldapp.py:178 msgid "Start a 2- or 3-way file comparison" msgstr "Comezar unha comparación de ficheiros a 2 ou 3 bandas" -#: ../meld/meldapp.py:190 +#: ../meld/meldapp.py:180 msgid "Start a 2- or 3-way folder comparison" msgstr "Iniciar comparación de ficheiros a 2/3 bandas" -#: ../meld/meldapp.py:233 +#: ../meld/meldapp.py:223 #, python-format msgid "Error: %s\n" msgstr "Erro: %s\n" -#: ../meld/meldapp.py:240 +#: ../meld/meldapp.py:230 msgid "Meld is a file and directory comparison tool." msgstr "Meld é un ferramenta de comparación de ficheiros e cartafoles." -#: ../meld/meldapp.py:244 +#: ../meld/meldapp.py:234 msgid "Set label to use instead of file name" msgstr "Estabelecer a etiqueta a usar en vez do nome do ficheiro" -#: ../meld/meldapp.py:247 +#: ../meld/meldapp.py:237 msgid "Open a new tab in an already running instance" msgstr "Abre unha nova lapela nunha instancia en execución" -#: ../meld/meldapp.py:250 +#: ../meld/meldapp.py:240 msgid "Automatically compare all differing files on startup" msgstr "Comparar automaticamente ao inicio todos os ficheiros distintos" -#: ../meld/meldapp.py:253 +#: ../meld/meldapp.py:243 msgid "Ignored for compatibility" msgstr "Ignorado para compatibilidade" -#: ../meld/meldapp.py:257 +#: ../meld/meldapp.py:247 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:260 +#: ../meld/meldapp.py:250 msgid "Automatically merge files" msgstr "Combinar ficheiros automaticamente" -#: ../meld/meldapp.py:264 +#: ../meld/meldapp.py:254 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:268 +#: ../meld/meldapp.py:258 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:288 +#: ../meld/meldapp.py:278 #, python-format msgid "too many arguments (wanted 0-3, got %d)" msgstr "demasiados argumentos (buscábanse 0-3, obtivéronse %d)" -#: ../meld/meldapp.py:291 +#: ../meld/meldapp.py:281 msgid "can’t auto-merge less than 3 files" msgstr "non é posíbel combinar automaticamente menos de 3 ficheiros" -#: ../meld/meldapp.py:293 +#: ../meld/meldapp.py:283 msgid "can’t auto-merge directories" msgstr "non é posíbel combinar automaticamente cartafoles" -#: ../meld/meldapp.py:307 +#: ../meld/meldapp.py:297 msgid "Error reading saved comparison file" msgstr "Produciuse un erro ao ler o ficheiro de comparación gardado" -#: ../meld/meldapp.py:324 +#: ../meld/meldapp.py:314 #, python-format msgid "invalid path or URI “%s”" msgstr "O URI ou a ruta son incorrectos «%s»" -#: ../meld/meldapp.py:330 +#: ../meld/meldapp.py:320 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:140 +#: ../meld/meldbuffer.py:123 msgid "" msgstr "" -#: ../meld/melddoc.py:68 +#: ../meld/melddoc.py:63 msgid "untitled" msgstr "sen título" -#: ../meld/meldwindow.py:47 +#: ../meld/meldwindow.py:56 msgid "_File" msgstr "_Ficheiro" -#: ../meld/meldwindow.py:48 +#: ../meld/meldwindow.py:57 msgid "_New Comparison…" msgstr "_Nova comparación…" -#: ../meld/meldwindow.py:49 +#: ../meld/meldwindow.py:58 msgid "Start a new comparison" msgstr "Comezar unha nova comparación" -#: ../meld/meldwindow.py:52 +#: ../meld/meldwindow.py:61 msgid "Save the current file" msgstr "Gardar o ficheiro actual" -#: ../meld/meldwindow.py:54 +#: ../meld/meldwindow.py:63 msgid "Save As…" msgstr "Gardar como…" -#: ../meld/meldwindow.py:55 +#: ../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:58 +#: ../meld/meldwindow.py:67 msgid "Close the current file" msgstr "Pechar o ficheiro actual" -#: ../meld/meldwindow.py:61 +#: ../meld/meldwindow.py:70 msgid "_Edit" msgstr "_Editar" -#: ../meld/meldwindow.py:63 +#: ../meld/meldwindow.py:72 msgid "Undo the last action" msgstr "Desfacer a última acción" -#: ../meld/meldwindow.py:66 +#: ../meld/meldwindow.py:75 msgid "Redo the last undone action" msgstr "Refacer a última acción desfeita" -#: ../meld/meldwindow.py:68 +#: ../meld/meldwindow.py:77 msgid "Cut the selection" msgstr "Cortar a selección" -#: ../meld/meldwindow.py:70 +#: ../meld/meldwindow.py:79 msgid "Copy the selection" msgstr "Copiar a selección" -#: ../meld/meldwindow.py:72 +#: ../meld/meldwindow.py:81 msgid "Paste the clipboard" msgstr "Pegar o contido do portapapeis" -#: ../meld/meldwindow.py:74 +#: ../meld/meldwindow.py:83 msgid "Find…" msgstr "Buscar…" -#: ../meld/meldwindow.py:74 +#: ../meld/meldwindow.py:83 msgid "Search for text" msgstr "Buscar texto" -#: ../meld/meldwindow.py:76 +#: ../meld/meldwindow.py:85 msgid "Find Ne_xt" msgstr "Buscar a _seguinte" -#: ../meld/meldwindow.py:77 +#: ../meld/meldwindow.py:86 msgid "Search forwards for the same text" msgstr "Buscar cara a adiante o mesmo texto" -#: ../meld/meldwindow.py:79 +#: ../meld/meldwindow.py:88 msgid "Find _Previous" msgstr "_Anterior" -#: ../meld/meldwindow.py:80 +#: ../meld/meldwindow.py:89 msgid "Search backwards for the same text" msgstr "Buscar cara a adiante o mesmo texto" -#: ../meld/meldwindow.py:83 +#: ../meld/meldwindow.py:92 msgid "_Replace…" msgstr "Substituí_r..." -#: ../meld/meldwindow.py:84 +#: ../meld/meldwindow.py:93 msgid "Find and replace text" msgstr "Buscar e substituír texto" -#: ../meld/meldwindow.py:86 +#: ../meld/meldwindow.py:95 msgid "Go to _Line" msgstr "Ir á _liña" -#: ../meld/meldwindow.py:87 +#: ../meld/meldwindow.py:96 msgid "Go to a specific line" msgstr "Ir a unha liña específica" -#: ../meld/meldwindow.py:90 +#: ../meld/meldwindow.py:99 msgid "_Changes" msgstr "_Cambios" -#: ../meld/meldwindow.py:91 +#: ../meld/meldwindow.py:100 msgid "Next Change" msgstr "Seguinte cambio" -#: ../meld/meldwindow.py:92 +#: ../meld/meldwindow.py:101 msgid "Go to the next change" msgstr "Ir ao seguinte cambio" -#: ../meld/meldwindow.py:94 +#: ../meld/meldwindow.py:103 msgid "Previous Change" msgstr "Anterior cambio" -#: ../meld/meldwindow.py:95 +#: ../meld/meldwindow.py:104 msgid "Go to the previous change" msgstr "Ir ao cambio anterior" -#: ../meld/meldwindow.py:97 +#: ../meld/meldwindow.py:106 msgid "Open Externally" msgstr "Abrir externamente" -#: ../meld/meldwindow.py:98 +#: ../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:102 +#: ../meld/meldwindow.py:111 msgid "_View" msgstr "_Ver" -#: ../meld/meldwindow.py:103 +#: ../meld/meldwindow.py:112 msgid "File Status" msgstr "Estado do ficheiro" -#: ../meld/meldwindow.py:104 +#: ../meld/meldwindow.py:113 msgid "Version Status" msgstr "Estado da versión" -#: ../meld/meldwindow.py:107 +#: ../meld/meldwindow.py:116 msgid "Stop the current action" msgstr "Deter a acción actual" -#: ../meld/meldwindow.py:110 +#: ../meld/meldwindow.py:119 msgid "Refresh the view" msgstr "Actualizar a vista" -#: ../meld/meldwindow.py:114 +#: ../meld/meldwindow.py:123 msgid "Fullscreen" msgstr "Pantalla completa" -#: ../meld/meldwindow.py:115 +#: ../meld/meldwindow.py:124 msgid "View the comparison in fullscreen" msgstr "Ver a comparación a pantalla completa" -#: ../meld/meldwindow.py:117 -msgid "_Toolbar" -msgstr "Barra de ferramen_tas" - -#: ../meld/meldwindow.py:118 -msgid "Show or hide the toolbar" -msgstr "Mostrar ou ocultar a barra de ferramentas" - -#: ../meld/meldwindow.py:127 +#: ../meld/meldwindow.py:133 msgid "Open Recent" msgstr "Abrir recentes" -#: ../meld/meldwindow.py:128 +#: ../meld/meldwindow.py:134 msgid "Open recent files" msgstr "Abrir ficheiros recentes" -#: ../meld/meldwindow.py:150 -msgid "_Meld" -msgstr "_Meld" - -#: ../meld/meldwindow.py:151 -msgid "Quit the program" -msgstr "Saír do programa" - -#: ../meld/meldwindow.py:153 -msgid "Prefere_nces" -msgstr "Prefere_ncias" - -#: ../meld/meldwindow.py:154 -msgid "Configure the application" -msgstr "Configurar o aplicativo" - -#: ../meld/meldwindow.py:156 -msgid "_Contents" -msgstr "_Contidos" - -#: ../meld/meldwindow.py:157 -msgid "Open the Meld manual" -msgstr "Abrir o manual do Meld" - -#: ../meld/meldwindow.py:159 -msgid "About this application" -msgstr "Sobre este aplicativo" - -#: ../meld/meldwindow.py:596 +#: ../meld/meldwindow.py:567 #, 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:617 +#: ../meld/meldwindow.py:588 msgid "Cannot compare a mixture of files and directories" msgstr "Non é posíbel comparar unha mestura de ficheiros e cartafoles" -#: ../meld/misc.py:207 +#: ../meld/misc.py:155 +msgid "" +"{}\n" +"\n" +"Meld encountered a critical error while running:\n" +"{}" +msgstr "" +"{}\n" +"\n" +"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" -#. no common path. empty names get changed to "[None]" -#: ../meld/misc.py:268 +#: ../meld/misc.py:311 msgid "[None]" msgstr "[Ningún]" -#: ../meld/preferences.py:33 +#: ../meld/preferences.py:42 ../meld/preferences.py:135 msgid "label" msgstr "etiqueta" -#: ../meld/preferences.py:33 +#: ../meld/preferences.py:42 ../meld/preferences.py:135 msgid "pattern" msgstr "patrón" -#: ../meld/recent.py:115 +#: ../meld/recent.py:106 msgid "Version control:" msgstr "Control de versións:" -#: ../meld/ui/bufferselectors.py:32 +#: ../meld/ui/bufferselectors.py:114 #, python-brace-format msgid "{name} ({charset})" msgstr "{name} ({charset})" -#: ../meld/ui/bufferselectors.py:65 ../meld/ui/bufferselectors.py:73 +#: ../meld/ui/bufferselectors.py:144 ../meld/ui/bufferselectors.py:152 msgid "Plain Text" msgstr "Texto plano" -#: ../meld/ui/notebooklabel.py:63 -msgid "Close tab" -msgstr "Pechar a lapela" - #. Abbreviation for line, column so that it will fit in the status bar -#: ../meld/ui/statusbar.py:133 +#: ../meld/ui/statusbar.py:124 #, python-format msgid "Ln %i, Col %i" msgstr "Li %i, Col %i" -#: ../meld/ui/statusbar.py:186 +#: ../meld/ui/statusbar.py:182 msgid "Line you want to move the cursor to" msgstr "A liña á que quere mover o cursor" -#: ../meld/ui/vcdialogs.py:48 +#: ../meld/ui/vcdialogs.py:55 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:93 +#: ../meld/vc/git.py:92 #, python-format msgid "%s in %s" msgstr "%s en %s" #. 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:101 +#: ../meld/vc/git.py:93 ../meld/vc/git.py:100 #, 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:96 +#: ../meld/vc/git.py:95 #, python-format msgid "%d branch" msgid_plural "%d branches" msgstr[0] "%d rama" msgstr[1] "%d ramas" -#: ../meld/vc/git.py:332 +#: ../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:340 +#: ../meld/vc/git.py:342 msgid "Partially staged" msgstr "Parcialmente preparado" -#: ../meld/vc/git.py:340 +#: ../meld/vc/git.py:342 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:38 +#: ../meld/vc/_null.py:37 msgid "None" msgstr "Ningún" -#: ../meld/vc/svn.py:204 +#: ../meld/vc/svn.py:203 #, python-format msgid "Rev %s" msgstr "Rev %s" @@ -2483,93 +2514,91 @@ msgstr "Non presente" #. Translators: This error message is shown when a version #. control binary isn't installed. -#: ../meld/vcview.py:249 +#: ../meld/vcview.py:282 #, python-format -#| msgid "%s not installed" 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:253 +#: ../meld/vcview.py:286 #, python-format -#| msgid "Invalid repository" msgid "%(name)s (Invalid repository)" msgstr "%(name)s (repositorio non válido)" -#: ../meld/vcview.py:274 +#: ../meld/vcview.py:307 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:276 +#: ../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:278 +#: ../meld/vcview.py:311 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:332 +#: ../meld/vcview.py:366 #, python-format msgid "%s: %s" msgstr "%s: %s" #. Initial yield so when we add this to our tasks, we don't #. create iterators that may be invalidated. -#: ../meld/vcview.py:339 +#: ../meld/vcview.py:373 msgid "Scanning repository" msgstr "Analizando o repositorio" -#: ../meld/vcview.py:368 +#: ../meld/vcview.py:402 #, python-format msgid "Scanning %s" msgstr "Analizando %s" -#: ../meld/vcview.py:407 +#: ../meld/vcview.py:441 msgid "(Empty)" msgstr "(Baleiro)" -#: ../meld/vcview.py:451 +#: ../meld/vcview.py:487 #, python-format msgid "%s — local" msgstr "%s — local" -#: ../meld/vcview.py:452 +#: ../meld/vcview.py:488 #, python-format msgid "%s — remote" msgstr "%s — remoto" -#: ../meld/vcview.py:460 +#: ../meld/vcview.py:496 #, python-format msgid "%s (local, merge, remote)" msgstr "%s (local, combinar, remoto)" -#: ../meld/vcview.py:465 +#: ../meld/vcview.py:501 #, python-format msgid "%s (remote, merge, local)" msgstr "%s (remoto, combinar, local)" -#: ../meld/vcview.py:476 +#: ../meld/vcview.py:512 #, python-format msgid "%s — repository" msgstr "%s — repositorio" -#: ../meld/vcview.py:482 +#: ../meld/vcview.py:518 #, python-format msgid "%s (working, repository)" msgstr "%s (funcionando, repositorio)" -#: ../meld/vcview.py:486 +#: ../meld/vcview.py:522 #, python-format msgid "%s (repository, working)" msgstr "%s (repositorio, funcionando)" -#: ../meld/vcview.py:675 +#: ../meld/vcview.py:688 msgid "Remove folder and all its files?" msgstr "Desexa eliminar o cartafol e todos os seus ficheiros?" -#: ../meld/vcview.py:677 +#: ../meld/vcview.py:690 msgid "" "This will remove all selected files and folders, and all files within any " "selected folders, from version control." @@ -2578,15 +2607,64 @@ msgstr "" "ficheiros dentro de calqueda dos cartafoles seleccionados, do control de " "versións." -#: ../meld/vcview.py:702 -#, python-format -msgid "Error removing %s" -msgstr "Produciuse un erro ao retirar %s" - -#: ../meld/vcview.py:780 +#: ../meld/vcview.py:804 msgid "Clear" msgstr "Limpar" +#~ msgid "Show toolbar" +#~ msgstr "Mostrar a barra de ferramentas" + +#~ msgid "If true, the window toolbar is visible." +#~ msgstr "Se se marca, a barra de ferramenta da xanela será visíbel." + +#~ msgid "Show statusbar" +#~ msgstr "Mostrar a barra de estado" + +#~ msgid "If true, the window statusbar is visible." +#~ msgstr "Se se marca, a barra de estado da xanela será visíbel." + +#~ msgid "Editable List" +#~ msgstr "Editar lista" + +#~ msgid "Meld Preferences" +#~ msgstr "Preferencias de Meld" + +#~ msgid "_Save as UTF-8" +#~ msgstr "_Gardar como UTF-8" + +#~ msgid "Couldn’t encode text as “%s”" +#~ msgstr "Non foi posíbel codificar o texto como «%s»" + +#~ msgid "_Toolbar" +#~ msgstr "Barra de ferramen_tas" + +#~ msgid "Show or hide the toolbar" +#~ msgstr "Mostrar ou ocultar a barra de ferramentas" + +#~ msgid "_Meld" +#~ msgstr "_Meld" + +#~ msgid "Quit the program" +#~ msgstr "Saír do programa" + +#~ msgid "Prefere_nces" +#~ msgstr "Prefere_ncias" + +#~ msgid "Configure the application" +#~ msgstr "Configurar o aplicativo" + +#~ msgid "_Contents" +#~ msgstr "_Contidos" + +#~ msgid "Open the Meld manual" +#~ msgstr "Abrir o manual do Meld" + +#~ msgid "About this application" +#~ msgstr "Sobre este aplicativo" + +#~ msgid "Error removing %s" +#~ msgstr "Produciuse un erro ao retirar %s" + #~ msgid "Copy _Right" #~ msgstr "Copiar á _dereita" @@ -3084,9 +3162,6 @@ msgstr "Limpar" #~ msgid "Three way file" #~ msgstr "Ficheiro a tres bandas" -#~ msgid "Two way directory" -#~ msgstr "Cartafol a dúas bandas" - #~ msgid "Two way file" #~ msgstr "Ficheiro a dúas bandas" From 149158a93ee37ea351e03bc752ea5fd6a5daf986 Mon Sep 17 00:00:00 2001 From: Marek Cernocky Date: Tue, 29 Jan 2019 14:33:42 +0100 Subject: [PATCH 0820/1316] Updated Czech translation --- po/cs.po | 206 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 109 insertions(+), 97 deletions(-) diff --git a/po/cs.po b/po/cs.po index 5399a4a5..bd523a67 100644 --- a/po/cs.po +++ b/po/cs.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: 2019-01-06 16:54+0000\n" -"PO-Revision-Date: 2019-01-07 10:40+0100\n" +"POT-Creation-Date: 2019-01-28 23:34+0000\n" +"PO-Revision-Date: 2019-01-29 14:32+0100\n" "Last-Translator: Marek Černocký \n" "Language-Team: čeština \n" "Language: cs\n" @@ -30,7 +30,7 @@ msgstr "Nelze importovat: " msgid "Meld requires %s or higher." msgstr "Meld vyžaduje %s nebo vyšší." -#: ../bin/meld:249 +#: ../bin/meld:262 #, c-format msgid "" "Couldn’t load Meld-specific CSS (%s)\n" @@ -146,6 +146,7 @@ msgstr "" "tabulátorů." #: ../data/org.gnome.meld.gschema.xml.h:11 +#: ../meld/resources/ui/statusbar-menu.ui.h:1 msgid "Show line numbers" msgstr "Zobrazovat čísla řádků" @@ -202,6 +203,7 @@ msgstr "" "vůbec („none“), za libovolným znakem („char“) nebo na koncích slov („word“)." #: ../data/org.gnome.meld.gschema.xml.h:21 +#: ../meld/resources/ui/statusbar-menu.ui.h:3 msgid "Highlight current line" msgstr "Zvýrazňovat aktuální řádek" @@ -878,8 +880,8 @@ msgstr "Kopírovat doprava" msgid "Delete selected" msgstr "Odstranit vybrané" -#: ../meld/resources/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:958 -#: ../meld/filediff.py:1586 +#: ../meld/resources/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:959 +#: ../meld/filediff.py:1601 msgid "Hide" msgstr "Skrýt" @@ -915,7 +917,7 @@ msgstr "Nové" msgid "Show new" msgstr "Zobrazovat nové" -#: ../meld/resources/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:76 +#: ../meld/resources/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:77 msgid "Modified" msgstr "Změněné" @@ -1130,7 +1132,7 @@ msgstr "Soubor 1" #. Create icon and filename CellRenderer #: ../meld/resources/ui/filter-list.ui.h:2 ../meld/resources/ui/vcview.ui.h:30 -#: ../meld/dirdiff.py:454 +#: ../meld/dirdiff.py:455 msgid "Name" msgstr "Název" @@ -1150,8 +1152,8 @@ msgstr "_Přidat" msgid "Remove selected filter" msgstr "Odstranit vybraný filtr" -#: ../meld/resources/ui/findbar.ui.h:1 ../meld/dirdiff.py:1040 -#: ../meld/iohelpers.py:107 +#: ../meld/resources/ui/findbar.ui.h:1 ../meld/dirdiff.py:1041 +#: ../meld/iohelpers.py:113 msgid "_Replace" msgstr "Nahradi_t" @@ -1264,7 +1266,7 @@ msgstr "Formátovat jako záplatu" msgid "Copy to Clipboard" msgstr "Kopírovat do schránky" -#: ../meld/resources/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:163 +#: ../meld/resources/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:165 msgid "Save Patch" msgstr "Uložení záplaty" @@ -1300,7 +1302,9 @@ msgstr "Po_užívat systémové písmo s pevnou šířkou" msgid "_Editor font:" msgstr "Písmo _editoru:" -#: ../meld/resources/ui/preferences.ui.h:5 +#. 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 msgid "Display" msgstr "Zobrazení" @@ -1531,8 +1535,8 @@ 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.h:4 ../meld/dirdiff.py:1039 -#: ../meld/iohelpers.py:52 ../meld/iohelpers.py:106 +#: ../meld/resources/ui/save-confirm-dialog.ui.h:4 ../meld/dirdiff.py:1040 +#: ../meld/iohelpers.py:58 ../meld/iohelpers.py:112 msgid "_Cancel" msgstr "_Zrušit" @@ -1540,6 +1544,14 @@ msgstr "_Zrušit" msgid "_Save" msgstr "_Uložit" +#: ../meld/resources/ui/statusbar-menu.ui.h:2 +msgid "Show whitespace" +msgstr "Zobrazovat mezery" + +#: ../meld/resources/ui/statusbar-menu.ui.h:4 +msgid "Text wrapping" +msgstr "Zalamování textu" + #: ../meld/resources/ui/vcview.ui.h:3 msgid "Co_mmit…" msgstr "Zařa_dit…" @@ -1632,7 +1644,7 @@ msgstr "Ne_verzované" msgid "Show unversioned files" msgstr "Zobrazovat soubory bez verzí" -#: ../meld/resources/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69 +#: ../meld/resources/ui/vcview.ui.h:28 ../meld/vc/_vc.py:70 msgid "Ignored" msgstr "Ignorované" @@ -1669,44 +1681,44 @@ msgid "Mac OS (CR)" msgstr "Mac OS (CR)" #. Create file size CellRenderer -#: ../meld/dirdiff.py:475 ../meld/preferences.py:138 +#: ../meld/dirdiff.py:476 ../meld/preferences.py:138 msgid "Size" msgstr "Velikost" #. Create date-time CellRenderer -#: ../meld/dirdiff.py:483 ../meld/preferences.py:139 +#: ../meld/dirdiff.py:484 ../meld/preferences.py:139 msgid "Modification time" msgstr "Čas změny" #. Create permissions CellRenderer -#: ../meld/dirdiff.py:491 ../meld/preferences.py:140 +#: ../meld/dirdiff.py:492 ../meld/preferences.py:140 msgid "Permissions" msgstr "Oprávnění" -#: ../meld/dirdiff.py:625 +#: ../meld/dirdiff.py:626 #, python-format msgid "Hide %s" msgstr "Skrýt %s" -#: ../meld/dirdiff.py:767 ../meld/dirdiff.py:790 +#: ../meld/dirdiff.py:768 ../meld/dirdiff.py:791 #, python-format msgid "[%s] Scanning %s" msgstr "[%s] Prochází se %s" -#: ../meld/dirdiff.py:925 +#: ../meld/dirdiff.py:926 #, python-format msgid "[%s] Done" msgstr "[%s] Hotovo" -#: ../meld/dirdiff.py:933 +#: ../meld/dirdiff.py:934 msgid "Folders have no differences" msgstr "Mezi složkami není žádný rozdíl" -#: ../meld/dirdiff.py:935 +#: ../meld/dirdiff.py:936 msgid "Contents of scanned files in folders are identical." msgstr "Obsah kontrolovaných souborů ve složkách je stejný." -#: ../meld/dirdiff.py:937 +#: ../meld/dirdiff.py:938 msgid "" "Scanned files in folders appear identical, but contents have not been " "scanned." @@ -1714,42 +1726,42 @@ msgstr "" "Kontrolované soubory ve složkách vypadají stejně, ale nebyl kontrolován " "jejich obsah." -#: ../meld/dirdiff.py:940 +#: ../meld/dirdiff.py:941 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:942 +#: ../meld/dirdiff.py:943 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:960 ../meld/filediff.py:1588 ../meld/filediff.py:1618 -#: ../meld/filediff.py:1620 ../meld/ui/msgarea.py:106 ../meld/ui/msgarea.py:119 +#: ../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 msgid "Hi_de" msgstr "_Skrýt" -#: ../meld/dirdiff.py:969 +#: ../meld/dirdiff.py:970 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:970 +#: ../meld/dirdiff.py:971 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:972 +#: ../meld/dirdiff.py:973 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:974 +#: ../meld/dirdiff.py:975 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:976 +#: ../meld/dirdiff.py:977 msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. The following files in this folder are hidden:" @@ -1757,17 +1769,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:987 +#: ../meld/dirdiff.py:988 #, python-format msgid "“%s” hidden by “%s”" msgstr "„%s“ skryto v „%s“" -#: ../meld/dirdiff.py:1043 +#: ../meld/dirdiff.py:1044 #, python-format msgid "Replace folder “%s”?" msgstr "Nahradit složku „%s“?" -#: ../meld/dirdiff.py:1045 +#: ../meld/dirdiff.py:1046 #, python-format msgid "" "Another folder with the same name already exists in “%s”.\n" @@ -1776,11 +1788,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:1058 +#: ../meld/dirdiff.py:1059 msgid "Error copying file" msgstr "Chyba při kopírování souboru" -#: ../meld/dirdiff.py:1059 +#: ../meld/dirdiff.py:1060 #, python-format msgid "" "Couldn’t copy %s\n" @@ -1793,19 +1805,19 @@ msgstr "" "\n" "%s" -#: ../meld/dirdiff.py:1084 ../meld/vcview.py:720 +#: ../meld/dirdiff.py:1085 ../meld/vcview.py:720 msgid "Error deleting {}" msgstr "Chyba při mazání {}" -#: ../meld/dirdiff.py:1593 +#: ../meld/dirdiff.py:1597 msgid "No folder" msgstr "Žádná složka" -#: ../meld/filediff.py:905 +#: ../meld/filediff.py:920 msgid "Comparison results will be inaccurate" msgstr "Výsledky porovnávání budou nepřesné" -#: ../meld/filediff.py:907 +#: ../meld/filediff.py:922 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1813,64 +1825,64 @@ msgstr "" "Filtr změnil počet řádků v souboru, což není podporováno. Porovnání nebude " "správné." -#: ../meld/filediff.py:979 +#: ../meld/filediff.py:994 msgid "Mark conflict as resolved?" msgstr "Označit konflikt jako vyřešený?" -#: ../meld/filediff.py:981 +#: ../meld/filediff.py:996 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:983 +#: ../meld/filediff.py:998 msgid "Cancel" msgstr "Zrušit" -#: ../meld/filediff.py:984 +#: ../meld/filediff.py:999 msgid "Mark _Resolved" msgstr "Označi_t za vyřešené" -#: ../meld/filediff.py:1303 +#: ../meld/filediff.py:1318 #, 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:1311 +#: ../meld/filediff.py:1326 #, python-format msgid "File %s appears to be a binary file." msgstr "Soubor %s je zřejmě binární." -#: ../meld/filediff.py:1313 +#: ../meld/filediff.py:1328 msgid "Do you want to open the file using the default application?" msgstr "Chcete soubor otevřít pomocí výchozí aplikace?" -#: ../meld/filediff.py:1315 +#: ../meld/filediff.py:1330 msgid "Open" msgstr "Otevřít" -#: ../meld/filediff.py:1331 +#: ../meld/filediff.py:1346 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Počítají se rozdíly" -#: ../meld/filediff.py:1392 +#: ../meld/filediff.py:1407 #, python-format msgid "File %s has changed on disk" msgstr "Soubor „%s“ byl změněn na disku." -#: ../meld/filediff.py:1393 +#: ../meld/filediff.py:1408 msgid "Do you want to reload the file?" msgstr "Chcete soubor znovu načíst?" -#: ../meld/filediff.py:1395 +#: ../meld/filediff.py:1410 msgid "_Reload" msgstr "Zno_vu načíst" -#: ../meld/filediff.py:1551 +#: ../meld/filediff.py:1566 msgid "Files are identical" msgstr "Soubory jsou stejné" -#: ../meld/filediff.py:1564 +#: ../meld/filediff.py:1579 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1878,11 +1890,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:1569 +#: ../meld/filediff.py:1584 msgid "Files differ in line endings only" msgstr "Soubory se liší pouze zakončením řádků" -#: ../meld/filediff.py:1571 +#: ../meld/filediff.py:1586 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1891,15 +1903,15 @@ msgstr "" "Soubory jsou shodné, vyjma rozdílného zakončení řádků:\n" "%s" -#: ../meld/filediff.py:1591 +#: ../meld/filediff.py:1606 msgid "Show without filters" msgstr "Zobrazit bez filtrů" -#: ../meld/filediff.py:1613 +#: ../meld/filediff.py:1628 msgid "Change highlighting incomplete" msgstr "Změnit zvýraznění neúplných" -#: ../meld/filediff.py:1614 +#: ../meld/filediff.py:1629 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." @@ -1908,19 +1920,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:1622 +#: ../meld/filediff.py:1637 msgid "Keep highlighting" msgstr "Zachovat zvýrazňování" -#: ../meld/filediff.py:1624 +#: ../meld/filediff.py:1639 msgid "_Keep highlighting" msgstr "Z_achovat zvýrazňování" -#: ../meld/filediff.py:1637 +#: ../meld/filediff.py:1652 msgid "Saving failed" msgstr "Ukládání selhalo" -#: ../meld/filediff.py:1638 +#: ../meld/filediff.py:1653 msgid "" "Please consider copying any critical changes to another program or file to " "avoid data loss." @@ -1928,36 +1940,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:1647 +#: ../meld/filediff.py:1662 msgid "Save Left Pane As" msgstr "Uložení levého panelu jako" -#: ../meld/filediff.py:1649 +#: ../meld/filediff.py:1664 msgid "Save Middle Pane As" msgstr "Uložení prostředního panelu jako" -#: ../meld/filediff.py:1651 +#: ../meld/filediff.py:1666 msgid "Save Right Pane As" msgstr "Uložení pravého panelu jako" -#: ../meld/filediff.py:1664 +#: ../meld/filediff.py:1679 #, 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:1666 +#: ../meld/filediff.py:1681 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:1669 +#: ../meld/filediff.py:1684 msgid "Save Anyway" msgstr "Přesto uložit" -#: ../meld/filediff.py:1670 +#: ../meld/filediff.py:1685 msgid "Don’t Save" msgstr "Neukládat" -#: ../meld/filediff.py:1712 +#: ../meld/filediff.py:1727 msgid "" "File “{}” contains characters that can’t be encoded using its current " "encoding “{}”." @@ -1965,7 +1977,7 @@ msgstr "" "Soubor {} obsahuje znaky, které nelze zakódovat pomocí jeho akuálního " "kódování „{}“." -#: ../meld/filediff.py:1716 ../meld/patchdialog.py:142 +#: ../meld/filediff.py:1731 ../meld/patchdialog.py:144 #, python-format msgid "" "Couldn’t save file due to:\n" @@ -1974,16 +1986,16 @@ msgstr "" "Nelze uložit soubor z důvodu:\n" "%s" -#: ../meld/filediff.py:1720 ../meld/patchdialog.py:141 +#: ../meld/filediff.py:1735 ../meld/patchdialog.py:143 #, python-format msgid "Could not save file %s." msgstr "Nelze uložit soubor %s." -#: ../meld/filediff.py:2113 +#: ../meld/filediff.py:2128 msgid "Live comparison updating disabled" msgstr "Živá aktualizace porovnání zakázána" -#: ../meld/filediff.py:2114 +#: ../meld/filediff.py:2129 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -2006,32 +2018,32 @@ msgstr "Kopírovat nahor_u" msgid "Copy _down" msgstr "Kopírovat _dolů" -#: ../meld/iohelpers.py:37 +#: ../meld/iohelpers.py:43 msgid "Deleting remote folders is not supported" msgstr "Mazání vzdálených složení nen podporované" -#: ../meld/iohelpers.py:39 +#: ../meld/iohelpers.py:45 msgid "Not a file or directory" msgstr "Nejedná se o soubor nebo složku" -#: ../meld/iohelpers.py:43 +#: ../meld/iohelpers.py:49 msgid "“{}” can’t be put in the trash. Do you want to delete it immediately?" msgstr "„{}“ nelze umístit do koše. Chcete smazat trvale?" -#: ../meld/iohelpers.py:48 +#: ../meld/iohelpers.py:54 msgid "This remote location does not support sending items to the trash." msgstr "Vzdálené umístění nepodporuje přesouvání položek do koše." -#: ../meld/iohelpers.py:53 +#: ../meld/iohelpers.py:59 msgid "_Delete Permanently" msgstr "_Smazat trvale" -#: ../meld/iohelpers.py:100 +#: ../meld/iohelpers.py:106 #, python-format msgid "Replace file “%s”?" msgstr "Nahradit soubor „%s“?" -#: ../meld/iohelpers.py:102 +#: ../meld/iohelpers.py:108 #, python-format msgid "" "A file with this name already exists in “%s”.\n" @@ -2136,7 +2148,7 @@ msgid "remote folder “{}” not supported" msgstr "vzdálená složka „{}“ není podporovaná" #. TRANSLATORS: This is the label of a new, currently-unnamed file. -#: ../meld/meldbuffer.py:124 +#: ../meld/meldbuffer.py:123 msgid "" msgstr "" @@ -2358,7 +2370,7 @@ msgstr "Prostý text" msgid "Ln %i, Col %i" msgstr "Řád %i, sl %i" -#: ../meld/ui/statusbar.py:177 +#: ../meld/ui/statusbar.py:182 msgid "Line you want to move the cursor to" msgstr "Řádek, na který chcete přesunout kurzor" @@ -2415,51 +2427,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:70 +#: ../meld/vc/_vc.py:71 msgid "Unversioned" msgstr "Neverzováno" -#: ../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" From b5f9b9f716eb4c1c7445c9d11c2568f99e6036ca Mon Sep 17 00:00:00 2001 From: Daniel Mustieles Date: Tue, 29 Jan 2019 16:22:22 +0100 Subject: [PATCH 0821/1316] Updated Spanish translation --- po/es.po | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/po/es.po b/po/es.po index b6abb4f1..fc94e1f1 100644 --- a/po/es.po +++ b/po/es.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: meld.master\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-28 13:43+0100\n" +"POT-Creation-Date: 2019-01-28 23:34+0000\n" +"PO-Revision-Date: 2019-01-29 16:07+0100\n" "Last-Translator: Daniel Mustieles \n" "Language-Team: es \n" "Language: es\n" @@ -1270,7 +1270,6 @@ msgid "C_ompare" msgstr "_Comparar" #: ../meld/resources/ui/notebook-label.ui.h:1 -#, fuzzy #| msgid "Close tab" msgid "Close Tab" msgstr "Cerrar pestaña" @@ -1304,7 +1303,6 @@ msgid "_Reverse patch direction" msgstr "Dirección in_versa del parche" #: ../meld/resources/ui/preferences.ui.h:1 -#, fuzzy #| msgid "_Preferences" msgid "Preferences" msgstr "Preferencias" @@ -1567,12 +1565,10 @@ msgid "_Save" msgstr "_Guardar" #: ../meld/resources/ui/statusbar-menu.ui.h:2 -#| msgid "Show w_hitespace" msgid "Show whitespace" msgstr "Mostrar espacios en blanco" #: ../meld/resources/ui/statusbar-menu.ui.h:4 -#, fuzzy #| msgid "Enable text _wrapping" msgid "Text wrapping" msgstr "Ajuste del texto" From 9508f22531d3ea759a4145a711b8d45154986a53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20=C8=98erb=C4=83nescu?= Date: Sat, 9 Feb 2019 16:25:15 +0000 Subject: [PATCH 0822/1316] Update Romanian translation --- po/ro.po | 698 +++++++++++++++++++++++++++++++++---------------------- 1 file changed, 423 insertions(+), 275 deletions(-) diff --git a/po/ro.po b/po/ro.po index c2741a3c..be75f6ef 100644 --- a/po/ro.po +++ b/po/ro.po @@ -6,10 +6,9 @@ msgid "" msgstr "" "Project-Id-Version: meld master\n" -"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" -"product=meld&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2017-09-09 21:16+0000\n" -"PO-Revision-Date: 2017-08-30 18:54+0200\n" +"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n" +"POT-Creation-Date: 2018-06-30 21:32+0000\n" +"PO-Revision-Date: 2018-08-17 16:13+0200\n" "Last-Translator: Daniel Șerbănescu \n" "Language-Team: Gnome Romanian Translation Team\n" "Language: ro\n" @@ -17,51 +16,55 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " -"20)) ? 1 : 2);;\n" -"X-Generator: Virtaal 0.7.1\n" +"20)) ? 1 : 2);\n" +"X-Generator: Poedit 2.1.1\n" "X-Project-Style: gnome\n" -#: ../bin/meld:179 +#: ../bin/meld:190 msgid "Cannot import: " msgstr "Nu se poate importa:" -#: ../bin/meld:182 +#: ../bin/meld:193 #, c-format msgid "Meld requires %s or higher." msgstr "Meld necesită %s sau superior." -#: ../bin/meld:227 -#, c-format +#: ../bin/meld:239 +#, fuzzy, c-format +#| msgid "" +#| "Couldn't load Meld-specific CSS (%s)\n" +#| "%s" msgid "" -"Couldn't load Meld-specific CSS (%s)\n" +"Couldn’t load Meld-specific CSS (%s)\n" "%s" msgstr "" "Nu s-a putut încărca CSS specific Meld (%s)\n" "%s" -#: ../data/meld.desktop.in.h:1 ../data/meld.appdata.xml.in.h:1 -#: ../data/ui/meldapp.ui.h:1 +#: ../data/org.gnome.meld.desktop.in.h:1 +#: ../data/org.gnome.meld.appdata.xml.in.h:1 ../data/ui/meldapp.ui.h:1 msgid "Meld" msgstr "Meld" -#: ../data/meld.desktop.in.h:2 +#: ../data/org.gnome.meld.desktop.in.h:2 msgid "Diff Viewer" msgstr "Vizualizator de diferențe" -#: ../data/meld.desktop.in.h:3 +#: ../data/org.gnome.meld.desktop.in.h:3 msgid "Meld Diff Viewer" msgstr "Vizualizatorul de diferențe Meld" -#: ../data/meld.desktop.in.h:4 ../data/meld.appdata.xml.in.h:2 +#: ../data/org.gnome.meld.desktop.in.h:4 +#: ../data/org.gnome.meld.appdata.xml.in.h:2 msgid "Compare and merge your files" msgstr "Comparați-vă și combinati-vă fișierele" #. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! -#: ../data/meld.desktop.in.h:6 +#: ../data/org.gnome.meld.desktop.in.h:6 msgid "diff;merge;" msgstr "diff;merge;diferență;diferențe;îmbinare;" -#: ../data/meld.appdata.xml.in.h:3 +#: ../data/org.gnome.meld.appdata.xml.in.h:3 msgid "" "Meld is a visual diff and merge tool targeted at developers. Meld helps you " "compare files, directories, and version controlled projects. It provides " @@ -74,7 +77,7 @@ msgstr "" "sisteme de control ale versiunilor incluzând Git, Mercurial, Bazaar și " "Subversion." -#: ../data/meld.appdata.xml.in.h:4 +#: ../data/org.gnome.meld.appdata.xml.in.h:4 msgid "" "Meld helps you review code changes, understand patches, and makes enormous " "merge conflicts slightly less painful." @@ -82,11 +85,11 @@ msgstr "" "Meld vă ajută să revizuiți schimbări ale codului, să înțelegeți petice, și " "face conflictele de combinații imense mai puțin dureroase." -#: ../data/meld.appdata.xml.in.h:5 +#: ../data/org.gnome.meld.appdata.xml.in.h:5 msgid "The GNOME Project" msgstr "Proiectul GNOME" -#: ../data/mime/meld.xml.in.h:1 +#: ../data/mime/org.gnome.meld.xml.in.h:1 msgid "Meld comparison description" msgstr "Descrierea comparației Meld" @@ -131,8 +134,13 @@ 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." +"may also be tried, depending on the user’s locale." msgstr "" +"Meld va folosi aceste codări de text pentru a încerca să decodeze fișierele " +"text încărcate înainte de a încerca alte codări. Adițional acestor codări " +"din această listă, UTF-8 și codarea localizării implicite vor fi întotdeauna " +"folosite; alte codări pot fi încercate de asemenea, în funcție de " +"localizarea utilizatorului." #: ../data/org.gnome.meld.gschema.xml.h:11 msgid "Width of an indentation step" @@ -140,15 +148,16 @@ msgstr "Lățimea unui pas de indentare" #: ../data/org.gnome.meld.gschema.xml.h:12 msgid "The number of spaces to use for a single indent step" -msgstr "" +msgstr "Numărul de spații de folosit pentru un singur pas de indentare" #: ../data/org.gnome.meld.gschema.xml.h:13 msgid "Whether to indent using spaces or tabs" -msgstr "" +msgstr "Dacă să se indenteze folosind spații sau taburi" #: ../data/org.gnome.meld.gschema.xml.h:14 msgid "If true, any new indentation will use spaces instead of tabs." msgstr "" +"Dacă este adevărat, orice nouă indentare va folosi spații în loc de taburi." #: ../data/org.gnome.meld.gschema.xml.h:15 #, fuzzy @@ -159,16 +168,21 @@ msgstr "Afișează numărul de _linii" #: ../data/org.gnome.meld.gschema.xml.h:16 msgid "If true, line numbers will be shown in the gutter of file comparisons." msgstr "" +"Dacă este adevărat, numerele liniilor vor fi afișate în rigola pentru " +"comparația de fișiere." #: ../data/org.gnome.meld.gschema.xml.h:17 msgid "Highlight syntax" -msgstr "" +msgstr "Evidențierea sintaxei" #: ../data/org.gnome.meld.gschema.xml.h:18 msgid "" -"Whether to highlight syntax in comparisons. Because of Meld's own color " +"Whether to highlight syntax in comparisons. Because of Meld’s own color " "highlighting, this is off by default." msgstr "" +"Dacă să se evidențieze sintaxa în comparații. Din cauza evidențierii " +"colorate proprie a lui Meld, această funcționalitate este dezactivată " +"implicit." #: ../data/org.gnome.meld.gschema.xml.h:19 #, fuzzy @@ -179,6 +193,7 @@ msgstr "Folosește _evidențierea sintaxei" #: ../data/org.gnome.meld.gschema.xml.h:20 msgid "Used by GtkSourceView to determine colors for syntax highlighting" msgstr "" +"Folosit de GtkSourceView pentru a determina culorile evidențierii sintaxei." #: ../data/org.gnome.meld.gschema.xml.h:21 #, fuzzy @@ -191,10 +206,12 @@ msgid "" "Selector for individual whitespace character types to be shown. Possible " "values are 'space', 'tab', 'newline' and 'nbsp'." msgstr "" +"Selector pentru caracterele de spații individuale de afișat. Valorile " +"posibile sunt „space”, „tab”, „newline” și „nbsp”." #: ../data/org.gnome.meld.gschema.xml.h:23 msgid "Wrap mode" -msgstr "" +msgstr "Modul încadrare" #: ../data/org.gnome.meld.gschema.xml.h:24 msgid "" @@ -202,16 +219,21 @@ msgid "" "not at all ('none'), at any character ('char') or only at the end of words " "('word')." msgstr "" +"Liniile din comparații de fișiere vor fi încadrate în conformitate cu " +"această configurare, fie deloc („none”), la orice caracter („char”) sau la " +"sfârșitul cuvintelor („word”)." #: ../data/org.gnome.meld.gschema.xml.h:25 msgid "Highlight current line" -msgstr "" +msgstr "Evidențiază linia curentă" #: ../data/org.gnome.meld.gschema.xml.h:26 msgid "" "If true, the line containing the cursor will be highlighted in file " "comparisons." msgstr "" +"Dacă este adevărat, linia ce conține cursorul va fi evidențiată în " +"comparațiile de fișiere." #: ../data/org.gnome.meld.gschema.xml.h:27 #, fuzzy @@ -223,25 +245,31 @@ msgstr "_Folosește mărimea fontului fixată de sistem" msgid "" "If false, custom-font will be used instead of the system monospace font." msgstr "" +"Dacă este fals, fontul personalizat va fi folosit în locul fontului " +"monospațiat al sistemului." #: ../data/org.gnome.meld.gschema.xml.h:29 msgid "Custom font" -msgstr "" +msgstr "Font personalizat" #: ../data/org.gnome.meld.gschema.xml.h:30 msgid "" "The custom font to use, stored as a string and parsed as a Pango font " "description." msgstr "" +"Fontul personalizat de folosit, stocat ca șir de caractere și parsat ca " +"descriere de fonturi Pango." #: ../data/org.gnome.meld.gschema.xml.h:31 msgid "Ignore blank lines when comparing files" -msgstr "" +msgstr "Ignoră liniile goale când se compară fișiere" #: ../data/org.gnome.meld.gschema.xml.h:32 msgid "" "If true, blank lines will be trimmed when highlighting changes between files." msgstr "" +"Dacă este adevărat, liniile goale vor fi scurtate când evidențierea se " +"schimbă între fișiere." #: ../data/org.gnome.meld.gschema.xml.h:33 #, fuzzy @@ -305,7 +333,7 @@ msgstr "" #: ../data/org.gnome.meld.gschema.xml.h:44 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 " +"between two files before they’re considered to have different mtimes. This " "is useful when comparing files between filesystems with different timestamp " "resolution." msgstr "" @@ -440,7 +468,7 @@ msgstr "Filtre de text" 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." +"but won’t contribute to the comparison itself." msgstr "" #: ../data/styles/meld-base.xml.h:1 @@ -461,7 +489,7 @@ msgstr "" #: ../data/ui/application.ui.h:1 msgid "About Meld" -msgstr "" +msgstr "Despre Meld" #: ../data/ui/application.ui.h:2 #, fuzzy @@ -470,18 +498,20 @@ msgstr "" #| "Copyright © 2009-2010 Kai Willadsen" msgid "" "Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2013 Kai Willadsen" +"Copyright © 2009-2017 Kai Willadsen" msgstr "" "Drepturi de autor © 2002-2009 Stephen Kennedy\n" "Drepturi de autor © 2009-2010 Kai Willadsen" #: ../data/ui/application.ui.h:4 msgid "Website" -msgstr "" +msgstr "Sit web" #: ../data/ui/application.ui.h:5 msgid "translator-credits" -msgstr "Cosmin Clapon , 2010" +msgstr "" +"Cosmin Clapon , 2010\n" +"Daniel Șerbănescu , 2018" #: ../data/ui/application.ui.h:6 #, fuzzy @@ -495,15 +525,15 @@ msgstr "_Ajutor" #: ../data/ui/application.ui.h:8 msgid "Keyboard Shortcuts" -msgstr "" +msgstr "Scurtături de tastatură" #: ../data/ui/application.ui.h:9 msgid "_About" -msgstr "" +msgstr "_Despre" #: ../data/ui/application.ui.h:10 msgid "_Quit" -msgstr "" +msgstr "_Ieșire" #: ../data/ui/dirdiff.ui.h:1 ../data/ui/vcview.ui.h:1 msgid "_Compare" @@ -516,80 +546,96 @@ msgid "Compare selected files" msgstr "Compară obiectul selectat" #: ../data/ui/dirdiff.ui.h:3 +msgid "Collapse Recursively" +msgstr "" + +#: ../data/ui/dirdiff.ui.h:4 +msgid "Collapse selected folder and all subfolders" +msgstr "" + +#: ../data/ui/dirdiff.ui.h:5 +msgid "Expand Recursively" +msgstr "" + +#: ../data/ui/dirdiff.ui.h:6 +msgid "Expand selected folder and all subfolders" +msgstr "" + +#: ../data/ui/dirdiff.ui.h:7 #, fuzzy #| msgid "Copy To Left" msgid "Copy to _Left" msgstr "Copiază la stânga" -#: ../data/ui/dirdiff.ui.h:4 +#: ../data/ui/dirdiff.ui.h:8 #, fuzzy #| msgid "Copy To Left" msgid "Copy to left" msgstr "Copiază la stânga" -#: ../data/ui/dirdiff.ui.h:5 +#: ../data/ui/dirdiff.ui.h:9 #, fuzzy #| msgid "Copy To Right" msgid "Copy to _Right" msgstr "Copiază la dreapta" -#: ../data/ui/dirdiff.ui.h:6 +#: ../data/ui/dirdiff.ui.h:10 #, fuzzy #| msgid "Copy To Right" msgid "Copy to right" msgstr "Copiază la dreapta" -#: ../data/ui/dirdiff.ui.h:7 +#: ../data/ui/dirdiff.ui.h:11 msgid "Delete selected" msgstr "Șterge obiectul selectat" -#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:856 ../meld/filediff.py:1360 +#: ../data/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:871 ../meld/filediff.py:1471 msgid "Hide" msgstr "Ascunde" -#: ../data/ui/dirdiff.ui.h:9 +#: ../data/ui/dirdiff.ui.h:13 msgid "Hide selected" msgstr "Ascunde obiectul selectat" -#: ../data/ui/dirdiff.ui.h:10 +#: ../data/ui/dirdiff.ui.h:14 msgid "Ignore Filename Case" msgstr "" -#: ../data/ui/dirdiff.ui.h:11 +#: ../data/ui/dirdiff.ui.h:15 msgid "" "Consider differently-cased filenames that are otherwise-identical to be the " "same" msgstr "" -#: ../data/ui/dirdiff.ui.h:12 +#: ../data/ui/dirdiff.ui.h:16 msgid "Same" msgstr "Același" -#: ../data/ui/dirdiff.ui.h:13 +#: ../data/ui/dirdiff.ui.h:17 msgid "Show identical" msgstr "Afișează fișierele identice" -#: ../data/ui/dirdiff.ui.h:14 +#: ../data/ui/dirdiff.ui.h:18 msgid "New" msgstr "Nou" -#: ../data/ui/dirdiff.ui.h:15 +#: ../data/ui/dirdiff.ui.h:19 msgid "Show new" msgstr "Afișează fișierele noi" -#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:77 +#: ../data/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:76 msgid "Modified" msgstr "Modificări" -#: ../data/ui/dirdiff.ui.h:17 +#: ../data/ui/dirdiff.ui.h:21 msgid "Show modified" msgstr "Afișează obiectele modificate" -#: ../data/ui/dirdiff.ui.h:18 +#: ../data/ui/dirdiff.ui.h:22 msgid "Filters" msgstr "Filtre" -#: ../data/ui/dirdiff.ui.h:19 +#: ../data/ui/dirdiff.ui.h:23 msgid "Set active filters" msgstr "Definește filtrele active" @@ -610,7 +656,7 @@ msgid "_Add" msgstr "_Adaugă" #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11 -#: ../meld/vcview.py:663 +#: ../meld/vcview.py:680 msgid "_Remove" msgstr "_Elimină" @@ -632,7 +678,7 @@ msgstr "" #. Create icon and filename CellRenderer #: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35 -#: ../meld/dirdiff.py:374 +#: ../meld/dirdiff.py:371 msgid "Name" msgstr "Nume" @@ -652,10 +698,14 @@ msgstr "Filtre de fișier" msgid "Remove selected filter" msgstr "Selectați fișierul" +#: ../data/ui/encoding-selector.ui.h:1 +msgid "Search text encoding…" +msgstr "" + #: ../data/ui/filediff.ui.h:1 #, fuzzy #| msgid "Format as patch..." -msgid "Format as Patch..." +msgid "Format as Patch…" msgstr "Formatează ca petic..." #: ../data/ui/filediff.ui.h:2 @@ -860,15 +910,15 @@ msgid "Save changes to documents before closing?" msgstr "" #: ../data/ui/filediff.ui.h:45 -msgid "If you don't save, changes will be permanently lost." +msgid "If you don’t save, changes will be permanently lost." msgstr "" #: ../data/ui/filediff.ui.h:46 msgid "Close _without Saving" msgstr "" -#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:938 ../meld/filediff.py:1426 -#: ../meld/filediff.py:1498 +#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:952 ../meld/filediff.py:1580 +#: ../meld/iohelpers.py:50 ../meld/iohelpers.py:100 msgid "_Cancel" msgstr "" @@ -901,14 +951,20 @@ msgid "File 1" msgstr "_Fișier" #: ../data/ui/filediff.ui.h:53 -msgid "Revert unsaved changes to documents?" +msgid "Discard unsaved changes to documents?" msgstr "" #: ../data/ui/filediff.ui.h:54 -msgid "Changes made to the following documents will be permanently lost:\n" +msgid "Changes made to the following documents will be permanently lost:" msgstr "" -#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:939 ../meld/filediff.py:1427 +#: ../data/ui/filediff.ui.h:55 +#, fuzzy +#| msgid "_Discard Changes" +msgid "_Discard" +msgstr "Anulează mo_dificările" + +#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:953 ../meld/iohelpers.py:101 msgid "_Replace" msgstr "În_locuiește" @@ -954,6 +1010,10 @@ msgstr "E_xpresie regulată" msgid "Wrapped" msgstr "" +#: ../data/ui/language-selector.ui.h:1 +msgid "Search highlight mode…" +msgstr "" + #: ../data/ui/patch-dialog.ui.h:1 #, fuzzy #| msgid "Format as patch..." @@ -964,7 +1024,7 @@ msgstr "Formatează ca petic..." msgid "Copy to Clipboard" msgstr "Copiază în clipboard" -#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:154 +#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:152 #, fuzzy #| msgid "Save Patch As..." msgid "Save Patch" @@ -1146,7 +1206,7 @@ msgstr "" "după nume. Fiecare tipar este o listă de metacaractere de tip shell separate " "prin spații." -#: ../data/ui/preferences.ui.h:37 ../meld/meldwindow.py:104 +#: ../data/ui/preferences.ui.h:37 ../meld/meldwindow.py:105 msgid "File Filters" msgstr "Filtre de fișiere" @@ -1217,7 +1277,7 @@ msgstr "" #: ../data/ui/shortcuts.ui.h:1 msgctxt "shortcut window" msgid "General" -msgstr "" +msgstr "Generale" #: ../data/ui/shortcuts.ui.h:2 #, fuzzy @@ -1264,7 +1324,7 @@ msgstr "Ecran complet" #: ../data/ui/shortcuts.ui.h:8 msgctxt "shortcut window" msgid "Tabs" -msgstr "" +msgstr "Taburi" #: ../data/ui/shortcuts.ui.h:9 #, fuzzy @@ -1283,7 +1343,7 @@ msgstr "Mergi la următoarea modificare" #: ../data/ui/shortcuts.ui.h:11 msgctxt "shortcut window" msgid "Switch to tab" -msgstr "" +msgstr "Comută la tab" #: ../data/ui/shortcuts.ui.h:12 #, fuzzy @@ -1330,32 +1390,32 @@ msgstr "_Editare" #: ../data/ui/shortcuts.ui.h:18 msgctxt "shortcut window" msgid "Undo" -msgstr "" +msgstr "Anulează" #: ../data/ui/shortcuts.ui.h:19 msgctxt "shortcut window" msgid "Redo" -msgstr "" +msgstr "Refă" #: ../data/ui/shortcuts.ui.h:20 msgctxt "shortcut window" msgid "Cut" -msgstr "" +msgstr "Taie" #: ../data/ui/shortcuts.ui.h:21 msgctxt "shortcut window" msgid "Copy" -msgstr "" +msgstr "Copiază" #: ../data/ui/shortcuts.ui.h:22 msgctxt "shortcut window" msgid "Paste" -msgstr "" +msgstr "Lipește" #: ../data/ui/shortcuts.ui.h:23 msgctxt "shortcut window" msgid "Find" -msgstr "" +msgstr "Caută" #: ../data/ui/shortcuts.ui.h:24 #, fuzzy @@ -1531,10 +1591,10 @@ msgstr "Alegeți un panou de control al versiunilor" #: ../data/ui/shortcuts.ui.h:49 msgctxt "shortcut window" msgid "Show/hide console output" -msgstr "" +msgstr "Arată/ascunde rezultatul consolei" -#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:562 -#: ../meld/newdifftab.py:38 +#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:567 +#: ../meld/newdifftab.py:49 #, fuzzy #| msgid "_File Comparison" msgid "New comparison" @@ -1621,7 +1681,7 @@ msgstr "_Compară" #: ../data/ui/vcview.ui.h:3 #, fuzzy #| msgid "Commit" -msgid "Co_mmit..." +msgid "Co_mmit…" msgstr "Validează" #: ../data/ui/vcview.ui.h:4 @@ -1724,7 +1784,7 @@ msgstr "" msgid "Show unversioned files" msgstr "Afișează fișierele care nu au versiune" -#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:70 +#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69 msgid "Ignored" msgstr "Ignorat" @@ -1756,7 +1816,7 @@ msgstr "Înregistrări precedente" msgid "Co_mmit" msgstr "Validează" -#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:332 +#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:331 msgid "Location" msgstr "Locație" @@ -1812,71 +1872,71 @@ msgstr "" msgid "Permissions" msgstr "" -#: ../meld/dirdiff.py:535 +#: ../meld/dirdiff.py:539 #, python-format msgid "Hide %s" msgstr "Ascunde %s" -#: ../meld/dirdiff.py:667 ../meld/dirdiff.py:691 +#: ../meld/dirdiff.py:680 ../meld/dirdiff.py:703 #, python-format msgid "[%s] Scanning %s" msgstr "[%s] Se analizează %s" -#: ../meld/dirdiff.py:823 +#: ../meld/dirdiff.py:838 #, python-format msgid "[%s] Done" msgstr "[%s] Terminat" -#: ../meld/dirdiff.py:831 +#: ../meld/dirdiff.py:846 #, fuzzy #| msgid "[%s] Fetching differences" msgid "Folders have no differences" msgstr "[%s] Se potrivesc diferențele" -#: ../meld/dirdiff.py:833 +#: ../meld/dirdiff.py:848 msgid "Contents of scanned files in folders are identical." msgstr "" -#: ../meld/dirdiff.py:835 +#: ../meld/dirdiff.py:850 msgid "" "Scanned files in folders appear identical, but contents have not been " "scanned." msgstr "" -#: ../meld/dirdiff.py:838 +#: ../meld/dirdiff.py:853 msgid "File filters are in use, so not all files have been scanned." msgstr "" -#: ../meld/dirdiff.py:840 +#: ../meld/dirdiff.py:855 msgid "Text filters are in use and may be masking content differences." msgstr "" -#: ../meld/dirdiff.py:858 ../meld/filediff.py:1362 ../meld/filediff.py:1392 -#: ../meld/filediff.py:1394 ../meld/ui/msgarea.py:105 ../meld/ui/msgarea.py:118 +#: ../meld/dirdiff.py:873 ../meld/filediff.py:1473 ../meld/filediff.py:1503 +#: ../meld/filediff.py:1505 ../meld/ui/msgarea.py:106 ../meld/ui/msgarea.py:119 msgid "Hi_de" msgstr "Ascun_de" -#: ../meld/dirdiff.py:868 +#: ../meld/dirdiff.py:882 msgid "Multiple errors occurred while scanning this folder" msgstr "" -#: ../meld/dirdiff.py:869 +#: ../meld/dirdiff.py:883 #, fuzzy #| msgid "%s is not in encodings: %s" msgid "Files with invalid encodings found" msgstr "%s nu se află în codări: %s" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:871 +#: ../meld/dirdiff.py:885 msgid "Some files were in an incorrect encoding. The names are something like:" msgstr "" -#: ../meld/dirdiff.py:873 +#: ../meld/dirdiff.py:887 msgid "Files hidden by case insensitive comparison" msgstr "" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:875 +#: ../meld/dirdiff.py:889 #, fuzzy #| msgid "" #| "You are running a case insensitive comparison on a case sensitive " @@ -1890,35 +1950,36 @@ msgstr "" "sensibil la majuscule. Anumite fișiere nu sunt vizibile:\n" "%s" -#: ../meld/dirdiff.py:886 -#, python-format -msgid "'%s' hidden by '%s'" +#: ../meld/dirdiff.py:900 +#, fuzzy, python-format +#| msgid "'%s' hidden by '%s'" +msgid "“%s” hidden by “%s”" msgstr "„%s” ascuns de „%s”" -#: ../meld/dirdiff.py:942 +#: ../meld/dirdiff.py:956 #, python-format msgid "Replace folder “%s”?" msgstr "" -#: ../meld/dirdiff.py:944 +#: ../meld/dirdiff.py:958 #, 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:957 +#: ../meld/dirdiff.py:971 msgid "Error copying file" msgstr "" -#: ../meld/dirdiff.py:958 +#: ../meld/dirdiff.py:972 #, fuzzy, python-format #| msgid "" #| "Error copying '%s' to '%s'\n" #| "\n" #| "%s." msgid "" -"Couldn't copy %s\n" +"Couldn’t copy %s\n" "to %s.\n" "\n" "%s" @@ -1927,42 +1988,27 @@ msgstr "" "\n" "%s." -#: ../meld/dirdiff.py:981 -#, fuzzy, python-format +#: ../meld/dirdiff.py:997 ../meld/vcview.py:703 +#, fuzzy #| msgid "" #| "Error removing %s\n" #| "\n" #| "%s." -msgid "Error deleting %s" +msgid "Error deleting {}" msgstr "" "Eroare la ștergerea %s\n" "\n" "%s." -#: ../meld/dirdiff.py:1494 +#: ../meld/dirdiff.py:1519 msgid "No folder" msgstr "" -#. Abbreviations for insert and overwrite that fit in the status bar -#: ../meld/filediff.py:335 -msgid "INS" -msgstr "INS" - -#: ../meld/filediff.py:335 -msgid "OVR" -msgstr "SPR" - -#. Abbreviation for line, column so that it will fit in the status bar -#: ../meld/filediff.py:337 -#, python-format -msgid "Ln %i, Col %i" -msgstr "Ln %i, Col %i" - -#: ../meld/filediff.py:762 +#: ../meld/filediff.py:816 msgid "Comparison results will be inaccurate" msgstr "" -#: ../meld/filediff.py:764 +#: ../meld/filediff.py:818 #, fuzzy #| msgid "" #| "Regular expression '%s' changed the number of lines in the file. " @@ -1974,202 +2020,201 @@ msgstr "" "Expresia regulată „%s” a modificat numărul de linii din fișier. Comparația " "va fi incorectă. Pentru mai multe detalii consultați manualul utilizatorului." -#: ../meld/filediff.py:820 +#: ../meld/filediff.py:875 #, fuzzy msgid "Mark conflict as resolved?" msgstr "Marcat ca rezolvat pentru panoul de control al versiunilor" -#: ../meld/filediff.py:822 +#: ../meld/filediff.py:877 msgid "" "If the conflict was resolved successfully, you may mark it as resolved now." msgstr "" -#: ../meld/filediff.py:824 +#: ../meld/filediff.py:879 msgid "Cancel" msgstr "" -#: ../meld/filediff.py:825 +#: ../meld/filediff.py:880 #, fuzzy #| msgid "_Resolved" msgid "Mark _Resolved" msgstr "_Rezolvat" -#: ../meld/filediff.py:1076 +#: ../meld/filediff.py:1188 #, python-format msgid "There was a problem opening the file “%s”." msgstr "" -#: ../meld/filediff.py:1084 +#: ../meld/filediff.py:1196 #, fuzzy, python-format #| msgid "%s appears to be a binary file." msgid "File %s appears to be a binary file." msgstr "%s apare ca fișier binar." -#: ../meld/filediff.py:1086 +#: ../meld/filediff.py:1198 msgid "Do you want to open the file using the default application?" msgstr "" -#: ../meld/filediff.py:1088 +#: ../meld/filediff.py:1200 msgid "Open" msgstr "" -#: ../meld/filediff.py:1104 +#: ../meld/filediff.py:1216 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Se calculează diferențele" -#: ../meld/filediff.py:1166 +#: ../meld/filediff.py:1277 #, python-format msgid "File %s has changed on disk" msgstr "" -#: ../meld/filediff.py:1167 +#: ../meld/filediff.py:1278 #, fuzzy #| msgid "Could not read file" msgid "Do you want to reload the file?" msgstr "Nu s-a putut citi fișierul" -#: ../meld/filediff.py:1169 +#: ../meld/filediff.py:1280 #, fuzzy #| msgid "Reload" msgid "_Reload" msgstr "Reîncarcă" -#: ../meld/filediff.py:1325 +#: ../meld/filediff.py:1436 msgid "Files are identical" msgstr "Fișierele sunt identice" -#: ../meld/filediff.py:1338 +#: ../meld/filediff.py:1449 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:1343 +#: ../meld/filediff.py:1454 #, fuzzy #| msgid "%s is not in encodings: %s" msgid "Files differ in line endings only" msgstr "%s nu se află în codări: %s" -#: ../meld/filediff.py:1345 +#: ../meld/filediff.py:1456 #, python-format msgid "" "Files are identical except for differing line endings:\n" "%s" msgstr "" -#: ../meld/filediff.py:1365 +#: ../meld/filediff.py:1476 #, fuzzy #| msgid "Show ignored files" msgid "Show without filters" msgstr "Afișează fișierele ignorate" -#: ../meld/filediff.py:1387 +#: ../meld/filediff.py:1498 msgid "Change highlighting incomplete" msgstr "" -#: ../meld/filediff.py:1388 +#: ../meld/filediff.py:1499 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:1396 +#: ../meld/filediff.py:1507 #, fuzzy #| msgid "Use s_yntax highlighting" msgid "Keep highlighting" msgstr "Folosește _evidențierea sintaxei" -#: ../meld/filediff.py:1398 +#: ../meld/filediff.py:1509 #, fuzzy #| msgid "Use s_yntax highlighting" msgid "_Keep highlighting" msgstr "Folosește _evidențierea sintaxei" -#: ../meld/filediff.py:1430 -#, python-format -msgid "Replace file “%s”?" +#: ../meld/filediff.py:1522 +msgid "Saving failed" msgstr "" -#: ../meld/filediff.py:1432 -#, python-format +#: ../meld/filediff.py:1523 msgid "" -"A file with this name already exists in “%s”.\n" -"If you replace the existing file, its contents will be lost." +"Please consider copying any critical changes to another program or file to " +"avoid data loss." msgstr "" -#: ../meld/filediff.py:1449 +#: ../meld/filediff.py:1532 #, fuzzy #| msgid "Save Patch As..." msgid "Save Left Pane As" msgstr "Salvează petic ca..." -#: ../meld/filediff.py:1451 +#: ../meld/filediff.py:1534 #, fuzzy #| msgid "Left and middle panes" msgid "Save Middle Pane As" msgstr "Panouri la stânga și la mijloc" -#: ../meld/filediff.py:1453 +#: ../meld/filediff.py:1536 msgid "Save Right Pane As" msgstr "" -#: ../meld/filediff.py:1467 +#: ../meld/filediff.py:1549 #, python-format msgid "File %s has changed on disk since it was opened" msgstr "" -#: ../meld/filediff.py:1469 +#: ../meld/filediff.py:1551 msgid "If you save it, any external changes will be lost." msgstr "" -#: ../meld/filediff.py:1472 +#: ../meld/filediff.py:1554 msgid "Save Anyway" msgstr "" -#: ../meld/filediff.py:1473 -msgid "Don't Save" +#: ../meld/filediff.py:1555 +msgid "Don’t Save" msgstr "" -#: ../meld/filediff.py:1499 +#: ../meld/filediff.py:1581 msgid "_Save as UTF-8" msgstr "" -#: ../meld/filediff.py:1502 +#: ../meld/filediff.py:1584 #, python-format -msgid "Couldn't encode text as “%s”" +msgid "Couldn’t encode text as “%s”" msgstr "" -#: ../meld/filediff.py:1504 +#: ../meld/filediff.py:1586 #, fuzzy, python-format #| msgid "" #| "'%s' contains characters not encodable with '%s'\n" #| "Would you like to save as UTF-8?" msgid "" -"File “%s” contains characters that can't be encoded using encoding “%s”.\n" +"File “%s” contains characters that can’t be encoded using encoding “%s”.\n" "Would you like to save as UTF-8?" msgstr "" "„%s” conține caractere care nu pot fi codificare cu „%s”\n" "Doriți să salvați ca UTF-8?" -#: ../meld/filediff.py:1544 ../meld/patchdialog.py:130 +#: ../meld/filediff.py:1626 ../meld/patchdialog.py:130 #, fuzzy, python-format #| msgid "Could not read file" msgid "Could not save file %s." msgstr "Nu s-a putut citi fișierul" -#: ../meld/filediff.py:1545 ../meld/patchdialog.py:131 -#, python-format +#: ../meld/filediff.py:1627 ../meld/patchdialog.py:131 +#, fuzzy, python-format +#| msgid "Could not read file" msgid "" -"Couldn't save file due to:\n" +"Couldn’t save file due to:\n" "%s" -msgstr "" +msgstr "Nu s-a putut citi fișierul" -#: ../meld/filediff.py:1909 +#: ../meld/filediff.py:2002 msgid "Live comparison updating disabled" msgstr "" -#: ../meld/filediff.py:1910 +#: ../meld/filediff.py:2003 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -2181,18 +2226,52 @@ msgstr "" msgid "[%s] Merging files" msgstr "[%s] Se combină fișierele" -#: ../meld/gutterrendererchunk.py:210 +#: ../meld/gutterrendererchunk.py:216 #, fuzzy #| msgid "Copy To Left" msgid "Copy _up" msgstr "Copiază la stânga" -#: ../meld/gutterrendererchunk.py:211 +#: ../meld/gutterrendererchunk.py:217 #, fuzzy #| msgid "Copy To Left" msgid "Copy _down" msgstr "Copiază la stânga" +#: ../meld/iohelpers.py:35 +msgid "Deleting remote folders is not supported" +msgstr "" + +#: ../meld/iohelpers.py:37 +msgid "Not a file or directory" +msgstr "" + +#: ../meld/iohelpers.py:41 +msgid "“{}” can’t be put in the trash. Do you want to delete it immediately?" +msgstr "" + +#: ../meld/iohelpers.py:46 +msgid "This remote location does not support sending items to the trash." +msgstr "" + +#: ../meld/iohelpers.py:51 +#, fuzzy +#| msgid "Delete change" +msgid "_Delete Permanently" +msgstr "Șterge modificarea" + +#: ../meld/iohelpers.py:94 +#, python-format +msgid "Replace file “%s”?" +msgstr "" + +#: ../meld/iohelpers.py:96 +#, 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:179 msgid "wrong number of arguments supplied to --diff" msgstr "număr de parametri incorect pentru --diff" @@ -2276,202 +2355,218 @@ msgid "too many arguments (wanted 0-3, got %d)" msgstr "prea multe argumente (e nevoie de 0-4, %d obținute)" #: ../meld/meldapp.py:291 -msgid "can't auto-merge less than 3 files" -msgstr "" +#, fuzzy +#| msgid "Flatten directories" +msgid "can’t auto-merge less than 3 files" +msgstr "Nivelează directoarele" #: ../meld/meldapp.py:293 #, fuzzy #| msgid "Flatten directories" -msgid "can't auto-merge directories" +msgid "can’t auto-merge directories" msgstr "Nivelează directoarele" #: ../meld/meldapp.py:307 msgid "Error reading saved comparison file" msgstr "" -#: ../meld/meldapp.py:349 +#: ../meld/meldapp.py:324 #, python-format -msgid "invalid path or URI \"%s\"" +msgid "invalid path or URI “%s”" +msgstr "" + +#: ../meld/meldapp.py:330 +msgid "remote folder “{}” not supported" msgstr "" #. TRANSLATORS: This is the label of a new, currently-unnamed file. -#: ../meld/meldbuffer.py:131 +#: ../meld/meldbuffer.py:124 msgid "" msgstr "" -#: ../meld/melddoc.py:64 +#: ../meld/melddoc.py:68 msgid "untitled" msgstr "fără titlu" -#: ../meld/meldwindow.py:49 +#: ../meld/meldwindow.py:47 msgid "_File" msgstr "_Fișier" -#: ../meld/meldwindow.py:50 +#: ../meld/meldwindow.py:48 #, fuzzy #| msgid "_File Comparison" -msgid "_New Comparison..." +msgid "_New Comparison…" msgstr "Comparație _fișier" -#: ../meld/meldwindow.py:51 +#: ../meld/meldwindow.py:49 msgid "Start a new comparison" msgstr "Începe o nouă comparație" -#: ../meld/meldwindow.py:54 +#: ../meld/meldwindow.py:52 msgid "Save the current file" msgstr "Salvează fișierul curent" -#: ../meld/meldwindow.py:56 +#: ../meld/meldwindow.py:54 #, fuzzy #| msgid "Save Patch As..." -msgid "Save As..." +msgid "Save As…" msgstr "Salvează petic ca..." -#: ../meld/meldwindow.py:57 +#: ../meld/meldwindow.py:55 #, fuzzy #| msgid "Save the current file" msgid "Save the current file with a different name" msgstr "Salvează fișierul curent" -#: ../meld/meldwindow.py:60 +#: ../meld/meldwindow.py:58 msgid "Close the current file" msgstr "Închide fișierul curent" -#: ../meld/meldwindow.py:63 +#: ../meld/meldwindow.py:61 msgid "_Edit" msgstr "_Editare" -#: ../meld/meldwindow.py:65 +#: ../meld/meldwindow.py:63 msgid "Undo the last action" msgstr "Anulează ultima acțiune" -#: ../meld/meldwindow.py:68 +#: ../meld/meldwindow.py:66 msgid "Redo the last undone action" msgstr "Refă ultima acțiune neterminată" -#: ../meld/meldwindow.py:70 +#: ../meld/meldwindow.py:68 msgid "Cut the selection" msgstr "Taie selecția" -#: ../meld/meldwindow.py:72 +#: ../meld/meldwindow.py:70 msgid "Copy the selection" msgstr "Copiază selecția" -#: ../meld/meldwindow.py:74 +#: ../meld/meldwindow.py:72 msgid "Paste the clipboard" msgstr "Lipește clipboard-ul" -#: ../meld/meldwindow.py:76 -msgid "Find..." +#: ../meld/meldwindow.py:74 +msgid "Find…" msgstr "" -#: ../meld/meldwindow.py:76 +#: ../meld/meldwindow.py:74 msgid "Search for text" msgstr "Caută după text" -#: ../meld/meldwindow.py:78 +#: ../meld/meldwindow.py:76 msgid "Find Ne_xt" msgstr "Găsește _următorul" -#: ../meld/meldwindow.py:79 +#: ../meld/meldwindow.py:77 msgid "Search forwards for the same text" msgstr "Caută după același text în față" -#: ../meld/meldwindow.py:81 +#: ../meld/meldwindow.py:79 #, fuzzy #| msgid "_Previous" msgid "Find _Previous" msgstr "Îna_poi" -#: ../meld/meldwindow.py:82 +#: ../meld/meldwindow.py:80 #, fuzzy #| msgid "Search forwards for the same text" msgid "Search backwards for the same text" msgstr "Caută după același text în față" -#: ../meld/meldwindow.py:85 +#: ../meld/meldwindow.py:83 #, fuzzy #| msgid "_Replace" -msgid "_Replace..." +msgid "_Replace…" msgstr "În_locuiește" -#: ../meld/meldwindow.py:86 +#: ../meld/meldwindow.py:84 msgid "Find and replace text" msgstr "Caută și înlocuiește un text" -#: ../meld/meldwindow.py:89 +#: ../meld/meldwindow.py:86 +#, fuzzy +#| msgid "Copy To Left" +msgid "Go to _Line" +msgstr "Copiază la stânga" + +#: ../meld/meldwindow.py:87 +msgid "Go to a specific line" +msgstr "" + +#: ../meld/meldwindow.py:90 msgid "_Changes" msgstr "_Modificări" -#: ../meld/meldwindow.py:90 +#: ../meld/meldwindow.py:91 #, fuzzy #| msgid "Next change" msgid "Next Change" msgstr "Următoarea modificare" -#: ../meld/meldwindow.py:91 +#: ../meld/meldwindow.py:92 msgid "Go to the next change" msgstr "Mergi la următoarea modificare" -#: ../meld/meldwindow.py:93 +#: ../meld/meldwindow.py:94 #, fuzzy #| msgid "Previous change" msgid "Previous Change" msgstr "Modificarea precedentă" -#: ../meld/meldwindow.py:94 +#: ../meld/meldwindow.py:95 msgid "Go to the previous change" msgstr "Revino la modificarea precedentă" -#: ../meld/meldwindow.py:96 +#: ../meld/meldwindow.py:97 msgid "Open Externally" msgstr "" -#: ../meld/meldwindow.py:97 +#: ../meld/meldwindow.py:98 msgid "Open selected file or directory in the default external application" msgstr "" -#: ../meld/meldwindow.py:101 +#: ../meld/meldwindow.py:102 msgid "_View" msgstr "_Vizualizare" -#: ../meld/meldwindow.py:102 +#: ../meld/meldwindow.py:103 #, fuzzy #| msgid "File status" msgid "File Status" msgstr "Stare fișier" -#: ../meld/meldwindow.py:103 +#: ../meld/meldwindow.py:104 #, fuzzy #| msgid "Version status" msgid "Version Status" msgstr "Stare versiune" -#: ../meld/meldwindow.py:106 +#: ../meld/meldwindow.py:107 msgid "Stop the current action" msgstr "Întrerupe acțiunea curentă" -#: ../meld/meldwindow.py:109 +#: ../meld/meldwindow.py:110 msgid "Refresh the view" msgstr "Reîmprospătează ecranul" -#: ../meld/meldwindow.py:113 +#: ../meld/meldwindow.py:114 #, fuzzy #| msgid "Full Screen" msgid "Fullscreen" msgstr "Ecran complet" -#: ../meld/meldwindow.py:114 +#: ../meld/meldwindow.py:115 #, fuzzy #| msgid "View the comparison in full screen" msgid "View the comparison in fullscreen" msgstr "Vezi comparația pe ecran complet" -#: ../meld/meldwindow.py:116 +#: ../meld/meldwindow.py:117 msgid "_Toolbar" msgstr "_Bară de unelte" -#: ../meld/meldwindow.py:117 +#: ../meld/meldwindow.py:118 msgid "Show or hide the toolbar" msgstr "Arată sau ascunde bara de unelte" @@ -2519,24 +2614,32 @@ msgstr "Deschide manulaul Meld" msgid "About this application" msgstr "Configurează aplicația" -#: ../meld/meldwindow.py:596 +#: ../meld/meldwindow.py:602 #, python-format msgid "Need three files to auto-merge, got: %r" msgstr "" -#: ../meld/meldwindow.py:610 +#: ../meld/meldwindow.py:623 #, fuzzy #| msgid "Cannot compare a mixture of files and directories.\n" msgid "Cannot compare a mixture of files and directories" msgstr "Nu se poate compara un amestec de fișiere și directoare.\n" -#: ../meld/misc.py:203 +#: ../meld/misc.py:134 +msgid "" +"{}\n" +"\n" +"Meld encountered a critical error while running:\n" +"{}" +msgstr "" + +#: ../meld/misc.py:253 #, python-format -msgid "Couldn't find colour scheme details for %s-%s; this is a bad install" +msgid "Couldn’t find colour scheme details for %s-%s; this is a bad install" msgstr "" #. no common path. empty names get changed to "[None]" -#: ../meld/misc.py:261 +#: ../meld/misc.py:314 msgid "[None]" msgstr "[Nespecificat]" @@ -2548,229 +2651,277 @@ msgstr "etichetă" msgid "pattern" msgstr "tipar" -#: ../meld/recent.py:114 +#: ../meld/recent.py:105 #, fuzzy #| msgid "Version Control\t1\t%s\n" msgid "Version control:" msgstr "Control al versiunilor\t1\t%s\n" +#: ../meld/ui/bufferselectors.py:32 +#, python-brace-format +msgid "{name} ({charset})" +msgstr "" + +#: ../meld/ui/bufferselectors.py:65 ../meld/ui/bufferselectors.py:73 +msgid "Plain Text" +msgstr "" + #: ../meld/ui/notebooklabel.py:63 msgid "Close tab" msgstr "Închide tabul" +#. Abbreviation for line, column so that it will fit in the status bar +#: ../meld/ui/statusbar.py:133 +#, python-format +msgid "Ln %i, Col %i" +msgstr "Ln %i, Col %i" + +#: ../meld/ui/statusbar.py:186 +msgid "Line you want to move the cursor to" +msgstr "" + #: ../meld/ui/vcdialogs.py:48 msgid "No files will be committed" msgstr "" #. Translators: First %s is replaced by translated "%d unpushed #. commits", second %s is replaced by translated "%d branches" -#: ../meld/vc/git.py:94 +#: ../meld/vc/git.py:92 #, python-format msgid "%s in %s" msgstr "" #. Translators: These messages cover the case where there is #. only one branch, and are not part of another message. -#: ../meld/vc/git.py:95 ../meld/vc/git.py:102 +#: ../meld/vc/git.py:93 ../meld/vc/git.py:100 #, python-format msgid "%d unpushed commit" msgid_plural "%d unpushed commits" msgstr[0] "" msgstr[1] "" +msgstr[2] "" -#: ../meld/vc/git.py:97 +#: ../meld/vc/git.py:95 #, python-format msgid "%d branch" msgid_plural "%d branches" msgstr[0] "" msgstr[1] "" +msgstr[2] "" -#: ../meld/vc/git.py:333 +#: ../meld/vc/git.py:334 #, fuzzy, python-format #| msgid "Merge all changes from left" msgid "Mode changed from %s to %s" msgstr "Combină toate modificările din stânga" -#: ../meld/vc/git.py:341 +#: ../meld/vc/git.py:342 msgid "Partially staged" msgstr "" -#: ../meld/vc/git.py:341 +#: ../meld/vc/git.py:342 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 +#: ../meld/vc/_null.py:37 #, fuzzy #| msgid "[None]" msgid "None" msgstr "[Nespecificat]" -#: ../meld/vc/svn.py:204 +#: ../meld/vc/svn.py:203 #, python-format msgid "Rev %s" msgstr "" -#: ../meld/vc/_vc.py:55 +#: ../meld/vc/_vc.py:54 msgid "Merged" msgstr "" -#: ../meld/vc/_vc.py:55 +#: ../meld/vc/_vc.py:54 msgid "Base" msgstr "" -#: ../meld/vc/_vc.py:55 +#: ../meld/vc/_vc.py:54 #, fuzzy #| msgid "Location" msgid "Local" msgstr "Locație" -#: ../meld/vc/_vc.py:55 +#: ../meld/vc/_vc.py:54 #, fuzzy #| msgid "_Remove" msgid "Remote" msgstr "_Elimină" -#: ../meld/vc/_vc.py:71 +#: ../meld/vc/_vc.py:70 #, fuzzy #| msgid "Show unversioned files" msgid "Unversioned" msgstr "Afișează fișierele care nu au versiune" -#: ../meld/vc/_vc.py:74 +#: ../meld/vc/_vc.py:73 msgid "Error" msgstr "" -#: ../meld/vc/_vc.py:76 +#: ../meld/vc/_vc.py:75 msgid "Newly added" msgstr "" -#: ../meld/vc/_vc.py:78 +#: ../meld/vc/_vc.py:77 #, fuzzy #| msgid "" msgid "Renamed" msgstr "" -#: ../meld/vc/_vc.py:79 +#: ../meld/vc/_vc.py:78 #, fuzzy #| msgid "Next conflict" msgid "Conflict" msgstr "Următorul conflict" -#: ../meld/vc/_vc.py:80 +#: ../meld/vc/_vc.py:79 #, fuzzy #| msgid "_Remove" msgid "Removed" msgstr "_Elimină" -#: ../meld/vc/_vc.py:81 +#: ../meld/vc/_vc.py:80 msgid "Missing" msgstr "" -#: ../meld/vc/_vc.py:82 +#: ../meld/vc/_vc.py:81 msgid "Not present" msgstr "" #. Translators: This error message is shown when a version #. control binary isn't installed. -#: ../meld/vcview.py:251 +#: ../meld/vcview.py:248 #, python-format msgid "%(name)s (%(cmd)s not installed)" msgstr "" #. Translators: This error message is shown when a version #. controlled repository is invalid. -#: ../meld/vcview.py:255 +#: ../meld/vcview.py:252 #, fuzzy, python-format #| msgid "Invalid Repository" msgid "%(name)s (Invalid repository)" msgstr "Depozit invalid" -#: ../meld/vcview.py:276 +#: ../meld/vcview.py:273 msgid "No valid version control system found in this folder" msgstr "" -#: ../meld/vcview.py:278 +#: ../meld/vcview.py:275 #, fuzzy msgid "Only one version control system found in this folder" msgstr "Doar un panou de control al versiunilor în acest director" -#: ../meld/vcview.py:280 +#: ../meld/vcview.py:277 #, fuzzy msgid "Choose which version control system to use" msgstr "Alegeți un panou de control al versiunilor" #. TRANSLATORS: This is the location of the directory being viewed -#: ../meld/vcview.py:332 +#: ../meld/vcview.py:331 #, python-format msgid "%s: %s" msgstr "%s: %s" -#: ../meld/vcview.py:352 +#. Initial yield so when we add this to our tasks, we don't +#. create iterators that may be invalidated. +#: ../meld/vcview.py:338 +#, fuzzy +#| msgid "[%s] Scanning %s" +msgid "Scanning repository" +msgstr "[%s] Se analizează %s" + +#: ../meld/vcview.py:367 #, fuzzy, python-format #| msgid "[%s] Scanning %s" msgid "Scanning %s" msgstr "[%s] Se analizează %s" -#: ../meld/vcview.py:391 +#: ../meld/vcview.py:406 msgid "(Empty)" msgstr "(gol)" -#: ../meld/vcview.py:435 +#: ../meld/vcview.py:450 #, python-format msgid "%s — local" msgstr "" -#: ../meld/vcview.py:436 +#: ../meld/vcview.py:451 #, python-format msgid "%s — remote" msgstr "" -#: ../meld/vcview.py:444 +#: ../meld/vcview.py:459 #, python-format msgid "%s (local, merge, remote)" msgstr "" -#: ../meld/vcview.py:449 +#: ../meld/vcview.py:464 #, python-format msgid "%s (remote, merge, local)" msgstr "" -#: ../meld/vcview.py:460 +#: ../meld/vcview.py:475 #, python-format msgid "%s — repository" msgstr "" -#: ../meld/vcview.py:466 +#: ../meld/vcview.py:481 #, python-format msgid "%s (working, repository)" msgstr "" -#: ../meld/vcview.py:470 +#: ../meld/vcview.py:485 #, python-format msgid "%s (repository, working)" msgstr "" -#: ../meld/vcview.py:657 +#: ../meld/vcview.py:674 msgid "Remove folder and all its files?" msgstr "" -#: ../meld/vcview.py:659 +#: ../meld/vcview.py:676 msgid "" "This will remove all selected files and folders, and all files within any " "selected folders, from version control." msgstr "" -#: ../meld/vcview.py:684 -#, python-format -msgid "Error removing %s" -msgstr "Eroare la ștergerea %s" - -#: ../meld/vcview.py:765 +#: ../meld/vcview.py:785 msgid "Clear" msgstr "Curăță" +#, fuzzy +#~| msgid "Format as patch..." +#~ msgid "Format as Patch..." +#~ msgstr "Formatează ca petic..." + +#, fuzzy +#~| msgid "Commit" +#~ msgid "Co_mmit..." +#~ msgstr "Validează" + +#~ msgid "INS" +#~ msgstr "INS" + +#~ msgid "OVR" +#~ msgstr "SPR" + +#, fuzzy +#~| msgid "_Replace" +#~ msgid "_Replace..." +#~ msgstr "În_locuiește" + +#~ msgid "Error removing %s" +#~ msgstr "Eroare la ștergerea %s" + #~ msgid "" #~ "Some files have been modified.\n" #~ "Which ones would you like to save?" @@ -2778,9 +2929,6 @@ msgstr "Curăță" #~ "Unele fișiere au fost modificate.\n" #~ "Pe care dintre ele doriți să le salvați?" -#~ msgid "_Discard Changes" -#~ msgstr "Anulează mo_dificările" - #~ msgid "_Save Selected" #~ msgstr "_Salvează fișierul" From 244447a82d39d07c1937091128b19ef776eee2df Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Fri, 8 Feb 2019 06:28:31 +1000 Subject: [PATCH 0823/1316] resources: Re-save filediff.ui with new glade --- meld/resources/ui/filediff.ui | 570 +++++++++++++++++----------------- 1 file changed, 285 insertions(+), 285 deletions(-) diff --git a/meld/resources/ui/filediff.ui b/meld/resources/ui/filediff.ui index d2e061d3..9048174f 100644 --- a/meld/resources/ui/filediff.ui +++ b/meld/resources/ui/filediff.ui @@ -1,184 +1,8 @@ + - - - - - - Format as Patch… - Create a patch using differences between files - - - - - - Save A_ll - Save all files in the current comparison - - - - - - - Revert files to their saved versions - gtk-revert-to-saved - - - - - - Add Synchronization Point - Add a synchronization point for changes between files - - - - - - Clear Synchronization Points - Clear sychronization points for changes between files - - - - - - Previous Conflict - Go to the previous conflict - - - - - - - Next Conflict - Go to the next conflict - - - - - - - Push to Left - Push current change to the left - gtk-go-back - - - - - - - Push to Right - Push current change to the right - gtk-go-forward - - - - - - - - Pull from Left - Pull change from the left - gtk-goto-last - - - - - - - Pull from Right - Pull change from the right - gtk-goto-first - - - - - - - Copy Above Left - Copy change above the left chunk - - - - - - - Copy Below Left - Copy change below the left chunk - - - - - - - Copy Above Right - Copy change above the right chunk - - - - - - - Copy Below Right - Copy change below the right chunk - - - - - - - Delete - Delete change - gtk-delete - - - - - - - Merge All from Left - Merge all non-conflicting changes from the left - - - - - - Merge All from Right - Merge all non-conflicting changes from the right - - - - - - Merge All - Merge all non-conflicting changes from left and right panes - - - - - - Previous Pane - Move keyboard focus to the previous document in this comparison - - - - - - - Next Pane - Move keyboard focus to the next document in this comparison - - - - - - - Lock Scrolling - Lock scrolling of all panes - True - - - - + + + + + + Format as Patch… + Create a patch using differences between files + + + + + + Save A_ll + Save all files in the current comparison + + + + + + + Revert files to their saved versions + gtk-revert-to-saved + + + + + + Add Synchronization Point + Add a synchronization point for changes between files + + + + + + Clear Synchronization Points + Clear sychronization points for changes between files + + + + + + Previous Conflict + Go to the previous conflict + + + + + + + Next Conflict + Go to the next conflict + + + + + + + Push to Left + Push current change to the left + gtk-go-back + + + + + + + Push to Right + Push current change to the right + gtk-go-forward + + + + + + + + Pull from Left + Pull change from the left + gtk-goto-last + + + + + + + Pull from Right + Pull change from the right + gtk-goto-first + + + + + + + Copy Above Left + Copy change above the left chunk + + + + + + + Copy Below Left + Copy change below the left chunk + + + + + + + Copy Above Right + Copy change above the right chunk + + + + + + + Copy Below Right + Copy change below the right chunk + + + + + + + Delete + Delete change + gtk-delete + + + + + + + Merge All from Left + Merge all non-conflicting changes from the left + + + + + + Merge All from Right + Merge all non-conflicting changes from the right + + + + + + Merge All + Merge all non-conflicting changes from left and right panes + + + + + + Previous Pane + Move keyboard focus to the previous document in this comparison + + + + + + + Next Pane + Move keyboard focus to the next document in this comparison + + + + + + + Lock Scrolling + Lock scrolling of all panes + True + + + + From 09b2a0b8c87df38eb837ec0098452472bc57fad9 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Thu, 7 Feb 2019 07:06:26 +1000 Subject: [PATCH 0824/1316] resources: Clean up the event masks on LinkMaps These are leftover from when the LinkMap handled actual click events. --- meld/resources/ui/filediff.ui | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meld/resources/ui/filediff.ui b/meld/resources/ui/filediff.ui index 9048174f..f1a395ff 100644 --- a/meld/resources/ui/filediff.ui +++ b/meld/resources/ui/filediff.ui @@ -426,7 +426,7 @@ 50 True False - GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_SCROLL_MASK + GDK_SCROLL_MASK @@ -475,7 +475,7 @@ 50 True False - GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_SCROLL_MASK + GDK_SCROLL_MASK From 3bb8bf79b5375e66d92fb06de360b532e926b636 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Thu, 7 Feb 2019 07:20:38 +1000 Subject: [PATCH 0825/1316] resources: Fix some icon use consistency --- meld/resources/ui/filediff.ui | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meld/resources/ui/filediff.ui b/meld/resources/ui/filediff.ui index f1a395ff..855d5997 100644 --- a/meld/resources/ui/filediff.ui +++ b/meld/resources/ui/filediff.ui @@ -34,7 +34,7 @@ True True - document-save + document-save-symbolic @@ -97,7 +97,7 @@ False 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. - emblem-readonly + changes-prevent-symbolic @@ -172,7 +172,7 @@ False 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. - emblem-readonly + changes-prevent-symbolic From 658170e4e2703adba96f6dfbf52985a59efe3ee7 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sat, 15 Dec 2018 08:37:14 +1000 Subject: [PATCH 0826/1316] linkmap: Simplify our bezier drawing --- meld/linkmap.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/meld/linkmap.py b/meld/linkmap.py index 5653f4bd..af555c16 100644 --- a/meld/linkmap.py +++ b/meld/linkmap.py @@ -75,9 +75,8 @@ def do_draw(self, context): self.views[1].get_line_num_for_y(pix_start[1] + height), ] - wtotal = allocation.width # For bezier control points - x_steps = [-0.5, wtotal / 2, wtotal / 2, wtotal + 0.5] + x_steps = [-0.5, allocation.width / 2, allocation.width + 0.5] q_rad = math.pi / 2 left, right = self.view_indices @@ -98,24 +97,24 @@ def view_offset_line(view_idx, line_num): if (t0 < 0 and t1 < 0) or (t0 > height and t1 > height): if f0 == f1: continue - context.arc(x_steps[0], f0 - 0.5 + RADIUS, RADIUS, -q_rad, 0) + context.arc(x_steps[0], f0 - 0.5 + RADIUS, RADIUS, q_rad * 3, 0) context.arc(x_steps[0], f1 - 0.5 - RADIUS, RADIUS, 0, q_rad) context.close_path() elif (f0 < 0 and f1 < 0) or (f0 > height and f1 > height): if t0 == t1: continue - context.arc_negative(x_steps[3], t0 - 0.5 + RADIUS, RADIUS, - -q_rad, q_rad * 2) - context.arc_negative(x_steps[3], t1 - 0.5 - RADIUS, RADIUS, + context.arc_negative(x_steps[2], t0 - 0.5 + RADIUS, RADIUS, + q_rad * 3, q_rad * 2) + context.arc_negative(x_steps[2], t1 - 0.5 - RADIUS, RADIUS, q_rad * 2, q_rad) context.close_path() else: context.move_to(x_steps[0], f0 - 0.5) context.curve_to(x_steps[1], f0 - 0.5, - x_steps[2], t0 - 0.5, - x_steps[3], t0 - 0.5) - context.line_to(x_steps[3], t1 - 0.5) - context.curve_to(x_steps[2], t1 - 0.5, + x_steps[1], t0 - 0.5, + x_steps[2], t0 - 0.5) + context.line_to(x_steps[2], t1 - 0.5) + context.curve_to(x_steps[1], t1 - 0.5, x_steps[1], f1 - 0.5, x_steps[0], f1 - 0.5) context.close_path() From f167416d2354c2e155419eb0b51e3b57a0670b2c Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sat, 15 Dec 2018 08:38:20 +1000 Subject: [PATCH 0827/1316] melddoc: Assume that unknown content types are text This seems wild... and it kind of is... but it also removes a platform-specific check and handles situations like e.g., opening an unsaved buffer. --- meld/melddoc.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meld/melddoc.py b/meld/melddoc.py index 4268f10d..0207940e 100644 --- a/meld/melddoc.py +++ b/meld/melddoc.py @@ -146,8 +146,9 @@ def open_cb(source, result, *data): elif file_type == Gio.FileType.REGULAR: content_type = info.get_content_type() # FIXME: Content types are broken on Windows with current gio - if Gio.content_type_is_a(content_type, "text/plain") or \ - sys.platform == "win32": + # If we can't access a content type, assume it's text. + if not content_type or Gio.content_type_is_a( + content_type, "text/plain"): if settings.get_boolean('use-system-editor'): gfile = Gio.File.new_for_path(path) if sys.platform == "win32": From 0abe68c38c142494efa89ac7d54486f62feae7d5 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Wed, 6 Feb 2019 06:59:53 +1000 Subject: [PATCH 0828/1316] filediff: Remove a queue_draw() from the after-text-modified handler I can't think of a reason why we'd need this, and I can't make it break anything in testing. --- meld/filediff.py | 1 - 1 file changed, 1 deletion(-) diff --git a/meld/filediff.py b/meld/filediff.py index b178c302..4b62a46a 100644 --- a/meld/filediff.py +++ b/meld/filediff.py @@ -898,7 +898,6 @@ def _after_text_modified(self, buf, startline, sizechange): if focused_pane != -1: self.on_cursor_position_changed(self.textbuffer[focused_pane], None, True) - self.queue_draw() def _filter_text(self, txt, buf, txt_start_iter, txt_end_iter): dimmed_tag = buf.get_tag_table().lookup("dimmed") From 9a39c9891383f36171da8d7dc6dbd60f754a3e52 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Fri, 8 Feb 2019 08:49:11 +1000 Subject: [PATCH 0829/1316] ui: Add status bar to Glade catalog --- meld/ui/catalog.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meld/ui/catalog.xml b/meld/ui/catalog.xml index 8941d7bf..11899340 100644 --- a/meld/ui/catalog.xml +++ b/meld/ui/catalog.xml @@ -12,6 +12,7 @@ + @@ -22,6 +23,7 @@ + From 87ddf8a42b15033a2eb3975471bebe58d7d644f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Urban=C4=8Di=C4=8D?= Date: Tue, 12 Feb 2019 12:34:54 +0100 Subject: [PATCH 0830/1316] Updated Slovenian translation --- po/sl.po | 2051 +++++++++++++++++++++++++++--------------------------- 1 file changed, 1027 insertions(+), 1024 deletions(-) diff --git a/po/sl.po b/po/sl.po index 92f346e2..ea318357 100644 --- a/po/sl.po +++ b/po/sl.po @@ -2,14 +2,14 @@ # Copyright (C) 2009 meld's COPYRIGHT HOLDER # This file is distributed under the same license as the meld package. # -# Matej Urbančič , 2009–2018. +# Matej Urbančič , 2009–2019. # msgid "" msgstr "" "Project-Id-Version: meld master\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n" -"POT-Creation-Date: 2018-10-13 21:05+0000\n" -"PO-Revision-Date: 2018-10-23 15:15+0200\n" +"POT-Creation-Date: 2019-01-25 12:24+0000\n" +"PO-Revision-Date: 2019-01-26 15:50+0100\n" "Last-Translator: Matej Urbančič \n" "Language-Team: Slovenian GNOME Translation Team \n" "Language: sl_SI\n" @@ -21,16 +21,16 @@ msgstr "" "X-Poedit-SourceCharset: utf-8\n" "X-Generator: Poedit 2.1.1\n" -#: ../bin/meld:194 +#: ../bin/meld:190 msgid "Cannot import: " msgstr "Ni mogoče uvoziti:" -#: ../bin/meld:197 +#: ../bin/meld:193 #, c-format msgid "Meld requires %s or higher." msgstr "Program Meld zahteva najmanj različico %s." -#: ../bin/meld:243 +#: ../bin/meld:262 #, c-format msgid "" "Couldn’t load Meld-specific CSS (%s)\n" @@ -40,7 +40,8 @@ msgstr "" "%s" #: ../data/org.gnome.meld.desktop.in.h:1 -#: ../data/org.gnome.meld.appdata.xml.in.h:1 ../data/ui/meldapp.ui.h:1 +#: ../data/org.gnome.meld.appdata.xml.in.h:1 +#: ../meld/resources/ui/appwindow.ui.h:1 msgid "Meld" msgstr "Meld" @@ -105,28 +106,10 @@ msgid "Default window fullscreen state" msgstr "Postavi okno v celozaslonski način." #: ../data/org.gnome.meld.gschema.xml.h:5 -msgid "Show toolbar" -msgstr "Pokaži orodno vrstico" - -#: ../data/org.gnome.meld.gschema.xml.h:6 -#, fuzzy -msgid "If true, the window toolbar is visible." -msgstr "Ali naj bo orodna vrstica vidna." - -#: ../data/org.gnome.meld.gschema.xml.h:7 -msgid "Show statusbar" -msgstr "Pokaži vrstico stanja" - -#: ../data/org.gnome.meld.gschema.xml.h:8 -#, fuzzy -msgid "If true, the window statusbar is visible." -msgstr "Vrstica stanja je vidna" - -#: ../data/org.gnome.meld.gschema.xml.h:9 msgid "Additional automatically detected text encodings" msgstr "Dodatna samodejno zaznana kodiranja" -#: ../data/org.gnome.meld.gschema.xml.h:10 +#: ../data/org.gnome.meld.gschema.xml.h:6 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 " @@ -134,173 +117,176 @@ msgid "" "may also be tried, depending on the user’s locale." msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:11 +#: ../data/org.gnome.meld.gschema.xml.h:7 #, fuzzy msgid "Width of an indentation step" msgstr "Število presledkov posamezne ravni zamikanja" -#: ../data/org.gnome.meld.gschema.xml.h:12 +#: ../data/org.gnome.meld.gschema.xml.h:8 #, fuzzy msgid "The number of spaces to use for a single indent step" msgstr "Število presledkov za vsak korak zamika" -#: ../data/org.gnome.meld.gschema.xml.h:13 +#: ../data/org.gnome.meld.gschema.xml.h:9 #, fuzzy msgid "Whether to indent using spaces or tabs" msgstr "Ali naj gedit vstavlja presledke namesto zamikov (tabulatorjev)." -#: ../data/org.gnome.meld.gschema.xml.h:14 +#: ../data/org.gnome.meld.gschema.xml.h:10 msgid "If true, any new indentation will use spaces instead of tabs." msgstr "" "Izbrana možnost določa, da bo vsako novo zamikanje uporabljalo presledke " "namesto tabulatorja." -#: ../data/org.gnome.meld.gschema.xml.h:15 +#: ../data/org.gnome.meld.gschema.xml.h:11 +#: ../meld/resources/ui/statusbar-menu.ui.h:1 msgid "Show line numbers" msgstr "Pokaži številke vrstic" -#: ../data/org.gnome.meld.gschema.xml.h:16 +#: ../data/org.gnome.meld.gschema.xml.h:12 msgid "If true, line numbers will be shown in the gutter of file comparisons." msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:17 +#: ../data/org.gnome.meld.gschema.xml.h:13 msgid "Highlight syntax" msgstr "Poudarjanje skladnje" -#: ../data/org.gnome.meld.gschema.xml.h:18 +#: ../data/org.gnome.meld.gschema.xml.h:14 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.h:19 +#: ../data/org.gnome.meld.gschema.xml.h:15 #, fuzzy msgid "Color scheme to use for syntax highlighting" msgstr "Ime barvne sheme gtksourceview za poudarjanje skladnje." -#: ../data/org.gnome.meld.gschema.xml.h:20 +#: ../data/org.gnome.meld.gschema.xml.h:16 msgid "Used by GtkSourceView to determine colors for syntax highlighting" msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:21 +#: ../data/org.gnome.meld.gschema.xml.h:17 msgid "Displayed whitespace" msgstr "Vidni presledni znaki" -#: ../data/org.gnome.meld.gschema.xml.h:22 +#: ../data/org.gnome.meld.gschema.xml.h:18 msgid "" "Selector for individual whitespace character types to be shown. Possible " "values are 'space', 'tab', 'newline' and 'nbsp'." msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:23 +#: ../data/org.gnome.meld.gschema.xml.h:19 msgid "Wrap mode" msgstr "Način preloma" -#: ../data/org.gnome.meld.gschema.xml.h:24 +#: ../data/org.gnome.meld.gschema.xml.h:20 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.h:25 +#: ../data/org.gnome.meld.gschema.xml.h:21 +#: ../meld/resources/ui/statusbar-menu.ui.h:3 msgid "Highlight current line" msgstr "Poudari trenutno vrstico" -#: ../data/org.gnome.meld.gschema.xml.h:26 +#: ../data/org.gnome.meld.gschema.xml.h:22 msgid "" "If true, the line containing the cursor will be highlighted in file " "comparisons." msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:27 +#: ../data/org.gnome.meld.gschema.xml.h:23 #, fuzzy msgid "Use the system default monospace font" msgstr "Ali naj se uporabi privzeta sistemska pisava enake širine znakov" -#: ../data/org.gnome.meld.gschema.xml.h:28 +#: ../data/org.gnome.meld.gschema.xml.h:24 msgid "" "If false, custom-font will be used instead of the system monospace font." msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:29 +#: ../data/org.gnome.meld.gschema.xml.h:25 msgid "Custom font" msgstr "Pisava po meri" -#: ../data/org.gnome.meld.gschema.xml.h:30 +#: ../data/org.gnome.meld.gschema.xml.h:26 msgid "" "The custom font to use, stored as a string and parsed as a Pango font " "description." msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:31 +#: ../data/org.gnome.meld.gschema.xml.h:27 msgid "Ignore blank lines when comparing files" msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:32 +#: ../data/org.gnome.meld.gschema.xml.h:28 msgid "" "If true, blank lines will be trimmed when highlighting changes between files." msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:33 +#: ../data/org.gnome.meld.gschema.xml.h:29 #, fuzzy msgid "Use the system default editor" msgstr "Uporabi _privzet sistemski urejevalnik besedil." -#: ../data/org.gnome.meld.gschema.xml.h:34 +#: ../data/org.gnome.meld.gschema.xml.h:30 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.h:35 +#: ../data/org.gnome.meld.gschema.xml.h:31 #, fuzzy msgid "The custom editor launch command" msgstr "Ukaz za zagon urejevalnika: " -#: ../data/org.gnome.meld.gschema.xml.h:36 +#: ../data/org.gnome.meld.gschema.xml.h:32 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.h:37 +#: ../data/org.gnome.meld.gschema.xml.h:33 msgid "Columns to display" msgstr "Prikazani stolpci" -#: ../data/org.gnome.meld.gschema.xml.h:38 +#: ../data/org.gnome.meld.gschema.xml.h:34 msgid "" "List of column names in folder comparison and whether they should be " "displayed." msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:39 ../data/ui/preferences.ui.h:25 +#: ../data/org.gnome.meld.gschema.xml.h:35 +#: ../meld/resources/ui/preferences.ui.h:25 msgid "Ignore symbolic links" msgstr "Prezri simbolne povezave" -#: ../data/org.gnome.meld.gschema.xml.h:40 +#: ../data/org.gnome.meld.gschema.xml.h:36 msgid "" "If true, folder comparisons do not follow symbolic links when traversing the " "folder tree." msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:41 +#: ../data/org.gnome.meld.gschema.xml.h:37 msgid "Use shallow comparison" msgstr "Uporabi grobo primerjavo" -#: ../data/org.gnome.meld.gschema.xml.h:42 +#: ../data/org.gnome.meld.gschema.xml.h:38 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.h:43 +#: ../data/org.gnome.meld.gschema.xml.h:39 #, fuzzy msgid "File timestamp resolution" msgstr "Ločljivost časovnega _žiga:" -#: ../data/org.gnome.meld.gschema.xml.h:44 +#: ../data/org.gnome.meld.gschema.xml.h:40 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 " @@ -308,129 +294,127 @@ msgid "" "resolution." msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:45 ../data/ui/preferences.ui.h:22 +#: ../data/org.gnome.meld.gschema.xml.h:41 +#: ../meld/resources/ui/preferences.ui.h:22 msgid "Apply text filters during folder comparisons" msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:46 +#: ../data/org.gnome.meld.gschema.xml.h:42 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.h:47 +#: ../data/org.gnome.meld.gschema.xml.h:43 msgid "File status filters" msgstr "Filtri stanja datotek" -#: ../data/org.gnome.meld.gschema.xml.h:48 +#: ../data/org.gnome.meld.gschema.xml.h:44 msgid "List of statuses used to filter visible files in folder comparison." msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:49 +#: ../data/org.gnome.meld.gschema.xml.h:45 #, fuzzy msgid "Show the version control console output" msgstr "Pokaži/Skrij odvod konzole" -#: ../data/org.gnome.meld.gschema.xml.h:50 +#: ../data/org.gnome.meld.gschema.xml.h:46 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.h:51 +#: ../data/org.gnome.meld.gschema.xml.h:47 #, fuzzy msgid "Version control pane position" msgstr "Nadzor različic" -#: ../data/org.gnome.meld.gschema.xml.h:52 +#: ../data/org.gnome.meld.gschema.xml.h:48 msgid "" "This is the height of the main version control tree when the console pane is " "shown." msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:53 +#: ../data/org.gnome.meld.gschema.xml.h:49 msgid "Present version comparisons as left-local/right-remote" msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:54 +#: ../data/org.gnome.meld.gschema.xml.h:50 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.h:55 +#: ../data/org.gnome.meld.gschema.xml.h:51 #, fuzzy msgid "Order for files in three-way version control merge comparisons" msgstr "Zagon primerjave nadzora različic" -#: ../data/org.gnome.meld.gschema.xml.h:56 +#: ../data/org.gnome.meld.gschema.xml.h:52 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.h:57 +#: ../data/org.gnome.meld.gschema.xml.h:53 #, fuzzy msgid "Show margin in commit message editor" msgstr "Pokaži desni rob v pogledu sporočil uveljavitev" -#: ../data/org.gnome.meld.gschema.xml.h:58 +#: ../data/org.gnome.meld.gschema.xml.h:54 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.h:59 +#: ../data/org.gnome.meld.gschema.xml.h:55 #, fuzzy msgid "Margin column in commit message editor" msgstr "Pokaži desni rob v pogledu sporočil uveljavitev" -#: ../data/org.gnome.meld.gschema.xml.h:60 +#: ../data/org.gnome.meld.gschema.xml.h:56 msgid "" "The column at which to show the margin in the version control commit message " "editor." msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:61 +#: ../data/org.gnome.meld.gschema.xml.h:57 msgid "Automatically hard-wrap commit messages" msgstr "Samodejno na silo prelomi sporočila uveljavitve" -#: ../data/org.gnome.meld.gschema.xml.h:62 +#: ../data/org.gnome.meld.gschema.xml.h:58 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.h:63 -#, fuzzy +#: ../data/org.gnome.meld.gschema.xml.h:59 msgid "Version control status filters" -msgstr "Filtri stanja datotek" +msgstr "Filtri nadzora različic" -#: ../data/org.gnome.meld.gschema.xml.h:64 +#: ../data/org.gnome.meld.gschema.xml.h:60 msgid "" "List of statuses used to filter visible files in version control comparison." msgstr "" -#: ../data/org.gnome.meld.gschema.xml.h:65 -#, fuzzy +#: ../data/org.gnome.meld.gschema.xml.h:61 msgid "Filename-based filters" -msgstr "Datotečni filtri" +msgstr "Filtri poimenovanja datotek" -#: ../data/org.gnome.meld.gschema.xml.h:66 +#: ../data/org.gnome.meld.gschema.xml.h:62 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.h:67 -#, fuzzy +#: ../data/org.gnome.meld.gschema.xml.h:63 msgid "Text-based filters" msgstr "Filtri besedila" -#: ../data/org.gnome.meld.gschema.xml.h:68 +#: ../data/org.gnome.meld.gschema.xml.h:64 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, " @@ -438,1188 +422,1204 @@ msgid "" msgstr "" #: ../data/styles/meld-base.xml.h:1 -#, fuzzy msgid "Meld base scheme" -msgstr "SHEMA" +msgstr "Osnovna shema" #: ../data/styles/meld-base.xml.h:2 -#, fuzzy msgid "Base color scheme for Meld highlighting" -msgstr "Ime barvne sheme gtksourceview za poudarjanje skladnje." +msgstr "Osnovna barvna shema za poudarjanje skladnje" #: ../data/styles/meld-dark.xml.h:1 -#, fuzzy msgid "Meld dark scheme" -msgstr "Meld" +msgstr "Temna shema" #: ../data/styles/meld-dark.xml.h:2 -#, fuzzy msgid "Dark color scheme for Meld highlighting" -msgstr "Temna barvna shema z barvno paleto tango" +msgstr "Temna barvna shema za poudarjanje skladnje" -#: ../data/ui/application.ui.h:1 -msgid "About Meld" -msgstr "O programu" +#: ../meld/resources/gtk/help-overlay.ui.h:1 +msgctxt "shortcut window" +msgid "General" +msgstr "Splošno" -#: ../data/ui/application.ui.h:2 -msgid "" -"Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2017 Kai Willadsen" -msgstr "" -"Avtorske pravice © 2002-2009 Stephen Kennedy\n" -"Avtorske pravice © 2009-2018 Kai Willadsen" +#: ../meld/resources/gtk/help-overlay.ui.h:2 +msgctxt "shortcut window" +msgid "New comparison" +msgstr "Nova primerjava" -#: ../data/ui/application.ui.h:4 -msgid "Website" -msgstr "Spletišče" +#: ../meld/resources/gtk/help-overlay.ui.h:3 +msgctxt "shortcut window" +msgid "Close a comparison" +msgstr "Zapri primerjavo" -#: ../data/ui/application.ui.h:5 -msgid "translator-credits" -msgstr "Matej Urbančič " +#: ../meld/resources/gtk/help-overlay.ui.h:4 +msgctxt "shortcut window" +msgid "Quit Meld" +msgstr "Končaj program" -#: ../data/ui/application.ui.h:6 -msgid "_Preferences" -msgstr "_Možnosti" +#: ../meld/resources/gtk/help-overlay.ui.h:5 +msgctxt "shortcut window" +msgid "Stop the current action" +msgstr "Ustavi trenutno dejanje" -#: ../data/ui/application.ui.h:7 -msgid "_Help" -msgstr "Pomo_č" +#: ../meld/resources/gtk/help-overlay.ui.h:6 +msgctxt "shortcut window" +msgid "Refresh comparison" +msgstr "Osveži primerjavo" -#: ../data/ui/application.ui.h:8 -msgid "Keyboard Shortcuts" -msgstr "Tipkovne bližnjice" +#: ../meld/resources/gtk/help-overlay.ui.h:7 +msgctxt "shortcut window" +msgid "Fullscreen" +msgstr "Celozaslonski način" -#: ../data/ui/application.ui.h:9 -msgid "_About" -msgstr "_O programu" +#: ../meld/resources/gtk/help-overlay.ui.h:8 +msgctxt "shortcut window" +msgid "Tabs" +msgstr "Zavihki" -#: ../data/ui/application.ui.h:10 -msgid "_Quit" -msgstr "_Končaj" +#: ../meld/resources/gtk/help-overlay.ui.h:9 +msgctxt "shortcut window" +msgid "Go to previous tab" +msgstr "Skoči na predhodni zavihek" -#: ../data/ui/dirdiff.ui.h:1 ../data/ui/vcview.ui.h:1 -msgid "_Compare" -msgstr "_Primerjava" +#: ../meld/resources/gtk/help-overlay.ui.h:10 +msgctxt "shortcut window" +msgid "Go to next tab" +msgstr "Skoči na naslednji zavihek" -#: ../data/ui/dirdiff.ui.h:2 ../data/ui/vcview.ui.h:2 -msgid "Compare selected files" -msgstr "Primerjajo izbrane datoteke" +#: ../meld/resources/gtk/help-overlay.ui.h:11 +msgctxt "shortcut window" +msgid "Switch to tab" +msgstr "Preklopi na zavihek" -#: ../data/ui/dirdiff.ui.h:3 -msgid "Collapse Recursively" -msgstr "" +#: ../meld/resources/gtk/help-overlay.ui.h:12 +msgctxt "shortcut window" +msgid "Move tab left" +msgstr "Premakni zavihek levo" -#: ../data/ui/dirdiff.ui.h:4 -#, fuzzy -#| msgid "Remove folder and all its files?" -msgid "Collapse selected folder and all subfolders" -msgstr "Ali želite izbrisati mapo in vse njene datoteke?" +#: ../meld/resources/gtk/help-overlay.ui.h:13 +msgctxt "shortcut window" +msgid "Move tab right" +msgstr "Premakni zavihek desno" -#: ../data/ui/dirdiff.ui.h:5 -msgid "Expand Recursively" -msgstr "" +#: ../meld/resources/gtk/help-overlay.ui.h:14 +msgctxt "shortcut window" +msgid "Changes" +msgstr "Spremembe" -#: ../data/ui/dirdiff.ui.h:6 -#, fuzzy -#| msgid "Remove folder and all its files?" -msgid "Expand selected folder and all subfolders" -msgstr "Ali želite izbrisati mapo in vse njene datoteke?" +#: ../meld/resources/gtk/help-overlay.ui.h:15 +msgctxt "shortcut window" +msgid "Go to previous change" +msgstr "Skoči na predhodno spremembo" -#: ../data/ui/dirdiff.ui.h:7 -msgid "Copy to _Left" -msgstr "Kopiraj na _levo" +#: ../meld/resources/gtk/help-overlay.ui.h:16 +msgctxt "shortcut window" +msgid "Go to next change" +msgstr "Skoči na naslednjo spremembo" -#: ../data/ui/dirdiff.ui.h:8 -msgid "Copy to left" -msgstr "Kopiraj na levo" +#: ../meld/resources/gtk/help-overlay.ui.h:17 +msgctxt "shortcut window" +msgid "Editing" +msgstr "Urejanje" -#: ../data/ui/dirdiff.ui.h:9 -msgid "Copy to _Right" -msgstr "Kopiraj na _desno" +#: ../meld/resources/gtk/help-overlay.ui.h:18 +msgctxt "shortcut window" +msgid "Undo" +msgstr "Razveljavi" -#: ../data/ui/dirdiff.ui.h:10 -msgid "Copy to right" -msgstr "Kopiraj na desno" +#: ../meld/resources/gtk/help-overlay.ui.h:19 +msgctxt "shortcut window" +msgid "Redo" +msgstr "Ponovi" -#: ../data/ui/dirdiff.ui.h:11 -msgid "Delete selected" -msgstr "Izbriši izbor" +#: ../meld/resources/gtk/help-overlay.ui.h:20 +msgctxt "shortcut window" +msgid "Cut" +msgstr "Izreži" -#: ../data/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:920 ../meld/filediff.py:1489 -msgid "Hide" -msgstr "Skrij" +#: ../meld/resources/gtk/help-overlay.ui.h:21 +msgctxt "shortcut window" +msgid "Copy" +msgstr "Kopiraj" -#: ../data/ui/dirdiff.ui.h:13 -msgid "Hide selected" -msgstr "Skrij izbrano" +#: ../meld/resources/gtk/help-overlay.ui.h:22 +msgctxt "shortcut window" +msgid "Paste" +msgstr "Prilepi" -#: ../data/ui/dirdiff.ui.h:14 -msgid "Ignore Filename Case" -msgstr "Prezri velikost črk imen datotek" +#: ../meld/resources/gtk/help-overlay.ui.h:23 +msgctxt "shortcut window" +msgid "Find" +msgstr "Najdi" -#: ../data/ui/dirdiff.ui.h:15 -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." +#: ../meld/resources/gtk/help-overlay.ui.h:24 +msgctxt "shortcut window" +msgid "Find Next" +msgstr "Najdi naslednje" -#: ../data/ui/dirdiff.ui.h:16 -msgid "Same" -msgstr "Enako" +#: ../meld/resources/gtk/help-overlay.ui.h:25 +msgctxt "shortcut window" +msgid "Find Previous" +msgstr "Najdi predhodno" -#: ../data/ui/dirdiff.ui.h:17 -msgid "Show identical" -msgstr "Pokaži enako" +#: ../meld/resources/gtk/help-overlay.ui.h:26 +msgctxt "shortcut window" +msgid "Replace" +msgstr "Zamenjaj" -#: ../data/ui/dirdiff.ui.h:18 -msgid "New" -msgstr "Novo" +#: ../meld/resources/gtk/help-overlay.ui.h:27 +msgctxt "shortcut window" +msgid "File comparison" +msgstr "Primerjava datotek" -#: ../data/ui/dirdiff.ui.h:19 -msgid "Show new" -msgstr "Pokaži novejše" +#: ../meld/resources/gtk/help-overlay.ui.h:28 +msgctxt "shortcut window" +msgid "Save current file" +msgstr "Shrani trenutno datoteko" -#: ../data/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:76 -msgid "Modified" -msgstr "Spremenjeno" +#: ../meld/resources/gtk/help-overlay.ui.h:29 +msgctxt "shortcut window" +msgid "Save current file to new path" +msgstr "Shrani trenutni izbor kot novo prednastavitev" -#: ../data/ui/dirdiff.ui.h:21 -msgid "Show modified" -msgstr "Pokaži spremenjeno" +#: ../meld/resources/gtk/help-overlay.ui.h:30 +msgctxt "shortcut window" +msgid "Save all files in comparison" +msgstr "Shrani vse datoteke trenutne primerjave" -#: ../data/ui/dirdiff.ui.h:22 -msgid "Filters" -msgstr "Filtri" +#: ../meld/resources/gtk/help-overlay.ui.h:31 +msgctxt "shortcut window" +msgid "Previous conflict" +msgstr "Predhodni spor" -#: ../data/ui/dirdiff.ui.h:23 -msgid "Set active filters" -msgstr "Določi dejavne filtre" +#: ../meld/resources/gtk/help-overlay.ui.h:32 +msgctxt "shortcut window" +msgid "Next conflict" +msgstr "Naslednji spor" + +#: ../meld/resources/gtk/help-overlay.ui.h:33 +msgctxt "shortcut window" +msgid "Push change to left" +msgstr "Potisni trenutne spremembe na levo" + +#: ../meld/resources/gtk/help-overlay.ui.h:34 +msgctxt "shortcut window" +msgid "Push change to right" +msgstr "Potisni trenutne spremembe na desno" + +#: ../meld/resources/gtk/help-overlay.ui.h:35 +msgctxt "shortcut window" +msgid "Pull change from left" +msgstr "Potegni spremembe z leve" + +#: ../meld/resources/gtk/help-overlay.ui.h:36 +msgctxt "shortcut window" +msgid "Pull change from right" +msgstr "Potegni spremembe z desne" + +#: ../meld/resources/gtk/help-overlay.ui.h:37 +msgctxt "shortcut window" +msgid "Copy change above left" +msgstr "Kopiraj spremembe nad levi del" + +#: ../meld/resources/gtk/help-overlay.ui.h:38 +msgctxt "shortcut window" +msgid "Copy change below left" +msgstr "Kopiraj spremembe pod levi del" + +#: ../meld/resources/gtk/help-overlay.ui.h:39 +msgctxt "shortcut window" +msgid "Copy change above right" +msgstr "Kopiraj spremembe nad desni del" + +#: ../meld/resources/gtk/help-overlay.ui.h:40 +msgctxt "shortcut window" +msgid "Copy change below right" +msgstr "Kopiraj spremembe pod desni del" + +#: ../meld/resources/gtk/help-overlay.ui.h:41 +msgctxt "shortcut window" +msgid "Delete change" +msgstr "Izbriši spremembo" + +#: ../meld/resources/gtk/help-overlay.ui.h:42 +msgctxt "shortcut window" +msgid "Previous comparison pane" +msgstr "Predhodno okno primerjave" + +#: ../meld/resources/gtk/help-overlay.ui.h:43 +msgctxt "shortcut window" +msgid "Next comparison pane" +msgstr "Naslednje okno primerjave" + +#: ../meld/resources/gtk/help-overlay.ui.h:44 +msgctxt "shortcut window" +msgid "Folder comparison" +msgstr "Primerjava map" + +#: ../meld/resources/gtk/help-overlay.ui.h:45 +msgctxt "shortcut window" +msgid "Copy to left" +msgstr "Kopiraj na levo" + +#: ../meld/resources/gtk/help-overlay.ui.h:46 +msgctxt "shortcut window" +msgid "Copy to right" +msgstr "Kopiraj na desno" + +#: ../meld/resources/gtk/help-overlay.ui.h:47 +msgctxt "shortcut window" +msgid "Version control comparison" +msgstr "Primerjava nadzora različic" + +#: ../meld/resources/gtk/help-overlay.ui.h:48 +msgctxt "shortcut window" +msgid "Commit to version control" +msgstr "Uveljavi spremembe v sistem za nadzor različic" + +#: ../meld/resources/gtk/help-overlay.ui.h:49 +msgctxt "shortcut window" +msgid "Show/hide console output" +msgstr "Pokaži/Skrij odvod konzole" + +#: ../meld/resources/gtk/menus.ui.h:1 +msgid "_Preferences" +msgstr "_Možnosti" + +#: ../meld/resources/gtk/menus.ui.h:2 +msgid "_Help" +msgstr "Pomo_č" + +#: ../meld/resources/gtk/menus.ui.h:3 +msgid "Keyboard Shortcuts" +msgstr "Tipkovne bližnjice" + +#: ../meld/resources/gtk/menus.ui.h:4 +msgid "_About" +msgstr "_O programu" + +#: ../meld/resources/gtk/menus.ui.h:5 +msgid "_Quit" +msgstr "_Končaj" + +#: ../meld/resources/ui/about-dialog.ui.h:1 +msgid "About Meld" +msgstr "O programu" + +#: ../meld/resources/ui/about-dialog.ui.h:2 +msgid "" +"Copyright © 2002-2009 Stephen Kennedy\n" +"Copyright © 2009-2017 Kai Willadsen" +msgstr "" +"Avtorske pravice © 2002-2009 Stephen Kennedy\n" +"Avtorske pravice © 2009-2018 Kai Willadsen" -#: ../data/ui/EditableList.ui.h:1 -msgid "Editable List" -msgstr "Uredljiv seznam" +#: ../meld/resources/ui/about-dialog.ui.h:4 +msgid "Website" +msgstr "Spletišče" + +#: ../meld/resources/ui/about-dialog.ui.h:5 +msgid "translator-credits" +msgstr "Matej Urbančič " -#: ../data/ui/EditableList.ui.h:2 +#: ../meld/resources/ui/column-list.ui.h:1 +#: ../meld/resources/ui/filter-list.ui.h:1 msgid "Active" msgstr "Dejavno" -#: ../data/ui/EditableList.ui.h:3 +#: ../meld/resources/ui/column-list.ui.h:2 msgid "Column Name" msgstr "Ime stolpca" -#: ../data/ui/EditableList.ui.h:4 ../data/ui/vcview.ui.h:9 -msgid "_Add" -msgstr "_Dodaj" - -#: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11 -#: ../meld/vcview.py:680 +#: ../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 msgid "_Remove" msgstr "_Odstrani" -#: ../data/ui/EditableList.ui.h:6 +#: ../meld/resources/ui/column-list.ui.h:4 +#: ../meld/resources/ui/filter-list.ui.h:8 msgid "Move item up" msgstr "Premakni predmet navzgor" -#: ../data/ui/EditableList.ui.h:7 +#: ../meld/resources/ui/column-list.ui.h:5 +#: ../meld/resources/ui/filter-list.ui.h:9 msgid "Move _Up" msgstr "Premakni _navzgor" -#: ../data/ui/EditableList.ui.h:8 +#: ../meld/resources/ui/column-list.ui.h:6 +#: ../meld/resources/ui/filter-list.ui.h:10 msgid "Move item down" msgstr "Premakni predmet navzdol" -#: ../data/ui/EditableList.ui.h:9 +#: ../meld/resources/ui/column-list.ui.h:7 +#: ../meld/resources/ui/filter-list.ui.h:11 msgid "Move _Down" msgstr "Premakni navz_dol" -#. Create icon and filename CellRenderer -#: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35 -#: ../meld/dirdiff.py:416 -msgid "Name" -msgstr "Ime" +#: ../meld/resources/ui/commit-dialog.ui.h:1 +msgid "Commit" +msgstr "Uveljavi" -#: ../data/ui/EditableList.ui.h:11 -msgid "Pattern" -msgstr "Vzorec" +#: ../meld/resources/ui/commit-dialog.ui.h:2 +msgid "Commit Files" +msgstr "Uveljavi datoteke" -#: ../data/ui/EditableList.ui.h:12 -msgid "Add new filter" -msgstr "Dodaj nov filter" +#: ../meld/resources/ui/commit-dialog.ui.h:3 +msgid "Log Message" +msgstr "Sporočilo beleženja" -#: ../data/ui/EditableList.ui.h:13 -msgid "Remove selected filter" -msgstr "Odstrani izbrani filter" +#: ../meld/resources/ui/commit-dialog.ui.h:4 +msgid "Previous logs:" +msgstr "Predhodni dnevniki:" + +#: ../meld/resources/ui/commit-dialog.ui.h:5 +msgid "Co_mmit" +msgstr "_Uveljavi" + +#: ../meld/resources/ui/dirdiff.ui.h:1 ../meld/resources/ui/vcview.ui.h:1 +msgid "_Compare" +msgstr "_Primerjava" + +#: ../meld/resources/ui/dirdiff.ui.h:2 ../meld/resources/ui/vcview.ui.h:2 +msgid "Compare selected files" +msgstr "Primerjajo izbrane datoteke" + +#: ../meld/resources/ui/dirdiff.ui.h:3 +msgid "Collapse Recursively" +msgstr "" + +#: ../meld/resources/ui/dirdiff.ui.h:4 +#, fuzzy +#| msgid "Remove folder and all its files?" +msgid "Collapse selected folder and all subfolders" +msgstr "Ali želite izbrisati mapo in vse njene datoteke?" + +#: ../meld/resources/ui/dirdiff.ui.h:5 +msgid "Expand Recursively" +msgstr "" + +#: ../meld/resources/ui/dirdiff.ui.h:6 +#, fuzzy +#| msgid "Remove folder and all its files?" +msgid "Expand selected folder and all subfolders" +msgstr "Ali želite izbrisati mapo in vse njene datoteke?" + +#: ../meld/resources/ui/dirdiff.ui.h:7 +msgid "Copy to _Left" +msgstr "Kopiraj na _levo" + +#: ../meld/resources/ui/dirdiff.ui.h:8 +msgid "Copy to left" +msgstr "Kopiraj na levo" + +#: ../meld/resources/ui/dirdiff.ui.h:9 +msgid "Copy to _Right" +msgstr "Kopiraj na _desno" + +#: ../meld/resources/ui/dirdiff.ui.h:10 +msgid "Copy to right" +msgstr "Kopiraj na desno" + +#: ../meld/resources/ui/dirdiff.ui.h:11 +msgid "Delete selected" +msgstr "Izbriši izbor" + +#: ../meld/resources/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:959 +#: ../meld/filediff.py:1601 +msgid "Hide" +msgstr "Skrij" + +#: ../meld/resources/ui/dirdiff.ui.h:13 +msgid "Hide selected" +msgstr "Skrij izbrano" + +#: ../meld/resources/ui/dirdiff.ui.h:14 +msgid "Ignore Filename Case" +msgstr "Prezri velikost črk imen datotek" + +#: ../meld/resources/ui/dirdiff.ui.h:15 +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." + +#: ../meld/resources/ui/dirdiff.ui.h:16 +msgid "Same" +msgstr "Enako" -#: ../data/ui/encoding-selector.ui.h:1 +#: ../meld/resources/ui/dirdiff.ui.h:17 +msgid "Show identical" +msgstr "Pokaži enako" + +#: ../meld/resources/ui/dirdiff.ui.h:18 +msgid "New" +msgstr "Novo" + +#: ../meld/resources/ui/dirdiff.ui.h:19 +msgid "Show new" +msgstr "Pokaži novejše" + +#: ../meld/resources/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:77 +msgid "Modified" +msgstr "Spremenjeno" + +#: ../meld/resources/ui/dirdiff.ui.h:21 +msgid "Show modified" +msgstr "Pokaži spremenjeno" + +#: ../meld/resources/ui/dirdiff.ui.h:22 +msgid "Filters" +msgstr "Filtri" + +#: ../meld/resources/ui/dirdiff.ui.h:23 +msgid "Set active filters" +msgstr "Določi dejavne filtre" + +#: ../meld/resources/ui/encoding-selector.ui.h:1 msgid "Search text encoding…" msgstr "" -#: ../data/ui/filediff.ui.h:1 +#: ../meld/resources/ui/filediff.ui.h:1 msgid "Format as Patch…" msgstr "Zapiši kot programski popravek ..." -#: ../data/ui/filediff.ui.h:2 +#: ../meld/resources/ui/filediff.ui.h:2 msgid "Create a patch using differences between files" msgstr "Ustvari popravek z razlikovanjem med datotekami" -#: ../data/ui/filediff.ui.h:3 +#: ../meld/resources/ui/filediff.ui.h:3 msgid "Save A_ll" msgstr "Shrani _vse" -#: ../data/ui/filediff.ui.h:4 +#: ../meld/resources/ui/filediff.ui.h:4 msgid "Save all files in the current comparison" msgstr "Shrani vse datoteke trenutne primerjave" -#: ../data/ui/filediff.ui.h:5 +#: ../meld/resources/ui/filediff.ui.h:5 msgid "Revert files to their saved versions" msgstr "Povrni datoteke na shranjene različice" -#: ../data/ui/filediff.ui.h:6 +#: ../meld/resources/ui/filediff.ui.h:6 msgid "Add Synchronization Point" msgstr "Dodaj točko usklajevanja" -#: ../data/ui/filediff.ui.h:7 +#: ../meld/resources/ui/filediff.ui.h:7 msgid "Add a synchronization point for changes between files" msgstr "" -#: ../data/ui/filediff.ui.h:8 +#: ../meld/resources/ui/filediff.ui.h:8 msgid "Clear Synchronization Points" msgstr "Počisti točke usklajevanja" -#: ../data/ui/filediff.ui.h:9 +#: ../meld/resources/ui/filediff.ui.h:9 msgid "Clear sychronization points for changes between files" msgstr "" -#: ../data/ui/filediff.ui.h:10 +#: ../meld/resources/ui/filediff.ui.h:10 msgid "Previous Conflict" msgstr "Predhodni spor" -#: ../data/ui/filediff.ui.h:11 +#: ../meld/resources/ui/filediff.ui.h:11 msgid "Go to the previous conflict" msgstr "Skoči na predhodni niz v sporu" -#: ../data/ui/filediff.ui.h:12 +#: ../meld/resources/ui/filediff.ui.h:12 msgid "Next Conflict" msgstr "Naslednji spor" -#: ../data/ui/filediff.ui.h:13 +#: ../meld/resources/ui/filediff.ui.h:13 msgid "Go to the next conflict" msgstr "Skoči na naslednji niz v sporu" -#: ../data/ui/filediff.ui.h:14 +#: ../meld/resources/ui/filediff.ui.h:14 msgid "Push to Left" msgstr "Potisni levo" -#: ../data/ui/filediff.ui.h:15 +#: ../meld/resources/ui/filediff.ui.h:15 msgid "Push current change to the left" msgstr "Potisni trenutne spremembe na levo" -#: ../data/ui/filediff.ui.h:16 +#: ../meld/resources/ui/filediff.ui.h:16 msgid "Push to Right" msgstr "Potisni desno" -#: ../data/ui/filediff.ui.h:17 +#: ../meld/resources/ui/filediff.ui.h:17 msgid "Push current change to the right" msgstr "Potisni trenutne spremembe na desno" -#: ../data/ui/filediff.ui.h:18 +#: ../meld/resources/ui/filediff.ui.h:18 msgid "Pull from Left" msgstr "Potegni z leve" -#: ../data/ui/filediff.ui.h:19 +#: ../meld/resources/ui/filediff.ui.h:19 msgid "Pull change from the left" msgstr "Potegni spremembe z leve" -#: ../data/ui/filediff.ui.h:20 +#: ../meld/resources/ui/filediff.ui.h:20 msgid "Pull from Right" msgstr "Potegni z desne" -#: ../data/ui/filediff.ui.h:21 +#: ../meld/resources/ui/filediff.ui.h:21 msgid "Pull change from the right" msgstr "Potegni spremembe z desne" -#: ../data/ui/filediff.ui.h:22 +#: ../meld/resources/ui/filediff.ui.h:22 msgid "Copy Above Left" msgstr "Kopiraj nad levo" -#: ../data/ui/filediff.ui.h:23 +#: ../meld/resources/ui/filediff.ui.h:23 msgid "Copy change above the left chunk" msgstr "Kopiraj spremembe nad levi del" -#: ../data/ui/filediff.ui.h:24 +#: ../meld/resources/ui/filediff.ui.h:24 msgid "Copy Below Left" msgstr "Kopiraj pod levo" -#: ../data/ui/filediff.ui.h:25 +#: ../meld/resources/ui/filediff.ui.h:25 msgid "Copy change below the left chunk" msgstr "Kopiraj spremembe pod levi del" -#: ../data/ui/filediff.ui.h:26 +#: ../meld/resources/ui/filediff.ui.h:26 msgid "Copy Above Right" msgstr "Kopiraj nad desno" -#: ../data/ui/filediff.ui.h:27 +#: ../meld/resources/ui/filediff.ui.h:27 msgid "Copy change above the right chunk" msgstr "Kopiraj spremembe nad desni del" -#: ../data/ui/filediff.ui.h:28 +#: ../meld/resources/ui/filediff.ui.h:28 msgid "Copy Below Right" msgstr "Kopiraj pod desno" -#: ../data/ui/filediff.ui.h:29 +#: ../meld/resources/ui/filediff.ui.h:29 msgid "Copy change below the right chunk" msgstr "Kopiraj spremembe pod desni del" -#: ../data/ui/filediff.ui.h:30 +#: ../meld/resources/ui/filediff.ui.h:30 msgid "Delete" msgstr "Izbriši" -#: ../data/ui/filediff.ui.h:31 +#: ../meld/resources/ui/filediff.ui.h:31 msgid "Delete change" msgstr "Izbriši spremembo" -#: ../data/ui/filediff.ui.h:32 +#: ../meld/resources/ui/filediff.ui.h:32 msgid "Merge All from Left" msgstr "Združi vse spremembe z leve" -#: ../data/ui/filediff.ui.h:33 +#: ../meld/resources/ui/filediff.ui.h:33 msgid "Merge all non-conflicting changes from the left" msgstr "Združi vse spremembe brez sporov z leve" -#: ../data/ui/filediff.ui.h:34 +#: ../meld/resources/ui/filediff.ui.h:34 msgid "Merge All from Right" msgstr "Združi vse spremembe z desne" -#: ../data/ui/filediff.ui.h:35 +#: ../meld/resources/ui/filediff.ui.h:35 msgid "Merge all non-conflicting changes from the right" msgstr "Združi vse spremembe brez sporov z desne" -#: ../data/ui/filediff.ui.h:36 +#: ../meld/resources/ui/filediff.ui.h:36 msgid "Merge All" msgstr "Združi vse" -#: ../data/ui/filediff.ui.h:37 +#: ../meld/resources/ui/filediff.ui.h:37 msgid "Merge all non-conflicting changes from left and right panes" msgstr "Združi vse spremembe brez sporov z leve in z desne" -#: ../data/ui/filediff.ui.h:38 +#: ../meld/resources/ui/filediff.ui.h:38 msgid "Previous Pane" msgstr "Predhodno okno" -#: ../data/ui/filediff.ui.h:39 +#: ../meld/resources/ui/filediff.ui.h:39 msgid "Move keyboard focus to the previous document in this comparison" msgstr "Premakne žarišče tipkovnice na naslednji dokument primerjave" -#: ../data/ui/filediff.ui.h:40 +#: ../meld/resources/ui/filediff.ui.h:40 msgid "Next Pane" msgstr "Naslednje okno" -#: ../data/ui/filediff.ui.h:41 +#: ../meld/resources/ui/filediff.ui.h:41 msgid "Move keyboard focus to the next document in this comparison" msgstr "Premakni dejavnost tipkovnice na naslednji dokument primerjave" -#: ../data/ui/filediff.ui.h:42 +#: ../meld/resources/ui/filediff.ui.h:42 msgid "Lock Scrolling" msgstr "Zakleni drsenje" -#: ../data/ui/filediff.ui.h:43 +#: ../meld/resources/ui/filediff.ui.h:43 msgid "Lock scrolling of all panes" msgstr "Zakleni drsenje vseh pladnjev" -#: ../data/ui/filediff.ui.h:44 -msgid "Save changes to documents before closing?" -msgstr "Ali želite shraniti spremembe dokumenta pred zapiranjem?" +#: ../meld/resources/ui/filediff.ui.h:44 +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 "" +"V datoteko ni mogoče pisati. S klikom na to mesto lahko odklenete datoteko " +"in vsebino spreminjate, vendar pa je treba spremembe shraniti v datoteko z " +"drugim imenom." -#: ../data/ui/filediff.ui.h:45 -msgid "If you don’t save, changes will be permanently lost." -msgstr "V kolikor sprememb ne shranite, bodo te trajno izgubljene." - -#: ../data/ui/filediff.ui.h:46 -msgid "Close _without Saving" -msgstr "Zapri _brez shranjevanja" - -#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:1001 ../meld/filediff.py:1598 -#: ../meld/iohelpers.py:50 ../meld/iohelpers.py:100 -msgid "_Cancel" -msgstr "_Prekliči" - -#: ../data/ui/filediff.ui.h:48 -msgid "_Save" -msgstr "_Shrani" - -#: ../data/ui/filediff.ui.h:49 -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 "" -"V datoteko ni mogoče pisati. S klikom na to mesto lahko odklenete datoteko " -"in vsebino spreminjate, vendar pa je treba spremembe shraniti v datoteko z " -"drugim imenom." - -#: ../data/ui/filediff.ui.h:50 +#: ../meld/resources/ui/filediff.ui.h:45 msgid "File 3" msgstr "Datoteka 3" -#: ../data/ui/filediff.ui.h:51 +#: ../meld/resources/ui/filediff.ui.h:46 msgid "File 2" msgstr "Datoteka 2" -#: ../data/ui/filediff.ui.h:52 +#: ../meld/resources/ui/filediff.ui.h:47 msgid "File 1" msgstr "Datoteka 1" -#: ../data/ui/filediff.ui.h:53 -#, fuzzy -#| msgid "Revert unsaved changes to documents?" -msgid "Discard unsaved changes to documents?" -msgstr "Ali naj se povrnejo neshranjene spremembe dokumentov?" +#. Create icon and filename CellRenderer +#: ../meld/resources/ui/filter-list.ui.h:2 ../meld/resources/ui/vcview.ui.h:30 +#: ../meld/dirdiff.py:455 +msgid "Name" +msgstr "Ime" -#: ../data/ui/filediff.ui.h:54 -#, fuzzy -#| msgid "Changes made to the following documents will be permanently lost:\n" -msgid "Changes made to the following documents will be permanently lost:" -msgstr "Spremembe navedenih dokumentov bodo trajno izgubljene:\n" +#: ../meld/resources/ui/filter-list.ui.h:3 +msgid "Pattern" +msgstr "Vzorec" -#: ../data/ui/filediff.ui.h:55 -msgid "_Discard" -msgstr "_Zavrzi" +#: ../meld/resources/ui/filter-list.ui.h:4 +msgid "Add new filter" +msgstr "Dodaj nov filter" -#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:1002 ../meld/iohelpers.py:101 +#: ../meld/resources/ui/filter-list.ui.h:5 ../meld/resources/ui/vcview.ui.h:9 +msgid "_Add" +msgstr "_Dodaj" + +#: ../meld/resources/ui/filter-list.ui.h:6 +msgid "Remove selected filter" +msgstr "Odstrani izbrani filter" + +#: ../meld/resources/ui/findbar.ui.h:1 ../meld/dirdiff.py:1041 +#: ../meld/iohelpers.py:113 msgid "_Replace" msgstr "_Zamenjaj" -#: ../data/ui/findbar.ui.h:2 +#: ../meld/resources/ui/findbar.ui.h:2 msgid "Replace _All" msgstr "Zamenjaj _vse" -#: ../data/ui/findbar.ui.h:3 +#: ../meld/resources/ui/findbar.ui.h:3 msgid "_Previous" msgstr "_Predhodni" -#: ../data/ui/findbar.ui.h:4 +#: ../meld/resources/ui/findbar.ui.h:4 msgid "_Next" msgstr "_Naslednji" -#: ../data/ui/findbar.ui.h:5 +#: ../meld/resources/ui/findbar.ui.h:5 msgid "Find:" msgstr "Najdi:" -#: ../data/ui/findbar.ui.h:6 +#: ../meld/resources/ui/findbar.ui.h:6 msgid "Replace _with:" msgstr "Zamenjaj _z:" -#: ../data/ui/findbar.ui.h:7 +#: ../meld/resources/ui/findbar.ui.h:7 msgid "_Match case" msgstr "_Upoštevaj velikost črk" -#: ../data/ui/findbar.ui.h:8 +#: ../meld/resources/ui/findbar.ui.h:8 msgid "Who_le word" msgstr "Cele _besede" -#: ../data/ui/findbar.ui.h:9 +#: ../meld/resources/ui/findbar.ui.h:9 msgid "Regular e_xpression" msgstr "_Logični izraz" -#: ../data/ui/findbar.ui.h:10 +#: ../meld/resources/ui/findbar.ui.h:10 msgid "Wrapped" msgstr "Prelomljeno" -#: ../data/ui/language-selector.ui.h:1 +#: ../meld/resources/ui/language-selector.ui.h:1 msgid "Search highlight mode…" msgstr "" -#: ../data/ui/patch-dialog.ui.h:1 +#: ../meld/resources/ui/new-diff-tab.ui.h:1 ../meld/meldwindow.py:532 +#: ../meld/newdifftab.py:53 +msgid "New comparison" +msgstr "Nova primerjava" + +#: ../meld/resources/ui/new-diff-tab.ui.h:2 +msgid "File comparison" +msgstr "Primerjava datotek" + +#: ../meld/resources/ui/new-diff-tab.ui.h:3 +msgid "Directory comparison" +msgstr "Primerjava vsebine map" + +#: ../meld/resources/ui/new-diff-tab.ui.h:4 +msgid "Version control view" +msgstr "Pogled nadzora različic" + +#: ../meld/resources/ui/new-diff-tab.ui.h:5 +msgid "_3-way comparison" +msgstr "_Trojna primerjava" + +#: ../meld/resources/ui/new-diff-tab.ui.h:6 +msgid "Select Third File" +msgstr "Izbor tretje datoteke" + +#: ../meld/resources/ui/new-diff-tab.ui.h:7 +msgid "Select Second File" +msgstr "Izbor druge datoteke" + +#: ../meld/resources/ui/new-diff-tab.ui.h:8 +msgid "Select First File" +msgstr "Izbor prve datoteke" + +#: ../meld/resources/ui/new-diff-tab.ui.h:9 +msgid "Select First Folder" +msgstr "Izbor prve mape" + +#: ../meld/resources/ui/new-diff-tab.ui.h:10 +msgid "Select Second Folder" +msgstr "Izbor druge mape" + +#: ../meld/resources/ui/new-diff-tab.ui.h:11 +msgid "Select Third Folder" +msgstr "Izbor tretje mape" + +#: ../meld/resources/ui/new-diff-tab.ui.h:12 +msgid "Select A Version-Controlled Folder" +msgstr "Izbor mape nadzora različic" + +#: ../meld/resources/ui/new-diff-tab.ui.h:13 +msgid "_Blank comparison" +msgstr "_Prazna primerjava" + +#: ../meld/resources/ui/new-diff-tab.ui.h:14 +msgid "C_ompare" +msgstr "_Primerjava" + +#: ../meld/resources/ui/notebook-label.ui.h:1 +msgid "Close Tab" +msgstr "Zapri zavihek" + +#: ../meld/resources/ui/patch-dialog.ui.h:1 msgid "Format as Patch" msgstr "Oblikuj kot popravek" -#: ../data/ui/patch-dialog.ui.h:2 +#: ../meld/resources/ui/patch-dialog.ui.h:2 msgid "Copy to Clipboard" msgstr "Kopiraj v odložišče" -#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:152 +#: ../meld/resources/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:165 msgid "Save Patch" msgstr "Shrani popravek" -#: ../data/ui/patch-dialog.ui.h:4 +#: ../meld/resources/ui/patch-dialog.ui.h:4 msgid "Use differences between:" msgstr "Uporabi razlike med:" -#: ../data/ui/patch-dialog.ui.h:5 +#: ../meld/resources/ui/patch-dialog.ui.h:5 msgid "Left and middle panes" msgstr "Levi in srednji pladenj" -#: ../data/ui/patch-dialog.ui.h:6 +#: ../meld/resources/ui/patch-dialog.ui.h:6 msgid "Middle and right panes" msgstr "Srednji in desni pladenj" -#: ../data/ui/patch-dialog.ui.h:7 +#: ../meld/resources/ui/patch-dialog.ui.h:7 msgid "_Reverse patch direction" msgstr "Obrni smer popravka" -#: ../data/ui/preferences.ui.h:1 -msgid "Meld Preferences" -msgstr "Možnosti Meld" +#: ../meld/resources/ui/preferences.ui.h:1 +msgid "Preferences" +msgstr "Možnosti" -#: ../data/ui/preferences.ui.h:2 +#: ../meld/resources/ui/preferences.ui.h:2 msgid "Font" msgstr "Pisava" -#: ../data/ui/preferences.ui.h:3 +#: ../meld/resources/ui/preferences.ui.h:3 msgid "_Use the system fixed width font" msgstr "_Uporabi sistemsko pisavo določene širine" -#: ../data/ui/preferences.ui.h:4 +#: ../meld/resources/ui/preferences.ui.h:4 msgid "_Editor font:" msgstr "Pisava _urejevalnika:" -#: ../data/ui/preferences.ui.h:5 +#. 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 msgid "Display" msgstr "Prikaz" -#: ../data/ui/preferences.ui.h:6 +#: ../meld/resources/ui/preferences.ui.h:6 msgid "_Tab width:" msgstr "Širina _tabulatorja:" -#: ../data/ui/preferences.ui.h:7 +#: ../meld/resources/ui/preferences.ui.h:7 msgid "_Insert spaces instead of tabs" msgstr "Vstavi _presledke namesto tabulatorjev" -#: ../data/ui/preferences.ui.h:8 +#: ../meld/resources/ui/preferences.ui.h:8 msgid "Enable text _wrapping" msgstr "Omogoči _prelom besedila" -#: ../data/ui/preferences.ui.h:9 +#: ../meld/resources/ui/preferences.ui.h:9 msgid "Do not _split words over two lines" msgstr "Ne _deli besed preko dveh vrstic" -#: ../data/ui/preferences.ui.h:10 +#: ../meld/resources/ui/preferences.ui.h:10 msgid "Highlight _current line" msgstr "Poudari _trenutno vrstico" -#: ../data/ui/preferences.ui.h:11 +#: ../meld/resources/ui/preferences.ui.h:11 msgid "Show _line numbers" msgstr "Pokaži _številke vrstic" -#: ../data/ui/preferences.ui.h:12 +#: ../meld/resources/ui/preferences.ui.h:12 msgid "Show w_hitespace" msgstr "Pokaži _presledne znake" -#: ../data/ui/preferences.ui.h:13 +#: ../meld/resources/ui/preferences.ui.h:13 msgid "Use s_yntax highlighting" msgstr "Uporabi _barvno poudarjanje skladnje" -#: ../data/ui/preferences.ui.h:14 +#: ../meld/resources/ui/preferences.ui.h:14 msgid "Syntax highlighting color scheme:" msgstr "Barvna shema poudarjanja skladnje:" -#: ../data/ui/preferences.ui.h:15 +#: ../meld/resources/ui/preferences.ui.h:15 msgid "External Editor" msgstr "Zunanji urejevalnik" -#: ../data/ui/preferences.ui.h:16 +#: ../meld/resources/ui/preferences.ui.h:16 msgid "Use _default system editor" msgstr "Uporabi _privzet sistemski urejevalnik besedil." -#: ../data/ui/preferences.ui.h:17 +#: ../meld/resources/ui/preferences.ui.h:17 msgid "Edito_r command:" msgstr "Ukaz _urejevalnika:" -#: ../data/ui/preferences.ui.h:18 +#: ../meld/resources/ui/preferences.ui.h:18 msgid "Editor" msgstr "Urejevalnik" -#: ../data/ui/preferences.ui.h:19 +#: ../meld/resources/ui/preferences.ui.h:19 msgid "Shallow Comparison" msgstr "Groba primerjava" -#: ../data/ui/preferences.ui.h:20 +#: ../meld/resources/ui/preferences.ui.h:20 msgid "C_ompare files based only on size and timestamp" msgstr "_Primerjaj datoteke na osnovi velikosti in časovnega žiga" -#: ../data/ui/preferences.ui.h:21 +#: ../meld/resources/ui/preferences.ui.h:21 msgid "_Timestamp resolution:" msgstr "Ločljivost časovnega _žiga:" -#: ../data/ui/preferences.ui.h:23 +#: ../meld/resources/ui/preferences.ui.h:23 msgid "Note: enabling text filters may make comparing large files much slower" msgstr "" -#: ../data/ui/preferences.ui.h:24 +#: ../meld/resources/ui/preferences.ui.h:24 msgid "Symbolic Links" msgstr "Simbolne povezave" -#: ../data/ui/preferences.ui.h:26 +#: ../meld/resources/ui/preferences.ui.h:26 msgid "Visible Columns" msgstr "Vidni stolpci" -#: ../data/ui/preferences.ui.h:27 +#: ../meld/resources/ui/preferences.ui.h:27 msgid "Folder Comparisons" msgstr "Primerjava map" -#: ../data/ui/preferences.ui.h:28 +#: ../meld/resources/ui/preferences.ui.h:28 msgid "Version Comparisons" msgstr "Primerjave različic" -#: ../data/ui/preferences.ui.h:29 +#: ../meld/resources/ui/preferences.ui.h:29 #, fuzzy msgid "_Order when comparing file revisions:" msgstr "_Med primerjavo predelav datotek" -#: ../data/ui/preferences.ui.h:30 +#: ../meld/resources/ui/preferences.ui.h:30 #, fuzzy msgid "Order when _merging files:" msgstr "[%s] Združevanje datotek" -#: ../data/ui/preferences.ui.h:31 +#: ../meld/resources/ui/preferences.ui.h:31 msgid "Commit Messages" msgstr "Uveljavi sporočila" -#: ../data/ui/preferences.ui.h:32 +#: ../meld/resources/ui/preferences.ui.h:32 msgid "Show _right margin at:" msgstr "Pokaži _desni rob pri:" -#: ../data/ui/preferences.ui.h:33 +#: ../meld/resources/ui/preferences.ui.h:33 msgid "Automatically _break lines at right margin on commit" msgstr "Samodejno _prelomi vrstice na desnem robu ob uveljavitvi" -#: ../data/ui/preferences.ui.h:34 +#: ../meld/resources/ui/preferences.ui.h:34 msgid "Version Control" msgstr "Nadzor različic" -#: ../data/ui/preferences.ui.h:35 +#: ../meld/resources/ui/preferences.ui.h:35 msgid "Filename filters" msgstr "Datotečni filtri" -#: ../data/ui/preferences.ui.h:36 -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 "" -"Pri primerjavi map je mogoče filtrirati datoteke in mape po imenu. Vsak " -"vzorec na seznamu je zapisan z nadomestnimi znaki (npr: * in ?), ločenimi s " -"presledki." - -#: ../data/ui/preferences.ui.h:37 ../meld/meldwindow.py:105 -msgid "File Filters" -msgstr "Filtri datotek" - -#: ../data/ui/preferences.ui.h:38 -#, fuzzy -msgid "Change trimming" -msgstr "Spremeni _v:" - -#: ../data/ui/preferences.ui.h:39 -msgid "Trim blank line differences from the start and end of changes" -msgstr "" - -#: ../data/ui/preferences.ui.h:40 -msgid "Text filters" -msgstr "Filtri besedila" - -#: ../data/ui/preferences.ui.h:41 +#: ../meld/resources/ui/preferences.ui.h:36 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 "" -"Pri primerjavi datotek je mogoče prezreti nekatere vrste sprememb. Vsak " -"vzorec na seznamu je zapisan z logičnimi izrazi, s katerimi se zamenja " -"želeno besedilo s praznim nizom, preden je primerjava izvede. V primeru, da " -"izraz vključuje skupine, so zamenjane le te. Več podrobnosti je zapisanih v " -"priročniku." - -#: ../data/ui/preferences.ui.h:42 -msgid "Text Filters" -msgstr "Filtri besedila" - -#: ../data/ui/preferences.ui.h:43 -msgid "Left is remote, right is local" -msgstr "Levo je oddaljeno, desno krajevno" - -#: ../data/ui/preferences.ui.h:44 -msgid "Left is local, right is remote" -msgstr "Levo je krajevno, desno oddaljeno" - -#: ../data/ui/preferences.ui.h:45 -msgid "Remote, merge, local" -msgstr "Oddaljeno, združi, krajevno" - -#: ../data/ui/preferences.ui.h:46 -msgid "Local, merge, remote" -msgstr "Krajevno, združi, oddaljeno" - -#: ../data/ui/preferences.ui.h:47 -msgid "1ns (ext4)" -msgstr "1ns (ext4)" - -#: ../data/ui/preferences.ui.h:48 -msgid "100ns (NTFS)" -msgstr "100ns (NTFS)" - -#: ../data/ui/preferences.ui.h:49 -msgid "1s (ext2/ext3)" -msgstr "1s (ext2/ext3)" - -#: ../data/ui/preferences.ui.h:50 -msgid "2s (VFAT)" -msgstr "2s (VFAT)" - -#: ../data/ui/shortcuts.ui.h:1 -msgctxt "shortcut window" -msgid "General" -msgstr "Splošno" - -#: ../data/ui/shortcuts.ui.h:2 -msgctxt "shortcut window" -msgid "New comparison" -msgstr "Nova primerjava" - -#: ../data/ui/shortcuts.ui.h:3 -msgctxt "shortcut window" -msgid "Close a comparison" -msgstr "Zapri primerjavo" - -#: ../data/ui/shortcuts.ui.h:4 -msgctxt "shortcut window" -msgid "Quit Meld" -msgstr "Končaj program" - -#: ../data/ui/shortcuts.ui.h:5 -msgctxt "shortcut window" -msgid "Stop the current action" -msgstr "Ustavi trenutno dejanje" - -#: ../data/ui/shortcuts.ui.h:6 -msgctxt "shortcut window" -msgid "Refresh comparison" -msgstr "Osveži primerjavo" - -#: ../data/ui/shortcuts.ui.h:7 -msgctxt "shortcut window" -msgid "Fullscreen" -msgstr "Celozaslonski način" - -#: ../data/ui/shortcuts.ui.h:8 -msgctxt "shortcut window" -msgid "Tabs" -msgstr "Zavihki" - -#: ../data/ui/shortcuts.ui.h:9 -msgctxt "shortcut window" -msgid "Go to previous tab" -msgstr "Skoči na predhodni zavihek" - -#: ../data/ui/shortcuts.ui.h:10 -msgctxt "shortcut window" -msgid "Go to next tab" -msgstr "Skoči na naslednji zavihek" - -#: ../data/ui/shortcuts.ui.h:11 -msgctxt "shortcut window" -msgid "Switch to tab" -msgstr "Preklopi na zavihek" - -#: ../data/ui/shortcuts.ui.h:12 -msgctxt "shortcut window" -msgid "Move tab left" -msgstr "Premakni zavihek levo" - -#: ../data/ui/shortcuts.ui.h:13 -msgctxt "shortcut window" -msgid "Move tab right" -msgstr "Premakni zavihek desno" - -#: ../data/ui/shortcuts.ui.h:14 -msgctxt "shortcut window" -msgid "Changes" -msgstr "Spremembe" - -#: ../data/ui/shortcuts.ui.h:15 -msgctxt "shortcut window" -msgid "Go to previous change" -msgstr "Skoči na predhodno spremembo" - -#: ../data/ui/shortcuts.ui.h:16 -msgctxt "shortcut window" -msgid "Go to next change" -msgstr "Skoči na naslednjo spremembo" - -#: ../data/ui/shortcuts.ui.h:17 -msgctxt "shortcut window" -msgid "Editing" -msgstr "Urejanje" - -#: ../data/ui/shortcuts.ui.h:18 -msgctxt "shortcut window" -msgid "Undo" -msgstr "Razveljavi" - -#: ../data/ui/shortcuts.ui.h:19 -msgctxt "shortcut window" -msgid "Redo" -msgstr "Ponovi" - -#: ../data/ui/shortcuts.ui.h:20 -msgctxt "shortcut window" -msgid "Cut" -msgstr "Izreži" - -#: ../data/ui/shortcuts.ui.h:21 -msgctxt "shortcut window" -msgid "Copy" -msgstr "Kopiraj" - -#: ../data/ui/shortcuts.ui.h:22 -msgctxt "shortcut window" -msgid "Paste" -msgstr "Prilepi" - -#: ../data/ui/shortcuts.ui.h:23 -msgctxt "shortcut window" -msgid "Find" -msgstr "Najdi" - -#: ../data/ui/shortcuts.ui.h:24 -msgctxt "shortcut window" -msgid "Find Next" -msgstr "Najdi naslednje" - -#: ../data/ui/shortcuts.ui.h:25 -msgctxt "shortcut window" -msgid "Find Previous" -msgstr "Najdi predhodno" - -#: ../data/ui/shortcuts.ui.h:26 -msgctxt "shortcut window" -msgid "Replace" -msgstr "Zamenjaj" - -#: ../data/ui/shortcuts.ui.h:27 -msgctxt "shortcut window" -msgid "File comparison" -msgstr "Primerjava datotek" - -#: ../data/ui/shortcuts.ui.h:28 -msgctxt "shortcut window" -msgid "Save current file" -msgstr "Shrani trenutno datoteko" - -#: ../data/ui/shortcuts.ui.h:29 -msgctxt "shortcut window" -msgid "Save current file to new path" -msgstr "Shrani trenutni izbor kot novo prednastavitev" - -#: ../data/ui/shortcuts.ui.h:30 -msgctxt "shortcut window" -msgid "Save all files in comparison" -msgstr "Shrani vse datoteke trenutne primerjave" - -#: ../data/ui/shortcuts.ui.h:31 -msgctxt "shortcut window" -msgid "Previous conflict" -msgstr "Predhodni spor" - -#: ../data/ui/shortcuts.ui.h:32 -msgctxt "shortcut window" -msgid "Next conflict" -msgstr "Naslednji spor" - -#: ../data/ui/shortcuts.ui.h:33 -msgctxt "shortcut window" -msgid "Push change to left" -msgstr "Potisni trenutne spremembe na levo" - -#: ../data/ui/shortcuts.ui.h:34 -msgctxt "shortcut window" -msgid "Push change to right" -msgstr "Potisni trenutne spremembe na desno" - -#: ../data/ui/shortcuts.ui.h:35 -msgctxt "shortcut window" -msgid "Pull change from left" -msgstr "Potegni spremembe z leve" - -#: ../data/ui/shortcuts.ui.h:36 -msgctxt "shortcut window" -msgid "Pull change from right" -msgstr "Potegni spremembe z desne" +"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 "" +"Pri primerjavi map je mogoče filtrirati datoteke in mape po imenu. Vsak " +"vzorec na seznamu je zapisan z nadomestnimi znaki (npr: * in ?), ločenimi s " +"presledki." -#: ../data/ui/shortcuts.ui.h:37 -msgctxt "shortcut window" -msgid "Copy change above left" -msgstr "Kopiraj spremembe nad levi del" +#: ../meld/resources/ui/preferences.ui.h:37 ../meld/meldwindow.py:114 +msgid "File Filters" +msgstr "Filtri datotek" -#: ../data/ui/shortcuts.ui.h:38 -msgctxt "shortcut window" -msgid "Copy change below left" -msgstr "Kopiraj spremembe pod levi del" +#: ../meld/resources/ui/preferences.ui.h:38 +#, fuzzy +msgid "Change trimming" +msgstr "Spremeni _v:" -#: ../data/ui/shortcuts.ui.h:39 -msgctxt "shortcut window" -msgid "Copy change above right" -msgstr "Kopiraj spremembe nad desni del" +#: ../meld/resources/ui/preferences.ui.h:39 +msgid "Trim blank line differences from the start and end of changes" +msgstr "" -#: ../data/ui/shortcuts.ui.h:40 -msgctxt "shortcut window" -msgid "Copy change below right" -msgstr "Kopiraj spremembe pod desni del" +#: ../meld/resources/ui/preferences.ui.h:40 +msgid "Text filters" +msgstr "Filtri besedila" -#: ../data/ui/shortcuts.ui.h:41 -msgctxt "shortcut window" -msgid "Delete change" -msgstr "Izbriši spremembo" +#: ../meld/resources/ui/preferences.ui.h:41 +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 "" +"Pri primerjavi datotek je mogoče prezreti nekatere vrste sprememb. Vsak " +"vzorec na seznamu je zapisan z logičnimi izrazi, s katerimi se zamenja " +"želeno besedilo s praznim nizom, preden je primerjava izvede. V primeru, da " +"izraz vključuje skupine, so zamenjane le te. Več podrobnosti je zapisanih v " +"priročniku." -#: ../data/ui/shortcuts.ui.h:42 -msgctxt "shortcut window" -msgid "Previous comparison pane" -msgstr "Predhodno okno primerjave" +#: ../meld/resources/ui/preferences.ui.h:42 +msgid "Text Filters" +msgstr "Filtri besedila" -#: ../data/ui/shortcuts.ui.h:43 -msgctxt "shortcut window" -msgid "Next comparison pane" -msgstr "Naslednje okno primerjave" +#: ../meld/resources/ui/preferences.ui.h:43 +msgid "Left is remote, right is local" +msgstr "Levo je oddaljeno, desno krajevno" -#: ../data/ui/shortcuts.ui.h:44 -msgctxt "shortcut window" -msgid "Folder comparison" -msgstr "Primerjava map" +#: ../meld/resources/ui/preferences.ui.h:44 +msgid "Left is local, right is remote" +msgstr "Levo je krajevno, desno oddaljeno" -#: ../data/ui/shortcuts.ui.h:45 -msgctxt "shortcut window" -msgid "Copy to left" -msgstr "Kopiraj na levo" +#: ../meld/resources/ui/preferences.ui.h:45 +msgid "Remote, merge, local" +msgstr "Oddaljeno, združi, krajevno" -#: ../data/ui/shortcuts.ui.h:46 -msgctxt "shortcut window" -msgid "Copy to right" -msgstr "Kopiraj na desno" +#: ../meld/resources/ui/preferences.ui.h:46 +msgid "Local, merge, remote" +msgstr "Krajevno, združi, oddaljeno" -#: ../data/ui/shortcuts.ui.h:47 -msgctxt "shortcut window" -msgid "Version control comparison" -msgstr "Primerjava nadzora različic" +#: ../meld/resources/ui/preferences.ui.h:47 +msgid "1ns (ext4)" +msgstr "1ns (ext4)" -#: ../data/ui/shortcuts.ui.h:48 -msgctxt "shortcut window" -msgid "Commit to version control" -msgstr "Uveljavi spremembe v sistem za nadzor različic" +#: ../meld/resources/ui/preferences.ui.h:48 +msgid "100ns (NTFS)" +msgstr "100ns (NTFS)" -#: ../data/ui/shortcuts.ui.h:49 -msgctxt "shortcut window" -msgid "Show/hide console output" -msgstr "Pokaži/Skrij odvod konzole" +#: ../meld/resources/ui/preferences.ui.h:49 +msgid "1s (ext2/ext3)" +msgstr "1s (ext2/ext3)" -#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:567 -#: ../meld/newdifftab.py:49 -msgid "New comparison" -msgstr "Nova primerjava" +#: ../meld/resources/ui/preferences.ui.h:50 +msgid "2s (VFAT)" +msgstr "2s (VFAT)" -#: ../data/ui/tab-placeholder.ui.h:2 -msgid "File comparison" -msgstr "Primerjava datotek" +#: ../meld/resources/ui/push-dialog.ui.h:1 +msgid "Push local commits to remote?" +msgstr "Ali naj se objavijo krajevne uveljavitve v oddaljeno skladišče?" -#: ../data/ui/tab-placeholder.ui.h:3 -msgid "Directory comparison" -msgstr "Primerjava vsebine map" +#: ../meld/resources/ui/push-dialog.ui.h:2 +msgid "The commits to be pushed are determined by your version control system." +msgstr "Uveljavitve za objavo določa sistem za nadzor različic." -#: ../data/ui/tab-placeholder.ui.h:4 -msgid "Version control view" -msgstr "Pogled nadzora različic" +#: ../meld/resources/ui/push-dialog.ui.h:3 +msgid "_Push commits" +msgstr "_Objavi uveljavitve" -#: ../data/ui/tab-placeholder.ui.h:5 -msgid "_3-way comparison" -msgstr "_Trojna primerjava" +#: ../meld/resources/ui/revert-dialog.ui.h:1 +#, fuzzy +#| msgid "Revert unsaved changes to documents?" +msgid "Discard unsaved changes to documents?" +msgstr "Ali naj se povrnejo neshranjene spremembe dokumentov?" -#: ../data/ui/tab-placeholder.ui.h:6 -msgid "Select Third File" -msgstr "Izbor tretje datoteke" +#: ../meld/resources/ui/revert-dialog.ui.h:2 +#, fuzzy +#| msgid "Changes made to the following documents will be permanently lost:\n" +msgid "Changes made to the following documents will be permanently lost:" +msgstr "Spremembe navedenih dokumentov bodo trajno izgubljene:\n" -#: ../data/ui/tab-placeholder.ui.h:7 -msgid "Select Second File" -msgstr "Izbor druge datoteke" +#: ../meld/resources/ui/revert-dialog.ui.h:3 +msgid "_Discard" +msgstr "_Zavrzi" -#: ../data/ui/tab-placeholder.ui.h:8 -msgid "Select First File" -msgstr "Izbor prve datoteke" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:1 +msgid "Save changes to documents before closing?" +msgstr "Ali želite shraniti spremembe dokumenta pred zapiranjem?" -#: ../data/ui/tab-placeholder.ui.h:9 -msgid "Select First Folder" -msgstr "Izbor prve mape" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:2 +msgid "If you don’t save, changes will be permanently lost." +msgstr "V kolikor sprememb ne shranite, bodo te trajno izgubljene." -#: ../data/ui/tab-placeholder.ui.h:10 -msgid "Select Second Folder" -msgstr "Izbor druge mape" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:3 +msgid "Close _without Saving" +msgstr "Zapri _brez shranjevanja" -#: ../data/ui/tab-placeholder.ui.h:11 -msgid "Select Third Folder" -msgstr "Izbor tretje mape" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:4 ../meld/dirdiff.py:1040 +#: ../meld/iohelpers.py:58 ../meld/iohelpers.py:112 +msgid "_Cancel" +msgstr "_Prekliči" -#: ../data/ui/tab-placeholder.ui.h:12 -msgid "Select A Version-Controlled Folder" -msgstr "Izbor mape nadzora različic" +#: ../meld/resources/ui/save-confirm-dialog.ui.h:5 +msgid "_Save" +msgstr "_Shrani" -#: ../data/ui/tab-placeholder.ui.h:13 -msgid "_Blank comparison" -msgstr "_Prazna primerjava" +#: ../meld/resources/ui/statusbar-menu.ui.h:2 +#, fuzzy +#| msgid "Show w_hitespace" +msgid "Show whitespace" +msgstr "Pokaži _presledne znake" -#: ../data/ui/tab-placeholder.ui.h:14 -msgid "C_ompare" -msgstr "_Primerjava" +#: ../meld/resources/ui/statusbar-menu.ui.h:4 +msgid "Text wrapping" +msgstr "Prelom besedila" -#: ../data/ui/vcview.ui.h:3 +#: ../meld/resources/ui/vcview.ui.h:3 msgid "Co_mmit…" msgstr "U_veljavi ..." -#: ../data/ui/vcview.ui.h:4 +#: ../meld/resources/ui/vcview.ui.h:4 msgid "Commit changes to version control" msgstr "Uveljavi spremembe v sistem za nadzor različic" -#: ../data/ui/vcview.ui.h:5 +#: ../meld/resources/ui/vcview.ui.h:5 msgid "_Update" msgstr "_Posodobi" -#: ../data/ui/vcview.ui.h:6 +#: ../meld/resources/ui/vcview.ui.h:6 msgid "Update working copy from version control" msgstr "Posodobi delovno kopijo preko nadzora različic" -#: ../data/ui/vcview.ui.h:7 +#: ../meld/resources/ui/vcview.ui.h:7 msgid "_Push" msgstr "_Objavi" -#: ../data/ui/vcview.ui.h:8 +#: ../meld/resources/ui/vcview.ui.h:8 msgid "Push local changes to remote" msgstr "Objavi spremembe v oddaljeno skladišče" -#: ../data/ui/vcview.ui.h:10 +#: ../meld/resources/ui/vcview.ui.h:10 msgid "Add to version control" msgstr "Dodaj v sistem nadzora različic" -#: ../data/ui/vcview.ui.h:12 +#: ../meld/resources/ui/vcview.ui.h:12 msgid "Remove from version control" msgstr "Odstrani iz sistema nadzora različic" -#: ../data/ui/vcview.ui.h:13 +#: ../meld/resources/ui/vcview.ui.h:13 msgid "Mar_k as Resolved" msgstr "Označi kot _razrešeno" -#: ../data/ui/vcview.ui.h:14 +#: ../meld/resources/ui/vcview.ui.h:14 msgid "Mark as resolved in version control" msgstr "Označi kot razrešeno v sistemu nadzora različic" -#: ../data/ui/vcview.ui.h:15 +#: ../meld/resources/ui/vcview.ui.h:15 msgid "Re_vert" msgstr "Po&vrni" -#: ../data/ui/vcview.ui.h:16 +#: ../meld/resources/ui/vcview.ui.h:16 msgid "Revert working copy to original state" msgstr "Povrni delovno kopijo na izvorno stanje" -#: ../data/ui/vcview.ui.h:17 +#: ../meld/resources/ui/vcview.ui.h:17 msgid "Delete from working copy" msgstr "Izbriši iz delovne kopije" -#: ../data/ui/vcview.ui.h:18 +#: ../meld/resources/ui/vcview.ui.h:18 msgid "Console" msgstr "Konzola" -#: ../data/ui/vcview.ui.h:19 +#: ../meld/resources/ui/vcview.ui.h:19 #, fuzzy msgid "Show or hide the version control console output pane" msgstr "Izbor različice sistema za nadzor različic za uporabo" -#: ../data/ui/vcview.ui.h:20 +#: ../meld/resources/ui/vcview.ui.h:20 msgid "_Flatten" msgstr "_Razpni" -#: ../data/ui/vcview.ui.h:21 +#: ../meld/resources/ui/vcview.ui.h:21 msgid "Flatten directories" msgstr "_Razpni mape" -#: ../data/ui/vcview.ui.h:22 +#: ../meld/resources/ui/vcview.ui.h:22 msgid "_Modified" msgstr "_Spremenjeno" -#: ../data/ui/vcview.ui.h:23 +#: ../meld/resources/ui/vcview.ui.h:23 msgid "Show modified files" msgstr "Pokaži spremenjene datoteke" -#: ../data/ui/vcview.ui.h:24 +#: ../meld/resources/ui/vcview.ui.h:24 msgid "_Normal" msgstr "_Običajno" -#: ../data/ui/vcview.ui.h:25 +#: ../meld/resources/ui/vcview.ui.h:25 msgid "Show normal files" msgstr "Pokaži običajne datoteke" -#: ../data/ui/vcview.ui.h:26 +#: ../meld/resources/ui/vcview.ui.h:26 msgid "Un_versioned" msgstr "Brez določene _različice" -#: ../data/ui/vcview.ui.h:27 +#: ../meld/resources/ui/vcview.ui.h:27 msgid "Show unversioned files" msgstr "Pokaži datoteke z nedoločenimi različicami" -#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69 +#: ../meld/resources/ui/vcview.ui.h:28 ../meld/vc/_vc.py:70 msgid "Ignored" msgstr "Prezrto" -#: ../data/ui/vcview.ui.h:29 +#: ../meld/resources/ui/vcview.ui.h:29 msgid "Show ignored files" msgstr "Pokaži prezrte datoteke" -#: ../data/ui/vcview.ui.h:30 -msgid "Commit" -msgstr "Uveljavi" - -#: ../data/ui/vcview.ui.h:31 -msgid "Commit Files" -msgstr "Uveljavi datoteke" - -#: ../data/ui/vcview.ui.h:32 -msgid "Log Message" -msgstr "Sporočilo beleženja" - -#: ../data/ui/vcview.ui.h:33 -msgid "Previous logs:" -msgstr "Predhodni dnevniki:" - -#: ../data/ui/vcview.ui.h:34 -msgid "Co_mmit" -msgstr "_Uveljavi" - -#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:331 +#: ../meld/resources/ui/vcview.ui.h:31 ../meld/vcview.py:366 msgid "Location" msgstr "Mesto" -#: ../data/ui/vcview.ui.h:37 +#: ../meld/resources/ui/vcview.ui.h:32 msgid "Status" msgstr "Stanje" -#: ../data/ui/vcview.ui.h:38 +#: ../meld/resources/ui/vcview.ui.h:33 msgid "Extra" msgstr "Dodatno" -#: ../data/ui/vcview.ui.h:39 +#: ../meld/resources/ui/vcview.ui.h:34 msgid "Console output" msgstr "Odvod konzole" -#: ../data/ui/vcview.ui.h:40 -msgid "Push local commits to remote?" -msgstr "Ali naj se objavijo krajevne uveljavitve v oddaljeno skladišče?" - -#: ../data/ui/vcview.ui.h:41 -msgid "The commits to be pushed are determined by your version control system." -msgstr "Uveljavitve za objavo določa sistem za nadzor različic." - -#: ../data/ui/vcview.ui.h:42 -msgid "_Push commits" -msgstr "_Objavi uveljavitve" - #: ../meld/const.py:12 msgid "UNIX (LF)" msgstr "UNIX (LF)" @@ -1633,82 +1633,82 @@ msgid "Mac OS (CR)" msgstr "Mac OS (CR)" #. Create file size CellRenderer -#: ../meld/dirdiff.py:437 ../meld/preferences.py:82 +#: ../meld/dirdiff.py:476 ../meld/preferences.py:138 msgid "Size" msgstr "Velikost" #. Create date-time CellRenderer -#: ../meld/dirdiff.py:445 ../meld/preferences.py:83 +#: ../meld/dirdiff.py:484 ../meld/preferences.py:139 msgid "Modification time" msgstr "Čas spremembe" #. Create permissions CellRenderer -#: ../meld/dirdiff.py:453 ../meld/preferences.py:84 +#: ../meld/dirdiff.py:492 ../meld/preferences.py:140 msgid "Permissions" msgstr "Dovoljenja" -#: ../meld/dirdiff.py:588 +#: ../meld/dirdiff.py:626 #, python-format msgid "Hide %s" msgstr "Skrij %s" -#: ../meld/dirdiff.py:729 ../meld/dirdiff.py:752 +#: ../meld/dirdiff.py:768 ../meld/dirdiff.py:791 #, python-format msgid "[%s] Scanning %s" msgstr "[%s] Preiskovanje %s" -#: ../meld/dirdiff.py:887 +#: ../meld/dirdiff.py:926 #, python-format msgid "[%s] Done" msgstr "[%s] končano" -#: ../meld/dirdiff.py:895 +#: ../meld/dirdiff.py:934 msgid "Folders have no differences" msgstr "V mapah ni razlik" -#: ../meld/dirdiff.py:897 +#: ../meld/dirdiff.py:936 msgid "Contents of scanned files in folders are identical." msgstr "" -#: ../meld/dirdiff.py:899 +#: ../meld/dirdiff.py:938 msgid "" "Scanned files in folders appear identical, but contents have not been " "scanned." msgstr "" -#: ../meld/dirdiff.py:902 +#: ../meld/dirdiff.py:941 msgid "File filters are in use, so not all files have been scanned." msgstr "" -#: ../meld/dirdiff.py:904 +#: ../meld/dirdiff.py:943 msgid "Text filters are in use and may be masking content differences." msgstr "" -#: ../meld/dirdiff.py:922 ../meld/filediff.py:1491 ../meld/filediff.py:1521 -#: ../meld/filediff.py:1523 ../meld/ui/msgarea.py:106 ../meld/ui/msgarea.py:119 +#: ../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 msgid "Hi_de" msgstr "S_krij" -#: ../meld/dirdiff.py:931 +#: ../meld/dirdiff.py:970 msgid "Multiple errors occurred while scanning this folder" msgstr "Med preiskovanjem mape, je prišlo do več napak." -#: ../meld/dirdiff.py:932 +#: ../meld/dirdiff.py:971 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:934 +#: ../meld/dirdiff.py:973 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:936 +#: ../meld/dirdiff.py:975 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:938 +#: ../meld/dirdiff.py:977 msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. The following files in this folder are hidden:" @@ -1717,29 +1717,29 @@ msgstr "" "razlike velikosti upošteva. Nekatere datoteke so skrite:\n" "%s" -#: ../meld/dirdiff.py:949 +#: ../meld/dirdiff.py:988 #, fuzzy, python-format #| msgid "'%s' hidden by '%s'" msgid "“%s” hidden by “%s”" msgstr "'%s' je skrit; '%s'" -#: ../meld/dirdiff.py:1005 +#: ../meld/dirdiff.py:1044 #, python-format msgid "Replace folder “%s”?" msgstr "Ali želite zamenjati mapo »%s«?" -#: ../meld/dirdiff.py:1007 +#: ../meld/dirdiff.py:1046 #, 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:1020 +#: ../meld/dirdiff.py:1059 msgid "Error copying file" msgstr "Napaka kopiranja datoteke" -#: ../meld/dirdiff.py:1021 +#: ../meld/dirdiff.py:1060 #, python-format msgid "" "Couldn’t copy %s\n" @@ -1752,84 +1752,82 @@ msgstr "" "\n" "%s" -#: ../meld/dirdiff.py:1046 ../meld/vcview.py:703 -#, fuzzy -#| msgid "Error deleting %s" +#: ../meld/dirdiff.py:1085 ../meld/vcview.py:720 msgid "Error deleting {}" -msgstr "Napaka med brisanjem %s" +msgstr "Napaka med brisanjem {}" -#: ../meld/dirdiff.py:1577 +#: ../meld/dirdiff.py:1597 msgid "No folder" msgstr "Ni mape" -#: ../meld/filediff.py:834 +#: ../meld/filediff.py:920 msgid "Comparison results will be inaccurate" msgstr "Rezultati primerjave ne bodo natančni" -#: ../meld/filediff.py:836 +#: ../meld/filediff.py:922 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." msgstr "" -#: ../meld/filediff.py:893 +#: ../meld/filediff.py:994 msgid "Mark conflict as resolved?" msgstr "Ali naj se spor označi kot razrešen?" -#: ../meld/filediff.py:895 +#: ../meld/filediff.py:996 msgid "" "If the conflict was resolved successfully, you may mark it as resolved now." msgstr "" -#: ../meld/filediff.py:897 +#: ../meld/filediff.py:998 msgid "Cancel" msgstr "Prekliči" -#: ../meld/filediff.py:898 +#: ../meld/filediff.py:999 msgid "Mark _Resolved" msgstr "Označi kot _razrešeno" -#: ../meld/filediff.py:1206 +#: ../meld/filediff.py:1318 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Prišlo je do napake med odpiranjem datoteke “%s”." -#: ../meld/filediff.py:1214 +#: ../meld/filediff.py:1326 #, fuzzy, python-format msgid "File %s appears to be a binary file." msgstr "Datoteka je videti kot besedilna datoteka" -#: ../meld/filediff.py:1216 +#: ../meld/filediff.py:1328 msgid "Do you want to open the file using the default application?" msgstr "" -#: ../meld/filediff.py:1218 +#: ../meld/filediff.py:1330 msgid "Open" msgstr "Odpri" -#: ../meld/filediff.py:1234 +#: ../meld/filediff.py:1346 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Računanje razlik" -#: ../meld/filediff.py:1295 +#: ../meld/filediff.py:1407 #, python-format msgid "File %s has changed on disk" msgstr "Datoteka %s je bila na disku spremenjena." -#: ../meld/filediff.py:1296 +#: ../meld/filediff.py:1408 msgid "Do you want to reload the file?" msgstr "Ali želite ponovno naložiti datoteko?" -#: ../meld/filediff.py:1298 +#: ../meld/filediff.py:1410 msgid "_Reload" msgstr "_Ponovno naloži" -#: ../meld/filediff.py:1454 +#: ../meld/filediff.py:1566 msgid "Files are identical" msgstr "Datoteki sta enaki" -#: ../meld/filediff.py:1467 +#: ../meld/filediff.py:1579 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1837,26 +1835,26 @@ msgstr "" "Uporabljani so filtri besedila, zato so lahko razlike med datotekami skrite. " "Ali naj se primerja vsebina brez dejavnih filtrov?" -#: ../meld/filediff.py:1472 +#: ../meld/filediff.py:1584 msgid "Files differ in line endings only" msgstr "" -#: ../meld/filediff.py:1474 +#: ../meld/filediff.py:1586 #, python-format msgid "" "Files are identical except for differing line endings:\n" "%s" msgstr "" -#: ../meld/filediff.py:1494 +#: ../meld/filediff.py:1606 msgid "Show without filters" msgstr "Pokaži brez filtrov" -#: ../meld/filediff.py:1516 +#: ../meld/filediff.py:1628 msgid "Change highlighting incomplete" msgstr "Spremeni označevanje kot nedokončano" -#: ../meld/filediff.py:1517 +#: ../meld/filediff.py:1629 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." @@ -1864,92 +1862,83 @@ 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:1525 +#: ../meld/filediff.py:1637 msgid "Keep highlighting" msgstr "Poudarjanje skladnje" -#: ../meld/filediff.py:1527 +#: ../meld/filediff.py:1639 msgid "_Keep highlighting" msgstr "_Poudarjanje skladnje" -#: ../meld/filediff.py:1540 +#: ../meld/filediff.py:1652 msgid "Saving failed" msgstr "Shranjevanje je spodletelo." -#: ../meld/filediff.py:1541 +#: ../meld/filediff.py:1653 msgid "" "Please consider copying any critical changes to another program or file to " "avoid data loss." msgstr "" -#: ../meld/filediff.py:1550 +#: ../meld/filediff.py:1662 msgid "Save Left Pane As" msgstr "Shrani levi pladenj kot" -#: ../meld/filediff.py:1552 +#: ../meld/filediff.py:1664 msgid "Save Middle Pane As" msgstr "Shrani srednji pladenj kot" -#: ../meld/filediff.py:1554 +#: ../meld/filediff.py:1666 msgid "Save Right Pane As" msgstr "Shrani desni pladenj kot" -#: ../meld/filediff.py:1567 +#: ../meld/filediff.py:1679 #, fuzzy, python-format msgid "File %s has changed on disk since it was opened" msgstr "Datoteka %s je bila na disku spremenjena." -#: ../meld/filediff.py:1569 +#: ../meld/filediff.py:1681 #, fuzzy msgid "If you save it, any external changes will be lost." msgstr "V primeru, da datoteke ne shranite, bodo izgubljene vse spremembe." -#: ../meld/filediff.py:1572 +#: ../meld/filediff.py:1684 msgid "Save Anyway" msgstr "Vseeno shrani" -#: ../meld/filediff.py:1573 +#: ../meld/filediff.py:1685 msgid "Don’t Save" msgstr "Ne shrani" -#: ../meld/filediff.py:1599 -msgid "_Save as UTF-8" -msgstr "_Shrani kot UTF-8" - -#: ../meld/filediff.py:1602 -#, fuzzy, python-format -msgid "Couldn’t encode text as “%s”" -msgstr "Ni mogoče zagnati zalednega programa »%s«." - -#: ../meld/filediff.py:1604 -#, fuzzy, python-format +#: ../meld/filediff.py:1727 +#, fuzzy #| msgid "" #| "'%s' contains characters not encodable with '%s'\n" #| "Would you like to save as UTF-8?" msgid "" -"File “%s” contains characters that can’t be encoded using encoding “%s”.\n" -"Would you like to save as UTF-8?" +"File “{}” contains characters that can’t be encoded using its current " +"encoding “{}”." msgstr "" "'%s' vsebuje znake, ki jih ni mogoče kodirati v naboru '%s'\n" "Ali naj se datoteka shrani v naboru UTF-8?" -#: ../meld/filediff.py:1644 ../meld/patchdialog.py:130 -#, python-format -msgid "Could not save file %s." -msgstr "Ni mogoče shraniti datoteke %s." - -#: ../meld/filediff.py:1645 ../meld/patchdialog.py:131 +#: ../meld/filediff.py:1731 ../meld/patchdialog.py:144 #, fuzzy, python-format msgid "" "Couldn’t save file due to:\n" "%s" msgstr "Ni mogoče shraniti slike v datoteko" -#: ../meld/filediff.py:2020 +#: ../meld/filediff.py:1735 ../meld/patchdialog.py:143 +#, python-format +msgid "Could not save file %s." +msgstr "Ni mogoče shraniti datoteke %s." + +#: ../meld/filediff.py:2128 msgid "Live comparison updating disabled" msgstr "Živo posodabljanje ob primerjavi je onemogočeno" -#: ../meld/filediff.py:2021 +#: ../meld/filediff.py:2129 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -1964,357 +1953,321 @@ msgstr "" msgid "[%s] Merging files" msgstr "[%s] Združevanje datotek" -#: ../meld/gutterrendererchunk.py:216 +#: ../meld/gutterrendererchunk.py:220 msgid "Copy _up" msgstr "Kopiraj _navzgor" -#: ../meld/gutterrendererchunk.py:217 +#: ../meld/gutterrendererchunk.py:221 msgid "Copy _down" msgstr "Kopiraj _navzdol" -#: ../meld/iohelpers.py:35 +#: ../meld/iohelpers.py:43 msgid "Deleting remote folders is not supported" msgstr "" -#: ../meld/iohelpers.py:37 +#: ../meld/iohelpers.py:45 msgid "Not a file or directory" msgstr "Predmet ni ne datoteka ne mapa" -#: ../meld/iohelpers.py:41 +#: ../meld/iohelpers.py:49 msgid "“{}” can’t be put in the trash. Do you want to delete it immediately?" msgstr "" -#: ../meld/iohelpers.py:46 +#: ../meld/iohelpers.py:54 msgid "This remote location does not support sending items to the trash." msgstr "" -#: ../meld/iohelpers.py:51 +#: ../meld/iohelpers.py:59 msgid "_Delete Permanently" msgstr "_Trajno izbriši" -#: ../meld/iohelpers.py:94 +#: ../meld/iohelpers.py:106 #, python-format msgid "Replace file “%s”?" msgstr "Ali želite zamenjati datoteko »%s«?" -#: ../meld/iohelpers.py:96 +#: ../meld/iohelpers.py:108 #, 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:181 +#: ../meld/meldapp.py:169 msgid "wrong number of arguments supplied to --diff" msgstr "Neveljavno število argumentov pri ukazu --diff." -#: ../meld/meldapp.py:186 +#: ../meld/meldapp.py:174 msgid "Start with an empty window" msgstr "Zagon brez odprtih oken" -#: ../meld/meldapp.py:187 ../meld/meldapp.py:189 +#: ../meld/meldapp.py:175 ../meld/meldapp.py:177 msgid "file" msgstr "datoteka" -#: ../meld/meldapp.py:187 ../meld/meldapp.py:191 +#: ../meld/meldapp.py:175 ../meld/meldapp.py:179 msgid "folder" msgstr "mapa" -#: ../meld/meldapp.py:188 +#: ../meld/meldapp.py:176 msgid "Start a version control comparison" msgstr "Zagon primerjave nadzora različic" -#: ../meld/meldapp.py:190 +#: ../meld/meldapp.py:178 msgid "Start a 2- or 3-way file comparison" msgstr "Zagon z dvojno ali trojno primerjavo datotek" -#: ../meld/meldapp.py:192 +#: ../meld/meldapp.py:180 #, fuzzy msgid "Start a 2- or 3-way folder comparison" msgstr "Zagon z dvojno ali trojno primerjavo datotek" -#: ../meld/meldapp.py:235 +#: ../meld/meldapp.py:223 #, python-format msgid "Error: %s\n" msgstr "Napaka: %s\n" -#: ../meld/meldapp.py:242 +#: ../meld/meldapp.py:230 msgid "Meld is a file and directory comparison tool." msgstr "Meld je orodje za primerjavo vsebine datotek in map." -#: ../meld/meldapp.py:246 +#: ../meld/meldapp.py:234 msgid "Set label to use instead of file name" msgstr "Določi naslov namesto imena datoteke" -#: ../meld/meldapp.py:249 +#: ../meld/meldapp.py:237 msgid "Open a new tab in an already running instance" msgstr "Odpri nov zavihek v že zagnanem programu" -#: ../meld/meldapp.py:252 +#: ../meld/meldapp.py:240 msgid "Automatically compare all differing files on startup" msgstr "Ob zagonu samodejno primerjaj vse različne datoteke." -#: ../meld/meldapp.py:255 +#: ../meld/meldapp.py:243 msgid "Ignored for compatibility" msgstr "Prezrto zaradi skladnosti" -#: ../meld/meldapp.py:259 +#: ../meld/meldapp.py:247 msgid "Set the target file for saving a merge result" msgstr "Določitev ciljne datoteke za shranjevanje rezultatov združevanja." -#: ../meld/meldapp.py:262 +#: ../meld/meldapp.py:250 msgid "Automatically merge files" msgstr "Samodejno združi datoteke" -#: ../meld/meldapp.py:266 +#: ../meld/meldapp.py:254 msgid "Load a saved comparison from a Meld comparison file" msgstr "Naloži shranjeno datoteko primerjav Meld" -#: ../meld/meldapp.py:270 +#: ../meld/meldapp.py:258 msgid "Create a diff tab for the supplied files or folders" msgstr "Ustvari zavihke primerjav za navedene datoteke ali mape." -#: ../meld/meldapp.py:290 +#: ../meld/meldapp.py:278 #, python-format msgid "too many arguments (wanted 0-3, got %d)" msgstr "preveč argumentov (zahtevanih 0-3, prejetih %d)" -#: ../meld/meldapp.py:293 +#: ../meld/meldapp.py:281 #, fuzzy #| msgid "can't auto-merge less than 3 files" msgid "can’t auto-merge less than 3 files" msgstr "manj kot treh datotek ni mogoče samodejno združevati" -#: ../meld/meldapp.py:295 +#: ../meld/meldapp.py:283 #, fuzzy #| msgid "can't auto-merge directories" msgid "can’t auto-merge directories" msgstr "Ni mogoče združiti map" -#: ../meld/meldapp.py:309 +#: ../meld/meldapp.py:297 msgid "Error reading saved comparison file" msgstr "Napaka med branjem datoteke primerjav" -#: ../meld/meldapp.py:326 +#: ../meld/meldapp.py:314 #, fuzzy, python-format msgid "invalid path or URI “%s”" msgstr "Neveljaven naslov URI mape »%s«" -#: ../meld/meldapp.py:332 +#: ../meld/meldapp.py:320 msgid "remote folder “{}” not supported" msgstr "" #. TRANSLATORS: This is the label of a new, currently-unnamed file. -#: ../meld/meldbuffer.py:124 +#: ../meld/meldbuffer.py:123 msgid "" msgstr "" -#: ../meld/melddoc.py:68 +#: ../meld/melddoc.py:63 msgid "untitled" msgstr "neimenovano" -#: ../meld/meldwindow.py:47 +#: ../meld/meldwindow.py:56 msgid "_File" msgstr "_Datoteka" -#: ../meld/meldwindow.py:48 +#: ../meld/meldwindow.py:57 msgid "_New Comparison…" msgstr "_Nova primerjava ..." -#: ../meld/meldwindow.py:49 +#: ../meld/meldwindow.py:58 msgid "Start a new comparison" msgstr "Nova primerjava" -#: ../meld/meldwindow.py:52 +#: ../meld/meldwindow.py:61 msgid "Save the current file" msgstr "Shrani trenutno datoteko" -#: ../meld/meldwindow.py:54 +#: ../meld/meldwindow.py:63 msgid "Save As…" msgstr "Shrani kot ..." -#: ../meld/meldwindow.py:55 +#: ../meld/meldwindow.py:64 msgid "Save the current file with a different name" msgstr "Shrani trenutno datoteko z drugim imenom" -#: ../meld/meldwindow.py:58 +#: ../meld/meldwindow.py:67 msgid "Close the current file" msgstr "Zapri trenutno datoteko" -#: ../meld/meldwindow.py:61 +#: ../meld/meldwindow.py:70 msgid "_Edit" msgstr "_Uredi" -#: ../meld/meldwindow.py:63 +#: ../meld/meldwindow.py:72 msgid "Undo the last action" msgstr "Razveljavi zadnje dejanje" -#: ../meld/meldwindow.py:66 +#: ../meld/meldwindow.py:75 msgid "Redo the last undone action" msgstr "Obnovi zadnje razveljavljeno dejanje" -#: ../meld/meldwindow.py:68 +#: ../meld/meldwindow.py:77 msgid "Cut the selection" msgstr "Izreži izbrano" -#: ../meld/meldwindow.py:70 +#: ../meld/meldwindow.py:79 msgid "Copy the selection" msgstr "Kopiraj izbrano" -#: ../meld/meldwindow.py:72 +#: ../meld/meldwindow.py:81 msgid "Paste the clipboard" msgstr "Prilepi iz odložišča" -#: ../meld/meldwindow.py:74 +#: ../meld/meldwindow.py:83 msgid "Find…" msgstr "Najdi ..." -#: ../meld/meldwindow.py:74 +#: ../meld/meldwindow.py:83 msgid "Search for text" msgstr "Poišči besedilo" -#: ../meld/meldwindow.py:76 +#: ../meld/meldwindow.py:85 msgid "Find Ne_xt" msgstr "Najdi _naslednje" -#: ../meld/meldwindow.py:77 +#: ../meld/meldwindow.py:86 msgid "Search forwards for the same text" msgstr "Poišči niz naprej po besedilu" -#: ../meld/meldwindow.py:79 +#: ../meld/meldwindow.py:88 msgid "Find _Previous" msgstr "Najdi _predhodne" -#: ../meld/meldwindow.py:80 +#: ../meld/meldwindow.py:89 msgid "Search backwards for the same text" msgstr "Besedilo najdi nazaj po besedilu" -#: ../meld/meldwindow.py:83 +#: ../meld/meldwindow.py:92 msgid "_Replace…" msgstr "_Zamenjaj ..." -#: ../meld/meldwindow.py:84 +#: ../meld/meldwindow.py:93 msgid "Find and replace text" msgstr "Poišči in zamenjaj besedilo" -#: ../meld/meldwindow.py:86 +#: ../meld/meldwindow.py:95 msgid "Go to _Line" msgstr "Skoči v _vrstico" -#: ../meld/meldwindow.py:87 +#: ../meld/meldwindow.py:96 msgid "Go to a specific line" msgstr "" -#: ../meld/meldwindow.py:90 +#: ../meld/meldwindow.py:99 msgid "_Changes" msgstr "_Spremembe" -#: ../meld/meldwindow.py:91 +#: ../meld/meldwindow.py:100 msgid "Next Change" msgstr "Naslednja sprememba" -#: ../meld/meldwindow.py:92 +#: ../meld/meldwindow.py:101 msgid "Go to the next change" msgstr "Skoči na naslednjo spremembo" -#: ../meld/meldwindow.py:94 +#: ../meld/meldwindow.py:103 msgid "Previous Change" msgstr "Predhodna sprememba" -#: ../meld/meldwindow.py:95 +#: ../meld/meldwindow.py:104 msgid "Go to the previous change" msgstr "Skoči na predhodno spremembo" -#: ../meld/meldwindow.py:97 +#: ../meld/meldwindow.py:106 msgid "Open Externally" msgstr "Odpri v zunanjem programu" -#: ../meld/meldwindow.py:98 +#: ../meld/meldwindow.py:107 msgid "Open selected file or directory in the default external application" msgstr "Odpri zbrano datoteko ali mapo v privzetem zunanjem programu" -#: ../meld/meldwindow.py:102 +#: ../meld/meldwindow.py:111 msgid "_View" msgstr "_Pogled" -#: ../meld/meldwindow.py:103 +#: ../meld/meldwindow.py:112 msgid "File Status" msgstr "Stanje datoteke" -#: ../meld/meldwindow.py:104 +#: ../meld/meldwindow.py:113 msgid "Version Status" msgstr "Stanje različice" -#: ../meld/meldwindow.py:107 +#: ../meld/meldwindow.py:116 msgid "Stop the current action" msgstr "Ustavi trenutno dejanje" -#: ../meld/meldwindow.py:110 +#: ../meld/meldwindow.py:119 msgid "Refresh the view" msgstr "Osveži pogled" -#: ../meld/meldwindow.py:114 +#: ../meld/meldwindow.py:123 msgid "Fullscreen" msgstr "Celozaslonski način" -#: ../meld/meldwindow.py:115 +#: ../meld/meldwindow.py:124 msgid "View the comparison in fullscreen" msgstr "Pokaži primerjavo v celozaslonskem načinu" -#: ../meld/meldwindow.py:117 -msgid "_Toolbar" -msgstr "_Orodna vrstica" - -#: ../meld/meldwindow.py:118 -msgid "Show or hide the toolbar" -msgstr "Pokaži ali skrij orodno vrstico" - -#: ../meld/meldwindow.py:127 +#: ../meld/meldwindow.py:133 msgid "Open Recent" msgstr "Odpri nedavno" -#: ../meld/meldwindow.py:128 +#: ../meld/meldwindow.py:134 msgid "Open recent files" msgstr "Odpri nedavne datoteke" -#: ../meld/meldwindow.py:150 -msgid "_Meld" -msgstr "_Meld" - -#: ../meld/meldwindow.py:151 -msgid "Quit the program" -msgstr "Končaj program" - -#: ../meld/meldwindow.py:153 -msgid "Prefere_nces" -msgstr "Mož_nosti" - -#: ../meld/meldwindow.py:154 -msgid "Configure the application" -msgstr "Spremeni nastavitve programa" - -#: ../meld/meldwindow.py:156 -msgid "_Contents" -msgstr "_Vsebina" - -#: ../meld/meldwindow.py:157 -msgid "Open the Meld manual" -msgstr "Odpri priročnik Meld" - -#: ../meld/meldwindow.py:159 -msgid "About this application" -msgstr "O programu" - -#: ../meld/meldwindow.py:602 +#: ../meld/meldwindow.py:567 #, python-format msgid "Need three files to auto-merge, got: %r" msgstr "" -#: ../meld/meldwindow.py:623 +#: ../meld/meldwindow.py:588 msgid "Cannot compare a mixture of files and directories" msgstr "Ni mogoče sočasno primerjati datotek in map" -#: ../meld/misc.py:136 +#: ../meld/misc.py:155 msgid "" "{}\n" "\n" @@ -2322,51 +2275,47 @@ msgid "" "{}" msgstr "" -#: ../meld/misc.py:255 +#: ../meld/misc.py:237 #, python-format msgid "Couldn’t find colour scheme details for %s-%s; this is a bad install" msgstr "" -#: ../meld/misc.py:326 +#: ../meld/misc.py:311 msgid "[None]" msgstr "[noben]" -#: ../meld/preferences.py:33 +#: ../meld/preferences.py:42 ../meld/preferences.py:135 msgid "label" msgstr "oznaka" -#: ../meld/preferences.py:33 +#: ../meld/preferences.py:42 ../meld/preferences.py:135 msgid "pattern" msgstr "vzorec" -#: ../meld/recent.py:105 +#: ../meld/recent.py:106 msgid "Version control:" msgstr "Nadzor različic:" -#: ../meld/ui/bufferselectors.py:32 +#: ../meld/ui/bufferselectors.py:114 #, python-brace-format msgid "{name} ({charset})" msgstr "{name} ({charset})" -#: ../meld/ui/bufferselectors.py:65 ../meld/ui/bufferselectors.py:73 +#: ../meld/ui/bufferselectors.py:144 ../meld/ui/bufferselectors.py:152 msgid "Plain Text" msgstr "Običajno besedilo" -#: ../meld/ui/notebooklabel.py:63 -msgid "Close tab" -msgstr "Zapri zavihek" - #. 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 "Vr. %i, St. %i" -#: ../meld/ui/statusbar.py:177 +#: ../meld/ui/statusbar.py:182 msgid "Line you want to move the cursor to" msgstr "" -#: ../meld/ui/vcdialogs.py:48 +#: ../meld/ui/vcdialogs.py:55 msgid "No files will be committed" msgstr "Ni pripravljenih datotek za uveljavitev" @@ -2422,141 +2371,141 @@ msgstr "Brez" msgid "Rev %s" msgstr "Za '%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:70 +#: ../meld/vc/_vc.py:71 msgid "Unversioned" msgstr "Brez določene različice" -#: ../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" #. Translators: This error message is shown when a version #. control binary isn't installed. -#: ../meld/vcview.py:248 +#: ../meld/vcview.py:282 #, fuzzy, python-format msgid "%(name)s (%(cmd)s not installed)" msgstr "Nameščena različica %s %s" #. Translators: This error message is shown when a version #. controlled repository is invalid. -#: ../meld/vcview.py:252 +#: ../meld/vcview.py:286 #, fuzzy, python-format msgid "%(name)s (Invalid repository)" msgstr "Neveljavno ime skupine: %s" -#: ../meld/vcview.py:273 +#: ../meld/vcview.py:307 msgid "No valid version control system found in this folder" msgstr "Ni veljavnega sistema za nadzor različic v tej mapi" -#: ../meld/vcview.py:275 +#: ../meld/vcview.py:309 msgid "Only one version control system found in this folder" msgstr "V tej mapi je le en sistem nadzora različic" -#: ../meld/vcview.py:277 +#: ../meld/vcview.py:311 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:331 +#: ../meld/vcview.py:366 #, python-format msgid "%s: %s" msgstr "%s: %s" #. Initial yield so when we add this to our tasks, we don't #. create iterators that may be invalidated. -#: ../meld/vcview.py:338 +#: ../meld/vcview.py:373 msgid "Scanning repository" msgstr "Poteka preiskovanje skladišča" -#: ../meld/vcview.py:367 +#: ../meld/vcview.py:402 #, python-format msgid "Scanning %s" msgstr "Preiskovanje %s" -#: ../meld/vcview.py:406 +#: ../meld/vcview.py:441 msgid "(Empty)" msgstr "(Prazno)" -#: ../meld/vcview.py:450 +#: ../meld/vcview.py:487 #, python-format msgid "%s — local" msgstr "%s — krajevno" -#: ../meld/vcview.py:451 +#: ../meld/vcview.py:488 #, python-format msgid "%s — remote" msgstr "%s — oddaljeno" -#: ../meld/vcview.py:459 +#: ../meld/vcview.py:496 #, python-format msgid "%s (local, merge, remote)" msgstr "%s (krajevno, združi, oddaljeno)" -#: ../meld/vcview.py:464 +#: ../meld/vcview.py:501 #, python-format msgid "%s (remote, merge, local)" msgstr "%s (oddaljeno, združi, krajevno)" -#: ../meld/vcview.py:475 +#: ../meld/vcview.py:512 #, python-format msgid "%s — repository" msgstr "%s — skladišče" -#: ../meld/vcview.py:481 +#: ../meld/vcview.py:518 #, python-format msgid "%s (working, repository)" msgstr "%s (delovno, skladišče)" -#: ../meld/vcview.py:485 +#: ../meld/vcview.py:522 #, python-format msgid "%s (repository, working)" msgstr "%s (skladišče, delovno)" -#: ../meld/vcview.py:674 +#: ../meld/vcview.py:688 msgid "Remove folder and all its files?" msgstr "Ali želite izbrisati mapo in vse njene datoteke?" -#: ../meld/vcview.py:676 +#: ../meld/vcview.py:690 msgid "" "This will remove all selected files and folders, and all files within any " "selected folders, from version control." @@ -2564,10 +2513,64 @@ msgstr "" "S tem dejanjem bodo odstranjene vse izbrane datoteke in mape in vse " "podrejene datoteke iz sistema za nadzor različic" -#: ../meld/vcview.py:785 +#: ../meld/vcview.py:804 msgid "Clear" msgstr "Počisti" +#~ 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 "Editable List" +#~ msgstr "Uredljiv seznam" + +#~ msgid "Meld Preferences" +#~ msgstr "Možnosti Meld" + +#~ 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 "_Toolbar" +#~ msgstr "_Orodna vrstica" + +#~ msgid "Show or hide the toolbar" +#~ msgstr "Pokaži ali skrij orodno vrstico" + +#~ 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 "INS" #~ msgstr "VST" From c34b9e11978ca4f09841877c188a9a9a0a3db6fb Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Mon, 28 Jan 2019 07:40:47 +1000 Subject: [PATCH 0831/1316] meldapp: Fix default window icon --- meld/meldapp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meld/meldapp.py b/meld/meldapp.py index a3b4610e..2c77afa9 100644 --- a/meld/meldapp.py +++ b/meld/meldapp.py @@ -48,7 +48,7 @@ def __init__(self): ) GLib.set_application_name("Meld") GLib.set_prgname(meld.conf.APPLICATION_ID) - Gtk.Window.set_default_icon_name("meld") + Gtk.Window.set_default_icon_name("org.gnome.meld") def do_startup(self): Gtk.Application.do_startup(self) From 347505814e43cfdad125ecd3759a7c5d70835371 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Mon, 28 Jan 2019 07:41:14 +1000 Subject: [PATCH 0832/1316] setup_win32: Make the non-escape-sequences clear --- setup_win32.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setup_win32.py b/setup_win32.py index 9c1a98d1..960b1de9 100755 --- a/setup_win32.py +++ b/setup_win32.py @@ -89,15 +89,15 @@ def get_non_python_libs(): # Create our registry key, and fill with install directory and exe registry_table = [ - ('MeldKLM', 2, 'SOFTWARE\Meld', '*', None, 'TARGETDIR'), - ('MeldInstallDir', 2, 'SOFTWARE\Meld', 'InstallDir', '[TARGETDIR]', 'TARGETDIR'), - ('MeldExecutable', 2, 'SOFTWARE\Meld', 'Executable', '[TARGETDIR]Meld.exe', 'TARGETDIR'), + ('MeldKLM', 2, r'SOFTWARE\Meld', '*', None, 'TARGETDIR'), + ('MeldInstallDir', 2, r'SOFTWARE\Meld', 'InstallDir', '[TARGETDIR]', 'TARGETDIR'), + ('MeldExecutable', 2, r'SOFTWARE\Meld', 'Executable', '[TARGETDIR]Meld.exe', 'TARGETDIR'), ] # Provide the locator and app search to give MSI the existing install directory # for future upgrades reg_locator_table = [ - ('MeldInstallDirLocate', 2, 'SOFTWARE\Meld', 'InstallDir', 0) + ('MeldInstallDirLocate', 2, r'SOFTWARE\Meld', 'InstallDir', 0) ] app_search_table = [('TARGETDIR', 'MeldInstallDirLocate')] From 45086fd0e4ea6c28fdcd18415662842039bbf41c Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Mon, 11 Feb 2019 07:44:49 +1000 Subject: [PATCH 0833/1316] gutterrendererchunk: Remove the action GtkSourceGutter for replacement --- meld/filediff.py | 24 +--- meld/gutterrendererchunk.py | 221 ------------------------------------ 2 files changed, 1 insertion(+), 244 deletions(-) diff --git a/meld/filediff.py b/meld/filediff.py index 4b62a46a..67b5f262 100644 --- a/meld/filediff.py +++ b/meld/filediff.py @@ -29,6 +29,7 @@ from meld import misc from meld.conf import _, ui_file from meld.const import MODE_DELETE, MODE_INSERT, MODE_REPLACE, NEWLINES +from meld.gutterrendererchunk import GutterRendererChunkLines from meld.iohelpers import prompt_save_filename from meld.matchers.diffutil import Differ, merged_chunk_order from meld.matchers.helpers import CachedSequenceMatcher @@ -313,33 +314,10 @@ def go_to_line(widget, line, pane): statusbar.connect('go-to-line', go_to_line, pane) # Prototype implementation - - from meld.gutterrendererchunk import ( - GutterRendererChunkAction, GutterRendererChunkLines) - for pane, t in enumerate(self.textview): # FIXME: set_num_panes will break this good direction = t.get_direction() - if pane == 0 or (pane == 1 and self.num_panes == 3): - window = Gtk.TextWindowType.RIGHT - if direction == Gtk.TextDirection.RTL: - window = Gtk.TextWindowType.LEFT - views = [self.textview[pane], self.textview[pane + 1]] - renderer = GutterRendererChunkAction( - pane, pane + 1, views, self, self.linediffer) - gutter = t.get_gutter(window) - gutter.insert(renderer, 10) - if pane in (1, 2): - window = Gtk.TextWindowType.LEFT - if direction == Gtk.TextDirection.RTL: - window = Gtk.TextWindowType.RIGHT - views = [self.textview[pane], self.textview[pane - 1]] - renderer = GutterRendererChunkAction( - pane, pane - 1, views, self, self.linediffer) - gutter = t.get_gutter(window) - gutter.insert(renderer, -40) - # TODO: This renderer handling should all be part of # MeldSourceView, but our current diff-chunk-handling makes # this difficult. diff --git a/meld/gutterrendererchunk.py b/meld/gutterrendererchunk.py index 55746778..c2a62acd 100644 --- a/meld/gutterrendererchunk.py +++ b/meld/gutterrendererchunk.py @@ -16,34 +16,11 @@ import math from gi.repository import Gdk -from gi.repository import Gtk from gi.repository import GtkSource from gi.repository import Pango -from meld.conf import _ -from meld.const import MODE_DELETE, MODE_INSERT, MODE_REPLACE from meld.misc import get_common_theme from meld.settings import meldsettings -from meld.ui.gtkcompat import get_style - -# Fixed size of the renderer. Ideally this would be font-dependent and -# would adjust to other textview attributes, but that's both quite difficult -# and not necessarily desirable. -LINE_HEIGHT = 16 - -GTK_RENDERER_STATE_MAPPING = { - GtkSource.GutterRendererState.NORMAL: Gtk.StateFlags.NORMAL, - GtkSource.GutterRendererState.CURSOR: Gtk.StateFlags.FOCUSED, - GtkSource.GutterRendererState.PRELIT: Gtk.StateFlags.PRELIGHT, - GtkSource.GutterRendererState.SELECTED: Gtk.StateFlags.SELECTED, -} - -ALIGN_MODE_FIRST = GtkSource.GutterRendererAlignmentMode.FIRST - - -def load(icon_name): - icon_theme = Gtk.IconTheme.get_default() - return icon_theme.load_icon(icon_name, LINE_HEIGHT, 0) def get_background_rgba(renderer): @@ -69,14 +46,6 @@ def get_background_rgba(renderer): _background_rgba = None -def renderer_to_gtk_state(state): - gtk_state = Gtk.StateFlags(0) - for renderer_flag, gtk_flag in GTK_RENDERER_STATE_MAPPING.items(): - if renderer_flag & state: - gtk_state |= gtk_flag - return gtk_state - - class MeldGutterRenderer: def set_renderer_defaults(self): @@ -147,196 +116,6 @@ def query_chunks(self, start, end, state): return in_chunk -class GutterRendererChunkAction( - GtkSource.GutterRendererPixbuf, MeldGutterRenderer): - __gtype_name__ = "GutterRendererChunkAction" - - ACTION_MAP = { - 'LTR': { - MODE_REPLACE: load("meld-change-apply-right"), - MODE_DELETE: load("meld-change-delete"), - MODE_INSERT: load("meld-change-copy"), - }, - 'RTL': { - MODE_REPLACE: load("meld-change-apply-left"), - MODE_DELETE: load("meld-change-delete"), - MODE_INSERT: load("meld-change-copy"), - } - } - - def __init__(self, from_pane, to_pane, views, filediff, linediffer): - super().__init__() - self.set_renderer_defaults() - self.from_pane = from_pane - self.to_pane = to_pane - # FIXME: Views are needed only for editable checking; connect to this - # in Filediff instead? - self.views = views - # FIXME: Don't pass in the linediffer; pass a generator like elsewhere - self.linediffer = linediffer - self.mode = MODE_REPLACE - self.set_size(LINE_HEIGHT) - direction = 'LTR' if from_pane < to_pane else 'RTL' - if self.views[0].get_direction() == Gtk.TextDirection.RTL: - direction = 'LTR' if direction == 'RTL' else 'RTL' - - self.is_action = False - self.action_map = self.ACTION_MAP[direction] - self.filediff = filediff - self.filediff.connect("action-mode-changed", - self.on_container_mode_changed) - - meldsettings.connect('changed', self.on_setting_changed) - self.on_setting_changed(meldsettings, 'style-scheme') - - def do_activate(self, start, area, event): - line = start.get_line() - chunk_index = self.linediffer.locate_chunk(self.from_pane, line)[0] - if chunk_index is None: - return - - chunk = self.linediffer.get_chunk( - chunk_index, self.from_pane, self.to_pane) - if chunk[1] != line: - return - - action = self._classify_change_actions(chunk) - if action == MODE_DELETE: - self.filediff.delete_chunk(self.from_pane, chunk) - elif action == MODE_INSERT: - copy_menu = self._make_copy_menu(chunk) - copy_menu.popup_at_rect( - self.get_view().get_window(self.get_window_type()), - area, - Gdk.Gravity.SOUTH_WEST, - Gdk.Gravity.NORTH_WEST, - None, - ) - elif action == MODE_REPLACE: - self.filediff.replace_chunk(self.from_pane, self.to_pane, chunk) - - def _make_copy_menu(self, chunk): - copy_menu = Gtk.Menu() - copy_up = Gtk.MenuItem.new_with_mnemonic(_("Copy _up")) - copy_down = Gtk.MenuItem.new_with_mnemonic(_("Copy _down")) - copy_menu.append(copy_up) - copy_menu.append(copy_down) - copy_menu.show_all() - - # FIXME: This is horrible - copy_menu.attach_to_widget(self.filediff, None) - - def copy_chunk(widget, chunk, copy_up): - self.filediff.copy_chunk(self.from_pane, self.to_pane, chunk, - copy_up) - - copy_up.connect('activate', copy_chunk, chunk, True) - copy_down.connect('activate', copy_chunk, chunk, False) - return copy_menu - - def do_begin(self, *args): - self.views_editable = [v.get_editable() for v in self.views] - - def do_draw(self, context, background_area, cell_area, start, end, state): - GtkSource.GutterRendererPixbuf.do_draw( - self, context, background_area, cell_area, start, end, state) - if self.is_action: - # TODO: Fix padding and min-height in CSS and use - # draw_style_common - style_context = get_style(None, "button.flat.image-button") - style_context.set_state(renderer_to_gtk_state(state)) - - x = background_area.x + 1 - y = background_area.y + 1 - width = background_area.width - 2 - height = background_area.height - 2 - - Gtk.render_background(style_context, context, x, y, width, height) - Gtk.render_frame(style_context, context, x, y, width, height) - - pixbuf = self.props.pixbuf - pix_width, pix_height = pixbuf.props.width, pixbuf.props.height - - xalign, yalign = self.get_alignment() - align_mode = self.get_alignment_mode() - if align_mode == GtkSource.GutterRendererAlignmentMode.CELL: - icon_x = x + (width - pix_width) // 2 - icon_y = y + (height - pix_height) // 2 - else: - line_iter = start if align_mode == ALIGN_MODE_FIRST else end - textview = self.get_view() - loc = textview.get_iter_location(line_iter) - line_x, line_y = textview.buffer_to_window_coords( - self.get_window_type(), loc.x, loc.y) - icon_x = cell_area.x + (cell_area.width - pix_width) * xalign - icon_y = line_y + (loc.height - pix_height) * yalign - - Gtk.render_icon(style_context, context, pixbuf, icon_x, icon_y) - - self.draw_chunks( - context, background_area, cell_area, start, end, state) - - def do_query_activatable(self, start, area, event): - line = start.get_line() - chunk_index = self.linediffer.locate_chunk(self.from_pane, line)[0] - if chunk_index is not None: - # FIXME: This is all chunks, not just those shared with to_pane - chunk = self.linediffer.get_chunk(chunk_index, self.from_pane) - if chunk[1] == line: - return True - return False - - def do_query_data(self, start, end, state): - self.query_chunks(start, end, state) - line = start.get_line() - - if self._chunk and self._chunk[1] == line: - action = self._classify_change_actions(self._chunk) - pixbuf = self.action_map.get(action) - else: - pixbuf = None - self.is_action = bool(pixbuf) - self.props.pixbuf = pixbuf - - def on_container_mode_changed(self, container, mode): - self.mode = mode - self.queue_draw() - - def _classify_change_actions(self, change): - """Classify possible actions for the given change - - Returns the action that can be performed given the content and - context of the change. - """ - editable, other_editable = self.views_editable - - if not editable and not other_editable: - return None - - # Reclassify conflict changes, since we treat them the same as a - # normal two-way change as far as actions are concerned - change_type = change[0] - if change_type == "conflict": - if change[1] == change[2]: - change_type = "insert" - elif change[3] == change[4]: - change_type = "delete" - else: - change_type = "replace" - - if change_type == 'insert': - return None - - action = self.mode - if action == MODE_DELETE and not editable: - action = None - elif action == MODE_INSERT and change_type == 'delete': - action = MODE_REPLACE - if not other_editable: - action = MODE_DELETE - return action - - # GutterRendererChunkLines is an adaptation of GtkSourceGutterRendererLines # Copyright (C) 2010 - Jesse van den Kieboom # From 47316608b9d1bb53d4828360de06bd610f59e3f3 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Mon, 11 Feb 2019 07:47:32 +1000 Subject: [PATCH 0834/1316] filediff: Remove diffmaps --- meld/filediff.py | 27 ++++++-------------- meld/resources/ui/filediff.ui | 46 ----------------------------------- 2 files changed, 8 insertions(+), 65 deletions(-) diff --git a/meld/filediff.py b/meld/filediff.py index 67b5f262..1899f84c 100644 --- a/meld/filediff.py +++ b/meld/filediff.py @@ -117,10 +117,6 @@ class FileDiff(Gtk.VBox, MeldDoc): ) actiongroup = Template.Child('FilediffActions') - diffmap0 = Template.Child() - diffmap1 = Template.Child() - dummy_toolbar_diffmap0 = Template.Child() - dummy_toolbar_diffmap1 = Template.Child() dummy_toolbar_linkmap0 = Template.Child() dummy_toolbar_linkmap1 = Template.Child() fileentry0 = Template.Child() @@ -200,11 +196,11 @@ def __init__(self, num_panes): bind_settings(self) widget_lists = [ - "diffmap", "file_save_button", "file_toolbar", "fileentry", + "file_save_button", "file_toolbar", "fileentry", "linkmap", "msgarea_mgr", "readonlytoggle", "scrolledwindow", "textview", "vbox", "dummy_toolbar_linkmap", "filelabel_toolitem", "filelabel", - "fileentry_toolitem", "dummy_toolbar_diffmap", "statusbar", + "fileentry_toolitem", "statusbar", ] map_widgets_into_lists(self, widget_lists) @@ -288,9 +284,6 @@ def __init__(self, num_panes): self.undosequence.connect("checkpointed", self.on_undo_checkpointed) self.connect("next-conflict-changed", self.on_next_conflict_changed) - for diffmap in self.diffmap: - self.linediffer.connect('diffs-changed', diffmap.on_diffs_changed) - for statusbar, buf in zip(self.statusbar, self.textbuffer): buf.bind_property( 'language', statusbar, 'source-language', @@ -1833,8 +1826,6 @@ def queue_draw(self, junk=None): t.queue_draw() for i in range(self.num_panes-1): self.linkmap[i].queue_draw() - self.diffmap0.queue_draw() - self.diffmap1.queue_draw() @Template.Callback() def on_action_lock_scrolling_toggled(self, action): @@ -1938,15 +1929,17 @@ def set_num_panes(self, n): self.num_panes = n for widget in ( - self.vbox[:n] + self.file_toolbar[:n] + self.diffmap[:n] + + self.vbox[:n] + self.file_toolbar[:n] + self.linkmap[:n - 1] + self.dummy_toolbar_linkmap[:n - 1] + - self.dummy_toolbar_diffmap[:n - 1] + self.statusbar[:n]): + self.statusbar[:n] + ): widget.show() for widget in ( - self.vbox[n:] + self.file_toolbar[n:] + self.diffmap[n:] + + self.vbox[n:] + self.file_toolbar[n:] + self.linkmap[n - 1:] + self.dummy_toolbar_linkmap[n - 1:] + - self.dummy_toolbar_diffmap[n - 1:] + self.statusbar[n:]): + self.statusbar[n:] + ): widget.hide() self.actiongroup.get_action("MakePatch").set_sensitive(n > 1) @@ -1985,10 +1978,6 @@ def coords_by_chunk(): yield c[0], y0 / max_y, (y + h) / max_y return coords_by_chunk - for (w, i) in zip(self.diffmap, (0, self.num_panes - 1)): - scroll = self.scrolledwindow[i].get_vscrollbar() - w.setup(scroll, coords_iter(i)) - for (w, i) in zip(self.linkmap, (0, self.num_panes - 2)): w.associate(self, self.textview[i], self.textview[i + 1]) diff --git a/meld/resources/ui/filediff.ui b/meld/resources/ui/filediff.ui index 855d5997..7eb14d55 100644 --- a/meld/resources/ui/filediff.ui +++ b/meld/resources/ui/filediff.ui @@ -385,29 +385,6 @@ 1 - - - True - False - - - - 6 - 0 - - - - - True - False - - - 6 - 1 - - True @@ -434,29 +411,6 @@ 1 - - - True - False - - - - 0 - 0 - - - - - True - False - - - 0 - 1 - - True From 301c0f2947e2ee5b8431fde519790aed8df648fe Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Mon, 11 Feb 2019 08:00:51 +1000 Subject: [PATCH 0835/1316] filediff: Move action mode to a gprop on FileDiff Having this is nicer than emitting a signal, and it makes it possible to simply prop-bind in a future gutter implementation. --- meld/const.py | 13 +++++++++---- meld/filediff.py | 19 ++++++++++++------- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/meld/const.py b/meld/const.py index f6ae1271..9738960b 100644 --- a/meld/const.py +++ b/meld/const.py @@ -1,12 +1,17 @@ +import enum + from gi.repository import GtkSource from meld.conf import _ -# Chunk action mode, set by filediff and used in gutterrendererchunk -MODE_REPLACE = 0 -MODE_DELETE = 1 -MODE_INSERT = 2 + +class ActionMode(enum.IntEnum): + """Action mode for chunk change actions""" + Replace = 0 + Delete = 1 + Insert = 2 + NEWLINES = { GtkSource.NewlineType.LF: ('\n', _("UNIX (LF)")), diff --git a/meld/filediff.py b/meld/filediff.py index 1899f84c..e8a92bc6 100644 --- a/meld/filediff.py +++ b/meld/filediff.py @@ -28,7 +28,7 @@ # TODO: Don't from-import whole modules from meld import misc from meld.conf import _, ui_file -from meld.const import MODE_DELETE, MODE_INSERT, MODE_REPLACE, NEWLINES +from meld.const import ActionMode, NEWLINES from meld.gutterrendererchunk import GutterRendererChunkLines from meld.iohelpers import prompt_save_filename from meld.matchers.diffutil import Differ, merged_chunk_order @@ -177,10 +177,14 @@ class FileDiff(Gtk.VBox, MeldDoc): __gsignals__ = { 'next-conflict-changed': ( GObject.SignalFlags.RUN_FIRST, None, (bool, bool)), - 'action-mode-changed': ( - GObject.SignalFlags.RUN_FIRST, None, (int,)), } + action_mode = GObject.Property( + type=int, + nick='Action mode for chunk change actions', + default=ActionMode.Replace, + ) + def __init__(self, num_panes): super().__init__() # FIXME: @@ -346,13 +350,14 @@ def get_keymask(self): def set_keymask(self, value): if value & MASK_SHIFT: - mode = MODE_DELETE + mode = ActionMode.Delete elif value & MASK_CTRL: - mode = MODE_INSERT + mode = ActionMode.Insert else: - mode = MODE_REPLACE + mode = ActionMode.Replace self._keymask = value - self.emit("action-mode-changed", mode) + self.action_mode = mode + keymask = property(get_keymask, set_keymask) @Template.Callback() From 26e2778713f9db547e17012616ac71c2d3007363 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Tue, 12 Feb 2019 06:28:28 +1000 Subject: [PATCH 0836/1316] filediff: Give the statusbar row a consistent thin border --- data/meld.css | 6 ++++++ meld/resources/ui/filediff.ui | 39 +++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/data/meld.css b/data/meld.css index 86d40ec3..8a5dbd53 100644 --- a/data/meld.css +++ b/data/meld.css @@ -31,6 +31,12 @@ link-map { border-color: @borders; } +.meld-status-bar { + border-width: 1px 0 0 0; + border-style: solid; + border-color: @borders; +} + .not-found { color: white; background-image: none; diff --git a/meld/resources/ui/filediff.ui b/meld/resources/ui/filediff.ui index 7eb14d55..e5d4f8b1 100644 --- a/meld/resources/ui/filediff.ui +++ b/meld/resources/ui/filediff.ui @@ -440,24 +440,63 @@ True + False + 1 3 + + + True + False + + + + 2 + 3 + + True + False + 3 3 + + + True + False + + + + 4 + 3 + 3 + + True + False + 5 From fc59f61cde169e2d521a627e754608d1736be0fd Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Tue, 12 Feb 2019 06:31:45 +1000 Subject: [PATCH 0837/1316] filediff: Remove an unneeded LinkMap expose --- meld/filediff.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/meld/filediff.py b/meld/filediff.py index e8a92bc6..5cc02d41 100644 --- a/meld/filediff.py +++ b/meld/filediff.py @@ -1745,8 +1745,6 @@ def set_buffer_editable(self, buf, editable): 'changes-prevent-symbolic') self.textview[index].set_editable(editable) self.on_cursor_position_changed(buf, None, True) - for linkmap in self.linkmap: - linkmap.queue_draw() @with_focused_pane def save(self, pane): From 331f46cd787cd23af8d69b21b3d22f83c8c40315 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Tue, 12 Feb 2019 06:33:07 +1000 Subject: [PATCH 0838/1316] actiongutter: New widget to replace GutterRendererChunkAction The main reason we're looking to replace the existing GutterRendererChunkAction is that using gutters for actions (and specifically using the right-hand gutter) doesn't really work visually, and conflicts somewhat with using overlay scrolling. The visual problem is that the gutter is included in rendering + sizing of the GtkSourceView, but when you look at the widget layout on screen, you kind of expect other alignment points (e.g., per-pane toolbars, per-pane infobars) not to cover the gutter space... but they do. Similarly, the visual hint for scrolling area (light dashed lines) on the textview appears on the far side of the gutter, but within its allocation... which again feels wrong. The conflict with overlay scrolling is much more straightforward. Overlay scrolling draws over the edge sub-window of the textview, which is by design the action gutter. This means that scrolling covers the action gutter (which looks wrong), and also that trying to activate buttons in the action gutter triggers the overlay scrollbar expansion. --- data/meld.css | 4 + meld/actiongutter.py | 402 ++++++++++++++++++++++++++++++++++++++ meld/const.py | 8 + meld/matchers/diffutil.py | 13 ++ 4 files changed, 427 insertions(+) create mode 100644 meld/actiongutter.py diff --git a/data/meld.css b/data/meld.css index 8a5dbd53..7a299939 100644 --- a/data/meld.css +++ b/data/meld.css @@ -25,6 +25,10 @@ link-map { background-color: @theme_bg_color; } +action-gutter { + background-color: @theme_bg_color; +} + .meld-vc-console-pane { border-width: 1px 0 0 0; border-style: solid; diff --git a/meld/actiongutter.py b/meld/actiongutter.py new file mode 100644 index 00000000..3801a3c8 --- /dev/null +++ b/meld/actiongutter.py @@ -0,0 +1,402 @@ +# Copyright (C) 2019 Kai Willadsen +# +# This program 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. +# +# This program 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. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +import bisect +from typing import Dict, Optional + +from gi.repository import Gdk +from gi.repository import GdkPixbuf +from gi.repository import GObject +from gi.repository import Gtk + +from meld.conf import _ +from meld.const import ActionMode, ChunkAction +from meld.misc import get_common_theme +from meld.settings import meldsettings +from meld.ui.gtkcompat import get_style + + +class ActionIcons: + + #: Fixed size of the renderer. Ideally this would be font-dependent and + #: would adjust to other textview attributes, but that's both quite + #: difficult and not necessarily desirable. + pixbuf_height = 16 + icon_cache: Dict[str, GdkPixbuf.Pixbuf] = {} + icon_name_prefix = 'meld-change' + + @classmethod + def load(cls, icon_name: str): + icon = cls.icon_cache.get(icon_name) + + if not icon: + icon_theme = Gtk.IconTheme.get_default() + icon = icon_theme.load_icon( + f'{cls.icon_name_prefix}-{icon_name}', cls.pixbuf_height, 0) + cls.icon_cache[icon_name] = icon + + return icon + + +class ActionGutter(Gtk.DrawingArea): + + __gtype_name__ = 'ActionGutter' + + action_mode = GObject.Property( + type=int, + nick='Action mode for chunk change actions', + default=ActionMode.Replace, + ) + + @GObject.Property( + type=object, + nick='List of diff chunks for display', + ) + def chunks(self): + return self._chunks + + @chunks.setter + def chunks_set(self, chunks): + self._chunks = chunks + self.chunk_starts = [c.start_a for c in chunks] + + @GObject.Property( + type=Gtk.IconLookupFlags, + nick='Which direction should directional changes appear to go', + flags=( + GObject.ParamFlags.READABLE | + GObject.ParamFlags.WRITABLE | + GObject.ParamFlags.CONSTRUCT_ONLY + ), + default=Gtk.IconLookupFlags.DIR_LTR, + ) + def icon_direction(self): + return self._icon_direction + + @icon_direction.setter + def icon_direction_set(self, direction: Gtk.IconLookupFlags): + if direction not in ( + Gtk.IconLookupFlags.DIR_LTR, Gtk.IconLookupFlags.DIR_RTL): + raise ValueError('Invalid icon direction {}'.format(direction)) + + replace_icons = { + Gtk.IconLookupFlags.DIR_LTR: 'apply-right', + Gtk.IconLookupFlags.DIR_RTL: 'apply-left', + } + self.action_map = { + ActionMode.Replace: ActionIcons.load(replace_icons[direction]), + ActionMode.Delete: ActionIcons.load('delete'), + ActionMode.Insert: ActionIcons.load('copy'), + } + self._icon_direction = direction + + _source_view: Gtk.TextView + _source_editable_connect_id: int = 0 + + @GObject.Property( + type=Gtk.TextView, + nick='Text view for which action are displayed', + default=None, + ) + def source_view(self): + return self._source_view + + @source_view.setter + def source_view_setter(self, view: Gtk.TextView): + if self._source_editable_connect_id: + self._source_view.disconnect(self._source_editable_connect_id) + + self._source_editable_connect_id = view.connect( + 'notify::editable', lambda *args: self.queue_draw) + self._source_view = view + self.queue_draw() + + _target_view: Gtk.TextView + _target_editable_connect_id: int = 0 + + @GObject.Property( + type=Gtk.TextView, + nick='Text view to which actions are directed', + default=None, + ) + def target_view(self): + return self._target_view + + @target_view.setter + def target_view_setter(self, view: Gtk.TextView): + if self._target_editable_connect_id: + self._target_view.disconnect(self._target_editable_connect_id) + + self._target_editable_connect_id = view.connect( + 'notify::editable', lambda *args: self.queue_draw) + self._target_view = view + self.queue_draw() + + @GObject.Signal + def chunk_action_activated( + self, + action: str, # String-ified ChunkAction + from_view: Gtk.TextView, + to_view: Gtk.TextView, + chunk: object, + ) -> None: + ... + + def __init__(self): + super().__init__() + + # Object-type defaults + self.chunks = [] + self.action_map = {} + + # State for "button" implementation + self.buttons = [] + self.pointer_chunk = None + self.pressed_chunk = None + + self.set_events( + Gdk.EventMask.LEAVE_NOTIFY_MASK | + Gdk.EventMask.POINTER_MOTION_MASK | + Gdk.EventMask.BUTTON_PRESS_MASK | + Gdk.EventMask.BUTTON_RELEASE_MASK + ) + self.connect('notify::action-mode', lambda *args: self.queue_draw()) + + def on_setting_changed(self, meldsettings, key): + if key == 'style-scheme': + self.fill_colors, self.line_colors = get_common_theme() + alpha = self.fill_colors['current-chunk-highlight'].alpha + self.chunk_highlights = { + state: Gdk.RGBA(*[alpha + c * (1.0 - alpha) for c in colour]) + for state, colour in self.fill_colors.items() + } + + def do_realize(self): + meldsettings.connect('changed', self.on_setting_changed) + self.on_setting_changed(meldsettings, 'style-scheme') + return Gtk.DrawingArea.do_realize(self) + + def do_motion_notify_event(self, event): + # This is the simplest button/intersection implementation in + # the world, but it basically works for our purposes. + for button in self.buttons: + x1, y1, x2, y2, chunk = button + + # Check y first; it's more likely to be out of range + if y1 <= event.y <= y2 and x1 <= event.x <= x2: + new_pointer_chunk = chunk + break + else: + new_pointer_chunk = None + + if new_pointer_chunk != self.pointer_chunk: + self.pointer_chunk = new_pointer_chunk + self.queue_draw() + + def do_leave_notify_event(self, event): + if self.pointer_chunk: + self.pointer_chunk = None + self.queue_draw() + + def do_button_press_event(self, event): + if self.pointer_chunk: + self.pressed_chunk = self.pointer_chunk + + return Gtk.DrawingArea.do_button_press_event(self, event) + + def do_button_release_event(self, event): + if self.pointer_chunk and self.pointer_chunk == self.pressed_chunk: + self.activate(self.pressed_chunk) + self.pressed_chunk = None + + return Gtk.DrawingArea.do_button_press_event(self, event) + + def _action_on_chunk(self, action: ChunkAction, chunk): + self.chunk_action_activated.emit( + action.value, self.source_view, self.target_view, chunk) + + def activate(self, chunk): + + action = self._classify_change_actions(chunk) + + # FIXME: When fully transitioned to GAction, we should see + # whether we can do this by getting the container's action + # group and activating the actions directly instead. + + if action == ActionMode.Replace: + self._action_on_chunk(ChunkAction.replace, chunk) + elif action == ActionMode.Delete: + self._action_on_chunk(ChunkAction.delete, chunk) + elif action == ActionMode.Insert: + copy_menu = self._make_copy_menu(chunk) + copy_menu.popup_at_pointer(None) + + def _make_copy_menu(self, chunk): + copy_menu = Gtk.Menu() + copy_up = Gtk.MenuItem.new_with_mnemonic(_('Copy _up')) + copy_down = Gtk.MenuItem.new_with_mnemonic(_('Copy _down')) + copy_menu.append(copy_up) + copy_menu.append(copy_down) + copy_menu.show_all() + + def copy_chunk(widget, action): + self._action_on_chunk(action, chunk) + + copy_up.connect('activate', copy_chunk, ChunkAction.copy_up) + copy_down.connect('activate', copy_chunk, ChunkAction.copy_down) + return copy_menu + + def get_chunk_range(self, start_y, end_y): + start_line = self.source_view.get_line_num_for_y(start_y) + end_line = self.source_view.get_line_num_for_y(end_y) + + start_idx = bisect.bisect(self.chunk_starts, start_line) + end_idx = bisect.bisect(self.chunk_starts, end_line) + + if start_idx > 0 and start_line <= self.chunks[start_idx - 1].end_a: + start_idx -= 1 + + return self.chunks[start_idx:end_idx] + + def do_draw(self, context): + view = self.source_view + if not view or not view.get_realized(): + return + + self.buttons = [] + + width = self.get_allocated_width() + height = self.get_allocated_height() + + style_context = self.get_style_context() + Gtk.render_background(style_context, context, 0, 0, width, height) + + buf = view.get_buffer() + + context.save() + context.set_line_width(1.0) + + # Get our linked view's visible offset, get our vertical offset + # against our view (e.g., for info bars at the top of the view) + # and translate our context to match. + view_y_start = view.get_visible_rect().y + view_y_offset = view.translate_coordinates(self, 0, 0)[1] + gutter_y_translate = view_y_offset - view_y_start + context.translate(0, gutter_y_translate) + + button_x = 1 + button_width = width - 2 + + for chunk in self.get_chunk_range(view_y_start, view_y_start + height): + + change_type, start_line, end_line, *_unused = chunk + + rect_y = view.get_y_for_line_num(start_line) + rect_height = max( + 0, view.get_y_for_line_num(end_line) - rect_y - 1) + + # Draw our rectangle outside x bounds, so we don't get + # vertical lines. Fill first, over-fill with a highlight + # if in the focused chunk, and then stroke the border. + context.rectangle(-0.5, rect_y + 0.5, width + 1, rect_height) + if start_line != end_line: + context.set_source_rgba(*self.fill_colors[change_type]) + context.fill_preserve() + if view.current_chunk_check(chunk): + highlight = self.fill_colors['current-chunk-highlight'] + context.set_source_rgba(*highlight) + context.fill_preserve() + context.set_source_rgba(*self.line_colors[change_type]) + context.stroke() + + # Button rendering and tracking + action = self._classify_change_actions(chunk) + if action is None: + continue + + it = buf.get_iter_at_line(start_line) + button_y, button_height = view.get_line_yrange(it) + button_y += 1 + button_height -= 2 + + button_style_context = get_style(None, 'button.flat.image-button') + if chunk == self.pointer_chunk: + button_style_context.set_state(Gtk.StateFlags.PRELIGHT) + + Gtk.render_background( + button_style_context, context, button_x, button_y, + button_width, button_height) + Gtk.render_frame( + button_style_context, context, button_x, button_y, + button_width, button_height) + + # TODO: Ideally we'd do this in a pre-render step of some + # kind, but I'm having trouble figuring out what that would + # look like. + self.buttons.append( + ( + button_x, + button_y + gutter_y_translate, + button_x + button_width, + button_y + gutter_y_translate + button_height, + chunk, + ) + ) + + pixbuf = self.action_map.get(action) + icon_x = button_x + (button_width - pixbuf.props.width) // 2 + icon_y = button_y + (button_height - pixbuf.props.height) // 2 + Gtk.render_icon( + button_style_context, context, pixbuf, icon_x, icon_y) + + context.restore() + + def _classify_change_actions(self, change) -> Optional[ActionMode]: + """Classify possible actions for the given change + + Returns the action that can be performed given the content and + context of the change. + """ + source_editable = self.source_view.get_editable() + target_editable = self.target_view.get_editable() + + if not source_editable and not target_editable: + return None + + # Reclassify conflict changes, since we treat them the same as a + # normal two-way change as far as actions are concerned + change_type = change[0] + if change_type == 'conflict': + if change[1] == change[2]: + change_type = 'insert' + elif change[3] == change[4]: + change_type = 'delete' + else: + change_type = 'replace' + + if change_type == 'insert': + return None + + action = self.action_mode + if action == ActionMode.Delete and not source_editable: + action = None + elif action == ActionMode.Insert and change_type == 'delete': + action = ActionMode.Replace + if not target_editable: + action = ActionMode.Delete + return action + + +ActionGutter.set_css_name('action-gutter') diff --git a/meld/const.py b/meld/const.py index 9738960b..419319cc 100644 --- a/meld/const.py +++ b/meld/const.py @@ -13,6 +13,14 @@ class ActionMode(enum.IntEnum): Insert = 2 +class ChunkAction(enum.Enum): + + delete = 'delete' + replace = 'replace' + copy_down = 'copy_down' + copy_up = 'copy_up' + + NEWLINES = { GtkSource.NewlineType.LF: ('\n', _("UNIX (LF)")), GtkSource.NewlineType.CR_LF: ('\r\n', _("DOS/Windows (CR-LF)")), diff --git a/meld/matchers/diffutil.py b/meld/matchers/diffutil.py index de5dde06..8c325272 100644 --- a/meld/matchers/diffutil.py +++ b/meld/matchers/diffutil.py @@ -386,6 +386,19 @@ def pair_changes(self, fromindex, toindex, lines=(None, None, None, None)): if c[seq]: yield reverse_chunk(c[seq]) + # FIXME: This is gratuitous copy-n-paste at this point + def paired_all_single_changes(self, fromindex, toindex): + if fromindex == 1: + seq = toindex // 2 + for c in self._merge_cache: + if c[seq]: + yield c[seq] + else: + seq = fromindex // 2 + for c in self._merge_cache: + if c[seq]: + yield reverse_chunk(c[seq]) + def single_changes(self, textindex, lines=(None, None)): """Give changes for single file only. do not return 'equal' hunks. """ From ef84861acfedd0616141a664109eaae28ac0d72e Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Tue, 12 Feb 2019 06:42:35 +1000 Subject: [PATCH 0839/1316] ui: Add ActionGutter to the glade catalogue --- meld/ui/catalog.xml | 2 ++ meld/ui/gladesupport.py | 1 + 2 files changed, 3 insertions(+) diff --git a/meld/ui/catalog.xml b/meld/ui/catalog.xml index 11899340..f8a80bd0 100644 --- a/meld/ui/catalog.xml +++ b/meld/ui/catalog.xml @@ -3,6 +3,7 @@ glade_python_init + @@ -21,6 +22,7 @@ + diff --git a/meld/ui/gladesupport.py b/meld/ui/gladesupport.py index 36f285fb..9e4c7db7 100644 --- a/meld/ui/gladesupport.py +++ b/meld/ui/gladesupport.py @@ -3,6 +3,7 @@ # module, allowing editing of our UI files without having widgets that # can't be instantiated everywhere. +from meld import actiongutter # noqa: F401 from meld import diffgrid # noqa: F401 from meld import diffmap # noqa: F401 from meld import linkmap # noqa: F401 From 515b4902d779ab0195f189352034bc6e1e87b319 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Tue, 12 Feb 2019 06:43:10 +1000 Subject: [PATCH 0840/1316] filediff: Integrate ActionGutter in to FileDiff This has required several changes to the GtkBuilder file, including switching to GtkGrid. This shouldn't be permanent, but currently DiffGrid can't actually handle the layout because of its fixed column index logic. --- meld/filediff.py | 67 ++++++++++++-- meld/resources/ui/filediff.ui | 158 +++++++++++++++++++++++++++++----- 2 files changed, 198 insertions(+), 27 deletions(-) diff --git a/meld/filediff.py b/meld/filediff.py index 5cc02d41..ef717157 100644 --- a/meld/filediff.py +++ b/meld/filediff.py @@ -16,6 +16,7 @@ import copy import functools +import logging import math from gi.repository import Gdk @@ -28,7 +29,7 @@ # TODO: Don't from-import whole modules from meld import misc from meld.conf import _, ui_file -from meld.const import ActionMode, NEWLINES +from meld.const import ActionMode, ChunkAction, NEWLINES from meld.gutterrendererchunk import GutterRendererChunkLines from meld.iohelpers import prompt_save_filename from meld.matchers.diffutil import Differ, merged_chunk_order @@ -49,6 +50,8 @@ make_multiobject_property_action, map_widgets_into_lists) from meld.undo import UndoSequence +log = logging.getLogger(__name__) + def with_scroll_lock(lock_attr): """Decorator for locking a callback based on an instance attribute @@ -117,6 +120,14 @@ class FileDiff(Gtk.VBox, MeldDoc): ) actiongroup = Template.Child('FilediffActions') + actiongutter0 = Template.Child() + actiongutter1 = Template.Child() + actiongutter2 = Template.Child() + actiongutter3 = Template.Child() + dummy_toolbar_actiongutter0 = Template.Child() + dummy_toolbar_actiongutter1 = Template.Child() + dummy_toolbar_actiongutter2 = Template.Child() + dummy_toolbar_actiongutter3 = Template.Child() dummy_toolbar_linkmap0 = Template.Child() dummy_toolbar_linkmap1 = Template.Child() fileentry0 = Template.Child() @@ -205,6 +216,7 @@ def __init__(self, num_panes): "scrolledwindow", "textview", "vbox", "dummy_toolbar_linkmap", "filelabel_toolitem", "filelabel", "fileentry_toolitem", "statusbar", + "actiongutter", "dummy_toolbar_actiongutter", ] map_widgets_into_lists(self, widget_lists) @@ -284,6 +296,11 @@ def __init__(self, num_panes): 'overwrite', self.textview[0], 'overwrite', GObject.BindingFlags.BIDIRECTIONAL) + for gutter in self.actiongutter: + self.bind_property('action_mode', gutter, 'action_mode') + gutter.connect( + 'chunk_action_activated', self.on_chunk_action_activated) + self.linediffer.connect("diffs-changed", self.on_diffs_changed) self.undosequence.connect("checkpointed", self.on_undo_checkpointed) self.connect("next-conflict-changed", self.on_next_conflict_changed) @@ -612,6 +629,29 @@ def get_action_panes(self, direction, reverse=False): dst = src + direction return (dst, src) if reverse else (src, dst) + def on_chunk_action_activated( + self, gutter, action, from_view, to_view, chunk): + + try: + chunk_action = ChunkAction(action) + except ValueError: + log.error('Invalid chunk action %s', action) + return + + # TODO: There's no reason the replace_chunk(), etc. calls should take + # an index instead of just taking the views themselves. + from_pane = self.textview.index(from_view) + to_pane = self.textview.index(to_view) + + if chunk_action == ChunkAction.replace: + self.replace_chunk(from_pane, to_pane, chunk) + elif chunk_action == ChunkAction.delete: + self.delete_chunk(from_pane, chunk) + elif chunk_action == ChunkAction.copy_up: + self.copy_chunk(from_pane, to_pane, chunk, copy_up=True) + elif chunk_action == ChunkAction.copy_down: + self.copy_chunk(from_pane, to_pane, chunk, copy_up=False) + @Template.Callback() def action_push_change_left(self, *args): src, dst = self.get_action_panes(PANE_LEFT) @@ -1413,6 +1453,15 @@ def set_action_enabled(action, enabled): set_action_enabled("MergeAll", mergeable[0] or mergeable[1]) def on_diffs_changed(self, linediffer, chunk_changes): + + # TODO: Break out highlight recalculation to its own method, + # and just update chunk lists in children here. + for gutter in self.actiongutter: + from_pane = self.textview.index(gutter.source_view) + to_pane = self.textview.index(gutter.target_view) + gutter.chunks = list(linediffer.paired_all_single_changes( + from_pane, to_pane)) + removed_chunks, added_chunks, modified_chunks = chunk_changes # We need to clear removed and modified chunks, and need to @@ -1829,6 +1878,8 @@ def queue_draw(self, junk=None): t.queue_draw() for i in range(self.num_panes-1): self.linkmap[i].queue_draw() + for gutter in self.actiongutter: + gutter.queue_draw() @Template.Callback() def on_action_lock_scrolling_toggled(self, action): @@ -1923,8 +1974,12 @@ def _sync_vscroll(self, adjustment, master): if i == 1: master, target_line = 1, other_line + # FIXME: We should really hook into the adjustments directly on + # the widgets instead of doing this. for lm in self.linkmap: lm.queue_draw() + for gutter in self.actiongutter: + gutter.queue_draw() def set_num_panes(self, n): if n == self.num_panes or n not in (1, 2, 3): @@ -1934,15 +1989,17 @@ def set_num_panes(self, n): for widget in ( self.vbox[:n] + self.file_toolbar[:n] + self.linkmap[:n - 1] + self.dummy_toolbar_linkmap[:n - 1] + - self.statusbar[:n] - ): + self.statusbar[:n] + + self.actiongutter[:(n - 1) * 2] + + self.dummy_toolbar_actiongutter[:(n - 1) * 2]): widget.show() for widget in ( self.vbox[n:] + self.file_toolbar[n:] + self.linkmap[n - 1:] + self.dummy_toolbar_linkmap[n - 1:] + - self.statusbar[n:] - ): + self.statusbar[n:] + + self.actiongutter[(n - 1) * 2:] + + self.dummy_toolbar_actiongutter[(n - 1) * 2:]): widget.hide() self.actiongroup.get_action("MakePatch").set_sensitive(n > 1) diff --git a/meld/resources/ui/filediff.ui b/meld/resources/ui/filediff.ui index e5d4f8b1..cf0636a1 100644 --- a/meld/resources/ui/filediff.ui +++ b/meld/resources/ui/filediff.ui @@ -1,7 +1,7 @@ - + - - - Format as Patch… - Create a patch using differences between files - - - Save A_ll From b53ee063b2f7e7ed4c101cf9aac339b58442b694 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 17 Feb 2019 13:15:19 +1000 Subject: [PATCH 0902/1316] Remove the now-unused app menu placeholder --- data/ui/meldapp-ui.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/data/ui/meldapp-ui.xml b/data/ui/meldapp-ui.xml index 9cca039e..1d4addb6 100644 --- a/data/ui/meldapp-ui.xml +++ b/data/ui/meldapp-ui.xml @@ -1,6 +1,5 @@ - From 12084c7171b2bf91c0cab10229425e8ebc3d580f Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 17 Feb 2019 14:52:46 +1000 Subject: [PATCH 0903/1316] Move save & revert actions to GActions --- data/ui/filediff-ui.xml | 8 -------- data/ui/meldapp-ui.xml | 4 ---- meld/accelerators.py | 3 +++ meld/filediff.py | 25 ++++++++++++------------- meld/melddoc.py | 6 ------ meld/meldwindow.py | 21 --------------------- meld/resources/gtk/menus.ui | 19 +++++++++++++++++++ meld/resources/ui/filediff.ui | 15 --------------- 8 files changed, 34 insertions(+), 67 deletions(-) diff --git a/data/ui/filediff-ui.xml b/data/ui/filediff-ui.xml index f3fc2e66..55c69509 100644 --- a/data/ui/filediff-ui.xml +++ b/data/ui/filediff-ui.xml @@ -1,11 +1,5 @@ - - - - - - @@ -58,8 +52,6 @@ - - diff --git a/data/ui/meldapp-ui.xml b/data/ui/meldapp-ui.xml index 1d4addb6..037a89a8 100644 --- a/data/ui/meldapp-ui.xml +++ b/data/ui/meldapp-ui.xml @@ -1,10 +1,6 @@ - - - - diff --git a/meld/accelerators.py b/meld/accelerators.py index 6a4d8fa1..efeb5322 100644 --- a/meld/accelerators.py +++ b/meld/accelerators.py @@ -7,6 +7,9 @@ def register_accels(app: Gtk.Application): ("view.next-change", ("Down", "KP_Down", "D")), ("view.previous-change", ("Up", "KP_Up", "E")), ("view.refresh", ("R", "F5")), + ('view.save', 'S'), + ('view.save-all', 'L'), + ('view.save-as', 'S'), ("win.stop", "Escape"), ) for (name, accel) in view_accels: diff --git a/meld/filediff.py b/meld/filediff.py index 20fd45c6..0d109a9a 100644 --- a/meld/filediff.py +++ b/meld/filediff.py @@ -282,6 +282,10 @@ def __init__(self, num_panes): ('next-change', self.action_next_change), ('previous-change', self.action_previous_change), ('refresh', self.action_refresh), + ('revert', self.action_revert), + ('save', self.action_save), + ('save-all', self.action_save_all), + ('save-as', self.action_save_as), ) for name, callback in actions: action = Gio.SimpleAction.new(name, None) @@ -1216,12 +1220,9 @@ def set_merge_output_file(self, gfile): def _set_save_action_sensitivity(self): pane = self._get_focused_pane() - modified = ( - False if pane == -1 else self.textbuffer[pane].get_modified()) - if self.main_actiongroup: - self.main_actiongroup.get_action("Save").set_sensitive(modified) - any_modified = any(b.get_modified() for b in self.textbuffer) - self.actiongroup.get_action("SaveAll").set_sensitive(any_modified) + modified_panes = [b.get_modified() for b in self.textbuffer] + self.set_action_enabled('save', pane != -1 and modified_panes[pane]) + self.set_action_enabled('save-all', any(modified_panes)) def recompute_label(self): self._set_save_action_sensitivity() @@ -1459,7 +1460,7 @@ def notify_file_changed(self, data): secondary = _("Do you want to reload the file?") self.msgarea_mgr[pane].add_action_msg( 'dialog-warning-symbolic', primary, secondary, _("_Reload"), - self.on_revert_activate) + self.action_revert) def refresh_comparison(self, *args): """Refresh the view by clearing and redoing all comparisons""" @@ -1831,15 +1832,14 @@ def set_buffer_editable(self, buf, editable): self.on_cursor_position_changed(buf, None, True) @with_focused_pane - def save(self, pane): + def action_save(self, pane, *args): self.save_file(pane) @with_focused_pane - def save_as(self, pane): + def action_save_as(self, pane, *args): self.save_file(pane, saveas=True) - @Template.Callback() - def on_save_all_activate(self, action): + def action_save_all(self, *args): for i in range(self.num_panes): if self.textbuffer[i].get_modified(): self.save_file(i) @@ -1895,8 +1895,7 @@ def check_unsaved_changes(self, buffers=None): dialog.destroy() return response == Gtk.ResponseType.OK - @Template.Callback() - def on_revert_activate(self, *extra): + def action_revert(self, *extra): if not self.check_unsaved_changes(): return diff --git a/meld/melddoc.py b/meld/melddoc.py index 2a9007de..74939519 100644 --- a/meld/melddoc.py +++ b/meld/melddoc.py @@ -115,12 +115,6 @@ def action_stop(self, *args): if self.scheduler.tasks_pending(): self.scheduler.remove_task(self.scheduler.get_current_task()) - def save(self): - pass - - def save_as(self): - pass - def _open_files(self, selected, line=0): query_attrs = ",".join((Gio.FILE_ATTRIBUTE_STANDARD_TYPE, Gio.FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE)) diff --git a/meld/meldwindow.py b/meld/meldwindow.py index d10f05c4..56e0b1d5 100644 --- a/meld/meldwindow.py +++ b/meld/meldwindow.py @@ -57,12 +57,6 @@ def __init__(self): actions = ( ("FileMenu", None, _("_File")), - ("Save", Gtk.STOCK_SAVE, None, None, - _("Save the current file"), - self.on_menu_save_activate), - ("SaveAs", Gtk.STOCK_SAVE_AS, _("Save As…"), "S", - _("Save the current file with a different name"), - self.on_menu_save_as_activate), ("Close", Gtk.STOCK_CLOSE, None, None, _("Close the current file"), self.on_menu_close_activate), @@ -124,8 +118,6 @@ def __init__(self): self.ui.insert_action_group(self.actiongroup, 0) self.ui.add_ui_from_file(ui_file("meldapp-ui.xml")) - for menuitem in ("Save", "Undo"): - self.actiongroup.get_action(menuitem).props.is_important = True self.add_accel_group(self.ui.get_accel_group()) self.menubar = self.ui.get_widget('/Menubar') self.toolbar = self.ui.get_widget('/Toolbar') @@ -309,13 +301,6 @@ def on_switch_page(self, notebook, page, which): self.actiongroup.get_action("Undo").set_sensitive(can_undo) self.actiongroup.get_action("Redo").set_sensitive(can_redo) - # FileDiff handles save sensitivity; it makes no sense for other modes - if not isinstance(newdoc, FileDiff): - self.actiongroup.get_action("Save").set_sensitive(False) - self.actiongroup.get_action("SaveAs").set_sensitive(False) - else: - self.actiongroup.get_action("SaveAs").set_sensitive(True) - if newdoc: nbl = self.notebook.get_tab_label(newdoc) self.set_title(nbl.props.label_text) @@ -348,12 +333,6 @@ def on_can_redo(self, undosequence, can): def on_action_new_tab_activate(self, action, parameter): self.append_new_comparison() - def on_menu_save_activate(self, menuitem): - self.current_doc().save() - - def on_menu_save_as_activate(self, menuitem): - self.current_doc().save_as() - def on_action_recent(self, action): uri = action.get_current_uri() if not uri: diff --git a/meld/resources/gtk/menus.ui b/meld/resources/gtk/menus.ui index b90e0148..df5c5783 100644 --- a/meld/resources/gtk/menus.ui +++ b/meld/resources/gtk/menus.ui @@ -20,6 +20,25 @@ F11 +
+ file-section + + _Save + view.save + + + Save As… + view.save-as + + + Save A_ll + view.save-all + + + Revert files… + view.revert + +
View diff --git a/meld/resources/ui/filediff.ui b/meld/resources/ui/filediff.ui index 1af42ec8..785314e2 100644 --- a/meld/resources/ui/filediff.ui +++ b/meld/resources/ui/filediff.ui @@ -730,21 +730,6 @@ - - - Save A_ll - Save all files in the current comparison - - - - - - - Revert files to their saved versions - gtk-revert-to-saved - - - Add Synchronization Point From 2b8e5b40350d619d6009bd4e1d5ca1002f792aff Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 17 Feb 2019 14:54:10 +1000 Subject: [PATCH 0904/1316] filediff: Rename the local-to-filediff-the-widget action group This was the cause of a weird problem where no `view`-group actions were actually activate-able from the context of FileDiff, because the `view` group *on the widget* was found before the `view` group in the window. We need the group on the window because that's the only way to get things to show up in the menu. We want (but don't need) the group on the FileDiff widget because it's saner scoping, and it Just Works for our status bars. An example symptom of this was that while you could use the toolbar buttons to go to the next change, the shortcut didn't work. --- meld/filediff.py | 2 +- meld/ui/statusbar.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meld/filediff.py b/meld/filediff.py index 0d109a9a..86fe49aa 100644 --- a/meld/filediff.py +++ b/meld/filediff.py @@ -268,7 +268,7 @@ def __init__(self, num_panes): for prop in sourceview_prop_actions: action = make_multiobject_property_action(self.textview, prop) prop_action_group.add_action(action) - self.insert_action_group('view', prop_action_group) + self.insert_action_group('view-local', prop_action_group) # Set up per-view action group for top-level menu insertion self.view_action_group = Gio.SimpleActionGroup() diff --git a/meld/ui/statusbar.py b/meld/ui/statusbar.py index a806d765..e1158cd0 100644 --- a/meld/ui/statusbar.py +++ b/meld/ui/statusbar.py @@ -273,7 +273,7 @@ def construct_display_popover(self): menu = builder.get_object('statusbar-menu') pop = Gtk.Popover() - pop.bind_model(menu, 'view') + pop.bind_model(menu, 'view-local') pop.set_position(Gtk.PositionType.TOP) button = MeldStatusMenuButton() From b7126f064340e9afb5513c9c433423373f3ce45e Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Mon, 18 Feb 2019 07:16:44 +1000 Subject: [PATCH 0905/1316] Move Close to a GAction This also relocates the Preferences menu item to the main app section, which is where most app-menu-retirement mockups have it. --- data/ui/meldapp-ui.xml | 1 - meld/accelerators.py | 1 + meld/meldwindow.py | 9 +++------ meld/resources/gtk/menus.ui | 10 +++++++--- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/data/ui/meldapp-ui.xml b/data/ui/meldapp-ui.xml index 037a89a8..799f9768 100644 --- a/data/ui/meldapp-ui.xml +++ b/data/ui/meldapp-ui.xml @@ -2,7 +2,6 @@ - diff --git a/meld/accelerators.py b/meld/accelerators.py index efeb5322..c5f32974 100644 --- a/meld/accelerators.py +++ b/meld/accelerators.py @@ -10,6 +10,7 @@ def register_accels(app: Gtk.Application): ('view.save', 'S'), ('view.save-all', 'L'), ('view.save-as', 'S'), + ('win.close', 'W'), ("win.stop", "Escape"), ) for (name, accel) in view_accels: diff --git a/meld/meldwindow.py b/meld/meldwindow.py index 56e0b1d5..39b00831 100644 --- a/meld/meldwindow.py +++ b/meld/meldwindow.py @@ -57,9 +57,6 @@ def __init__(self): actions = ( ("FileMenu", None, _("_File")), - ("Close", Gtk.STOCK_CLOSE, None, None, - _("Close the current file"), - self.on_menu_close_activate), ("EditMenu", None, _("_Edit")), ("Undo", Gtk.STOCK_UNDO, None, "Z", @@ -138,7 +135,7 @@ def __init__(self): # Manually handle GAction additions actions = ( - ("close", self.on_menu_close_activate), + ("close", self.action_close), ("new-tab", self.on_action_new_tab_activate), ("stop", self.action_stop), ) @@ -259,7 +256,7 @@ def _update_page_action_sensitivity(self): else: page = None - self.actiongroup.get_action("Close").set_sensitive(bool(page)) + self.lookup_action('close').set_enabled(bool(page)) if not isinstance(page, MeldDoc): for action in ("Cut", "Copy", "Paste", "Find", "FindNext", "FindPrevious", "Replace", @@ -343,7 +340,7 @@ def on_action_recent(self, action): # FIXME: Need error handling, but no sensible display location log.exception(f'Error opening recent file {uri}') - def on_menu_close_activate(self, *extra): + def action_close(self, *extra): i = self.notebook.get_current_page() if i >= 0: page = self.notebook.get_nth_page(i) diff --git a/meld/resources/gtk/menus.ui b/meld/resources/gtk/menus.ui index df5c5783..8a0f8709 100644 --- a/meld/resources/gtk/menus.ui +++ b/meld/resources/gtk/menus.ui @@ -65,14 +65,18 @@
- preferences-section + window-section - _Preferences - app.preferences + _Close + win.close
application-section + + _Preferences + app.preferences + _Help app.help From 2abd8e02c37c3d70906a3f0d9c79435a7e22df5b Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Fri, 22 Feb 2019 10:16:27 +1000 Subject: [PATCH 0906/1316] ui.recentselector: New implementation of a recent comparison selector This is a relatively small widget template whose entire purpose is to be put into a popover so that we have recent selection from a headerbar button. --- meld/recent.py | 2 +- meld/resources/meld.gresource.xml | 1 + meld/resources/ui/recent-selector.ui | 58 +++++++++++++++++ meld/ui/recentselector.py | 95 ++++++++++++++++++++++++++++ 4 files changed, 155 insertions(+), 1 deletion(-) create mode 100644 meld/resources/ui/recent-selector.ui create mode 100644 meld/ui/recentselector.py diff --git a/meld/recent.py b/meld/recent.py index ad8bfc80..4a63607e 100644 --- a/meld/recent.py +++ b/meld/recent.py @@ -211,7 +211,7 @@ def _filter_items(self, recent_filter, items): for attr in attrs: filter_data[attr] = getattr(i, "get_" + attr)() filter_info = Gtk.RecentFilterInfo() - filter_info.contains = recent_filter.get_needed() + filter_info.contains = needed for f, v in filter_data.items(): # https://bugzilla.gnome.org/show_bug.cgi?id=695970 if isinstance(v, list): diff --git a/meld/resources/meld.gresource.xml b/meld/resources/meld.gresource.xml index f9f418d5..ae89d70c 100644 --- a/meld/resources/meld.gresource.xml +++ b/meld/resources/meld.gresource.xml @@ -22,6 +22,7 @@ ui/patch-dialog.ui ui/preferences.ui ui/push-dialog.ui + ui/recent-selector.ui ui/revert-dialog.ui ui/save-confirm-dialog.ui ui/vcview.ui diff --git a/meld/resources/ui/recent-selector.ui b/meld/resources/ui/recent-selector.ui new file mode 100644 index 00000000..ba63ed55 --- /dev/null +++ b/meld/resources/ui/recent-selector.ui @@ -0,0 +1,58 @@ + + + + + + diff --git a/meld/ui/recentselector.py b/meld/ui/recentselector.py new file mode 100644 index 00000000..fc4e3e14 --- /dev/null +++ b/meld/ui/recentselector.py @@ -0,0 +1,95 @@ +# Copyright (C) 2019 Kai Willadsen +# +# This program 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. +# +# This program 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. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +from gi.repository import GObject +from gi.repository import Gtk + +from meld.recent import RecentFiles +from meld.ui._gtktemplate import Template + + +@Template(resource_path='/org/gnome/meld/ui/recent-selector.ui') +class RecentSelector(Gtk.Grid): + + __gtype_name__ = 'RecentSelector' + + @GObject.Signal( + flags=( + GObject.SignalFlags.RUN_FIRST | + GObject.SignalFlags.ACTION + ), + arg_types=(str,), + ) + def open_recent(self, uri: str) -> None: + ... + + recent_chooser = Template.Child() + search_entry = Template.Child() + open_button = Template.Child() + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.init_template() + + self.filter_text = '' + self.recent_chooser.set_filter(self.make_recent_filter()) + + def custom_recent_filter_func( + self, filter_info: Gtk.RecentFilterInfo) -> bool: + """Filter function for Meld-specific files + + Normal GTK recent filter rules are all OR-ed together to check + whether an entry should be shown. This filter instead only ever + shows Meld-specific entries, and then filters down from there. + """ + + if filter_info.mime_type != RecentFiles.mime_type: + return False + + if self.filter_text not in filter_info.display_name.lower(): + return False + + return True + + def make_recent_filter(self) -> Gtk.RecentFilter: + recent_filter = Gtk.RecentFilter() + recent_filter.add_custom( + ( + Gtk.RecentFilterFlags.MIME_TYPE | + Gtk.RecentFilterFlags.DISPLAY_NAME + ), + self.custom_recent_filter_func, + ) + return recent_filter + + @Template.Callback() + def on_filter_text_changed(self, *args): + self.filter_text = self.search_entry.get_text().lower() + + # This feels unnecessary, but there's no other good way to get + # the RecentChooser to re-evaluate the filter. + self.recent_chooser.set_filter(self.make_recent_filter()) + + @Template.Callback() + def on_selection_changed(self, *args): + have_selection = bool(self.recent_chooser.get_current_uri()) + self.open_button.set_sensitive(have_selection) + + @Template.Callback() + def on_activate(self, *args): + uri = self.recent_chooser.get_current_uri() + if uri: + self.open_recent.emit(uri) From ccadf7deac770f3509f3aa0a3129dac5317d5670 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Fri, 22 Feb 2019 10:32:13 +1000 Subject: [PATCH 0907/1316] meldwindow: Move recent opening to new popover widget --- data/ui/meldapp-ui.xml | 3 -- meld/meldwindow.py | 37 ++++------------- meld/resources/ui/appwindow.ui | 59 +++++++++++++++++++++++----- meld/resources/ui/recent-selector.ui | 2 - meld/ui/gladesupport.py | 1 + 5 files changed, 59 insertions(+), 43 deletions(-) diff --git a/data/ui/meldapp-ui.xml b/data/ui/meldapp-ui.xml index 799f9768..1535a48c 100644 --- a/data/ui/meldapp-ui.xml +++ b/data/ui/meldapp-ui.xml @@ -1,8 +1,5 @@ - - - diff --git a/meld/meldwindow.py b/meld/meldwindow.py index 39b00831..051245ae 100644 --- a/meld/meldwindow.py +++ b/meld/meldwindow.py @@ -56,8 +56,6 @@ def __init__(self): self.init_template() actions = ( - ("FileMenu", None, _("_File")), - ("EditMenu", None, _("_Edit")), ("Undo", Gtk.STOCK_UNDO, None, "Z", _("Undo the last action"), @@ -102,15 +100,6 @@ def __init__(self): self.actiongroup.set_translation_domain("meld") self.actiongroup.add_actions(actions) - recent_action = Gtk.RecentAction( - name="Recent", label=_("Open Recent"), - tooltip=_("Open recent files"), stock_id=None) - recent_action.set_show_private(True) - recent_action.set_filter(recent_comparisons.recent_filter) - recent_action.set_sort_type(Gtk.RecentSortType.MRU) - recent_action.connect("item-activated", self.on_action_recent) - self.actiongroup.add_action(recent_action) - self.ui = Gtk.UIManager() self.ui.insert_action_group(self.actiongroup, 0) self.ui.add_ui_from_file(ui_file("meldapp-ui.xml")) @@ -183,10 +172,6 @@ def __init__(self): self.ui.ensure_update() self.undo_handlers = tuple() - # Set tooltip on map because the recentmenu is lazily created - rmenu = self.ui.get_widget('/Menubar/FileMenu/Recent').get_submenu() - rmenu.connect("map", self._on_recentmenu_map) - def do_realize(self): Gtk.ApplicationWindow.do_realize(self) @@ -197,10 +182,6 @@ def do_realize(self): meld.ui.util.extract_accels_from_menu(menu, self.get_application()) - def _on_recentmenu_map(self, recentmenu): - for imagemenuitem in recentmenu.get_children(): - imagemenuitem.set_tooltip_text(imagemenuitem.get_label()) - def on_widget_drag_data_received( self, wid, context, x, y, selection_data, info, time): uris = selection_data.get_uris() @@ -330,16 +311,6 @@ def on_can_redo(self, undosequence, can): def on_action_new_tab_activate(self, action, parameter): self.append_new_comparison() - def on_action_recent(self, action): - uri = action.get_current_uri() - if not uri: - return - try: - self.append_recent(uri) - except (IOError, ValueError): - # FIXME: Need error handling, but no sensible display location - log.exception(f'Error opening recent file {uri}') - def action_close(self, *extra): i = self.notebook.get_current_page() if i >= 0: @@ -443,6 +414,14 @@ def on_file_changed(self, srcpage, filename): if page != srcpage: page.on_file_changed(filename) + @Template.Callback() + def on_open_recent(self, recent_selector, uri): + try: + self.append_recent(uri) + except (IOError, ValueError): + # FIXME: Need error handling, but no sensible display location + log.exception(f'Error opening recent file {uri}') + def _append_page(self, page, icon): nbl = NotebookLabel(icon_name=icon, page=page) self.notebook.append_page(page, nbl) diff --git a/meld/resources/ui/appwindow.ui b/meld/resources/ui/appwindow.ui index cf0696ef..a625af51 100644 --- a/meld/resources/ui/appwindow.ui +++ b/meld/resources/ui/appwindow.ui @@ -1,6 +1,7 @@ + + + True + False + 400 + 500 + + + True + True + + + + diff --git a/meld/resources/ui/recent-selector.ui b/meld/resources/ui/recent-selector.ui index ba63ed55..32fd36bb 100644 --- a/meld/resources/ui/recent-selector.ui +++ b/meld/resources/ui/recent-selector.ui @@ -3,8 +3,6 @@