|
|
@ -5,7 +5,7 @@
|
|
|
|
msgid ""
|
|
|
|
msgid ""
|
|
|
|
msgstr ""
|
|
|
|
msgstr ""
|
|
|
|
"Project-Id-Version: PACKAGE VERSION\n"
|
|
|
|
"Project-Id-Version: PACKAGE VERSION\n"
|
|
|
|
"POT-Creation-Date: 2018-12-27 20:04+0100\n"
|
|
|
|
"POT-Creation-Date: 2019-01-13 19:08+0100\n"
|
|
|
|
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
|
|
|
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
|
|
|
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
|
|
|
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
|
|
|
"Language-Team: LANGUAGE <LL@li.org>\n"
|
|
|
|
"Language-Team: LANGUAGE <LL@li.org>\n"
|
|
|
@ -136,11 +136,6 @@ msgid ""
|
|
|
|
"the merge and rescan the directory?"
|
|
|
|
"the merge and rescan the directory?"
|
|
|
|
msgstr ""
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:335 kdiff3.cpp:602 kdiff3.cpp:610 kdiff3.cpp:622
|
|
|
|
|
|
|
|
#: mergeresultwindow.cpp:287 pdiff.cpp:981 pdiff.cpp:1724 pdiff.cpp:1732
|
|
|
|
|
|
|
|
msgid "Warning"
|
|
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930
|
|
|
|
#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930
|
|
|
|
msgid "Rescan"
|
|
|
|
msgid "Rescan"
|
|
|
|
msgstr ""
|
|
|
|
msgstr ""
|
|
|
@ -242,11 +237,6 @@ msgstr ""
|
|
|
|
msgid "C&ontinue"
|
|
|
|
msgid "C&ontinue"
|
|
|
|
msgstr ""
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:169 smalldialogs.cpp:381
|
|
|
|
|
|
|
|
msgid "&Cancel"
|
|
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:1236
|
|
|
|
#: directorymergewindow.cpp:1236
|
|
|
|
msgid "Processing "
|
|
|
|
msgid "Processing "
|
|
|
|
msgstr ""
|
|
|
|
msgstr ""
|
|
|
@ -335,12 +325,6 @@ msgstr ""
|
|
|
|
msgid "An error occurred while copying.\n"
|
|
|
|
msgid "An error occurred while copying.\n"
|
|
|
|
msgstr ""
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371
|
|
|
|
|
|
|
|
msgid "Error"
|
|
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372
|
|
|
|
#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372
|
|
|
|
msgid "Merge Error"
|
|
|
|
msgid "Merge Error"
|
|
|
|
msgstr ""
|
|
|
|
msgstr ""
|
|
|
@ -557,10 +541,6 @@ msgstr ""
|
|
|
|
msgid "Link-Destination"
|
|
|
|
msgid "Link-Destination"
|
|
|
|
msgstr ""
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2712
|
|
|
|
|
|
|
|
msgid "File"
|
|
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2729
|
|
|
|
#: directorymergewindow.cpp:2729
|
|
|
|
msgid "not available"
|
|
|
|
msgid "not available"
|
|
|
|
msgstr ""
|
|
|
|
msgstr ""
|
|
|
@ -808,10 +788,6 @@ msgstr ""
|
|
|
|
msgid "Opens documents for comparison..."
|
|
|
|
msgid "Opens documents for comparison..."
|
|
|
|
msgstr ""
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:436
|
|
|
|
|
|
|
|
msgid "Reload"
|
|
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:439
|
|
|
|
#: kdiff3.cpp:439
|
|
|
|
msgid "Saves the merge result. All conflicts must be solved!"
|
|
|
|
msgid "Saves the merge result. All conflicts must be solved!"
|
|
|
|
msgstr ""
|
|
|
|
msgstr ""
|
|
|
@ -1079,10 +1055,6 @@ msgid ""
|
|
|
|
"You are currently doing a directory merge. Are you sure, you want to abort?"
|
|
|
|
"You are currently doing a directory merge. Are you sure, you want to abort?"
|
|
|
|
msgstr ""
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:622
|
|
|
|
|
|
|
|
msgid "Quit"
|
|
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:644
|
|
|
|
#: kdiff3.cpp:644
|
|
|
|
msgid "Saving file..."
|
|
|
|
msgid "Saving file..."
|
|
|
|
msgstr ""
|
|
|
|
msgstr ""
|
|
|
@ -1091,10 +1063,6 @@ msgstr ""
|
|
|
|
msgid "Saving file with a new filename..."
|
|
|
|
msgid "Saving file with a new filename..."
|
|
|
|
msgstr ""
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:663
|
|
|
|
|
|
|
|
msgid "Save As..."
|
|
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:751
|
|
|
|
#: kdiff3.cpp:751
|
|
|
|
msgid "Printing..."
|
|
|
|
msgid "Printing..."
|
|
|
|
msgstr ""
|
|
|
|
msgstr ""
|
|
|
@ -1341,14 +1309,6 @@ msgstr ""
|
|
|
|
msgid "Change this if non-ASCII characters are not displayed correctly."
|
|
|
|
msgid "Change this if non-ASCII characters are not displayed correctly."
|
|
|
|
msgstr ""
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:455
|
|
|
|
|
|
|
|
msgid "Configure"
|
|
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:510
|
|
|
|
|
|
|
|
msgid "Font"
|
|
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:510
|
|
|
|
#: optiondialog.cpp:510
|
|
|
|
msgid "Editor & Diff Output Font"
|
|
|
|
msgid "Editor & Diff Output Font"
|
|
|
|
msgstr ""
|
|
|
|
msgstr ""
|
|
|
@ -2228,10 +2188,6 @@ msgstr ""
|
|
|
|
msgid "Configure..."
|
|
|
|
msgid "Configure..."
|
|
|
|
msgstr ""
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:164
|
|
|
|
|
|
|
|
msgid "&OK"
|
|
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:347
|
|
|
|
#: smalldialogs.cpp:347
|
|
|
|
msgid "Search text:"
|
|
|
|
msgid "Search text:"
|
|
|
|
msgstr ""
|
|
|
|
msgstr ""
|
|
|
@ -2304,14 +2260,6 @@ msgstr ""
|
|
|
|
msgid "Sort key result:"
|
|
|
|
msgid "Sort key result:"
|
|
|
|
msgstr ""
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:493
|
|
|
|
|
|
|
|
msgid "OK"
|
|
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:497
|
|
|
|
|
|
|
|
msgid "Cancel"
|
|
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568
|
|
|
|
#: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568
|
|
|
|
msgid "Match success."
|
|
|
|
msgid "Match success."
|
|
|
|
msgstr ""
|
|
|
|
msgstr ""
|
|
|
@ -2334,11 +2282,6 @@ msgstr ""
|
|
|
|
msgid "Configure KDiff3"
|
|
|
|
msgid "Configure KDiff3"
|
|
|
|
msgstr ""
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3_shell.rc:4
|
|
|
|
|
|
|
|
#, no-c-format
|
|
|
|
|
|
|
|
msgid "&File"
|
|
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3_shell.rc:7
|
|
|
|
#: kdiff3_shell.rc:7
|
|
|
|
#, no-c-format
|
|
|
|
#, no-c-format
|
|
|
|
msgid "&Directory"
|
|
|
|
msgid "&Directory"
|
|
|
@ -2373,8 +2316,3 @@ msgstr ""
|
|
|
|
#, no-c-format
|
|
|
|
#, no-c-format
|
|
|
|
msgid "&Window"
|
|
|
|
msgid "&Window"
|
|
|
|
msgstr ""
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3_shell.rc:106
|
|
|
|
|
|
|
|
#, no-c-format
|
|
|
|
|
|
|
|
msgid "Main Toolbar"
|
|
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|