[meld] Update Esperanto translation
- From: Translations User D-L <translations src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] Update Esperanto translation
- Date: Sat, 23 Dec 2017 22:24:52 +0000 (UTC)
commit 9a3d2fe276cd7389b1292c55c1c9a8a89aedc0bd
Author: Kristjan SCHMIDT <kristjan schmidt googlemail com>
Date: Sat Dec 23 22:24:38 2017 +0000
Update Esperanto translation
po/eo.po | 2697 ++++++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 1931 insertions(+), 766 deletions(-)
---
diff --git a/po/eo.po b/po/eo.po
index 3c7f9ab..a020de2 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -1,33 +1,42 @@
# Esperanto translation for meld.
# Copyright (C) 2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the meld package.
-# Kristjan SCHMIDT <kristjan schmidt googlemail com>, 2012.
-#
+# Kristjan SCHMIDT <kristjan schmidt googlemail com>, 2012, 2017.
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-22 19:28+0000\n"
-"PO-Revision-Date: 2012-02-25 10:34+0100\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=meld&k";
+"eywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-11-26 17:40+0000\n"
+"PO-Revision-Date: 2017-12-23 23:23+0200\n"
"Last-Translator: Kristjan SCHMIDT <kristjan schmidt googlemail com>\n"
-"Language-Team: Esperanto <gnome-l10n-eo lists launchpad net>\n"
+"Language-Team: Esperanto <gnome-eo-list gnome org>\n"
"Language: eo\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"
+"X-Generator: Virtaal 0.7.1\n"
+"X-Project-Style: gnome\n"
-#: ../bin/meld:97
+#: ../bin/meld:185
msgid "Cannot import: "
-msgstr "Ne povas enporti:"
+msgstr "Ne povas enporti: "
-#: ../bin/meld:100
+#: ../bin/meld:188
#, c-format
msgid "Meld requires %s or higher."
msgstr "Meldo bezonas %s aŭ pli alta."
-#: ../data/meld.desktop.in.h:1 ../data/ui/meldapp.ui.h:1
+#: ../bin/meld:240
+#, c-format
+msgid ""
+"Couldn’t load Meld-specific CSS (%s)\n"
+"%s"
+msgstr ""
+
+#: ../data/meld.desktop.in.h:1 ../data/meld.appdata.xml.in.h:1
+#: ../data/ui/meldapp.ui.h:1
msgid "Meld"
msgstr "Meldo"
@@ -39,10 +48,508 @@ msgstr "Montrilo de diferencoj"
msgid "Meld Diff Viewer"
msgstr "Meldo - Montrilo de diferencoj"
-#: ../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 "Kompari kaj kunfandi dosierojn"
+#. 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 "
+"two- and three-way comparison of both files and directories, and supports "
+"many version control systems including Git, Mercurial, Bazaar and Subversion."
+msgstr ""
+
+#: ../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 ""
+
+#: ../data/meld.appdata.xml.in.h:5
+msgid "The GNOME Project"
+msgstr "La GNOME-projekto"
+
+#: ../data/mime/meld.xml.in.h:1
+msgid "Meld comparison description"
+msgstr ""
+
+#: ../data/org.gnome.meld.gschema.xml.h:1
+msgid "Default window width"
+msgstr ""
+
+#: ../data/org.gnome.meld.gschema.xml.h:2
+msgid "Default window height"
+msgstr ""
+
+#: ../data/org.gnome.meld.gschema.xml.h:3
+msgid "Default window maximised state"
+msgstr ""
+
+#: ../data/org.gnome.meld.gschema.xml.h:4
+msgid "Default window fullscreen state"
+msgstr ""
+
+#: ../data/org.gnome.meld.gschema.xml.h:5
+#| msgid "_Toolbar"
+msgid "Show toolbar"
+msgstr "Montri la ilobreton"
+
+#: ../data/org.gnome.meld.gschema.xml.h:6
+msgid "If true, the window toolbar is visible."
+msgstr ""
+
+#: ../data/org.gnome.meld.gschema.xml.h:7
+#| msgid "_Statusbar"
+msgid "Show statusbar"
+msgstr "Montri la statobreton"
+
+#: ../data/org.gnome.meld.gschema.xml.h:8
+msgid "If true, the window statusbar is visible."
+msgstr ""
+
+#: ../data/org.gnome.meld.gschema.xml.h:9
+msgid "Additional automatically detected text encodings"
+msgstr ""
+
+#: ../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 ""
+
+#: ../data/org.gnome.meld.gschema.xml.h:11
+msgid "Width of an indentation step"
+msgstr ""
+
+#: ../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:13
+msgid "Whether to indent using spaces or tabs"
+msgstr ""
+
+#: ../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:15
+msgid "Show line numbers"
+msgstr ""
+
+#: ../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:17
+msgid "Highlight syntax"
+msgstr ""
+
+#: ../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:19
+msgid "Color scheme to use for syntax highlighting"
+msgstr ""
+
+#: ../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:21
+msgid "Displayed whitespace"
+msgstr ""
+
+#: ../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 ""
+
+#: ../data/org.gnome.meld.gschema.xml.h:23
+msgid "Wrap mode"
+msgstr ""
+
+#: ../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 ""
+
+#: ../data/org.gnome.meld.gschema.xml.h:25
+msgid "Highlight current line"
+msgstr ""
+
+#: ../data/org.gnome.meld.gschema.xml.h:26
+msgid ""
+"If true, the line containing the cursor will be highlighted in file "
+"comparisons."
+msgstr ""
+
+#: ../data/org.gnome.meld.gschema.xml.h:27
+msgid "Use the system default monospace font"
+msgstr ""
+
+#: ../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:29
+msgid "Custom font"
+msgstr ""
+
+#: ../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:31
+msgid "Ignore blank lines when comparing files"
+msgstr ""
+
+#: ../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:33
+msgid "Use the system default editor"
+msgstr ""
+
+#: ../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 ""
+
+#: ../data/org.gnome.meld.gschema.xml.h:35
+msgid "The custom editor launch command"
+msgstr ""
+
+#: ../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:37
+msgid "Columns to display"
+msgstr ""
+
+#: ../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:39 ../data/ui/preferences.ui.h:25
+msgid "Ignore symbolic links"
+msgstr ""
+
+#: ../data/org.gnome.meld.gschema.xml.h:40
+msgid ""
+"If true, folder comparisons do not follow symbolic links when traversing the "
+"folder tree."
+msgstr ""
+
+#: ../data/org.gnome.meld.gschema.xml.h:41
+#, fuzzy
+#| msgid "Start a new comparison"
+msgid "Use shallow comparison"
+msgstr "Komenci novan komparon"
+
+#: ../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 ""
+
+#: ../data/org.gnome.meld.gschema.xml.h:43
+msgid "File timestamp resolution"
+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 "
+"is useful when comparing files between filesystems with different timestamp "
+"resolution."
+msgstr ""
+
+#: ../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: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 ""
+
+#: ../data/org.gnome.meld.gschema.xml.h:47
+msgid "File status filters"
+msgstr ""
+
+#: ../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:49
+msgid "Show the version control console output"
+msgstr ""
+
+#: ../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:51
+msgid "Version control pane position"
+msgstr ""
+
+#: ../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:53
+msgid "Present version comparisons as left-local/right-remote"
+msgstr ""
+
+#: ../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:55
+msgid "Order for files in three-way version control merge comparisons"
+msgstr ""
+
+#: ../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:57
+msgid "Show margin in commit message editor"
+msgstr ""
+
+#: ../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:59
+msgid "Margin column in commit message editor"
+msgstr ""
+
+#: ../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:61
+msgid "Automatically hard-wrap commit messages"
+msgstr ""
+
+#: ../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:63
+msgid "Version control status filters"
+msgstr ""
+
+#: ../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:65
+msgid "Filename-based filters"
+msgstr ""
+
+#: ../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 ""
+
+#: ../data/org.gnome.meld.gschema.xml.h:67
+msgid "Text-based filters"
+msgstr ""
+
+#: ../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 ""
+
+#: ../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 "Pri Meldo"
+
+#: ../data/ui/application.ui.h:2
+#| msgid ""
+#| "Copyright © 2002-2009 Stephen Kennedy\n"
+#| "Copyright © 2009-2011 Kai Willadsen"
+msgid ""
+"Copyright © 2002-2009 Stephen Kennedy\n"
+"Copyright © 2009-2017 Kai Willadsen"
+msgstr ""
+"Kopirajto © 2002-2009 Stephen KENNEDY\n"
+"Kopirajto © 2009-2017 Kai WILLADSEN"
+
+#: ../data/ui/application.ui.h:4
+msgid "Website"
+msgstr "Retejo"
+
+#: ../data/ui/application.ui.h:5
+msgid "translator-credits"
+msgstr "Kristjan SCHMIDT"
+
+#: ../data/ui/application.ui.h:6
+msgid "_Preferences"
+msgstr "_Agordoj"
+
+#: ../data/ui/application.ui.h:7
+msgid "_Help"
+msgstr "_Helpo"
+
+#: ../data/ui/application.ui.h:8
+msgid "Keyboard Shortcuts"
+msgstr "Klavkombinoj"
+
+#: ../data/ui/application.ui.h:9
+msgid "_About"
+msgstr "_Pri"
+
+#: ../data/ui/application.ui.h:10
+msgid "_Quit"
+msgstr "Ĉ_esi"
+
+#: ../data/ui/dirdiff.ui.h:1 ../data/ui/vcview.ui.h:1
+msgid "_Compare"
+msgstr "_Kompari"
+
+#: ../data/ui/dirdiff.ui.h:2 ../data/ui/vcview.ui.h:2
+#| msgid "Remove selected filter"
+msgid "Compare selected files"
+msgstr "Kompari elektitajn dosierojn"
+
+#: ../data/ui/dirdiff.ui.h:3
+msgid "Copy to _Left"
+msgstr "Kopii _maldekstren"
+
+#: ../data/ui/dirdiff.ui.h:4
+msgid "Copy to left"
+msgstr "Kopii maldekstren"
+
+#: ../data/ui/dirdiff.ui.h:5
+msgid "Copy to _Right"
+msgstr "Kopii _dekstren"
+
+#: ../data/ui/dirdiff.ui.h:6
+msgid "Copy to right"
+msgstr "Kopii dekstren"
+
+#: ../data/ui/dirdiff.ui.h:7
+msgid "Delete selected"
+msgstr "Forigi elekton"
+
+#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:856 ../meld/filediff.py:1409
+msgid "Hide"
+msgstr "Kaŝi"
+
+#: ../data/ui/dirdiff.ui.h:9
+msgid "Hide selected"
+msgstr ""
+
+#: ../data/ui/dirdiff.ui.h:10
+msgid "Ignore Filename Case"
+msgstr ""
+
+#: ../data/ui/dirdiff.ui.h:11
+msgid ""
+"Consider differently-cased filenames that are otherwise-identical to be the "
+"same"
+msgstr ""
+
+#: ../data/ui/dirdiff.ui.h:12
+msgid "Same"
+msgstr "Sama"
+
+#: ../data/ui/dirdiff.ui.h:13
+msgid "Show identical"
+msgstr ""
+
+#: ../data/ui/dirdiff.ui.h:14
+msgid "New"
+msgstr "Nova"
+
+#: ../data/ui/dirdiff.ui.h:15
+msgid "Show new"
+msgstr ""
+
+#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:77
+msgid "Modified"
+msgstr "Modifite"
+
+#: ../data/ui/dirdiff.ui.h:17
+msgid "Show modified"
+msgstr ""
+
+#: ../data/ui/dirdiff.ui.h:18
+msgid "Filters"
+msgstr "Filtriloj"
+
+#: ../data/ui/dirdiff.ui.h:19
+msgid "Set active filters"
+msgstr ""
+
#: ../data/ui/EditableList.ui.h:1
msgid "Editable List"
msgstr "Redaktebla listo"
@@ -51,67 +558,285 @@ msgstr "Redaktebla listo"
msgid "Active"
msgstr "Aktive"
-#: ../data/ui/EditableList.ui.h:3 ../meld/vcview.py:166
-msgid "Name"
-msgstr "Nomo"
-
-#: ../data/ui/EditableList.ui.h:4
-msgid "Pattern"
-msgstr "Modelo"
+#: ../data/ui/EditableList.ui.h:3
+msgid "Column Name"
+msgstr "Kolumna nomo"
-#: ../data/ui/EditableList.ui.h:5
-msgid "Add new filter"
-msgstr "Aldoni novan filtrilon"
-
-#: ../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 "_Aldoni"
-#: ../data/ui/EditableList.ui.h:7
-msgid "Remove selected filter"
-msgstr "Forigi elektitan filtrilon"
-
-#: ../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:682
msgid "_Remove"
msgstr "Fo_rigi"
-#: ../data/ui/EditableList.ui.h:9
+#: ../data/ui/EditableList.ui.h:6
msgid "Move item up"
msgstr "Movi elementon supren"
-#: ../data/ui/EditableList.ui.h:10
+#: ../data/ui/EditableList.ui.h:7
msgid "Move _Up"
msgstr "Movi s_upren"
-#: ../data/ui/EditableList.ui.h:11
+#: ../data/ui/EditableList.ui.h:8
msgid "Move item down"
msgstr "Movi elementon malsupren"
-#: ../data/ui/EditableList.ui.h:12
+#: ../data/ui/EditableList.ui.h:9
msgid "Move _Down"
msgstr "Movi _malsupren"
+#. Create icon and filename CellRenderer
+#: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35
+#: ../meld/dirdiff.py:373
+msgid "Name"
+msgstr "Nomo"
+
+#: ../data/ui/EditableList.ui.h:11
+msgid "Pattern"
+msgstr "Modelo"
+
+#: ../data/ui/EditableList.ui.h:12
+msgid "Add new filter"
+msgstr "Aldoni novan filtrilon"
+
+#: ../data/ui/EditableList.ui.h:13
+msgid "Remove selected filter"
+msgstr "Forigi elektitan filtrilon"
+
+#: ../data/ui/encoding-selector.ui.h:1
+msgid "Search text encoding…"
+msgstr ""
+
#: ../data/ui/filediff.ui.h:1
-msgid "Save modified files?"
-msgstr "Ĉu konservi modifitajn dosierojn?"
+msgid "Format as Patch…"
+msgstr ""
#: ../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 ""
+
+#: ../data/ui/filediff.ui.h:3
+msgid "Save A_ll"
msgstr ""
-"Kelkaj dosieroj estas ŝanĝitaj.\n"
-"Kiun vi volas konservi?"
#: ../data/ui/filediff.ui.h:4
-msgid "_Discard Changes"
-msgstr "_Ignori ŝanĝojn"
+msgid "Save all files in the current comparison"
+msgstr ""
#: ../data/ui/filediff.ui.h:5
-msgid "_Save Selected"
-msgstr "Kon_servi elektitan"
+msgid "Revert files to their saved versions"
+msgstr ""
+
+#: ../data/ui/filediff.ui.h:6
+msgid "Add Synchronization Point"
+msgstr ""
+
+#: ../data/ui/filediff.ui.h:7
+msgid "Add a synchronization point for changes between files"
+msgstr ""
+
+#: ../data/ui/filediff.ui.h:8
+msgid "Clear Synchronization Points"
+msgstr ""
+
+#: ../data/ui/filediff.ui.h:9
+msgid "Clear sychronization points for changes between files"
+msgstr ""
+
+#: ../data/ui/filediff.ui.h:10
+#| msgid "_Previous"
+msgid "Previous Conflict"
+msgstr "Antaŭa konfliko"
+
+#: ../data/ui/filediff.ui.h:11
+msgid "Go to the previous conflict"
+msgstr ""
+
+#: ../data/ui/filediff.ui.h:12
+msgid "Next Conflict"
+msgstr ""
+
+#: ../data/ui/filediff.ui.h:13
+msgid "Go to the next conflict"
+msgstr ""
+
+#: ../data/ui/filediff.ui.h:14
+msgid "Push to Left"
+msgstr ""
+
+#: ../data/ui/filediff.ui.h:15
+msgid "Push current change to the left"
+msgstr ""
+
+#: ../data/ui/filediff.ui.h:16
+msgid "Push to Right"
+msgstr ""
+
+#: ../data/ui/filediff.ui.h:17
+msgid "Push current change to the right"
+msgstr ""
+
+#: ../data/ui/filediff.ui.h:18
+msgid "Pull from Left"
+msgstr ""
+
+#: ../data/ui/filediff.ui.h:19
+msgid "Pull change from the left"
+msgstr ""
+
+#: ../data/ui/filediff.ui.h:20
+msgid "Pull from Right"
+msgstr ""
+
+#: ../data/ui/filediff.ui.h:21
+msgid "Pull change from the right"
+msgstr ""
+
+#: ../data/ui/filediff.ui.h:22
+msgid "Copy Above Left"
+msgstr ""
+
+#: ../data/ui/filediff.ui.h:23
+msgid "Copy change above the left chunk"
+msgstr ""
+
+#: ../data/ui/filediff.ui.h:24
+msgid "Copy Below Left"
+msgstr ""
+
+#: ../data/ui/filediff.ui.h:25
+msgid "Copy change below the left chunk"
+msgstr ""
+
+#: ../data/ui/filediff.ui.h:26
+msgid "Copy Above Right"
+msgstr ""
+
+#: ../data/ui/filediff.ui.h:27
+msgid "Copy change above the right chunk"
+msgstr ""
+
+#: ../data/ui/filediff.ui.h:28
+msgid "Copy Below Right"
+msgstr ""
+
+#: ../data/ui/filediff.ui.h:29
+msgid "Copy change below the right chunk"
+msgstr ""
+
+#: ../data/ui/filediff.ui.h:30
+msgid "Delete"
+msgstr "Forigi"
+
+#: ../data/ui/filediff.ui.h:31
+msgid "Delete change"
+msgstr ""
+
+#: ../data/ui/filediff.ui.h:32
+msgid "Merge All from Left"
+msgstr ""
+
+#: ../data/ui/filediff.ui.h:33
+msgid "Merge all non-conflicting changes from the left"
+msgstr ""
+
+#: ../data/ui/filediff.ui.h:34
+msgid "Merge All from Right"
+msgstr ""
+
+#: ../data/ui/filediff.ui.h:35
+msgid "Merge all non-conflicting changes from the right"
+msgstr ""
+
+#: ../data/ui/filediff.ui.h:36
+msgid "Merge All"
+msgstr ""
+
+#: ../data/ui/filediff.ui.h:37
+msgid "Merge all non-conflicting changes from left and right panes"
+msgstr ""
+
+#: ../data/ui/filediff.ui.h:38
+#, fuzzy
+#| msgid "_Previous Tab"
+msgid "Previous Pane"
+msgstr "Antaŭa langeto"
+
+#: ../data/ui/filediff.ui.h:39
+msgid "Move keyboard focus to the previous document in this comparison"
+msgstr ""
+
+#: ../data/ui/filediff.ui.h:40
+#, fuzzy
+#| msgid "Next change"
+msgid "Next Pane"
+msgstr "Sekva ŝanĝo"
+
+#: ../data/ui/filediff.ui.h:41
+msgid "Move keyboard focus to the next document in this comparison"
+msgstr ""
+
+#: ../data/ui/filediff.ui.h:42
+msgid "Lock Scrolling"
+msgstr ""
+
+#: ../data/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/findbar.ui.h:1 ../meld/meldwindow.py:141
+#: ../data/ui/filediff.ui.h:46
+msgid "Close _without Saving"
+msgstr ""
+
+#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:938 ../meld/filediff.py:1480
+#: ../meld/filediff.py:1552
+msgid "_Cancel"
+msgstr ""
+
+#: ../data/ui/filediff.ui.h:48
+msgid "_Save"
+msgstr ""
+
+#: ../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 ""
+
+#: ../data/ui/filediff.ui.h:50
+#| msgid "_File"
+msgid "File 3"
+msgstr "Doserio 3"
+
+#: ../data/ui/filediff.ui.h:51
+#| msgid "_File"
+msgid "File 2"
+msgstr "Doserio 2"
+
+#: ../data/ui/filediff.ui.h:52
+#| msgid "_File"
+msgid "File 1"
+msgstr "Doserio 1"
+
+#: ../data/ui/filediff.ui.h:53
+msgid "Revert unsaved changes to documents?"
+msgstr ""
+
+#: ../data/ui/filediff.ui.h:54
+msgid "Changes made to the following documents will be permanently lost:\n"
+msgstr ""
+
+#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:939 ../meld/filediff.py:1481
msgid "_Replace"
msgstr "A_nstataŭigi"
@@ -128,15 +853,17 @@ msgid "_Next"
msgstr "Sekve_n"
#: ../data/ui/findbar.ui.h:5
-msgid "_Search for"
-msgstr "_Serĉi"
+msgid "Find:"
+msgstr "Serĉi:"
#: ../data/ui/findbar.ui.h:6
-msgid "Replace _With"
-msgstr "Anstataŭigi _per"
+#| msgid "Replace _With"
+msgid "Replace _with:"
+msgstr "Anstataŭigi _per:"
#: ../data/ui/findbar.ui.h:7
-msgid "_Match Case"
+#| msgid "_Match Case"
+msgid "_Match case"
msgstr "_Uskleca kongruo"
#: ../data/ui/findbar.ui.h:8
@@ -144,90 +871,43 @@ msgid "Who_le word"
msgstr "_Tuta vorto"
#: ../data/ui/findbar.ui.h:9
-msgid "Regular E_xpression"
-msgstr ""
-
-#: ../data/ui/meldapp.ui.h:2
-msgid ""
-"Copyright © 2002-2009 Stephen Kennedy\n"
-"Copyright © 2009-2011 Kai Willadsen"
-msgstr ""
-"Kopirajto © 2002-2009 Stephen KENNEDY\n"
-"Kopirajto © 2009-2011 Kai WILLADSEN"
-
-#: ../data/ui/meldapp.ui.h:4
-msgid "translator-credits"
-msgstr "Kristjan SCHMIDT <kristjan schmidt googlemail com>"
-
-#: ../data/ui/meldapp.ui.h:5
-msgid "Choose Files"
-msgstr "Elekti dosierojn"
-
-#: ../data/ui/meldapp.ui.h:6
-msgid "_Three Way Compare"
-msgstr "_Triopa komparo"
-
-#. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:8
-msgid "Mine"
-msgstr ""
-
-#. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:10
-msgid "Original"
-msgstr "Originalo"
-
-#. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:12
-msgid "Other"
-msgstr "Alia"
-
-#: ../data/ui/meldapp.ui.h:13
-msgid "_File Comparison"
+msgid "Regular e_xpression"
msgstr ""
-#: ../data/ui/meldapp.ui.h:14
-msgid "_Directory Comparison"
+#: ../data/ui/findbar.ui.h:10
+msgid "Wrapped"
msgstr ""
-#: ../data/ui/meldapp.ui.h:15
-msgid "Select VC Directory"
-msgstr ""
-
-#: ../data/ui/meldapp.ui.h:16
-msgid "Directory"
-msgstr "Dosierujo"
-
-#: ../data/ui/meldapp.ui.h:17
-msgid "_Version Control Browser"
+#: ../data/ui/language-selector.ui.h:1
+msgid "Search highlight mode…"
msgstr ""
#: ../data/ui/patch-dialog.ui.h:1
-msgid "Create Patch"
+msgid "Format as Patch"
msgstr ""
#: ../data/ui/patch-dialog.ui.h:2
-msgid "Create a patch"
+msgid "Copy to Clipboard"
msgstr ""
-#: ../data/ui/patch-dialog.ui.h:3
-msgid "Use differences between:"
+#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:154
+msgid "Save Patch"
msgstr ""
#: ../data/ui/patch-dialog.ui.h:4
-msgid "Left and middle panes"
+msgid "Use differences between:"
msgstr ""
#: ../data/ui/patch-dialog.ui.h:5
-msgid "Middle and right panes"
+msgid "Left and middle panes"
msgstr ""
#: ../data/ui/patch-dialog.ui.h:6
-msgid "_Reverse patch direction"
+msgid "Middle and right panes"
msgstr ""
#: ../data/ui/patch-dialog.ui.h:7
-msgid "Copy to Clipboard"
+msgid "_Reverse patch direction"
msgstr ""
#: ../data/ui/preferences.ui.h:1
@@ -267,49 +947,129 @@ msgid "Do not _split words over two lines"
msgstr ""
#: ../data/ui/preferences.ui.h:10
-msgid "Show _line numbers"
+msgid "Highlight _current line"
msgstr ""
#: ../data/ui/preferences.ui.h:11
-msgid "Show w_hitespace"
+msgid "Show _line numbers"
msgstr ""
#: ../data/ui/preferences.ui.h:12
-msgid "Use s_yntax highlighting"
+msgid "Show w_hitespace"
msgstr ""
#: ../data/ui/preferences.ui.h:13
-msgid "External editor"
+msgid "Use s_yntax highlighting"
msgstr ""
#: ../data/ui/preferences.ui.h:14
-msgid "Use _default system editor"
+msgid "Syntax highlighting color scheme:"
msgstr ""
#: ../data/ui/preferences.ui.h:15
-msgid "Edito_r command:"
+msgid "External Editor"
msgstr ""
#: ../data/ui/preferences.ui.h:16
-msgid "Editor"
+msgid "Use _default system editor"
msgstr ""
#: ../data/ui/preferences.ui.h:17
+msgid "Edito_r command:"
+msgstr ""
+
+#: ../data/ui/preferences.ui.h:18
+msgid "Editor"
+msgstr ""
+
+#: ../data/ui/preferences.ui.h:19
+#, fuzzy
+#| msgid "Start a new comparison"
+msgid "Shallow Comparison"
+msgstr "Komenci novan komparon"
+
+#: ../data/ui/preferences.ui.h:20
+msgid "C_ompare files based only on size and timestamp"
+msgstr ""
+
+#: ../data/ui/preferences.ui.h:21
+msgid "_Timestamp resolution:"
+msgstr ""
+
+#: ../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:26
+msgid "Visible Columns"
+msgstr ""
+
+#: ../data/ui/preferences.ui.h:27
+msgid "Folder Comparisons"
+msgstr ""
+
+#: ../data/ui/preferences.ui.h:28
+msgid "Version Comparisons"
+msgstr ""
+
+#: ../data/ui/preferences.ui.h:29
+msgid "_Order when comparing file revisions:"
+msgstr ""
+
+#: ../data/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 ""
+
+#: ../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 "Filters"
+msgid "Filename filters"
+msgstr "Dosiernom-filtriloj"
+
+#: ../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 ""
-#: ../data/ui/preferences.ui.h:18
-msgid "Ignore symbolic links"
+#: ../data/ui/preferences.ui.h:37 ../meld/meldwindow.py:104
+msgid "File Filters"
msgstr ""
-#: ../data/ui/preferences.ui.h:19
-msgid "File Filters"
+#: ../data/ui/preferences.ui.h:38
+msgid "Change trimming"
msgstr ""
-#: ../data/ui/preferences.ui.h:20
+#: ../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 "Filters"
+msgid "Text filters"
+msgstr "Tekst-filtriloj"
+
+#: ../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 "
@@ -318,1115 +1078,1520 @@ msgid ""
"details."
msgstr ""
-#: ../data/ui/preferences.ui.h:21
-msgid "Ignore changes which insert or delete blank lines"
-msgstr ""
-
-#: ../data/ui/preferences.ui.h:22
+#: ../data/ui/preferences.ui.h:42
msgid "Text Filters"
msgstr ""
-#: ../data/ui/preferences.ui.h:23
-msgid "Loading"
-msgstr "Ŝargante"
+#: ../data/ui/preferences.ui.h:43
+msgid "Left is remote, right is local"
+msgstr ""
-#: ../data/ui/preferences.ui.h:24
-msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
+#: ../data/ui/preferences.ui.h:44
+msgid "Left is local, right is remote"
msgstr ""
-#: ../data/ui/preferences.ui.h:25
-msgid "Encoding"
+#: ../data/ui/preferences.ui.h:45
+msgid "Remote, merge, local"
msgstr ""
-#: ../data/ui/vcview.ui.h:1
-msgid "VC Log"
+#: ../data/ui/preferences.ui.h:46
+msgid "Local, merge, remote"
msgstr ""
-#: ../data/ui/vcview.ui.h:2
-msgid "Commit Files"
+#: ../data/ui/preferences.ui.h:47
+msgid "1ns (ext4)"
msgstr ""
-#: ../data/ui/vcview.ui.h:3
-msgid "Previous Logs"
+#: ../data/ui/preferences.ui.h:48
+msgid "100ns (NTFS)"
msgstr ""
-#: ../data/ui/vcview.ui.h:4
-msgid "Log Message"
+#: ../data/ui/preferences.ui.h:49
+msgid "1s (ext2/ext3)"
msgstr ""
-#: ../meld/dirdiff.py:232 ../meld/vcview.py:127
-msgid "_Compare"
-msgstr "_Kompari"
+#: ../data/ui/preferences.ui.h:50
+msgid "2s (VFAT)"
+msgstr ""
-#: ../meld/dirdiff.py:232 ../meld/vcview.py:127
-msgid "Compare selected"
+#: ../data/ui/shortcuts.ui.h:1
+msgctxt "shortcut window"
+msgid "General"
msgstr ""
-#: ../meld/dirdiff.py:233
-msgid "Copy _Left"
+#: ../data/ui/shortcuts.ui.h:2
+#| msgid "Start a new comparison"
+msgctxt "shortcut window"
+msgid "New comparison"
+msgstr "Nova komparo"
+
+#: ../data/ui/shortcuts.ui.h:3
+#| msgid "Start a new comparison"
+msgctxt "shortcut window"
+msgid "Close a comparison"
+msgstr "Fermi komparon"
+
+#: ../data/ui/shortcuts.ui.h:4
+#| msgid "Meld"
+msgctxt "shortcut window"
+msgid "Quit Meld"
+msgstr "Ĉesi Meldon"
+
+#: ../data/ui/shortcuts.ui.h:5
+#| msgid "Save the current file"
+msgctxt "shortcut window"
+msgid "Stop the current action"
+msgstr "Haltigi la aktualan agon"
+
+#: ../data/ui/shortcuts.ui.h:6
+#| msgid "Start a new comparison"
+msgctxt "shortcut window"
+msgid "Refresh comparison"
+msgstr "Aktualigi komparon"
+
+#: ../data/ui/shortcuts.ui.h:7
+#| msgid "Full Screen"
+msgctxt "shortcut window"
+msgid "Fullscreen"
+msgstr "Tutekrane"
+
+#: ../data/ui/shortcuts.ui.h:8
+#| msgid "_Tabs"
+msgctxt "shortcut window"
+msgid "Tabs"
+msgstr "Langetoj"
+
+#: ../data/ui/shortcuts.ui.h:9
+#| msgid "_Previous Tab"
+msgctxt "shortcut window"
+msgid "Go to previous tab"
+msgstr "Iri al antaŭa langeto"
+
+#: ../data/ui/shortcuts.ui.h:10
+msgctxt "shortcut window"
+msgid "Go to next tab"
msgstr ""
-#: ../meld/dirdiff.py:233
-msgid "Copy to left"
+#: ../data/ui/shortcuts.ui.h:11
+msgctxt "shortcut window"
+msgid "Switch to tab"
msgstr ""
-#: ../meld/dirdiff.py:234
-msgid "Copy _Right"
+#: ../data/ui/shortcuts.ui.h:12
+msgctxt "shortcut window"
+msgid "Move tab left"
msgstr ""
-#: ../meld/dirdiff.py:234
-msgid "Copy to right"
+#: ../data/ui/shortcuts.ui.h:13
+msgctxt "shortcut window"
+msgid "Move tab right"
msgstr ""
-#: ../meld/dirdiff.py:235
-msgid "Delete selected"
+#: ../data/ui/shortcuts.ui.h:14
+#| msgid "_Changes"
+msgctxt "shortcut window"
+msgid "Changes"
+msgstr "Ŝanĝoj"
+
+#: ../data/ui/shortcuts.ui.h:15
+msgctxt "shortcut window"
+msgid "Go to previous change"
msgstr ""
-#: ../meld/dirdiff.py:236 ../meld/filediff.py:1165
-msgid "Hide"
+#: ../data/ui/shortcuts.ui.h:16
+#| msgid "Next change"
+msgctxt "shortcut window"
+msgid "Go to next change"
+msgstr "Iri al sekva ŝanĝo"
+
+#: ../data/ui/shortcuts.ui.h:17
+#| msgid "_Edit"
+msgctxt "shortcut window"
+msgid "Editing"
+msgstr "Redaktado"
+
+#: ../data/ui/shortcuts.ui.h:18
+msgctxt "shortcut window"
+msgid "Undo"
msgstr ""
-#: ../meld/dirdiff.py:236
-msgid "Hide selected"
+#: ../data/ui/shortcuts.ui.h:19
+msgctxt "shortcut window"
+msgid "Redo"
msgstr ""
-#: ../meld/dirdiff.py:240
-msgid "Case"
+#: ../data/ui/shortcuts.ui.h:20
+msgctxt "shortcut window"
+msgid "Cut"
msgstr ""
-#: ../meld/dirdiff.py:240
-msgid "Ignore case of entries"
+#: ../data/ui/shortcuts.ui.h:21
+msgctxt "shortcut window"
+msgid "Copy"
msgstr ""
-#: ../meld/dirdiff.py:241
-msgid "Same"
-msgstr "Sama"
+#: ../data/ui/shortcuts.ui.h:22
+msgctxt "shortcut window"
+msgid "Paste"
+msgstr ""
-#: ../meld/dirdiff.py:241
-msgid "Show identical"
+#: ../data/ui/shortcuts.ui.h:23
+msgctxt "shortcut window"
+msgid "Find"
msgstr ""
-#: ../meld/dirdiff.py:242
-msgid "New"
-msgstr "Nova"
+#: ../data/ui/shortcuts.ui.h:24
+#| msgid "Find Ne_xt"
+msgctxt "shortcut window"
+msgid "Find Next"
+msgstr "Serĉi sekvan"
-#: ../meld/dirdiff.py:242
-msgid "Show new"
-msgstr ""
+#: ../data/ui/shortcuts.ui.h:25
+#| msgid "Find _Previous"
+msgctxt "shortcut window"
+msgid "Find Previous"
+msgstr "Serĉi antaŭan"
-#: ../meld/dirdiff.py:243
-msgid "Modified"
-msgstr "Modifite"
+#: ../data/ui/shortcuts.ui.h:26
+#| msgid "_Replace"
+msgctxt "shortcut window"
+msgid "Replace"
+msgstr "Anstataŭigi"
-#: ../meld/dirdiff.py:243 ../meld/vcview.py:140
-msgid "Show modified"
+#: ../data/ui/shortcuts.ui.h:27
+#| msgid "Start a new comparison"
+msgctxt "shortcut window"
+msgid "File comparison"
+msgstr "Dosiera komparo"
+
+#: ../data/ui/shortcuts.ui.h:28
+#| msgid "Save the current file"
+msgctxt "shortcut window"
+msgid "Save current file"
+msgstr "Konservi la aktualan dosieron"
+
+#: ../data/ui/shortcuts.ui.h:29
+#| msgid "Save the current file"
+msgctxt "shortcut window"
+msgid "Save current file to new path"
+msgstr "Konservi la aktualan dosieron al nova pado"
+
+#: ../data/ui/shortcuts.ui.h:30
+#| msgid "Start a new comparison"
+msgctxt "shortcut window"
+msgid "Save all files in comparison"
+msgstr "Konservi ĉiujn dosierojn de la komparo"
+
+#: ../data/ui/shortcuts.ui.h:31
+#| msgid "_Previous"
+msgctxt "shortcut window"
+msgid "Previous conflict"
+msgstr "Antaŭa konfliko"
+
+#: ../data/ui/shortcuts.ui.h:32
+msgctxt "shortcut window"
+msgid "Next conflict"
msgstr ""
-#: ../meld/dirdiff.py:245
-msgid "Filters"
-msgstr "Filtriloj"
+#: ../data/ui/shortcuts.ui.h:33
+msgctxt "shortcut window"
+msgid "Push change to left"
+msgstr ""
-#: ../meld/dirdiff.py:245
-msgid "Set active filters"
+#: ../data/ui/shortcuts.ui.h:34
+msgctxt "shortcut window"
+msgid "Push change to right"
msgstr ""
-#: ../meld/dirdiff.py:362
-#, python-format
-msgid "Hide %s"
+#: ../data/ui/shortcuts.ui.h:35
+msgctxt "shortcut window"
+msgid "Pull change from left"
msgstr ""
-#: ../meld/dirdiff.py:465 ../meld/dirdiff.py:478 ../meld/vcview.py:322
-#: ../meld/vcview.py:346
-#, python-format
-msgid "[%s] Scanning %s"
+#: ../data/ui/shortcuts.ui.h:36
+msgctxt "shortcut window"
+msgid "Pull change from right"
msgstr ""
-#: ../meld/dirdiff.py:577
-#, python-format
-msgid "[%s] Done"
+#: ../data/ui/shortcuts.ui.h:37
+#, fuzzy
+#| msgid "Copy the selection"
+msgctxt "shortcut window"
+msgid "Copy change above left"
+msgstr "Kopii ŝanĝon"
+
+#: ../data/ui/shortcuts.ui.h:38
+#, fuzzy
+#| msgid "Copy the selection"
+msgctxt "shortcut window"
+msgid "Copy change below left"
+msgstr "Kopii ŝanĝon"
+
+#: ../data/ui/shortcuts.ui.h:39
+msgctxt "shortcut window"
+msgid "Copy change above right"
msgstr ""
-#: ../meld/dirdiff.py:581
-msgid "Multiple errors occurred while scanning this folder"
+#: ../data/ui/shortcuts.ui.h:40
+msgctxt "shortcut window"
+msgid "Copy change below right"
msgstr ""
-#: ../meld/dirdiff.py:582
-msgid "Files with invalid encodings found"
+#: ../data/ui/shortcuts.ui.h:41
+#| msgid "Next change"
+msgctxt "shortcut window"
+msgid "Delete change"
+msgstr "Forigi ŝanĝon"
+
+#: ../data/ui/shortcuts.ui.h:42
+msgctxt "shortcut window"
+msgid "Previous comparison pane"
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:"
+#: ../data/ui/shortcuts.ui.h:43
+msgctxt "shortcut window"
+msgid "Next comparison pane"
msgstr ""
-#: ../meld/dirdiff.py:586
-msgid "Files hidden by case insensitive comparison"
+#: ../data/ui/shortcuts.ui.h:44
+#| msgid "Start a new comparison"
+msgctxt "shortcut window"
+msgid "Folder comparison"
+msgstr "Dosieruja komparo"
+
+#: ../data/ui/shortcuts.ui.h:45
+#| msgid "Copy the selection"
+msgctxt "shortcut window"
+msgid "Copy to left"
+msgstr "Kopii maldekstren"
+
+#: ../data/ui/shortcuts.ui.h:46
+msgctxt "shortcut window"
+msgid "Copy to right"
+msgstr "Kopii dekstren"
+
+#: ../data/ui/shortcuts.ui.h:47
+msgctxt "shortcut window"
+msgid "Version control comparison"
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:"
+#: ../data/ui/shortcuts.ui.h:48
+msgctxt "shortcut window"
+msgid "Commit to version control"
msgstr ""
-#: ../meld/dirdiff.py:599
-#, python-format
-msgid "'%s' hidden by '%s'"
+#: ../data/ui/shortcuts.ui.h:49
+msgctxt "shortcut window"
+msgid "Show/hide console output"
msgstr ""
-#: ../meld/dirdiff.py:624 ../meld/filediff.py:1008 ../meld/filediff.py:1169
-msgid "Hi_de"
+#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:558
+#: ../meld/newdifftab.py:39
+#| msgid "Start a new comparison"
+msgid "New comparison"
+msgstr "Nova komparo"
+
+#: ../data/ui/tab-placeholder.ui.h:2
+#| msgid "Start a new comparison"
+msgid "File comparison"
+msgstr "Dosiera komparo"
+
+#: ../data/ui/tab-placeholder.ui.h:3
+#| msgid "Directory"
+msgid "Directory comparison"
+msgstr "Dosieruja komparo"
+
+#: ../data/ui/tab-placeholder.ui.h:4
+msgid "Version control view"
msgstr ""
-#: ../meld/dirdiff.py:674
-#, python-format
-msgid ""
-"'%s' exists.\n"
-"Overwrite?"
+#: ../data/ui/tab-placeholder.ui.h:5
+#| msgid "Start a new comparison"
+msgid "_3-way comparison"
+msgstr "_3-obla komparon"
+
+#: ../data/ui/tab-placeholder.ui.h:6
+#| msgid "Select file"
+msgid "Select Third File"
+msgstr "Elekti trian dosieron"
+
+#: ../data/ui/tab-placeholder.ui.h:7
+#| msgid "Select file"
+msgid "Select Second File"
+msgstr "Elekti duan dosieron"
+
+#: ../data/ui/tab-placeholder.ui.h:8
+#| msgid "Select file"
+msgid "Select First File"
+msgstr "Elekti unua dosieron"
+
+#: ../data/ui/tab-placeholder.ui.h:9
+#| msgid "Select directory"
+msgid "Select First Folder"
+msgstr "Elekti unuan dosierujon"
+
+#: ../data/ui/tab-placeholder.ui.h:10
+#| msgid "Select directory"
+msgid "Select Second Folder"
+msgstr "Elekti duan dosierujon"
+
+#: ../data/ui/tab-placeholder.ui.h:11
+#| msgid "Select file"
+msgid "Select Third Folder"
+msgstr "Elekti trian dosieron"
+
+#: ../data/ui/tab-placeholder.ui.h:12
+msgid "Select A Version-Controlled Folder"
msgstr ""
-#: ../meld/dirdiff.py:681
-#, python-format
-msgid ""
-"Error copying '%s' to '%s'\n"
-"\n"
-"%s."
+#: ../data/ui/tab-placeholder.ui.h:13
+#| msgid "Start a new comparison"
+msgid "_Blank comparison"
+msgstr "_Malplena komparo"
+
+#: ../data/ui/tab-placeholder.ui.h:14
+#| msgid "_Compare"
+msgid "C_ompare"
+msgstr "K_ompari"
+
+#: ../data/ui/vcview.ui.h:3
+#| msgid "Co_mmit"
+msgid "Co_mmit…"
+msgstr "En_meti…"
+
+#: ../data/ui/vcview.ui.h:4
+msgid "Commit changes to version control"
msgstr ""
-#: ../meld/dirdiff.py:699 ../meld/vcview.py:535
-#, python-format
-msgid ""
-"'%s' is a directory.\n"
-"Remove recursively?"
+#: ../data/ui/vcview.ui.h:5
+msgid "_Update"
+msgstr "Ĝ_isdatigi"
+
+#: ../data/ui/vcview.ui.h:6
+msgid "Update working copy from version control"
msgstr ""
-#: ../meld/dirdiff.py:706 ../meld/vcview.py:540
-#, python-format
-msgid ""
-"Error removing %s\n"
-"\n"
-"%s."
+#: ../data/ui/vcview.ui.h:7
+msgid "_Push"
msgstr ""
-#: ../meld/dirdiff.py:740
-#, python-format
-msgid "%i second"
-msgid_plural "%i seconds"
-msgstr[0] "%i sekundo"
-msgstr[1] "%i sekundoj"
+#: ../data/ui/vcview.ui.h:8
+msgid "Push local changes to remote"
+msgstr ""
-#: ../meld/dirdiff.py:741
-#, python-format
-msgid "%i minute"
-msgid_plural "%i minutes"
-msgstr[0] "%i minuto"
-msgstr[1] "%i minutoj"
+#: ../data/ui/vcview.ui.h:10
+msgid "Add to version control"
+msgstr ""
-#: ../meld/dirdiff.py:742
-#, python-format
-msgid "%i hour"
-msgid_plural "%i hours"
-msgstr[0] "%i horo"
-msgstr[1] "%i horoj"
+#: ../data/ui/vcview.ui.h:12
+msgid "Remove from version control"
+msgstr ""
-#: ../meld/dirdiff.py:743
-#, python-format
-msgid "%i day"
-msgid_plural "%i days"
-msgstr[0] "%i tago"
-msgstr[1] "%i tagoj"
+#: ../data/ui/vcview.ui.h:13
+msgid "Mar_k as Resolved"
+msgstr ""
-#: ../meld/dirdiff.py:744
-#, python-format
-msgid "%i week"
-msgid_plural "%i weeks"
-msgstr[0] "%i semajno"
-msgstr[1] "%i semajnoj"
+#: ../data/ui/vcview.ui.h:14
+msgid "Mark as resolved in version control"
+msgstr ""
-#: ../meld/dirdiff.py:745
-#, python-format
-msgid "%i month"
-msgid_plural "%i months"
-msgstr[0] "%i monato"
-msgstr[1] "%i monatoj"
+#: ../data/ui/vcview.ui.h:15
+msgid "Re_vert"
+msgstr ""
-#: ../meld/dirdiff.py:746
-#, python-format
-msgid "%i year"
-msgid_plural "%i years"
-msgstr[0] "%i jaro"
-msgstr[1] "%i jaroj"
+#: ../data/ui/vcview.ui.h:16
+msgid "Revert working copy to original state"
+msgstr ""
-#: ../meld/filediff.py:294
-msgid "Format as patch..."
+#: ../data/ui/vcview.ui.h:17
+msgid "Delete from working copy"
msgstr ""
-#: ../meld/filediff.py:294
-msgid "Create a patch using differences between files"
+#: ../data/ui/vcview.ui.h:18
+msgid "Console"
msgstr ""
-#: ../meld/filediff.py:295
-msgid "Previous conflict"
+#: ../data/ui/vcview.ui.h:19
+msgid "Show or hide the version control console output pane"
msgstr ""
-#: ../meld/filediff.py:295
-msgid "Go to the previous conflict"
+#: ../data/ui/vcview.ui.h:20
+msgid "_Flatten"
msgstr ""
-#: ../meld/filediff.py:296
-msgid "Next conflict"
+#: ../data/ui/vcview.ui.h:21
+msgid "Flatten directories"
msgstr ""
-#: ../meld/filediff.py:296
-msgid "Go to the next conflict"
+#: ../data/ui/vcview.ui.h:22
+msgid "_Modified"
+msgstr "_Modifite"
+
+#: ../data/ui/vcview.ui.h:23
+#| msgid "Save modified files?"
+msgid "Show modified files"
+msgstr "Montri modifitajn dosierojn"
+
+#: ../data/ui/vcview.ui.h:24
+msgid "_Normal"
+msgstr "_Normale"
+
+#: ../data/ui/vcview.ui.h:25
+msgid "Show normal files"
msgstr ""
-#: ../meld/filediff.py:297
-msgid "Push to left"
+#: ../data/ui/vcview.ui.h:26
+msgid "Un_versioned"
msgstr ""
-#: ../meld/filediff.py:297
-msgid "Push current change to the left"
+#: ../data/ui/vcview.ui.h:27
+msgid "Show unversioned files"
msgstr ""
-#: ../meld/filediff.py:298
-msgid "Push to right"
+#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:70
+msgid "Ignored"
+msgstr "Ignorite"
+
+#: ../data/ui/vcview.ui.h:29
+msgid "Show ignored files"
msgstr ""
-#: ../meld/filediff.py:298
-msgid "Push current change to the right"
+#: ../data/ui/vcview.ui.h:30
+msgid "Commit"
+msgstr "Enmeti"
+
+#: ../data/ui/vcview.ui.h:31
+msgid "Commit Files"
msgstr ""
-#. FIXME: using LAST and FIRST is terrible and unreliable icon abuse
-#: ../meld/filediff.py:300
-msgid "Pull from left"
+#: ../data/ui/vcview.ui.h:32
+msgid "Log Message"
msgstr ""
-#: ../meld/filediff.py:300
-msgid "Pull change from the left"
+#: ../data/ui/vcview.ui.h:33
+#, fuzzy
+#| msgid "_Previous"
+msgid "Previous logs:"
+msgstr "Antaŭa:"
+
+#: ../data/ui/vcview.ui.h:34
+msgid "Co_mmit"
+msgstr "En_meti"
+
+#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:334
+msgid "Location"
+msgstr "Loko"
+
+#: ../data/ui/vcview.ui.h:37
+msgid "Status"
+msgstr "Stato"
+
+#: ../data/ui/vcview.ui.h:38
+msgid "Extra"
msgstr ""
-#: ../meld/filediff.py:301
-msgid "Pull from right"
+#: ../data/ui/vcview.ui.h:39
+msgid "Console output"
msgstr ""
-#: ../meld/filediff.py:301
-msgid "Pull change from the right"
+#: ../data/ui/vcview.ui.h:40
+msgid "Push local commits to remote?"
msgstr ""
-#: ../meld/filediff.py:302
-msgid "Copy above left"
+#: ../data/ui/vcview.ui.h:41
+msgid "The commits to be pushed are determined by your version control system."
msgstr ""
-#: ../meld/filediff.py:302
-msgid "Copy change above the left chunk"
+#: ../data/ui/vcview.ui.h:42
+msgid "_Push commits"
msgstr ""
-#: ../meld/filediff.py:303
-msgid "Copy below left"
+#: ../meld/const.py:12
+msgid "UNIX (LF)"
msgstr ""
-#: ../meld/filediff.py:303
-msgid "Copy change below the left chunk"
+#: ../meld/const.py:13
+msgid "DOS/Windows (CR-LF)"
msgstr ""
-#: ../meld/filediff.py:304
-msgid "Copy above right"
+#: ../meld/const.py:14
+msgid "Mac OS (CR)"
msgstr ""
-#: ../meld/filediff.py:304
-msgid "Copy change above the right chunk"
+#. Create file size CellRenderer
+#: ../meld/dirdiff.py:391 ../meld/preferences.py:82
+msgid "Size"
msgstr ""
-#: ../meld/filediff.py:305
-msgid "Copy below right"
+#. Create date-time CellRenderer
+#: ../meld/dirdiff.py:399 ../meld/preferences.py:83
+msgid "Modification time"
msgstr ""
-#: ../meld/filediff.py:305
-msgid "Copy change below the right chunk"
+#. Create permissions CellRenderer
+#: ../meld/dirdiff.py:407 ../meld/preferences.py:84
+msgid "Permissions"
msgstr ""
-#: ../meld/filediff.py:306
-msgid "Delete"
-msgstr "Forigi"
+#: ../meld/dirdiff.py:534
+#, python-format
+msgid "Hide %s"
+msgstr ""
-#: ../meld/filediff.py:306
-msgid "Delete change"
+#: ../meld/dirdiff.py:667 ../meld/dirdiff.py:691
+#, python-format
+msgid "[%s] Scanning %s"
msgstr ""
-#: ../meld/filediff.py:307
-msgid "Merge all changes from left"
+#: ../meld/dirdiff.py:823
+#, python-format
+msgid "[%s] Done"
msgstr ""
-#: ../meld/filediff.py:307
-msgid "Merge all non-conflicting changes from the left"
+#: ../meld/dirdiff.py:831
+msgid "Folders have no differences"
msgstr ""
-#: ../meld/filediff.py:308
-msgid "Merge all changes from right"
+#: ../meld/dirdiff.py:833
+msgid "Contents of scanned files in folders are identical."
msgstr ""
-#: ../meld/filediff.py:308
-msgid "Merge all non-conflicting changes from the right"
+#: ../meld/dirdiff.py:835
+msgid ""
+"Scanned files in folders appear identical, but contents have not been "
+"scanned."
msgstr ""
-#: ../meld/filediff.py:309
-msgid "Merge all non-conflicting"
+#: ../meld/dirdiff.py:838
+msgid "File filters are in use, so not all files have been scanned."
msgstr ""
-#: ../meld/filediff.py:309
-msgid "Merge all non-conflicting changes from left and right panes"
+#: ../meld/dirdiff.py:840
+msgid "Text filters are in use and may be masking content differences."
msgstr ""
-#: ../meld/filediff.py:310
-msgid "Cycle through documents"
+#: ../meld/dirdiff.py:858 ../meld/filediff.py:1411 ../meld/filediff.py:1441
+#: ../meld/filediff.py:1443 ../meld/ui/msgarea.py:105 ../meld/ui/msgarea.py:118
+msgid "Hi_de"
msgstr ""
-#: ../meld/filediff.py:310
-msgid "Move keyboard focus to the next document in this comparison"
+#: ../meld/dirdiff.py:868
+msgid "Multiple errors occurred while scanning this folder"
msgstr ""
-#: ../meld/filediff.py:314
-msgid "Lock scrolling"
+#: ../meld/dirdiff.py:869
+msgid "Files with invalid encodings found"
msgstr ""
-#: ../meld/filediff.py:315
-msgid "Lock scrolling of all panes"
+#. TRANSLATORS: This is followed by a list of files
+#: ../meld/dirdiff.py:871
+msgid "Some files were in an incorrect encoding. The names are something like:"
msgstr ""
-#. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:396
-msgid "INS"
+#: ../meld/dirdiff.py:873
+msgid "Files hidden by case insensitive comparison"
msgstr ""
-#: ../meld/filediff.py:396
-msgid "OVR"
+#. TRANSLATORS: This is followed by a list of files
+#: ../meld/dirdiff.py:875
+msgid ""
+"You are running a case insensitive comparison on a case sensitive "
+"filesystem. The following files in this folder are hidden:"
msgstr ""
-#. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:398
+#: ../meld/dirdiff.py:886
#, python-format
-msgid "Ln %i, Col %i"
+msgid "“%s” hidden by “%s”"
+msgstr ""
+
+#: ../meld/dirdiff.py:942
+#, python-format
+msgid "Replace folder “%s”?"
msgstr ""
-#: ../meld/filediff.py:722
+#: ../meld/dirdiff.py:944
#, python-format
msgid ""
-"Filter '%s' changed the number of lines in the file. Comparison will be "
-"incorrect. See the user manual for more details."
+"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 ""
-#. TRANSLATORS: this is the name of a new file which has not yet been saved
-#: ../meld/filediff.py:809
-msgid "<unnamed>"
+#: ../meld/dirdiff.py:957
+msgid "Error copying file"
msgstr ""
-#: ../meld/filediff.py:996
+#: ../meld/dirdiff.py:958
#, python-format
-msgid "[%s] Set num panes"
+msgid ""
+"Couldn’t copy %s\n"
+"to %s.\n"
+"\n"
+"%s"
msgstr ""
-#: ../meld/filediff.py:1002
+#: ../meld/dirdiff.py:981
#, python-format
-msgid "[%s] Opening files"
+msgid "Error deleting %s"
msgstr ""
-#: ../meld/filediff.py:1026 ../meld/filediff.py:1035 ../meld/filediff.py:1047
-#: ../meld/filediff.py:1053
-msgid "Could not read file"
+#: ../meld/dirdiff.py:1495
+msgid "No folder"
msgstr ""
-#: ../meld/filediff.py:1027
-#, python-format
-msgid "[%s] Reading files"
+#: ../meld/filediff.py:782
+msgid "Comparison results will be inaccurate"
msgstr ""
-#: ../meld/filediff.py:1036
+#: ../meld/filediff.py:784
+msgid ""
+"A filter changed the number of lines in the file, which is unsupported. The "
+"comparison will not be accurate."
+msgstr ""
+
+#: ../meld/filediff.py:840
+msgid "Mark conflict as resolved?"
+msgstr ""
+
+#: ../meld/filediff.py:842
+msgid ""
+"If the conflict was resolved successfully, you may mark it as resolved now."
+msgstr ""
+
+#: ../meld/filediff.py:844
+msgid "Cancel"
+msgstr ""
+
+#: ../meld/filediff.py:845
+msgid "Mark _Resolved"
+msgstr ""
+
+#: ../meld/filediff.py:1132
#, python-format
-msgid "%s appears to be a binary file."
+msgid "There was a problem opening the file “%s”."
msgstr ""
-#: ../meld/filediff.py:1048
+#: ../meld/filediff.py:1140
#, python-format
-msgid "%s is not in encodings: %s"
+msgid "File %s appears to be a binary file."
+msgstr ""
+
+#: ../meld/filediff.py:1142
+msgid "Do you want to open the file using the default application?"
+msgstr ""
+
+#: ../meld/filediff.py:1144
+msgid "Open"
msgstr ""
-#: ../meld/filediff.py:1078 ../meld/filemerge.py:67
+#: ../meld/filediff.py:1160
#, python-format
msgid "[%s] Computing differences"
msgstr ""
-#: ../meld/filediff.py:1156
+#: ../meld/filediff.py:1221
+#, python-format
+msgid "File %s has changed on disk"
+msgstr ""
+
+#: ../meld/filediff.py:1222
+msgid "Do you want to reload the file?"
+msgstr ""
+
+#: ../meld/filediff.py:1224
+#| msgid "Reload"
+msgid "_Reload"
+msgstr "_Reŝargi"
+
+#: ../meld/filediff.py:1374
+msgid "Files are identical"
+msgstr ""
+
+#: ../meld/filediff.py:1387
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:1162
-msgid "Files are identical"
+#: ../meld/filediff.py:1392
+msgid "Files differ in line endings only"
+msgstr ""
+
+#: ../meld/filediff.py:1394
+#, python-format
+msgid ""
+"Files are identical except for differing line endings:\n"
+"%s"
msgstr ""
-#: ../meld/filediff.py:1172
+#: ../meld/filediff.py:1414
msgid "Show without filters"
msgstr ""
-#: ../meld/filediff.py:1361
-#, python-format
+#: ../meld/filediff.py:1436
+msgid "Change highlighting incomplete"
+msgstr ""
+
+#: ../meld/filediff.py:1437
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 ""
-#: ../meld/filediff.py:1374
+#: ../meld/filediff.py:1445
+msgid "Keep highlighting"
+msgstr ""
+
+#: ../meld/filediff.py:1447
+msgid "_Keep highlighting"
+msgstr ""
+
+#: ../meld/filediff.py:1484
+#, python-format
+msgid "Replace file “%s”?"
+msgstr ""
+
+#: ../meld/filediff.py:1486
#, 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 ""
+
+#: ../meld/filediff.py:1503
+msgid "Save Left Pane As"
+msgstr ""
+
+#: ../meld/filediff.py:1505
+msgid "Save Middle Pane As"
msgstr ""
-#: ../meld/filediff.py:1383
+#: ../meld/filediff.py:1507
+msgid "Save Right Pane As"
+msgstr ""
+
+#: ../meld/filediff.py:1521
#, python-format
-msgid "Choose a name for buffer %i."
+msgid "File %s has changed on disk since it was opened"
+msgstr ""
+
+#: ../meld/filediff.py:1523
+msgid "If you save it, any external changes will be lost."
msgstr ""
-#: ../meld/filediff.py:1398
+#: ../meld/filediff.py:1526
+msgid "Save Anyway"
+msgstr ""
+
+#: ../meld/filediff.py:1527
+msgid "Don’t Save"
+msgstr ""
+
+#: ../meld/filediff.py:1553
+msgid "_Save as UTF-8"
+msgstr ""
+
+#: ../meld/filediff.py:1556
#, 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 ""
-#: ../meld/filediff.py:1414
+#: ../meld/filediff.py:1558
#, 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 ""
-#: ../meld/filediff.py:1473
+#: ../meld/filediff.py:1598 ../meld/patchdialog.py:130
+#, python-format
+msgid "Could not save file %s."
+msgstr ""
+
+#: ../meld/filediff.py:1599 ../meld/patchdialog.py:131
#, 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 ""
+
+#: ../meld/filediff.py:1964
+msgid "Live comparison updating disabled"
msgstr ""
-#: ../meld/filemerge.py:82
+#: ../meld/filediff.py:1965
+msgid ""
+"Live updating of comparisons is disabled when synchronization points are "
+"active. You can still manually refresh the comparison, and live updates will "
+"resume when synchronization points are cleared."
+msgstr ""
+
+#: ../meld/filemerge.py:37
#, python-format
msgid "[%s] Merging files"
msgstr ""
-#: ../meld/meldapp.py:152
+#: ../meld/gutterrendererchunk.py:216
+msgid "Copy _up"
+msgstr ""
+
+#: ../meld/gutterrendererchunk.py:217
+msgid "Copy _down"
+msgstr ""
+
+#: ../meld/meldapp.py:177
msgid "wrong number of arguments supplied to --diff"
msgstr ""
-#: ../meld/meldapp.py:156
+#: ../meld/meldapp.py:182
msgid "Start with an empty window"
msgstr ""
-#: ../meld/meldapp.py:157 ../meld/meldapp.py:158 ../meld/meldapp.py:160
+#: ../meld/meldapp.py:183 ../meld/meldapp.py:185
msgid "file"
msgstr "dosiero"
-#: ../meld/meldapp.py:157 ../meld/meldapp.py:159 ../meld/meldapp.py:160
-msgid "dir"
+#: ../meld/meldapp.py:183 ../meld/meldapp.py:187
+msgid "folder"
msgstr "dosierujo"
-#: ../meld/meldapp.py:157
+#: ../meld/meldapp.py:184
msgid "Start a version control comparison"
msgstr ""
-#: ../meld/meldapp.py:158
+#: ../meld/meldapp.py:186
msgid "Start a 2- or 3-way file comparison"
msgstr ""
-#: ../meld/meldapp.py:159
-msgid "Start a 2- or 3-way directory comparison"
-msgstr ""
+#: ../meld/meldapp.py:188
+#| msgid "Start a new comparison"
+msgid "Start a 2- or 3-way folder comparison"
+msgstr "Komenci 2- aŭ 3-oblan dosierujan komparon"
-#: ../meld/meldapp.py:160
-msgid "Start a comparison between file and dir/file"
-msgstr ""
+#: ../meld/meldapp.py:231
+#, python-format
+msgid "Error: %s\n"
+msgstr "Eraro: %s\n"
-#: ../meld/meldapp.py:166
+#: ../meld/meldapp.py:238
msgid "Meld is a file and directory comparison tool."
msgstr ""
-#: ../meld/meldapp.py:169
+#: ../meld/meldapp.py:242
msgid "Set label to use instead of file name"
msgstr ""
-#: ../meld/meldapp.py:171
+#: ../meld/meldapp.py:245
+msgid "Open a new tab in an already running instance"
+msgstr ""
+
+#: ../meld/meldapp.py:248
msgid "Automatically compare all differing files on startup"
msgstr ""
-#: ../meld/meldapp.py:173
+#: ../meld/meldapp.py:251
msgid "Ignored for compatibility"
msgstr ""
-#: ../meld/meldapp.py:176
+#: ../meld/meldapp.py:255
msgid "Set the target file for saving a merge result"
msgstr ""
-#: ../meld/meldapp.py:179
-msgid "Creates a diff tab for up to 3 supplied files or directories."
+#: ../meld/meldapp.py:258
+#| msgid "Compare and merge your files"
+msgid "Automatically merge files"
+msgstr "Aŭtomate kunfandi dosierojn"
+
+#: ../meld/meldapp.py:262
+msgid "Load a saved comparison from a Meld comparison file"
+msgstr ""
+
+#: ../meld/meldapp.py:266
+msgid "Create a diff tab for the supplied files or folders"
msgstr ""
-#: ../meld/meldapp.py:182
+#: ../meld/meldapp.py:286
#, python-format
-msgid "too many arguments (wanted 0-4, got %d)"
+msgid "too many arguments (wanted 0-3, got %d)"
+msgstr ""
+
+#: ../meld/meldapp.py:289
+msgid "can’t auto-merge less than 3 files"
+msgstr ""
+
+#: ../meld/meldapp.py:291
+msgid "can’t auto-merge directories"
msgstr ""
-#: ../meld/meldapp.py:184 ../meld/meldapp.py:188
-msgid "can't compare more than three directories"
+#: ../meld/meldapp.py:305
+msgid "Error reading saved comparison file"
msgstr ""
-#: ../meld/melddoc.py:56 ../meld/melddoc.py:57
+#: ../meld/meldapp.py:350
+#, python-format
+msgid "invalid path or URI “%s”"
+msgstr ""
+
+#. TRANSLATORS: This is the label of a new, currently-unnamed file.
+#: ../meld/meldbuffer.py:140
+msgid "<unnamed>"
+msgstr "<nenomite>"
+
+#: ../meld/melddoc.py:65
msgid "untitled"
msgstr "sentitole"
-#: ../meld/meldwindow.py:125
+#: ../meld/meldwindow.py:46
msgid "_File"
msgstr "_Doserio"
-#: ../meld/meldwindow.py:126
-msgid "_New..."
-msgstr "_Nova..."
+#: ../meld/meldwindow.py:47
+#| msgid "Start a new comparison"
+msgid "_New Comparison…"
+msgstr "_Nova komparo…"
-#: ../meld/meldwindow.py:126
+#: ../meld/meldwindow.py:48
msgid "Start a new comparison"
msgstr "Komenci novan komparon"
-#: ../meld/meldwindow.py:127
+#: ../meld/meldwindow.py:51
msgid "Save the current file"
msgstr "Konservi la aktualan dosieron"
-#: ../meld/meldwindow.py:129
+#: ../meld/meldwindow.py:53
+msgid "Save As…"
+msgstr ""
+
+#: ../meld/meldwindow.py:54
+#| msgid "Save the current file"
+msgid "Save the current file with a different name"
+msgstr "Konservi la aktualan dosieron per alia nomo"
+
+#: ../meld/meldwindow.py:57
msgid "Close the current file"
msgstr "Fermi la aktualan dosieron"
-#: ../meld/meldwindow.py:130
-msgid "Quit the program"
-msgstr "Ĉesi la programon"
-
-#: ../meld/meldwindow.py:132
+#: ../meld/meldwindow.py:60
msgid "_Edit"
msgstr "R_edakti"
-#: ../meld/meldwindow.py:133
+#: ../meld/meldwindow.py:62
msgid "Undo the last action"
msgstr "Malfari la lastan agon"
-#: ../meld/meldwindow.py:134
+#: ../meld/meldwindow.py:65
msgid "Redo the last undone action"
msgstr "Refari la lastan malfaritan agon"
-#: ../meld/meldwindow.py:135
+#: ../meld/meldwindow.py:67
msgid "Cut the selection"
msgstr "Eltondi la elektaĵon"
-#: ../meld/meldwindow.py:136
+#: ../meld/meldwindow.py:69
msgid "Copy the selection"
msgstr "Kopii la elektaĵon"
-#: ../meld/meldwindow.py:137
+#: ../meld/meldwindow.py:71
msgid "Paste the clipboard"
msgstr "Enmeti la tondujon"
-#: ../meld/meldwindow.py:138
+#: ../meld/meldwindow.py:73
+msgid "Find…"
+msgstr ""
+
+#: ../meld/meldwindow.py:73
msgid "Search for text"
msgstr "Serĉi tekston"
-#: ../meld/meldwindow.py:139
+#: ../meld/meldwindow.py:75
msgid "Find Ne_xt"
msgstr "Serĉi la se_kvan"
-#: ../meld/meldwindow.py:139
+#: ../meld/meldwindow.py:76
msgid "Search forwards for the same text"
msgstr "Serĉi antaŭen la saman tekston"
-#: ../meld/meldwindow.py:140
+#: ../meld/meldwindow.py:78
msgid "Find _Previous"
msgstr "Serĉi la _antaŭan"
-#: ../meld/meldwindow.py:140
+#: ../meld/meldwindow.py:79
msgid "Search backwards for the same text"
msgstr ""
-#: ../meld/meldwindow.py:141
+#: ../meld/meldwindow.py:82
+#| msgid "_Replace"
+msgid "_Replace…"
+msgstr "_Anstataŭigi…"
+
+#: ../meld/meldwindow.py:83
msgid "Find and replace text"
msgstr ""
-#: ../meld/meldwindow.py:142
-msgid "Prefere_nces"
-msgstr ""
+#: ../meld/meldwindow.py:85
+msgid "Go to _Line"
+msgstr "Iri al _linio"
-#: ../meld/meldwindow.py:142
-msgid "Configure the application"
+#: ../meld/meldwindow.py:86
+msgid "Go to a specific line"
msgstr ""
-#: ../meld/meldwindow.py:144
+#: ../meld/meldwindow.py:89
msgid "_Changes"
msgstr "Ŝa_nĝoj"
-#: ../meld/meldwindow.py:145
-msgid "Next change"
+#: ../meld/meldwindow.py:90
+#| msgid "Next change"
+msgid "Next Change"
msgstr "Sekva ŝanĝo"
-#: ../meld/meldwindow.py:145
+#: ../meld/meldwindow.py:91
msgid "Go to the next change"
msgstr ""
-#: ../meld/meldwindow.py:146
-msgid "Previous change"
-msgstr ""
+#: ../meld/meldwindow.py:93
+#| msgid "_Previous Tab"
+msgid "Previous Change"
+msgstr "Antaŭa ŝanĝo"
-#: ../meld/meldwindow.py:146
+#: ../meld/meldwindow.py:94
msgid "Go to the previous change"
msgstr ""
-#: ../meld/meldwindow.py:147
-msgid "Open externally"
+#: ../meld/meldwindow.py:96
+msgid "Open Externally"
msgstr ""
-#: ../meld/meldwindow.py:147
+#: ../meld/meldwindow.py:97
msgid "Open selected file or directory in the default external application"
msgstr ""
-#: ../meld/meldwindow.py:149
+#: ../meld/meldwindow.py:101
msgid "_View"
msgstr "_Vido"
-#: ../meld/meldwindow.py:150
-msgid "File status"
-msgstr ""
-
-#: ../meld/meldwindow.py:151
-msgid "Version status"
-msgstr ""
+#: ../meld/meldwindow.py:102
+#| msgid "Status"
+msgid "File Status"
+msgstr "Dosiera stato"
-#: ../meld/meldwindow.py:152
-msgid "File filters"
-msgstr ""
+#: ../meld/meldwindow.py:103
+#| msgid "Status"
+msgid "Version Status"
+msgstr "Versia stato"
-#: ../meld/meldwindow.py:153
+#: ../meld/meldwindow.py:106
msgid "Stop the current action"
msgstr ""
-#: ../meld/meldwindow.py:154
+#: ../meld/meldwindow.py:109
msgid "Refresh the view"
msgstr ""
-#: ../meld/meldwindow.py:155
-msgid "Reload"
-msgstr "Reŝargi"
+#: ../meld/meldwindow.py:113
+#| msgid "Full Screen"
+msgid "Fullscreen"
+msgstr "Tutekrane"
-#: ../meld/meldwindow.py:155
-msgid "Reload the comparison"
+#: ../meld/meldwindow.py:114
+msgid "View the comparison in fullscreen"
msgstr ""
-#: ../meld/meldwindow.py:157
-msgid "_Tabs"
-msgstr "_Langetoj"
-
-#: ../meld/meldwindow.py:158
-msgid "_Previous Tab"
-msgstr "_Antaŭa langeto"
+#: ../meld/meldwindow.py:116
+msgid "_Toolbar"
+msgstr "Ilobre_to"
-#: ../meld/meldwindow.py:158
-msgid "Activate previous tab"
+#: ../meld/meldwindow.py:117
+msgid "Show or hide the toolbar"
msgstr ""
-#: ../meld/meldwindow.py:159
-msgid "_Next Tab"
-msgstr "_Sekva langeto"
-
-#: ../meld/meldwindow.py:159
-msgid "Activate next tab"
+#: ../meld/meldwindow.py:127
+msgid "Open Recent"
msgstr ""
-#: ../meld/meldwindow.py:160
-msgid "Move Tab _Left"
-msgstr ""
+#: ../meld/meldwindow.py:128
+#| msgid "Select file"
+msgid "Open recent files"
+msgstr "Malfermi lastan dosieron"
-#: ../meld/meldwindow.py:160
-msgid "Move current tab to left"
-msgstr ""
+#: ../meld/meldwindow.py:150
+#| msgid "Meld"
+msgid "_Meld"
+msgstr "_Meldo"
-#: ../meld/meldwindow.py:161
-msgid "Move Tab _Right"
-msgstr ""
+#: ../meld/meldwindow.py:151
+msgid "Quit the program"
+msgstr "Ĉesi la programon"
-#: ../meld/meldwindow.py:161
-msgid "Move current tab to right"
-msgstr ""
+#: ../meld/meldwindow.py:153
+msgid "Prefere_nces"
+msgstr "_Agordoj"
-#: ../meld/meldwindow.py:163
-msgid "_Help"
-msgstr "_Helpo"
+#: ../meld/meldwindow.py:154
+msgid "Configure the application"
+msgstr ""
-#: ../meld/meldwindow.py:164
+#: ../meld/meldwindow.py:156
msgid "_Contents"
msgstr "_Enhavo"
-#: ../meld/meldwindow.py:164
+#: ../meld/meldwindow.py:157
msgid "Open the Meld manual"
msgstr ""
-#: ../meld/meldwindow.py:165
-msgid "Report _Bug"
-msgstr ""
+#: ../meld/meldwindow.py:159
+#| msgid "Cut the selection"
+msgid "About this application"
+msgstr "Pri ĉi tiu aplikaĵo"
-#: ../meld/meldwindow.py:165
-msgid "Report a bug in Meld"
+#: ../meld/meldwindow.py:592
+#, python-format
+msgid "Need three files to auto-merge, got: %r"
msgstr ""
-#: ../meld/meldwindow.py:166
-msgid "About this program"
+#: ../meld/meldwindow.py:613
+msgid "Cannot compare a mixture of files and directories"
msgstr ""
-#: ../meld/meldwindow.py:169
-msgid "Full Screen"
-msgstr "Tutekrane"
+#: ../meld/misc.py:205
+#, python-format
+msgid "Couldn’t find colour scheme details for %s-%s; this is a bad install"
+msgstr ""
-#: ../meld/meldwindow.py:169
-msgid "View the comparison in full screen"
+#. no common path. empty names get changed to "[None]"
+#: ../meld/misc.py:265
+msgid "[None]"
msgstr ""
-#: ../meld/meldwindow.py:170
-msgid "_Toolbar"
-msgstr "Ilobre_to"
+#: ../meld/preferences.py:33
+msgid "label"
+msgstr "etikedo"
-#: ../meld/meldwindow.py:170
-msgid "Show or hide the toolbar"
+#: ../meld/preferences.py:33
+msgid "pattern"
msgstr ""
-#: ../meld/meldwindow.py:171
-msgid "_Statusbar"
-msgstr "_Statobreto"
-
-#: ../meld/meldwindow.py:171
-msgid "Show or hide the statusbar"
+#: ../meld/recent.py:116
+msgid "Version control:"
msgstr ""
-#: ../meld/meldwindow.py:538
-msgid "Switch to this tab"
+#: ../meld/ui/bufferselectors.py:32
+#, python-brace-format
+msgid "{name} ({charset})"
msgstr ""
-#. exit at first non found directory + file
-#: ../meld/meldwindow.py:629
-msgid "Cannot compare a mixture of files and directories.\n"
+#: ../meld/ui/bufferselectors.py:65 ../meld/ui/bufferselectors.py:73
+msgid "Plain Text"
msgstr ""
-#. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:174
-msgid "[None]"
+#: ../meld/ui/notebooklabel.py:63
+msgid "Close tab"
+msgstr "Fermi la langeton"
+
+#. 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 ""
-#: ../meld/patchdialog.py:122
-msgid "Save Patch As..."
+#: ../meld/ui/statusbar.py:186
+msgid "Line you want to move the cursor to"
msgstr ""
-#: ../meld/preferences.py:37
-msgid "label"
+#: ../meld/ui/vcdialogs.py:48
+msgid "No files will be committed"
msgstr ""
-#: ../meld/preferences.py:37
-msgid "pattern"
+#. 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 "%s in %s"
msgstr ""
-#: ../meld/preferences.py:111
-msgid "Only available if you have gnome-python-desktop installed"
+#. 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] ""
+msgstr[1] ""
+
+#: ../meld/vc/git.py:97
+#, python-format
+msgid "%d branch"
+msgid_plural "%d branches"
+msgstr[0] "%d branĉo"
+msgstr[1] "%d branĉoj"
+
+#: ../meld/vc/git.py:333
+#, python-format
+msgid "Mode changed from %s to %s"
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"
+#: ../meld/vc/git.py:341
+msgid "Partially staged"
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/vc/git.py:341
+msgid "Staged"
msgstr ""
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:238
+#. 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 "Neniu"
+
+#: ../meld/vc/svn.py:204
#, python-format
-msgid "Version Control\t1\t%s\n"
+msgid "Rev %s"
msgstr ""
-#. 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 ""
+#: ../meld/vc/_vc.py:55
+msgid "Merged"
+msgstr "Kunfandigite"
-#. 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}"
+#: ../meld/vc/_vc.py:55
+msgid "Base"
msgstr ""
-#. 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 ""
+#: ../meld/vc/_vc.py:55
+#| msgid "Location"
+msgid "Local"
+msgstr "Loke"
+
+#: ../meld/vc/_vc.py:55
+#| msgid "_Remove"
+msgid "Remote"
+msgstr "Defore"
-#. 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"
+#: ../meld/vc/_vc.py:71
+msgid "Unversioned"
msgstr ""
-#. 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"
+#: ../meld/vc/_vc.py:74
+msgid "Error"
msgstr ""
-#. 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"
+#: ../meld/vc/_vc.py:76
+msgid "Newly added"
msgstr ""
-#. 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"
+#: ../meld/vc/_vc.py:78
+msgid "Renamed"
msgstr ""
-#. 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#.*"
+#: ../meld/vc/_vc.py:79
+msgid "Conflict"
msgstr ""
-#: ../meld/vcview.py:128
-msgid "Co_mmit"
-msgstr "En_meti"
+#: ../meld/vc/_vc.py:80
+#| msgid "_Remove"
+msgid "Removed"
+msgstr "Forigite"
-#: ../meld/vcview.py:128
-msgid "Commit"
-msgstr "Enmeti"
+#: ../meld/vc/_vc.py:81
+msgid "Missing"
+msgstr ""
-#: ../meld/vcview.py:129
-msgid "_Update"
-msgstr "Ĝ_isdatigi"
+#: ../meld/vc/_vc.py:82
+msgid "Not present"
+msgstr ""
-#: ../meld/vcview.py:129
-msgid "Update"
-msgstr "Ĝisdatigi"
+#. 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 ""
-#: ../meld/vcview.py:130
-msgid "Add to VC"
+#. 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 ""
-#: ../meld/vcview.py:131
-msgid "Add _Binary"
+#: ../meld/vcview.py:276
+msgid "No valid version control system found in this folder"
msgstr ""
-#: ../meld/vcview.py:131
-msgid "Add binary to VC"
+#: ../meld/vcview.py:278
+msgid "Only one version control system found in this folder"
msgstr ""
-#: ../meld/vcview.py:132
-msgid "Remove from VC"
+#: ../meld/vcview.py:280
+msgid "Choose which version control system to use"
msgstr ""
-#: ../meld/vcview.py:133
-msgid "_Resolved"
+#. TRANSLATORS: This is the location of the directory being viewed
+#: ../meld/vcview.py:334
+#, 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:341
+msgid "Scanning repository"
msgstr ""
-#: ../meld/vcview.py:133
-msgid "Mark as resolved for VC"
+#: ../meld/vcview.py:370
+#, python-format
+msgid "Scanning %s"
msgstr ""
-#: ../meld/vcview.py:134
-msgid "Revert to original"
+#: ../meld/vcview.py:409
+msgid "(Empty)"
+msgstr "(Malplene)"
+
+#: ../meld/vcview.py:453
+#, python-format
+msgid "%s — local"
msgstr ""
-#: ../meld/vcview.py:135
-msgid "Delete locally"
+#: ../meld/vcview.py:454
+#, python-format
+msgid "%s — remote"
msgstr ""
-#: ../meld/vcview.py:139
-msgid "_Flatten"
+#: ../meld/vcview.py:462
+#, python-format
+msgid "%s (local, merge, remote)"
msgstr ""
-#: ../meld/vcview.py:139
-msgid "Flatten directories"
+#: ../meld/vcview.py:467
+#, python-format
+msgid "%s (remote, merge, local)"
msgstr ""
-#: ../meld/vcview.py:140
-msgid "_Modified"
-msgstr "_Modifite"
+#: ../meld/vcview.py:478
+#, python-format
+msgid "%s — repository"
+msgstr ""
-#: ../meld/vcview.py:141
-msgid "_Normal"
-msgstr "_Normale"
+#: ../meld/vcview.py:484
+#, python-format
+msgid "%s (working, repository)"
+msgstr ""
-#: ../meld/vcview.py:141
-msgid "Show normal"
+#: ../meld/vcview.py:488
+#, python-format
+msgid "%s (repository, working)"
msgstr ""
-#: ../meld/vcview.py:142
-msgid "Non _VC"
+#: ../meld/vcview.py:676
+msgid "Remove folder and all its files?"
msgstr ""
-#: ../meld/vcview.py:142
-msgid "Show unversioned files"
+#: ../meld/vcview.py:678
+msgid ""
+"This will remove all selected files and folders, and all files within any "
+"selected folders, from version control."
msgstr ""
-#: ../meld/vcview.py:143
-msgid "Ignored"
-msgstr "Ignorite"
+#: ../meld/vcview.py:703
+#, python-format
+msgid "Error removing %s"
+msgstr ""
-#: ../meld/vcview.py:143
-msgid "Show ignored files"
+#: ../meld/vcview.py:782
+msgid "Clear"
msgstr ""
-#: ../meld/vcview.py:186 ../meld/vcview.py:318
-msgid "Location"
-msgstr "Loko"
+#~ msgid ""
+#~ "Some files have been modified.\n"
+#~ "Which ones would you like to save?"
+#~ msgstr ""
+#~ "Kelkaj dosieroj estas ŝanĝitaj.\n"
+#~ "Kiun vi volas konservi?"
-#: ../meld/vcview.py:187
-msgid "Status"
-msgstr "Stato"
+#~ msgid "_Discard Changes"
+#~ msgstr "_Ignori ŝanĝojn"
-#: ../meld/vcview.py:188
-msgid "Rev"
-msgstr ""
+#~ msgid "_Save Selected"
+#~ msgstr "Kon_servi elektitan"
-#: ../meld/vcview.py:189
-msgid "Tag"
-msgstr ""
+#~ msgid "_Search for"
+#~ msgstr "_Serĉi"
-#: ../meld/vcview.py:190
-msgid "Options"
-msgstr "Opcioj"
+#~ msgid "Choose Files"
+#~ msgstr "Elekti dosierojn"
-#: ../meld/vcview.py:249
-msgid "Choose one Version Control"
-msgstr ""
+#~ msgid "_Three Way Compare"
+#~ msgstr "_Triopa komparo"
-#: ../meld/vcview.py:250
-msgid "Only one Version Control in this directory"
-msgstr ""
+#~ msgid "Original"
+#~ msgstr "Originalo"
-#. TRANSLATORS: this is an error message when a version control
-#. application isn't installed or can't be found
-#: ../meld/vcview.py:263
-#, python-format
-msgid "%s Not Installed"
-msgstr ""
+#~ msgid "Other"
+#~ msgstr "Alia"
-#. TRANSLATORS: this is an error message when a version
-#. controlled repository is invalid or corrupted
-#: ../meld/vcview.py:267
-msgid "Invalid Repository"
-msgstr ""
+#~ msgid "Loading"
+#~ msgstr "Ŝargante"
-#: ../meld/vcview.py:276
-#, python-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#~ msgid "%i second"
+#~ msgid_plural "%i seconds"
+#~ msgstr[0] "%i sekundo"
+#~ msgstr[1] "%i sekundoj"
-#. TRANSLATORS: This is the location of the directory the user is diffing
-#: ../meld/vcview.py:318
-#, python-format
-msgid "%s: %s"
-msgstr "%s: %s"
+#~ msgid "%i minute"
+#~ msgid_plural "%i minutes"
+#~ msgstr[0] "%i minuto"
+#~ msgstr[1] "%i minutoj"
-#: ../meld/vcview.py:362
-msgid "(Empty)"
-msgstr "(Malplene)"
+#~ msgid "%i hour"
+#~ msgid_plural "%i hours"
+#~ msgstr[0] "%i horo"
+#~ msgstr[1] "%i horoj"
-#: ../meld/vcview.py:400
-#, python-format
-msgid "[%s] Fetching differences"
-msgstr ""
+#~ msgid "%i day"
+#~ msgid_plural "%i days"
+#~ msgstr[0] "%i tago"
+#~ msgstr[1] "%i tagoj"
-#: ../meld/vcview.py:408
-#, python-format
-msgid "[%s] Applying patch"
-msgstr ""
+#~ msgid "%i week"
+#~ msgid_plural "%i weeks"
+#~ msgstr[0] "%i semajno"
+#~ msgstr[1] "%i semajnoj"
-#: ../meld/vcview.py:510
-msgid "Select some files first."
-msgstr ""
+#~ msgid "%i month"
+#~ msgid_plural "%i months"
+#~ msgstr[0] "%i monato"
+#~ msgstr[1] "%i monatoj"
-#: ../meld/vcview.py:583
-#, 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 ""
-
-#: ../meld/ui/findbar.py:127
-#, python-format
-msgid ""
-"Regular expression error\n"
-"'%s'"
-msgstr ""
+#~ msgid "%i year"
+#~ msgid_plural "%i years"
+#~ msgstr[0] "%i jaro"
+#~ msgstr[1] "%i jaroj"
-#: ../meld/ui/historyentry.py:293
-msgid "_Browse..."
-msgstr "_Foliumi..."
+#~ msgid "dir"
+#~ msgstr "dosierujo"
-#: ../meld/ui/historyentry.py:301
-msgid "Path"
-msgstr "Vojo"
+#~ msgid "_New..."
+#~ msgstr "_Nova..."
-#: ../meld/ui/historyentry.py:302
-msgid "Path to file"
-msgstr "Vojo al dosiero"
+#~ msgid "_Next Tab"
+#~ msgstr "_Sekva langeto"
-#: ../meld/ui/historyentry.py:303
-msgid "Pop up a file selector to choose a file"
-msgstr "Ekaperi dosierelektilon por elekti dosieron"
+#~ msgid "Update"
+#~ msgstr "Ĝisdatigi"
-#: ../meld/ui/historyentry.py:441
-msgid "Select directory"
-msgstr "Elekti dosierujon"
+#~ msgid "Options"
+#~ msgstr "Opcioj"
-#: ../meld/ui/historyentry.py:445
-msgid "Select file"
-msgstr "Elekti dosieron"
+#~ msgid "%s (%s)"
+#~ msgstr "%s (%s)"
-#: ../meld/ui/notebooklabel.py:60
-msgid "Close tab"
-msgstr "Fermi la langeton"
+#~ msgid "_Browse..."
+#~ msgstr "_Foliumi..."
-#. 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 ""
+#~ msgid "Path"
+#~ msgstr "Vojo"
-#: ../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 ""
+#~ msgid "Path to file"
+#~ msgstr "Vojo al dosiero"
+
+#~ msgid "Pop up a file selector to choose a file"
+#~ msgstr "Ekaperi dosierelektilon por elekti dosieron"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
