2021-11-18 20:34:08 +00:00
|
|
|
# SOME DESCRIPTIVE TITLE.
|
|
|
|
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
|
|
|
|
# This file is distributed under the same license as the PACKAGE package.
|
|
|
|
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
|
|
|
#
|
2021-11-23 03:14:22 +00:00
|
|
|
#, fuzzy
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid ""
|
|
|
|
msgstr ""
|
|
|
|
"Project-Id-Version: PACKAGE VERSION\n"
|
|
|
|
"Report-Msgid-Bugs-To: \n"
|
2021-11-23 03:14:22 +00:00
|
|
|
"POT-Creation-Date: 2021-11-24 10:26-0500\n"
|
2021-11-18 20:34:08 +00:00
|
|
|
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
|
|
|
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
|
|
|
"Language-Team: LANGUAGE <LL@li.org>\n"
|
|
|
|
"Language: \n"
|
|
|
|
"MIME-Version: 1.0\n"
|
|
|
|
"Content-Type: text/plain; charset=UTF-8\n"
|
|
|
|
"Content-Transfer-Encoding: 8bit\n"
|
|
|
|
|
|
|
|
#: data/io.github.mightycreak.Diffuse.desktop.in:3
|
2021-11-23 03:14:22 +00:00
|
|
|
#: data/io.github.mightycreak.Diffuse.appdata.xml.in:4
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Diffuse Merge Tool"
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
#: data/io.github.mightycreak.Diffuse.desktop.in:4
|
2021-11-23 03:14:22 +00:00
|
|
|
#: data/io.github.mightycreak.Diffuse.appdata.xml.in:5
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Graphical tool for merging and comparing text files"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: data/io.github.mightycreak.Diffuse.appdata.xml.in:7
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid ""
|
|
|
|
"Diffuse is a graphical tool for comparing and merging text files. It can "
|
|
|
|
"retrieve files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, "
|
|
|
|
"Monotone, RCS, Subversion, and SVK repositories."
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: data/io.github.mightycreak.Diffuse.appdata.xml.in:21
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Main window: diff between two files"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/constants.py.in:23
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Copyright"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:77
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Close Tab"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:120
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Open File..."
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:121
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Reload File"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:122
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Save File"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:123
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Save File As..."
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:268
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Save changes before loading the new file?"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:377
|
2021-11-18 20:34:08 +00:00
|
|
|
#, python-format
|
|
|
|
msgid "Error reading revision %(rev)s of %(file)s."
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:379 src/diffuse/main.py:1712
|
2021-11-18 20:34:08 +00:00
|
|
|
#, python-format
|
|
|
|
msgid "Error reading %s."
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:400
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Open File"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:450
|
2021-11-18 20:34:08 +00:00
|
|
|
#, python-format
|
|
|
|
msgid "The file %s changed on disk. Do you want to reload the file?"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:470
|
2021-11-18 20:34:08 +00:00
|
|
|
#, python-format
|
|
|
|
msgid "Save %(title)s Pane %(pane)d"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:496
|
2021-11-18 20:34:08 +00:00
|
|
|
#, python-format
|
|
|
|
msgid "A file named %s already exists. Do you want to overwrite it?"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:501
|
2021-11-18 20:34:08 +00:00
|
|
|
#, python-format
|
|
|
|
msgid ""
|
|
|
|
"The file %s has been modified by another process since reading it. If you "
|
|
|
|
"save, all the external changes could be lost. Save anyways?"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:540
|
2021-11-18 20:34:08 +00:00
|
|
|
#, python-format
|
|
|
|
msgid "Error encoding to %s."
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:542
|
|
|
|
#, python-format
|
|
|
|
msgid "Error writing %s."
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
#: src/diffuse/main.py:570
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Go To Line..."
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:570
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Line Number: "
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:596
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid ""
|
|
|
|
"Press the enter key or double click to edit. Press the space bar or use the "
|
|
|
|
"RMB menu to manually align."
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:598
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Press the escape key to finish editing."
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:600
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid ""
|
|
|
|
"Select target line and press the space bar to align. Press the escape key "
|
|
|
|
"to cancel."
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:711
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "_File"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:712
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "_Open File..."
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:713
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Open File In New _Tab..."
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:714
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Open _Modified Files..."
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:715
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Open Commi_t..."
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:716
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "_Reload File"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:718
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "_Save File"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:719
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Save File _As..."
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:720
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Save A_ll"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:722
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "New _2-Way File Merge"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:723
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "New _3-Way File Merge"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:724
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "New _N-Way File Merge..."
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:726
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "_Close Tab"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:727
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "_Undo Close Tab"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:728
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "_Quit"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:730
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "_Edit"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:731
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "_Undo"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:732
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "_Redo"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:734
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Cu_t"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:735
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "_Copy"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:736
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "_Paste"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:738
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Select _All"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:739
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "C_lear Edits"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:740
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "_Dismiss All Edits"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:742
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "_Find..."
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:743
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Find _Next"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:744
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Find Pre_vious"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:745
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "_Go To Line..."
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:747
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Pr_eferences..."
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:749
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "None"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:757
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "_View"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:758
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "_Syntax Highlighting"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:760
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Re_align All"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:761
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "_Isolate"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:763
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "_First Difference"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:764
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "_Previous Difference"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:765
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "_Next Difference"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:766
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "_Last Difference"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:768
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Fir_st Tab"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:769
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Pre_vious Tab"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:770
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Next _Tab"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:771
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Las_t Tab"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:773
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Shift Pane _Right"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:774
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Shift Pane _Left"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:776
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "F_ormat"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:777
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Convert To _Upper Case"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:778
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Convert To _Lower Case"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:780
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Sort Lines In _Ascending Order"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:781
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Sort Lines In D_escending Order"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:783
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Remove Trailing _White Space"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:784
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Convert Tabs To _Spaces"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:785
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Convert Leading Spaces To _Tabs"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:787
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "_Increase Indenting"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:788
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "De_crease Indenting"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:790
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Convert To _DOS Format"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:791
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Convert To _Mac Format"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:792
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Convert To Uni_x Format"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:794
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "_Merge"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:795
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Copy Selection _Right"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:796
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Copy Selection _Left"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:798
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Copy Left _Into Selection"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:799
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Copy Right I_nto Selection"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:800
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "_Merge From Left Then Right"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:801
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "M_erge From Right Then Left"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:803
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "_Help"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:804
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "_Help Contents..."
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:806
|
2021-11-18 20:34:08 +00:00
|
|
|
#, python-format
|
|
|
|
msgid "_About %s..."
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:820
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "New 2-Way File Merge"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:821
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "New 3-Way File Merge"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:823
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Realign All"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:824
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "First Difference"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:825
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Previous Difference"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:826
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Next Difference"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:827
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Last Difference"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:829
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Copy Selection Right"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:830
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Copy Selection Left"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:831
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Copy Left Into Selection"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:832
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Copy Right Into Selection"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:833
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Merge From Left Then Right"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:834
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Merge From Right Then Left"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:836
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Undo"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:837
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Redo"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:838
|
|
|
|
msgid "Cut"
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
#: src/diffuse/main.py:839
|
|
|
|
msgid "Copy"
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
#: src/diffuse/main.py:840
|
|
|
|
msgid "Paste"
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
#: src/diffuse/main.py:841
|
|
|
|
msgid "Clear Edits"
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
#: src/diffuse/main.py:961
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid ""
|
|
|
|
"Some files have unsaved changes. Select the files to save before closing."
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:974
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Tab"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:979
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Pane"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:990
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Close _Without Saving"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:1026
|
|
|
|
#, python-format
|
|
|
|
msgid "Closing this tab will quit %s."
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
#: src/diffuse/main.py:1108
|
2021-11-18 20:34:08 +00:00
|
|
|
#, python-format
|
|
|
|
msgid "File Merge %d"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:1211
|
2021-11-18 20:34:08 +00:00
|
|
|
#, python-format
|
|
|
|
msgid "Error retrieving commits for %s."
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:1240
|
2021-11-18 20:34:08 +00:00
|
|
|
#, python-format
|
|
|
|
msgid "Error retrieving modifications for %s."
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:1270
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Open File In New Tab"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:1286
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Choose Folder With Modified Files"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:1299
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "No modified files found."
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:1304
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Choose Folder With Commit"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:1317
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "No committed files found."
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:1351
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "New N-Way File Merge..."
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:1351
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Number of panes: "
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:1416
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Phrase not found. Continue from the end of the file?"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:1418
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Phrase not found. Continue from the start of the file?"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:1631
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid ""
|
|
|
|
"Usage:\n"
|
|
|
|
" diffuse [ [OPTION...] [FILE...] ]...\n"
|
|
|
|
" diffuse ( -h | -? | --help | -v | --version )\n"
|
|
|
|
"\n"
|
|
|
|
"Diffuse is a graphical tool for merging and comparing text files. Diffuse "
|
|
|
|
"is\n"
|
|
|
|
"able to compare an arbitrary number of files side-by-side and gives users "
|
|
|
|
"the\n"
|
|
|
|
"ability to manually adjust line matching and directly edit files. Diffuse "
|
|
|
|
"can\n"
|
|
|
|
"also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial,\n"
|
|
|
|
"Monotone, RCS, Subversion, and SVK repositories for comparison and merging.\n"
|
|
|
|
"\n"
|
|
|
|
"Help Options:\n"
|
|
|
|
" ( -h | -? | --help ) Display this usage information\n"
|
|
|
|
" ( -v | --version ) Display version and copyright "
|
|
|
|
"information\n"
|
|
|
|
"\n"
|
|
|
|
"Configuration Options:\n"
|
|
|
|
" --no-rcfile Do not read any resource files\n"
|
|
|
|
" --rcfile <file> Specify explicit resource file\n"
|
|
|
|
"\n"
|
|
|
|
"General Options:\n"
|
|
|
|
" ( -c | --commit ) <rev> File revisions <rev-1> and <rev>\n"
|
|
|
|
" ( -D | --close-if-same ) Close all tabs with no differences\n"
|
|
|
|
" ( -e | --encoding ) <codec> Use <codec> to read and write files\n"
|
|
|
|
" ( -L | --label ) <label> Display <label> instead of the file name\n"
|
|
|
|
" ( -m | --modified ) Create a new tab for each modified file\n"
|
|
|
|
" ( -r | --revision ) <rev> File revision <rev>\n"
|
|
|
|
" ( -s | --separate ) Create a new tab for each file\n"
|
|
|
|
" ( -t | --tab ) Start a new tab\n"
|
|
|
|
" ( -V | --vcs ) <vcs-list> Version control system search order\n"
|
|
|
|
" --line <line> Start with line <line> selected\n"
|
|
|
|
" --null-file Create a blank file comparison pane\n"
|
|
|
|
"\n"
|
|
|
|
"Display Options:\n"
|
|
|
|
" ( -b | --ignore-space-change ) Ignore changes to white space\n"
|
|
|
|
" ( -B | --ignore-blank-lines ) Ignore changes in blank lines\n"
|
|
|
|
" ( -E | --ignore-end-of-line ) Ignore end of line differences\n"
|
|
|
|
" ( -i | --ignore-case ) Ignore case differences\n"
|
|
|
|
" ( -w | --ignore-all-space ) Ignore white space differences"
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:1802
|
2021-11-18 20:34:08 +00:00
|
|
|
msgid "Error parsing line number."
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:1812
|
2021-11-18 20:34:08 +00:00
|
|
|
#, python-format
|
|
|
|
msgid "Skipping unknown argument \"%s\"."
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/main.py:1819
|
2021-11-18 20:34:08 +00:00
|
|
|
#, python-format
|
|
|
|
msgid "Error processing argument \"%s\". Directory not expected."
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/vcs/cvs.py:51 src/diffuse/vcs/rcs.py:60
|
|
|
|
#: src/diffuse/vcs/svn.py:93
|
2021-11-18 20:34:08 +00:00
|
|
|
#, python-format
|
|
|
|
msgid "Error parsing revision %s."
|
|
|
|
msgstr ""
|
|
|
|
|
2021-11-23 03:14:22 +00:00
|
|
|
#: src/diffuse/vcs/vcs_registry.py:231
|
2021-11-18 20:34:08 +00:00
|
|
|
#, python-format
|
|
|
|
msgid "Error parsing %s."
|
|
|
|
msgstr ""
|