summaryrefslogtreecommitdiffstats
path: root/po/en_GB.po
diff options
context:
space:
mode:
authorTDE Weblate <[email protected]>2019-01-14 00:26:13 +0000
committerTDE Weblate <[email protected]>2019-01-14 00:26:13 +0000
commite98834131ea835c6e9f0b22661f66c596783466b (patch)
treed6ff9d594456a3187f149821990e14b8a79546ff /po/en_GB.po
parent1ee2d437814622aaa51348f50a8deb2f02839c7b (diff)
downloadkdiff3-e98834131ea835c6e9f0b22661f66c596783466b.tar.gz
kdiff3-e98834131ea835c6e9f0b22661f66c596783466b.zip
Update translation files
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: applications/kdiff3 Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3/
Diffstat (limited to 'po/en_GB.po')
-rw-r--r--po/en_GB.po81
1 files changed, 16 insertions, 65 deletions
diff --git a/po/en_GB.po b/po/en_GB.po
index 6254ee9..a743fe9 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: kdiff3\n"
-"POT-Creation-Date: 2018-12-27 20:04+0100\n"
+"POT-Creation-Date: 2019-01-13 19:08+0100\n"
"PO-Revision-Date: 2005-02-02 11:52+0000\n"
"Last-Translator: Andrew Coles <[email protected]>\n"
"Language-Team: British English <[email protected]>\n"
@@ -155,11 +155,6 @@ msgstr ""
"You are currently doing a directory merge. Are you sure, you want to abort "
"the merge and rescan the directory?"
-#: 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
msgid "Rescan"
msgstr "Rescan"
@@ -264,11 +259,6 @@ msgstr "Changing All Merge Operations"
msgid "C&ontinue"
msgstr "C&ontinue"
-#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287
-#: smalldialogs.cpp:169 smalldialogs.cpp:381
-msgid "&Cancel"
-msgstr ""
-
#: directorymergewindow.cpp:1236
msgid "Processing "
msgstr "Processing "
@@ -362,13 +352,6 @@ msgstr "Program Error"
msgid "An error occurred while copying.\n"
msgstr "An error occurred while copying.\n"
-#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034
-#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112
-#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371
-#, fuzzy
-msgid "Error"
-msgstr "Error."
-
#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372
msgid "Merge Error"
msgstr "Merge Error"
@@ -604,11 +587,6 @@ msgstr "Last Modification"
msgid "Link-Destination"
msgstr "Link-Destination"
-#: directorymergewindow.cpp:2712
-#, fuzzy
-msgid "File"
-msgstr "File..."
-
#: directorymergewindow.cpp:2729
msgid "not available"
msgstr "not available"
@@ -870,10 +848,6 @@ msgstr "File Open Error"
msgid "Opens documents for comparison..."
msgstr "Opens documents for comparison..."
-#: kdiff3.cpp:436
-msgid "Reload"
-msgstr ""
-
#: kdiff3.cpp:439
msgid "Saves the merge result. All conflicts must be solved!"
msgstr "Saves the merge result. All conflicts must be solved!"
@@ -1146,10 +1120,6 @@ msgid ""
msgstr ""
"You are currently doing a directory merge. Are you sure, you want to abort?"
-#: kdiff3.cpp:622
-msgid "Quit"
-msgstr ""
-
#: kdiff3.cpp:644
msgid "Saving file..."
msgstr "Saving file..."
@@ -1158,10 +1128,6 @@ msgstr "Saving file..."
msgid "Saving file with a new filename..."
msgstr "Saving file with a new filename..."
-#: kdiff3.cpp:663
-msgid "Save As..."
-msgstr ""
-
#: kdiff3.cpp:751
#, fuzzy
msgid "Printing..."
@@ -1430,15 +1396,6 @@ msgstr "Latin1"
msgid "Change this if non-ASCII characters are not displayed correctly."
msgstr "Change this if non-ASCII characters are not displayed correctly."
-#: optiondialog.cpp:455
-#, fuzzy
-msgid "Configure"
-msgstr "Configure..."
-
-#: optiondialog.cpp:510
-msgid "Font"
-msgstr ""
-
#: optiondialog.cpp:510
msgid "Editor & Diff Output Font"
msgstr "Editor & Diff Output Font"
@@ -2407,10 +2364,6 @@ msgstr "Output (optional):"
msgid "Configure..."
msgstr "Configure..."
-#: smalldialogs.cpp:164
-msgid "&OK"
-msgstr ""
-
#: smalldialogs.cpp:347
msgid "Search text:"
msgstr "Search text:"
@@ -2483,14 +2436,6 @@ msgstr ""
msgid "Sort key result:"
msgstr ""
-#: smalldialogs.cpp:493
-msgid "OK"
-msgstr ""
-
-#: smalldialogs.cpp:497
-msgid "Cancel"
-msgstr ""
-
#: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568
msgid "Match success."
msgstr ""
@@ -2514,11 +2459,6 @@ msgstr "&KDiff3"
msgid "Configure KDiff3"
msgstr "Configure KDiff3"
-#: kdiff3_shell.rc:4
-#, fuzzy, no-c-format
-msgid "&File"
-msgstr "File..."
-
#: kdiff3_shell.rc:7
#, no-c-format
msgid "&Directory"
@@ -2554,10 +2494,21 @@ msgstr "&Merge"
msgid "&Window"
msgstr "&Window"
-#: kdiff3_shell.rc:106
-#, no-c-format
-msgid "Main Toolbar"
-msgstr ""
+#, fuzzy
+#~ msgid "Error"
+#~ msgstr "Error."
+
+#, fuzzy
+#~ msgid "File"
+#~ msgstr "File..."
+
+#, fuzzy
+#~ msgid "Configure"
+#~ msgstr "Configure..."
+
+#, fuzzy
+#~ msgid "&File"
+#~ msgstr "File..."
#~ msgid "Files A and B are binary equal.\n"
#~ msgstr "Files A and B are binary equal.\n"