Merge translation files from master branch.

1 files changed, 0 insertions, 72 deletions

diff --git a/tde-i18n-pa/messages/tdenetwork/kopete.po b/tde-i18n-pa/messages/tdenetwork/kopete.po
index 239737e7f1c..4688a390d99 100644
--- a/tde-i18n-pa/messages/tdenetwork/kopete.po
+++ b/tde-i18n-pa/messages/tdenetwork/kopete.po
@@ -5908,7 +5908,6 @@ msgstr ""
 
 #: protocols/msn/incomingtransfer.cpp:112
 #, fuzzy
-#| msgid "Could not open file for writing."
 msgid "Cannot open file for writing"
 msgstr "ਫਾਇਲ ਨੂੰ ਲਿਖਣ ਲਈ ਖੋਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
@@ -5924,25 +5923,21 @@ msgstr "ਆਉਣ-ਬਾਕਸ ਖੋਲ੍ਹੋ(&x)..."
 
 #: protocols/msn/msnaccount.cpp:84
 #, fuzzy
-#| msgid "Display Name"
 msgid "&Change Display Name..."
 msgstr "ਵੇਖਣ ਲਈ ਨਾਂ"
 
 #: protocols/msn/msnaccount.cpp:85
 #, fuzzy
-#| msgid "Start &Chat..."
 msgid "&Start Chat..."
 msgstr "ਗੱਲਬਾਤ ਸ਼ੁਰੂ (&C)..."
 
 #: protocols/msn/msnaccount.cpp:271 protocols/msn/msnchatsession.cpp:82
 #, fuzzy
-#| msgid "Send Email..."
 msgid "Send Raw C&ommand..."
 msgstr "ਈ-ਮੇਲ ਭੇਜੋ..."
 
 #: protocols/msn/msnaccount.cpp:332
 #, fuzzy
-#| msgid "MSN Plugin"
 msgid "Start Chat - MSN Plugin"
 msgstr "MSN ਪਲੱਗਇਨ"
 
@@ -5955,7 +5950,6 @@ msgstr ""
 #: protocols/msn/msnchatsession.cpp:365
 #: protocols/msn/ui/msneditaccountwidget.cpp:278
 #, fuzzy
-#| msgid "<qt>You must enter a valid password.</qt>"
 msgid "<qt>You must enter a valid email address.</qt>"
 msgstr "<qt>ਤੁਹਾਨੂੰ ਇੱਕ ਸਹੀਂ ਗੁਪਤ-ਕੋਡ ਦੇਣਾ ਚਾਹੀਦਾ ਹੈ।</qt>"
 
@@ -5984,19 +5978,16 @@ msgstr ""
 
 #: protocols/msn/msnaccount.cpp:436
 #, fuzzy
-#| msgid "Connection Lost."
 msgid "Connection Lost - MSN Plugin"
 msgstr "ਕੁਨੈਕਸ਼ਨ ਬੰਦ ਹੋਇਆ।"
 
 #: protocols/msn/msnchatsession.cpp:86
 #, fuzzy
-#| msgid "&Send Message"
 msgid "Send Nudge"
 msgstr "ਸੁਨੇਹਾ ਭੇਜੋ(&S)"
 
 #: protocols/msn/msnchatsession.cpp:89 protocols/msn/msncontact.cpp:148
 #, fuzzy
-#| msgid "View &Webcam"
 msgid "View Contact's Webcam"
 msgstr "ਵੈਬਕੈਮ ਵੇਖੋ(&W)"
 
@@ -6006,14 +5997,12 @@ msgstr "ਵੈਬ-ਕੈਮ ਭੇਜੋ"
 
 #: protocols/msn/msnchatsession.cpp:98
 #, fuzzy
-#| msgid "Yahoo Display Picture"
 msgid "Request Display Picture"
 msgstr "ਯਾਹੂ ਤਸਵੀਰ ਵੇਖਾਓ"
 
 #: protocols/msn/msnchatsession.cpp:105
 #: protocols/msn/ui/msneditaccountwidget.cpp:330
 #, fuzzy
-#| msgid "Yahoo Display Picture"
 msgid "MSN Display Picture"
 msgstr "ਯਾਹੂ ਤਸਵੀਰ ਵੇਖਾਓ"
 
@@ -6052,7 +6041,6 @@ msgstr ""
 
 #: protocols/msn/msnchatsession.cpp:652
 #, fuzzy
-#| msgid "A contact sent you a buzz/nudge."
 msgid "has sent you a nudge"
 msgstr "ਇੱਕ ਸੰਪਰਕ ਤੁਹਾਨੂੰ ਬੱਜ/ਧੱਕਾ ਦੇ ਰਿਹਾ ਹੈ।"
 
@@ -6076,19 +6064,16 @@ msgstr ""
 
 #: protocols/msn/msncontact.cpp:315
 #, fuzzy
-#| msgid "MSN Messenger"
 msgid "Web Messenger"
 msgstr "MSN ਸੰਦੇਸ਼ਕ"
 
 #: protocols/msn/msncontact.cpp:317
 #, fuzzy
-#| msgid "Windows-1255 Hebrew"
 msgid "Windows Mobile"
 msgstr "Windows-1255 ਹੈਬਰਿਊ"
 
 #: protocols/msn/msncontact.cpp:319
 #, fuzzy
-#| msgid "Mobile"
 msgid "MSN Mobile"
 msgstr "ਮੋਬਾਇਲ"
 
@@ -6098,7 +6083,6 @@ msgstr ""
 
 #: protocols/msn/msnfiletransfersocket.cpp:44
 #, fuzzy
-#| msgid "File Transfer"
 msgid "File Transfer - MSN Plugin"
 msgstr "ਫਾਇਲ ਤਬਦੀਲ"
 
@@ -6111,7 +6095,6 @@ msgstr "ਗਲੋਬਲ ਫੋਟੋ ਸੰਭਾਲਣ ਦੌਰਾਨ ਗਲ�
 
 #: protocols/msn/msnfiletransfersocket.cpp:225
 #, fuzzy
-#| msgid "Connection timed out."
 msgid "Connection timed out"
 msgstr "ਕੁਨੈਕਸ਼ਨ ਸਮਾਂ ਸਮਾਪਤ ਹੋਇਆ।"
 
@@ -6192,9 +6175,6 @@ msgstr ""
 
 #: protocols/msn/msnnotifysocket.cpp:757
 #, fuzzy, c-format
-#| msgid ""
-#| "_n: You have one unread message in your Yahoo inbox.\n"
-#| "You have %n unread messages in your Yahoo inbox."
 msgid ""
 "_n: You have one unread message in your MSN inbox.\n"
 "You have %n unread messages in your MSN inbox."
@@ -6213,13 +6193,11 @@ msgstr "ਤੁਹਾਨੂੰ ਤੁਹਾਡੇ ਯਾਹੂ ਆਉਣ-ਬਕ�
 
 #: protocols/msn/msnnotifysocket.cpp:905
 #, fuzzy
-#| msgid "More Information..."
 msgid "More Information"
 msgstr "ਹੋਰ ਜਾਣਕਾਰੀ..."
 
 #: protocols/msn/msnnotifysocket.cpp:908
 #, fuzzy
-#| msgid "Subscription"
 msgid "Manage Subscription"
 msgstr "ਮੈਂਬਰੀ"
 
@@ -6243,7 +6221,6 @@ msgstr "ਆਉਨਾਂ"
 
 #: protocols/msn/msnprotocol.cpp:54
 #, fuzzy
-#| msgid "Be Right Back"
 msgid "Be &Right Back"
 msgstr "ਆਉਨਾਂ"
 
@@ -6253,43 +6230,36 @@ msgstr "ਕੰਪਿਊਟਰ ਤੋਂ ਦੂਰ"
 
 #: protocols/msn/msnprotocol.cpp:56
 #, fuzzy
-#| msgid "On the phone"
 msgid "On the Phone"
 msgstr "ਫੋਨ 'ਤੇ"
 
 #: protocols/msn/msnprotocol.cpp:56
 #, fuzzy
-#| msgid "On the phone"
 msgid "On The &Phone"
 msgstr "ਫੋਨ 'ਤੇ"
 
 #: protocols/msn/msnprotocol.cpp:57
 #, fuzzy
-#| msgid "Out to lunch"
 msgid "Out to Lunch"
 msgstr "ਦੁਪੈਹਰ ਦੇ ਖਾਣੇ 'ਤੇ"
 
 #: protocols/msn/msnprotocol.cpp:57
 #, fuzzy
-#| msgid "Out to lunch"
 msgid "Out To &Lunch"
 msgstr "ਦੁਪੈਹਰ ਦੇ ਖਾਣੇ 'ਤੇ"
 
 #: protocols/msn/msnprotocol.cpp:58
 #, fuzzy
-#| msgid "Offline"
 msgid "&Offline"
 msgstr "ਆਫਲਾਇਨ"
 
 #: protocols/msn/msnprotocol.cpp:60
 #, fuzzy
-#| msgid "Idle"
 msgid "&Idle"
 msgstr "ਬੇਕਾਰ"
 
 #: protocols/msn/msnprotocol.cpp:67
 #, fuzzy
-#| msgid "Remove Contact"
 msgid "Remote Client"
 msgstr "ਸੰਪਰਕ ਹਟਾਓ"
 
@@ -6305,13 +6275,11 @@ msgstr ""
 
 #: protocols/msn/msnsocket.cpp:186
 #, fuzzy, c-format
-#| msgid "Unable to Connect '%1'"
 msgid "Unable to lookup %1"
 msgstr "'%1' ਨਾਲ ਜੁੜਨ ਵਿੱਚ ਅਸਫ਼ਲ"
 
 #: protocols/msn/msnsocket.cpp:568
 #, fuzzy
-#| msgid "The %1 service is temporarily unavailable. Please try again later."
 msgid "An internal server error occurred. Please try again later."
 msgstr "ਸੇਵਾ %1 ਆਰਜ਼ੀ ਰੂਪ ਵਿੱਚ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ। ਬਾਅਦ 'ਚ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ।"
 
@@ -6323,13 +6291,11 @@ msgstr ""
 
 #: protocols/msn/msnsocket.cpp:580
 #, fuzzy
-#| msgid "The %1 service is temporarily unavailable. Please try again later."
 msgid "The MSN server is busy. Please try again later."
 msgstr "ਸੇਵਾ %1 ਆਰਜ਼ੀ ਰੂਪ ਵਿੱਚ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ। ਬਾਅਦ 'ਚ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ।"
 
 #: protocols/msn/msnsocket.cpp:590
 #, fuzzy
-#| msgid "The %1 service is temporarily unavailable. Please try again later."
 msgid "The server is not available at the moment. Please try again later."
 msgstr "ਸੇਵਾ %1 ਆਰਜ਼ੀ ਰੂਪ ਵਿੱਚ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ। ਬਾਅਦ 'ਚ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ।"
 
@@ -6348,13 +6314,11 @@ msgstr ""
 
 #: protocols/msn/msnswitchboardsocket.cpp:126
 #, fuzzy
-#| msgid "User Defined"
 msgid "user never joined"
 msgstr "ਉਪਭੋਗੀ ਪ੍ਰਭਾਸ਼ਿਤ"
 
 #: protocols/msn/msnswitchboardsocket.cpp:131
 #, fuzzy
-#| msgid "The resource is already in use."
 msgid "The user %1 is already in this chat."
 msgstr "ਸਰੋਤ ਪਹਿਲਾਂ ਹੀ ਵਰਤੋਂ ਅਧੀਨ ਹੈ।"
 
@@ -6378,7 +6342,6 @@ msgstr ""
 
 #: protocols/msn/msnswitchboardsocket.cpp:151
 #, fuzzy
-#| msgid "Disconnected"
 msgid "user disconnected"
 msgstr "ਨਾ-ਜੁੜਿਆ"
 
@@ -6407,7 +6370,6 @@ msgstr ""
 
 #: protocols/msn/msnswitchboardsocket.cpp:843
 #, fuzzy
-#| msgid "Connection closed"
 msgid "connection closed"
 msgstr "ਕੁਨੈਕਸ਼ਨ ਬੰਦ ਕੀਤਾ ਗਿਆ ਹੈ"
 
@@ -6418,7 +6380,6 @@ msgstr ""
 #: protocols/msn/ui/msneditaccountwidget.cpp:237
 #: protocols/msn/ui/msneditaccountwidget.cpp:355
 #, fuzzy
-#| msgid "An error occurred when trying to change the display picture."
 msgid ""
 "<qt>An error occurred when trying to change the display picture.<br>Make "
 "sure that you have selected a correct image file</qt>"
@@ -6468,7 +6429,6 @@ msgstr ""
 
 #: protocols/oscar/aim/aimaccount.cpp:325
 #, fuzzy
-#| msgid "Join Channel..."
 msgid "Join Chat..."
 msgstr "ਚੈਨਨ ਵਿੱਚ ਸ਼ਾਮਿਲ..."
 
@@ -6483,7 +6443,6 @@ msgstr ""
 
 #: protocols/oscar/aim/aimaccount.cpp:387
 #, fuzzy
-#| msgid "Unable to connect to server."
 msgid "Unable to edit user info"
 msgstr "ਸਰਵਰ ਨਾਲ ਜੁੜਨ ਲਈ ਅਸਫਲ ਹੈ।"
 
@@ -6600,13 +6559,11 @@ 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 "ਉਪਭੋਗੀ ਜਾਣਕਾਰੀ"
 
 #: protocols/oscar/aim/aimuserinfo.cpp:90
 #, fuzzy
-#| msgid "User Profile"
 msgid "&Save Profile"
 msgstr "ਉਪਭੋਗੀ ਪ੍ਰੋਫਾਇਲ"
 
@@ -6624,7 +6581,6 @@ msgstr ""
 
 #: protocols/oscar/aim/ui/aimaddcontactpage.cpp:66
 #, fuzzy
-#| msgid "Nick Name"
 msgid "No Screen Name"
 msgstr "ਛੋਟਾ ਨਾਂ"
 
@@ -13903,7 +13859,6 @@ msgstr "ਦੂਰ ਸੁਨੇਹੇ"
 
 #: protocols/msn/config/msnprefs.ui:132
 #, fuzzy, no-c-format
-#| msgid "Away message:"
 msgid "Send &away messages"
 msgstr "ਦੂਰ ਸੁਨੇਹਾ:"
 
@@ -13961,7 +13916,6 @@ msgstr "&ID ਸ਼ਾਮਿਲ"
 
 #: protocols/msn/ui/msndebugrawcommand_base.ui:73
 #, fuzzy, no-c-format
-#| msgid "Add New Alias"
 msgid "Add &new line"
 msgstr "ਨਵਾਂ ਉਪ-ਨਾਂ ਸ਼ਾਮਲ"
 
@@ -14192,25 +14146,21 @@ msgstr ""
 
 #: protocols/msn/ui/msneditaccountui.ui:594
 #, fuzzy, no-c-format
-#| msgid "Work:"
 msgid "&Work:"
 msgstr "ਕੰਮ:"
 
 #: protocols/msn/ui/msneditaccountui.ui:615
 #, fuzzy, no-c-format
-#| msgid "Mobile"
 msgid "&Mobile:"
 msgstr "ਮੋਬਾਇਲ"
 
 #: protocols/msn/ui/msneditaccountui.ui:633
 #, fuzzy, no-c-format
-#| msgid "Yahoo Display Picture"
 msgid "Display Picture"
 msgstr "ਯਾਹੂ ਤਸਵੀਰ ਵੇਖਾਓ"
 
 #: protocols/msn/ui/msneditaccountui.ui:652
 #, fuzzy, no-c-format
-#| msgid "Yahoo Display Picture"
 msgid "E&xport a display picture"
 msgstr "ਯਾਹੂ ਤਸਵੀਰ ਵੇਖਾਓ"
 
@@ -14221,7 +14171,6 @@ msgstr ""
 
 #: protocols/msn/ui/msneditaccountui.ui:693
 #, fuzzy, no-c-format
-#| msgid "Select..."
 msgid "&Select Image..."
 msgstr "ਚੁਣੋ...."
 
@@ -14232,7 +14181,6 @@ msgstr ""
 
 #: protocols/msn/ui/msneditaccountui.ui:847
 #, fuzzy, no-c-format
-#| msgid "Contacts"
 msgid "Con&tacts"
 msgstr "Contacts"
 
@@ -14247,7 +14195,6 @@ msgstr ""
 
 #: protocols/msn/ui/msneditaccountui.ui:876
 #, fuzzy, no-c-format
-#| msgid "&Block Contact"
 msgid "Bloc&ked contacts:"
 msgstr "ਸੰਪਰਕ ਪਾਬੰਦੀ(&B)"
 
@@ -14263,7 +14210,6 @@ msgstr "&<"
 
 #: protocols/msn/ui/msneditaccountui.ui:935
 #, fuzzy, no-c-format
-#| msgid "Allow Contact?"
 msgid "Allo&wed contacts:"
 msgstr "ਕੀ ਸੰਪਰਕ ਸਵੀਕਾਰ?"
 
@@ -14299,7 +14245,6 @@ msgstr ""
 
 #: protocols/msn/ui/msneditaccountui.ui:1108
 #, fuzzy, no-c-format
-#| msgid "Connection Preferences"
 msgid "Connection Preferences (for advanced users)"
 msgstr "ਕੁਨੈਕਸ਼ਨ ਪਸੰਦ"
 
@@ -14371,7 +14316,6 @@ msgstr "ਫੋਨ"
 
 #: protocols/msn/ui/msninfo.ui:173
 #, fuzzy, no-c-format
-#| msgid "Mobile"
 msgid "Mobile:"
 msgstr "ਮੋਬਾਇਲ"
 
@@ -14382,7 +14326,6 @@ msgstr ""
 
 #: protocols/msn/ui/msninfo.ui:194
 #, fuzzy, no-c-format
-#| msgid "Show or hide the contact list"
 msgid "Show whether you are on the contact list of this user"
 msgstr "ਸੰਪਰਕ ਸੂਚੀ ਵੇਖਾਓ ਜਾਂ ਓਹਲੇ"
 
@@ -14401,23 +14344,16 @@ msgstr "ਸੰਪਰਕ ਜਾਣਕਾਰੀ"
 
 #: protocols/oscar/aim/ui/aimaddcontactui.ui:53
 #, fuzzy, no-c-format
-#| msgid ""
-#| "_: AIM user id\n"
-#| "screen name"
 msgid "AIM screen name:"
 msgstr "ਸਕਰੀਨ ਨਾਂ"
 
 #: protocols/oscar/aim/ui/aimeditaccountui.ui:24
 #, fuzzy, no-c-format
-#| msgid "Account Preferences - MSN"
 msgid "Account Preferences - AIM"
 msgstr "ਖਾਤਾ ਪਸੰਦ - MSN"
 
 #: protocols/oscar/aim/ui/aimeditaccountui.ui:86
 #, fuzzy, no-c-format
-#| msgid ""
-#| "_: AIM user id\n"
-#| "screen name"
 msgid "AIM &screen name:"
 msgstr "ਸਕਰੀਨ ਨਾਂ"
 
@@ -14490,7 +14426,6 @@ msgstr ""
 
 #: protocols/oscar/aim/ui/aimeditaccountui.ui:392
 #, fuzzy, no-c-format
-#| msgid "Video Settings"
 msgid "Visibility settings"
 msgstr "ਵੀਡਿਓ ਸਥਾਪਨ"
 
@@ -14501,13 +14436,11 @@ msgstr ""
 
 #: protocols/oscar/aim/ui/aimeditaccountui.ui:411
 #, fuzzy, no-c-format
-#| msgid "Block User"
 msgid "Block all users"
 msgstr "ਵਿਅਕਤੀ ਪਾਬੰਦੀ"
 
 #: protocols/oscar/aim/ui/aimeditaccountui.ui:419
 #, fuzzy, no-c-format
-#| msgid "Block User"
 msgid "Block AIM users"
 msgstr "ਵਿਅਕਤੀ ਪਾਬੰਦੀ"
 
@@ -14523,31 +14456,26 @@ msgstr ""
 
 #: protocols/oscar/aim/ui/aimeditaccountui.ui:443
 #, fuzzy, no-c-format
-#| msgid "Not in your contact list"
 msgid "Allow only contact list's users"
 msgstr "ਤੁਹਾਡੀ ਸੰਪਰਕ ਸੂਚੀ 'ਚ ਨਹੀਂ ਹੈ"
 
 #: protocols/oscar/aim/ui/aiminfobase.ui:80
 #, fuzzy, no-c-format
-#| msgid "Surname:"
 msgid "Screen name:"
 msgstr "ਉਪ-ਨਾਂ:"
 
 #: protocols/oscar/aim/ui/aiminfobase.ui:122
 #, fuzzy, no-c-format
-#| msgid "minutes"
 msgid "Idle minutes:"
 msgstr "ਮਿੰਟ"
 
 #: protocols/oscar/aim/ui/aiminfobase.ui:201
 #, fuzzy, no-c-format
-#| msgid "User Profile"
 msgid "Profile:"
 msgstr "ਉਪਭੋਗੀ ਪ੍ਰੋਫਾਇਲ"
 
 #: protocols/oscar/aim/ui/aimjoinchatbase.ui:27
 #, fuzzy, no-c-format
-#| msgid "Please enter the name for the new group:"
 msgid "Please enter the name of the chat room you wish to join."
 msgstr "ਨਵੇਂ ਗਰੁੱਪ ਲਈ ਨਾਂ ਦਿਓ ਜੀ:"