Merge translation files from master branch.

1 files changed, 0 insertions, 18 deletions

diff --git a/tde-i18n-cy/messages/tdenetwork/kopete.po b/tde-i18n-cy/messages/tdenetwork/kopete.po
index b10b5f422e2..f11bf83bbf8 100644
--- a/tde-i18n-cy/messages/tdenetwork/kopete.po
+++ b/tde-i18n-cy/messages/tdenetwork/kopete.po
@@ -5940,7 +5940,6 @@ msgstr ""
 
 #: protocols/msn/msnaccount.cpp:84
 #, fuzzy
-#| msgid "Display Name"
 msgid "&Change Display Name..."
 msgstr "Enw Dangos"
 
@@ -5951,13 +5950,11 @@ msgstr "Ymuno â'r Sianel..."
 
 #: protocols/msn/msnaccount.cpp:271 protocols/msn/msnchatsession.cpp:82
 #, fuzzy
-#| msgid "Send Email..."
 msgid "Send Raw C&ommand..."
 msgstr "Anfon Ebost ..."
 
 #: protocols/msn/msnaccount.cpp:332
 #, fuzzy
-#| msgid "MSN Plugin"
 msgid "Start Chat - MSN Plugin"
 msgstr "Ategyn MSN"
 
@@ -6011,7 +6008,6 @@ msgstr ""
 
 #: protocols/msn/msnchatsession.cpp:92 protocols/msn/msncontact.cpp:151
 #, fuzzy
-#| msgid "&Webcam"
 msgid "Send Webcam"
 msgstr "&Camera Gwe"
 
@@ -6100,7 +6096,6 @@ msgstr ""
 
 #: protocols/msn/msnfiletransfersocket.cpp:44
 #, fuzzy
-#| msgid "File Transfer"
 msgid "File Transfer - MSN Plugin"
 msgstr "Trosglwyddo ffeiliau"
 
@@ -6218,7 +6213,6 @@ msgstr "Tanysgrifiad"
 
 #: protocols/msn/msnnotifysocket.cpp:1017
 #, fuzzy
-#| msgid "Now Listening"
 msgid "Now Listening: ♫ %1 ♫"
 msgstr "Rwan yn Gwrando ar"
 
@@ -6324,7 +6318,6 @@ msgstr ""
 
 #: protocols/msn/msnswitchboardsocket.cpp:126
 #, fuzzy
-#| msgid "User Defined"
 msgid "user never joined"
 msgstr "Diffinir gan y Defnyddiwr"
 
@@ -6351,7 +6344,6 @@ msgstr ""
 
 #: protocols/msn/msnswitchboardsocket.cpp:151
 #, fuzzy
-#| msgid "Disconnected"
 msgid "user disconnected"
 msgstr "Datgysylltwyd"
 
@@ -6574,7 +6566,6 @@ msgstr ""
 #: protocols/oscar/aim/aimuserinfo.cpp:136
 #: protocols/oscar/aim/aimuserinfo.cpp:153
 #, fuzzy, c-format
-#| msgid "User Information"
 msgid "User Information on %1"
 msgstr "Gwybodaeth Defnyddiwr"
 
@@ -6597,7 +6588,6 @@ msgstr ""
 
 #: protocols/oscar/aim/ui/aimaddcontactpage.cpp:66
 #, fuzzy
-#| msgid "Screen name:"
 msgid "No Screen Name"
 msgstr "Enw sgrîn:"
 
@@ -13923,7 +13913,6 @@ msgstr "Negeseuon Allan"
 
 #: protocols/msn/config/msnprefs.ui:132
 #, fuzzy, no-c-format
-#| msgid "Away Messages"
 msgid "Send &away messages"
 msgstr "Negeseuon Allan"
 
@@ -13981,7 +13970,6 @@ msgstr "&Ychwanegu"
 
 #: protocols/msn/ui/msndebugrawcommand_base.ui:73
 #, fuzzy, no-c-format
-#| msgid "&Underline"
 msgid "Add &new line"
 msgstr "&Danlinellu"
 
@@ -14037,7 +14025,6 @@ msgstr ""
 
 #: protocols/msn/ui/msneditaccountui.ui:241
 #, fuzzy, no-c-format
-#| msgid "Global Photo"
 msgid "Global MSN Options"
 msgstr "Ffoto Ymhobman"
 
@@ -14223,7 +14210,6 @@ msgstr "Ffôn Symudol :"
 
 #: protocols/msn/ui/msneditaccountui.ui:633
 #, fuzzy, no-c-format
-#| msgid "Display Name"
 msgid "Display Picture"
 msgstr "Enw Dangos"
 
@@ -14239,7 +14225,6 @@ msgstr ""
 
 #: protocols/msn/ui/msneditaccountui.ui:693
 #, fuzzy, no-c-format
-#| msgid "Select..."
 msgid "&Select Image..."
 msgstr "Dewis..."
 
@@ -14264,7 +14249,6 @@ msgstr ""
 
 #: protocols/msn/ui/msneditaccountui.ui:876
 #, fuzzy, no-c-format
-#| msgid "&Block Contact"
 msgid "Bloc&ked contacts:"
 msgstr "&Atal Cyswllt"
 
@@ -14381,7 +14365,6 @@ msgstr "Neges:"
 
 #: protocols/msn/ui/msninfo.ui:130
 #, fuzzy, no-c-format
-#| msgid "Phone:"
 msgid "Phones"
 msgstr "Ffôn:"
 
@@ -14537,7 +14520,6 @@ msgstr "Enw sgrîn:"
 
 #: protocols/oscar/aim/ui/aiminfobase.ui:122
 #, fuzzy, no-c-format
-#| msgid "minutes"
 msgid "Idle minutes:"
 msgstr "munudau"