summaryrefslogtreecommitdiffstats
path: root/po/cy.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/cy.po')
-rw-r--r--po/cy.po81
1 files changed, 16 insertions, 65 deletions
diff --git a/po/cy.po b/po/cy.po
index 7ba3584..47e7c8f 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: ../cy/messages//kdeextragear-1/kdiff3.po\n"
-"POT-Creation-Date: 2018-12-27 20:04+0100\n"
+"POT-Creation-Date: 2019-01-13 19:08+0100\n"
"PO-Revision-Date: 2004-09-20 15:44+0200\n"
"Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
"Language-Team: cy <LL@li.org>\n"
@@ -134,11 +134,6 @@ msgid ""
"the merge and rescan the directory?"
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
msgid "Rescan"
msgstr "Ailsyllu"
@@ -240,11 +235,6 @@ msgstr ""
msgid "C&ontinue"
msgstr "&Mynd ymlaen"
-#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287
-#: smalldialogs.cpp:169 smalldialogs.cpp:381
-msgid "&Cancel"
-msgstr ""
-
#: directorymergewindow.cpp:1236
msgid "Processing "
msgstr ""
@@ -333,13 +323,6 @@ msgstr ""
msgid "An error occurred while copying.\n"
msgstr ""
-#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034
-#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112
-#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371
-#, fuzzy
-msgid "Error"
-msgstr "Gwall."
-
#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372
msgid "Merge Error"
msgstr ""
@@ -556,11 +539,6 @@ msgstr ""
msgid "Link-Destination"
msgstr ""
-#: directorymergewindow.cpp:2712
-#, fuzzy
-msgid "File"
-msgstr "Ffeil..."
-
#: directorymergewindow.cpp:2729
msgid "not available"
msgstr "dim ar gael"
@@ -809,10 +787,6 @@ msgstr "Gwall agor ffeil"
msgid "Opens documents for comparison..."
msgstr ""
-#: kdiff3.cpp:436
-msgid "Reload"
-msgstr ""
-
#: kdiff3.cpp:439
msgid "Saves the merge result. All conflicts must be solved!"
msgstr ""
@@ -1080,10 +1054,6 @@ msgid ""
"You are currently doing a directory merge. Are you sure, you want to abort?"
msgstr ""
-#: kdiff3.cpp:622
-msgid "Quit"
-msgstr ""
-
#: kdiff3.cpp:644
msgid "Saving file..."
msgstr "Yn cadw ffeil..."
@@ -1092,10 +1062,6 @@ msgstr "Yn cadw ffeil..."
msgid "Saving file with a new filename..."
msgstr ""
-#: kdiff3.cpp:663
-msgid "Save As..."
-msgstr ""
-
#: kdiff3.cpp:751
msgid "Printing..."
msgstr "Argraffu..."
@@ -1342,15 +1308,6 @@ msgstr "Lladin1"
msgid "Change this if non-ASCII characters are not displayed correctly."
msgstr ""
-#: optiondialog.cpp:455
-#, fuzzy
-msgid "Configure"
-msgstr "Ffurfweddu..."
-
-#: optiondialog.cpp:510
-msgid "Font"
-msgstr ""
-
#: optiondialog.cpp:510
msgid "Editor & Diff Output Font"
msgstr ""
@@ -2236,10 +2193,6 @@ msgstr ""
msgid "Configure..."
msgstr "Ffurfweddu..."
-#: smalldialogs.cpp:164
-msgid "&OK"
-msgstr ""
-
#: smalldialogs.cpp:347
#, fuzzy
msgid "Search text:"
@@ -2313,14 +2266,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 ""
@@ -2343,11 +2288,6 @@ msgstr ""
msgid "Configure KDiff3"
msgstr ""
-#: kdiff3_shell.rc:4
-#, fuzzy, no-c-format
-msgid "&File"
-msgstr "Ffeil..."
-
#: kdiff3_shell.rc:7
#, no-c-format
msgid "&Directory"
@@ -2383,10 +2323,21 @@ msgstr "&Cyfuno"
msgid "&Window"
msgstr "&Ffenestr"
-#: kdiff3_shell.rc:106
-#, no-c-format
-msgid "Main Toolbar"
-msgstr ""
+#, fuzzy
+#~ msgid "Error"
+#~ msgstr "Gwall."
+
+#, fuzzy
+#~ msgid "File"
+#~ msgstr "Ffeil..."
+
+#, fuzzy
+#~ msgid "Configure"
+#~ msgstr "Ffurfweddu..."
+
+#, fuzzy
+#~ msgid "&File"
+#~ msgstr "Ffeil..."
#, fuzzy
#~ msgid "Manually match lines"