From: <pan...@us...> - 2009-07-15 11:39:37
|
Revision: 5075 http://kmess.svn.sourceforge.net/kmess/?rev=5075&view=rev Author: pano9000 Date: 2009-07-15 11:39:33 +0000 (Wed, 15 Jul 2009) Log Message: ----------- Merged an updated Greek translation | 0f0u Modified Paths: -------------- branches/kmess/kmess-2.0.x/ChangeLog branches/kmess/kmess-2.0.x/po/el.po Modified: branches/kmess/kmess-2.0.x/ChangeLog =================================================================== --- branches/kmess/kmess-2.0.x/ChangeLog 2009-07-14 23:39:46 UTC (rev 5074) +++ branches/kmess/kmess-2.0.x/ChangeLog 2009-07-15 11:39:33 UTC (rev 5075) @@ -1,4 +1,8 @@ + +2009-07-15 (Pano) + * Merged an updated Greek translation by Dimitrios Glentadakis. + 2009-07-14 (Valerio) * Removed BinReloc, AutoPackage, and the other packaging support files. * Removed code which will never be in any 2.0.x release: WebApplication, NetMeeting/GnomeMeeting, Modified: branches/kmess/kmess-2.0.x/po/el.po =================================================================== --- branches/kmess/kmess-2.0.x/po/el.po 2009-07-14 23:39:46 UTC (rev 5074) +++ branches/kmess/kmess-2.0.x/po/el.po 2009-07-15 11:39:33 UTC (rev 5075) @@ -7,9 +7,9 @@ msgstr "" "Project-Id-Version: el\n" "Report-Msgid-Bugs-To: http://www.kmess.org/board/\n" -"POT-Creation-Date: 2009-07-13 20:29+0200\n" -"PO-Revision-Date: 2009-07-13 21:44+0100\n" -"Last-Translator: Panagiotis Papadopoulos <pa...@gm...>\n" +"POT-Creation-Date: 2009-07-05 23:13+0200\n" +"PO-Revision-Date: 2009-07-15 13:36+0200\n" +"Last-Translator: Glentadakis Dimitrios <dg...@gm...>\n" "Language-Team: Greek <kde...@kd...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,8 +17,7 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 0.3\n" -#: account.cpp:45 -#: account.cpp:744 +#: account.cpp:45 account.cpp:744 msgid "I am away from my computer" msgstr "Είμαι μακριά από τον υπολογιστή μου" @@ -26,16 +25,27 @@ msgid "Your name" msgstr "Το ψευδώνυμό σας" -#: account.cpp:57 -#: settings/accountpage.cpp:218 +#: account.cpp:57 settings/accountpage.cpp:217 #: settings/accountsettingsdialog.cpp:205 msgid "yo...@ho..." msgstr "εσείς@hotmail.com" #: accountsmanager.cpp:559 #, kde-format -msgid "<html>Some insecurely stored account passwords have been found.<br />Do you want to import the passwords to the KDE Wallet named '%1', keep the insecurely stored passwords, or delete them permanently?<br /><br /><i>Note: it is not recommended to keep insecurely stored passwords if the KDE Wallet is available, because your passwords will be easily readable in the KMess configuration files.</i></html>" -msgstr "<html>Βρέθηκαν μερικοί κωδικοί που δεν έχουν αποθηκευθεί με ασφαλή μέθοδο.<br />Θέλετε να εισάγετε τους κωδικούς στο KDE Wallet με όνομα '%1', να διατηρήσετε χωρίς ασφάλεια αποθηκευμένους τους κωδικούς, ή να τους διαγράψετε ;<br /><br /><i>Σημείωση: Δεν συνιστάται η μη ασφαλής αποθήκευση των κωδικών όταν υπάρχει διαθέσιμο το KDE Wallet, διότι οι κωδικοί σας θα είναι εύκολα αναγνώσιμοι στα αρχεία ρυθμίσεων του KMess.</i></html>" +msgid "" +"<html>Some insecurely stored account passwords have been found.<br />Do you " +"want to import the passwords to the KDE Wallet named '%1', keep the " +"insecurely stored passwords, or delete them permanently?<br /><br /><i>Note: " +"it is not recommended to keep insecurely stored passwords if the KDE Wallet " +"is available, because your passwords will be easily readable in the KMess " +"configuration files.</i></html>" +msgstr "" +"<html>Βρέθηκαν μερικοί κωδικοί που δεν έχουν αποθηκευθεί με ασφαλή μέθοδο." +"<br />Θέλετε να εισάγετε τους κωδικούς στο KDE Wallet με όνομα '%1', να " +"διατηρήσετε χωρίς ασφάλεια αποθηκευμένους τους κωδικούς, ή να τους " +"διαγράψετε ;<br /><br /><i>Σημείωση: Δεν συνιστάται η μη ασφαλής αποθήκευση " +"των κωδικών όταν υπάρχει διαθέσιμο το KDE Wallet, διότι οι κωδικοί σας θα " +"είναι εύκολα αναγνώσιμοι στα αρχεία ρυθμίσεων του KMess.</i></html>" #: accountsmanager.cpp:567 msgctxt "Dialog box caption" @@ -59,8 +69,14 @@ #: chat/chat.cpp:112 msgctxt "Error dialog box text" -msgid "You cannot send invitations when there are multiple contacts in a chat. Please start a separate chat with the contact you wanted to send the invitation to." -msgstr "Δεν μπορείτε να στείλετε προσκλήσεις όταν υπάρχουν περισσότερες επαφές στη συνομιλία. Παρακαλώ ξεκινήστε μία ξεχωριστή συνομιλία με την επαφή που θέλετε να στείλετε την πρόσκληση." +msgid "" +"You cannot send invitations when there are multiple contacts in a chat. " +"Please start a separate chat with the contact you wanted to send the " +"invitation to." +msgstr "" +"Δεν μπορείτε να στείλετε προσκλήσεις όταν υπάρχουν περισσότερες επαφές στη " +"συνομιλία. Παρακαλώ ξεκινήστε μία ξεχωριστή συνομιλία με την επαφή που " +"θέλετε να στείλετε την πρόσκληση." #: chat/chat.cpp:136 #, kde-format @@ -99,181 +115,265 @@ #: chat/chat.cpp:827 #, kde-format -msgid "<html>KMess could not save the log for this chat:<br />The chat logs directory, "%1", does not exist.</html>" -msgstr "<html>Το KMess δεν μπόρεσε να καταγράψει αυτή την συνομιλία:<br />Ο κατάλογος καταγραφής, "%1", δεν υπάρχει.</html>" +msgid "" +"<html>KMess could not save the log for this chat:<br />The chat logs " +"directory, "%1", does not exist.</html>" +msgstr "" +"<html>Το KMess δεν μπόρεσε να καταγράψει αυτή την συνομιλία:<br />Ο " +"κατάλογος καταγραφής, "%1", δεν υπάρχει.</html>" -#: chat/chat.cpp:969 -#, fuzzy +#: chat/chat.cpp:966 msgctxt "Message shown in the chat window (when the wink name is unknown)" msgid "You have sent a wink!" -msgstr "Στείλατε μία ειδοποίηση με δόνηση!" +msgstr "Στείλατε ένα νεύμα!" -#: chat/chat.cpp:974 +#: chat/chat.cpp:971 #, kde-format msgctxt "Message shown in the chat window, %1 is the wink name" msgid "You have sent the "%1" wink!" msgstr "Στείλατε το νεύμα "%1" !" -#: chat/chat.cpp:1007 -msgid "The chat has been disabled because you are no longer connected to the Live Messenger server." -msgstr "Η συνομιλία απενεργοποιήθηκε διότι δεν είστε πια σε συνδεση στον εξυπηρετητή Live Messenger." +#: chat/chat.cpp:1004 +msgid "" +"The chat has been disabled because you are no longer connected to the Live " +"Messenger server." +msgstr "" +"Η συνομιλία απενεργοποιήθηκε διότι δεν είστε πια σε συνδεση στον εξυπηρετητή " +"Live Messenger." -#: chat/chat.cpp:1164 +#: chat/chat.cpp:1161 msgctxt "Warning message shown in chat" msgid "There has been a connection problem." msgstr "Παρουσιάστηκε πρόβλημα στην σύνδεση." -#: chat/chat.cpp:1174 +#: chat/chat.cpp:1171 msgctxt "Warning message shown in chat" -msgid "There were too many different custom emoticons in your last message. Only the first 7 will be sent." -msgstr "Υπήρξαν πάρα πολλά διαφορετικά προσαρμοσμένα εικονίδια διάθεσης στο τελευταίο σας μήνυμα. Μόνο τα πρώτα 7 θα αποσταλούν" +msgid "" +"There were too many different custom emoticons in your last message. Only " +"the first 7 will be sent." +msgstr "" +"Υπήρξαν πάρα πολλά διαφορετικά προσαρμοσμένα εικονίδια διάθεσης στο " +"τελευταίο σας μήνυμα. Μόνο τα πρώτα 7 θα αποσταλούν" -#: chat/chat.cpp:1187 +#: chat/chat.cpp:1184 #, kde-format msgctxt "Warning message shown in chat, %1 is the contact's friendly name" -msgid "%1 has sent you a voice clip, but KMess does not support voice clips yet." -msgstr "Ο χρήστης %1 σας έστειλε ένα φωνητικό κλιπ, αλλά το KMess δεν υποστηρίζει φωνητικά κλιπ ακόμα." +msgid "" +"%1 has sent you a voice clip, but KMess does not support voice clips yet." +msgstr "" +"Ο χρήστης %1 σας έστειλε ένα φωνητικό κλιπ, αλλά το KMess δεν υποστηρίζει " +"φωνητικά κλιπ ακόμα." -#: chat/chat.cpp:1201 +#: chat/chat.cpp:1198 #, kde-format msgctxt "Warning message shown in chat, %1 is the contact's friendly name" -msgid "%1 has sent you an action message, but KMess does not support action messages yet." -msgstr "Ο χρήστης %1 σας έστειλε μια ενέργεια, αλλά το KMess δεν υποστηρίζει αυτο το χαρακτηριστικό ακόμα." +msgid "" +"%1 has sent you an action message, but KMess does not support action " +"messages yet." +msgstr "" +"Ο χρήστης %1 σας έστειλε μια ενέργεια, αλλά το KMess δεν υποστηρίζει αυτο το " +"χαρακτηριστικό ακόμα." -#: chat/chat.cpp:1216 +#: chat/chat.cpp:1213 #, kde-format msgctxt "Warning message shown in chat, %1 is the contact's friendly name" -msgid "%1 has sent you a Live Messenger feature that KMess does not support yet." -msgstr "Ο χρήστης %1 σας έστειλε ένα χαρακτηριστικό Live Messenger το οποίο το KMess δεν υποστηρίζει ακόμα." +msgid "" +"%1 has sent you a Live Messenger feature that KMess does not support yet." +msgstr "" +"Ο χρήστης %1 σας έστειλε ένα χαρακτηριστικό Live Messenger το οποίο το KMess " +"δεν υποστηρίζει ακόμα." -#: chat/chat.cpp:1242 +#: chat/chat.cpp:1239 #, kde-format msgctxt "Message shown in the chat window, %1 is the contact's friendly name" -msgid "You received a wink from %1, but displaying winks has been disabled. You can re-enable it in the <a href='kmess://accountconfig'>account settings</a>." -msgstr "Ο χρήστης %1 σας έστειλε ένα νεύμα, αλλά η προβολή νευμάτων είναι απενεργοποιημένη. Μπορείτε να την ενεργοποιήσετε από το <a href='kmess://accountconfig'>ρυθμίσεις λογαριασμού</a>." +msgid "" +"You received a wink from %1, but displaying winks has been disabled. You can " +"re-enable it in the <a href='kmess://accountconfig'>account settings</a>." +msgstr "" +"Ο χρήστης %1 σας έστειλε ένα νεύμα, αλλά η προβολή νευμάτων είναι " +"απενεργοποιημένη. Μπορείτε να την ενεργοποιήσετε από το <a href='kmess://" +"accountconfig'>ρυθμίσεις λογαριασμού</a>." -#: chat/chat.cpp:1252 +#: chat/chat.cpp:1249 #, kde-format -msgctxt "Message shown in the chat window, %1 is the contact's friendly name, %2 is the wink name" -msgid "You received the "%2" wink from %1, but displaying winks has been disabled. You can re-enable it in the <a href='kmess://accountconfig'>account settings</a>." -msgstr "Ο χρήστης %1 σας έστειλε το νεύμα "%2" %1, αλλά η προβολή νευμάτων είναι απενεργοποιημένη. Μπορείτε να την ενεργοποιήσετε από το <a href='kmess://accountconfig'>ρυθμίσεις λογαριασμού</a>." +msgctxt "" +"Message shown in the chat window, %1 is the contact's friendly name, %2 is " +"the wink name" +msgid "" +"You received the "%2" wink from %1, but displaying winks has been " +"disabled. You can re-enable it in the <a href='kmess://" +"accountconfig'>account settings</a>." +msgstr "" +"Ο χρήστης %1 σας έστειλε το νεύμα "%2" %1, αλλά η προβολή νευμάτων " +"είναι απενεργοποιημένη. Μπορείτε να την ενεργοποιήσετε από το <a " +"href='kmess://accountconfig'>ρυθμίσεις λογαριασμού</a>." -#: chat/chat.cpp:1282 +#: chat/chat.cpp:1279 #, kde-format msgctxt "Message shown in the chat window, %1 is the contact's friendly name" msgid "%1 has sent you a wink!" msgstr "Ο χρήστης %1 σας έστειλε ένα νεύμα!" -#: chat/chat.cpp:1289 +#: chat/chat.cpp:1286 #, kde-format -msgctxt "Message shown in the chat window, %1 is the contact's friendly name, %2 is the wink name" +msgctxt "" +"Message shown in the chat window, %1 is the contact's friendly name, %2 is " +"the wink name" msgid "%1 has sent you a wink: "%2"!" msgstr "Ο χρήστης %1 σας έστειλε ένα νεύμα: "%2"!" -#: chat/chat.cpp:1311 +#: chat/chat.cpp:1308 #, kde-format msgctxt "Message shown in the chat window, %1 is the contact's friendly name" -msgid "You received a wink from %1, but it could not be displayed. Make sure you have the "cabextract" program installed." -msgstr "Έχετε λάβει ένα νεύμα από τον χρήστη %1, αλλά η προβολή του είναι αδύνατη. Σιγουρευτείτε ότι έχετε εγκατεστημένο το "cabextract"." +msgid "" +"You received a wink from %1, but it could not be displayed. Make sure you " +"have the "cabextract" program installed." +msgstr "" +"Έχετε λάβει ένα νεύμα από τον χρήστη %1, αλλά η προβολή του είναι αδύνατη. " +"Σιγουρευτείτε ότι έχετε εγκατεστημένο το "cabextract"." -#: chat/chat.cpp:1320 +#: chat/chat.cpp:1317 #, kde-format -msgctxt "Message shown in the chat window, %1 is the contact's friendly name, %2 is the wink name" -msgid "You received the "%2" wink from %1, but it could not be displayed. Make sure you have the "cabextract" program installed." -msgstr "Λάβατε το νεύμα "%2" από τον χρήστη %1, αλλα ειναι αδύνατη η εμφανιση του. Σιγουρευτείτε ότι έχετε εγκατεστημένο το "cabextract"." +msgctxt "" +"Message shown in the chat window, %1 is the contact's friendly name, %2 is " +"the wink name" +msgid "" +"You received the "%2" wink from %1, but it could not be displayed. " +"Make sure you have the "cabextract" program installed." +msgstr "" +"Λάβατε το νεύμα "%2" από τον χρήστη %1, αλλα ειναι αδύνατη η " +"εμφανιση του. Σιγουρευτείτε ότι έχετε εγκατεστημένο το "" +"cabextract"." -#: chat/chat.cpp:1332 +#: chat/chat.cpp:1329 #, kde-format msgctxt "Message shown in the chat window, %1 is the contact's friendly name" -msgid "You received a wink from %1, but it could not be displayed. Extracting the wink package with "cabextract" has failed." -msgstr "Έχετε λάβει ένα νεύμα από τον χρήστη %1, αλλά η προβολή του είναι αδύνατη. Η εξαγωγή του πακέτου του νεύματος μέσω του προγράμματος "cabextract" απέτυχε." +msgid "" +"You received a wink from %1, but it could not be displayed. Extracting the " +"wink package with "cabextract" has failed." +msgstr "" +"Έχετε λάβει ένα νεύμα από τον χρήστη %1, αλλά η προβολή του είναι αδύνατη. Η " +"εξαγωγή του πακέτου του νεύματος μέσω του προγράμματος "" +"cabextract" απέτυχε." -#: chat/chat.cpp:1341 +#: chat/chat.cpp:1338 #, kde-format -msgctxt "Message shown in the chat window, %1 is the contact's friendly name, %2 is the wink name" -msgid "You received the "%2" wink from %1, but it could not be displayed. Extracting the wink package with "cabextract" has failed." -msgstr "Έχετε λάβει το νεύμα "%2" από τον χρήστη %1, αλλά η προβολή του είναι αδύνατη. Η εξαγωγή του πακέτου του νεύματος μέσω του προγράμματος "cabextract" απέτυχε." +msgctxt "" +"Message shown in the chat window, %1 is the contact's friendly name, %2 is " +"the wink name" +msgid "" +"You received the "%2" wink from %1, but it could not be displayed. " +"Extracting the wink package with "cabextract" has failed." +msgstr "" +"Έχετε λάβει το νεύμα "%2" από τον χρήστη %1, αλλά η προβολή του " +"είναι αδύνατη. Η εξαγωγή του πακέτου του νεύματος μέσω του προγράμματος " +""cabextract" απέτυχε." -#: chat/chat.cpp:1353 +#: chat/chat.cpp:1350 #, kde-format msgctxt "Message shown in the chat window, %1 is the contact's friendly name" -msgid "You received a wink from %1, but it could not be displayed. The data could not be read." -msgstr "Έχετε λάβει ένα νεύμα από τον χρήστη %1, αλλά η προβολή του είναι αδύνατη. Τα δεδομένα δεν μπορούν να διαβαστούν" +msgid "" +"You received a wink from %1, but it could not be displayed. The data could " +"not be read." +msgstr "" +"Έχετε λάβει ένα νεύμα από τον χρήστη %1, αλλά η προβολή του είναι αδύνατη. " +"Τα δεδομένα δεν μπορούν να διαβαστούν" -#: chat/chat.cpp:1362 +#: chat/chat.cpp:1359 #, kde-format -msgctxt "Message shown in the chat window, %1 is the contact's friendly name, %2 is the wink name" -msgid "You received the "%2" wink from %1, but it could not be displayed. The data could not be read." -msgstr "Έχετε λάβει το νεύμα "%2" από τον χρήστη %1, αλλά η προβολή του είναι αδύνατη. Τα δεδομένα δεν μπορούν να διαβαστούν" +msgctxt "" +"Message shown in the chat window, %1 is the contact's friendly name, %2 is " +"the wink name" +msgid "" +"You received the "%2" wink from %1, but it could not be displayed. " +"The data could not be read." +msgstr "" +"Έχετε λάβει το νεύμα "%2" από τον χρήστη %1, αλλά η προβολή του " +"είναι αδύνατη. Τα δεδομένα δεν μπορούν να διαβαστούν" -#: chat/chat.cpp:1404 +#: chat/chat.cpp:1401 #, kde-format -msgid "%1 has gone offline. Any messages you send will be delivered the next time he or she logs in." -msgstr "Ο χρήστης %1 αυτή τη στιγμή είναι εκτός σύνδεσης. Όλα τα μηνύματα που στέλνετε θα παραδοθούν την επόμενη φορά που ο χρήστης θα είναι συνδεδεμένος." +msgid "" +"%1 has gone offline. Any messages you send will be delivered the next time " +"he or she logs in." +msgstr "" +"Ο χρήστης %1 αυτή τη στιγμή είναι εκτός σύνδεσης. Όλα τα μηνύματα που " +"στέλνετε θα παραδοθούν την επόμενη φορά που ο χρήστης θα είναι συνδεδεμένος." -#: chat/chat.cpp:1409 +#: chat/chat.cpp:1406 #, kde-format msgid "%1 has gone offline." msgstr "Ο χρήστης %1 είναι αποσυνδεδεμένος" -#: chat/chat.cpp:1419 +#: chat/chat.cpp:1416 #, kde-format msgid "%1 has changed his or her status to "%2"." msgstr "Ο χρήστης %1 άλλαξε κατάσταση σε "%2"" -#: chat/chat.cpp:1450 +#: chat/chat.cpp:1447 #, kde-format msgid "%1 has sent you a nudge!" msgstr "Ο χρήστης %1 σας έστειλε μία ειδοποίηση με δόνηση!<" -#: chat/chat.cpp:1483 -msgctxt "Phrase to be inserted in place of a contact name, when a message can't be delivered to any of the recipients" +#: chat/chat.cpp:1480 +msgctxt "" +"Phrase to be inserted in place of a contact name, when a message can't be " +"delivered to any of the recipients" msgid "all contacts" msgstr "όλες οι επαφές" -#: chat/chat.cpp:1496 +#: chat/chat.cpp:1493 #, kde-format msgctxt "Error message shown in chat, %1 is the contact's friendly name" msgid "Failed to send the nudge to %1." msgstr "Η αποστολή ειδοποίησης με δόνηση στον χρήστη %1 απέτυχε." -#: chat/chat.cpp:1501 +#: chat/chat.cpp:1498 #, kde-format msgctxt "Error message shown in chat, %1 is the contact's friendly name" msgid "Failed to send the wink to %1." msgstr "Η αποστολή του νεύματος στον χρήστη %1 απέτυχε." -#: chat/chat.cpp:1511 +#: chat/chat.cpp:1508 #, kde-format msgctxt "Error message shown in chat, %1 is the contact's friendly name" msgid "Failed to send the handwritten message to %1." msgstr "Η αποστολή του χειρόγραφου μηνύματος στον χρήστη %1 απέτυχε." -#: chat/chat.cpp:1526 +#: chat/chat.cpp:1523 #, kde-format -msgctxt "Error message shown in chat, %1 is the sent message, %2 is the contact's friendly name" +msgctxt "" +"Error message shown in chat, %1 is the sent message, %2 is the contact's " +"friendly name" msgid "Failed to send the message to %2:<br/>%1" msgstr "Απέτυχε η αποστολή του μηνύματος στον χρήστη %2:<br/>%1" -#: chat/chat.cpp:1609 +#: chat/chat.cpp:1606 #, kde-format -msgid "The file "%1" could not be found on your computer, and the download failed." -msgstr "Το αρχείο "%1" δεν βρέθηκε στον υπολογιστή σας, και η λήψη απέτυχε." +msgid "" +"The file "%1" could not be found on your computer, and the " +"download failed." +msgstr "" +"Το αρχείο "%1" δεν βρέθηκε στον υπολογιστή σας, και η λήψη απέτυχε." -#: chat/chat.cpp:1646 +#: chat/chat.cpp:1643 #, kde-format msgctxt "Message shown in chat window, %1 is the contact's friendly name" msgid "You have sent a nudge to %1!" msgstr "Στείλατε μία ειδοποίηση με δόνηση στον χρήστη %1!" -#: chat/chat.cpp:1652 +#: chat/chat.cpp:1649 msgid "You have sent a nudge!" msgstr "Στείλατε μία ειδοποίηση με δόνηση!" -#: chat/chat.cpp:1718 +#: chat/chat.cpp:1715 #, kde-format -msgid "%1 is currently offline. Any messages you send will be delivered the next time he or she logs in." -msgstr "Ο χρήστης %1 αυτή τη στιγμή είναι εκτός σύνδεσης. Όλα τα μηνύματα που στέλνετε θα παραδοθούν την επόμενη φορά που ο χρήστης θα είναι συνδεδεμένος." +msgid "" +"%1 is currently offline. Any messages you send will be delivered the next " +"time he or she logs in." +msgstr "" +"Ο χρήστης %1 αυτή τη στιγμή είναι εκτός σύνδεσης. Όλα τα μηνύματα που " +"στέλνετε θα παραδοθούν την επόμενη φορά που ο χρήστης θα είναι συνδεδεμένος." #: chat/chatmaster.cpp:1387 #, kde-format @@ -287,13 +387,16 @@ #: chat/chatmessageview.cpp:345 #, kde-format -msgctxt "Header of a chat file saved in HTML: %1 is the contact, %2 the date and time" +msgctxt "" +"Header of a chat file saved in HTML: %1 is the contact, %2 the date and time" msgid "Chat with %1<br/>Started on: %2" msgstr "Η συνομιλία με το χρήστη %1<br/>Ξεκίνησε στις: %2" #: chat/chatmessageview.cpp:392 #, kde-format -msgctxt "Header of a single chat saved as plain text chat log: %1 is the chat date and time" +msgctxt "" +"Header of a single chat saved as plain text chat log: %1 is the chat date " +"and time" msgid "Chat started on: %2" msgstr "Η συνομιλία ξεκίνησε στις : %2" @@ -303,8 +406,7 @@ msgid "Saved KMess chats with %1" msgstr "Αποθηκευμένες συνομιλίες KMess με %1" -#: chat/chatmessageview.cpp:1095 -#: utils/richtextparser.cpp:658 +#: chat/chatmessageview.cpp:1095 utils/richtextparser.cpp:658 #, kde-format msgid "Add this emoticon: %1" msgstr "Προσθέστε αυτό το εικονίδιο διάθεσης : %1" @@ -330,10 +432,12 @@ #, kde-format msgid "" "Could not save chat log in directory '%1'.\n" -"Make sure you have permission to write in the folder where logs are being saved." +"Make sure you have permission to write in the folder where logs are being " +"saved." msgstr "" "Αδύνατη η αποθήκευση του αρχείου στον κατάλογο « %1 ».\n" -"σιγουρευτείτε ότι έχετε άδεια εγγραφής στον φάκελο αποθήκευσης των καταγραφών." +"σιγουρευτείτε ότι έχετε άδεια εγγραφής στον φάκελο αποθήκευσης των " +"καταγραφών." #: chat/chatview.cpp:465 msgctxt "Chat log saving dialog, file type filter" @@ -355,14 +459,12 @@ "Το αρχείο « %1 » υπάρχει ήδη.\n" "Επιθυμείτε την αντικατάστασή του;" -#: chat/chatview.cpp:485 -#: network/applications/filetransfer.cpp:261 +#: chat/chatview.cpp:485 network/applications/filetransfer.cpp:261 #: network/applications/filetransferp2p.cpp:347 msgid "Overwrite File" msgstr "Αντικατάσταση αρχείου" -#: chat/chatview.cpp:486 -#: network/applications/filetransfer.cpp:261 +#: chat/chatview.cpp:486 network/applications/filetransfer.cpp:261 #: network/applications/filetransferp2p.cpp:347 msgid "Over&write" msgstr "Αντικατάσταση" @@ -395,8 +497,7 @@ msgid "Copy &Address" msgstr "Αντιγραφή διεύθυνσης" -#: chat/chatview.cpp:882 -#: chat/chatwindow.cpp:507 +#: chat/chatview.cpp:882 chat/chatwindow.cpp:507 msgid "C&lear Chat" msgstr "Καθαρισμός συνομιλίας" @@ -408,8 +509,7 @@ msgid "Contacts" msgstr "Επαφές" -#: chat/chatwindow.cpp:121 -#: settings/accountsettingsdialog.cpp:90 +#: chat/chatwindow.cpp:121 settings/accountsettingsdialog.cpp:90 #: settings/accountsettingsdialog.cpp:91 msgid "Emoticons" msgstr "Εικονίδια διάθεσης" @@ -419,8 +519,14 @@ msgstr "Εικονίδια διάθεσης" #: chat/chatwindow.cpp:341 -msgid "<html>There are multiple tabs open in this chat window. Do you want to close the current tab only, or all tabs?<br /><br /><i>Note: You can close all tabs at once by pressing Alt+F4.</i></html>" -msgstr "Υπάρχουν περισσότερες καρτέλες ανοιχτές σε αυτο το παράθυρο συνομιλίας. Θέλετε να κλείσετε μόνο την τρέχουσα καρτέλα, ή όλες ;<br /><br /><i>Σημείωση : Μπορείτε να κλείσετε όλες τις καρτέλες με Alt+F4.</i>" +msgid "" +"<html>There are multiple tabs open in this chat window. Do you want to close " +"the current tab only, or all tabs?<br /><br /><i>Note: You can close all " +"tabs at once by pressing Alt+F4.</i></html>" +msgstr "" +"Υπάρχουν περισσότερες καρτέλες ανοιχτές σε αυτο το παράθυρο συνομιλίας. " +"Θέλετε να κλείσετε μόνο την τρέχουσα καρτέλα, ή όλες ;<br /><br /" +"><i>Σημείωση : Μπορείτε να κλείσετε όλες τις καρτέλες με Alt+F4.</i>" #: chat/chatwindow.cpp:344 msgctxt "Dialog box caption: closing a chatwindow with a single tab" @@ -499,13 +605,11 @@ msgid "Send a &File" msgstr "Αποστολή αρχείου" -#: chat/chatwindow.cpp:460 -#: chat/chatwindow.cpp:461 +#: chat/chatwindow.cpp:460 chat/chatwindow.cpp:461 msgid "P&revious Tab" msgstr "Προηγούμενη καρτέλα" -#: chat/chatwindow.cpp:462 -#: chat/chatwindow.cpp:463 +#: chat/chatwindow.cpp:462 chat/chatwindow.cpp:463 msgid "Ne&xt Tab" msgstr "Επόμενη καρτέλα" @@ -513,28 +617,27 @@ msgid "Enable or disable the contacts panel" msgstr "Ενεργοποίηση ή απενεργοποίηση του πίνακα με τις επαφές" -#: chat/chatwindow.cpp:479 -#: chat/chatwindow.cpp:480 +#: chat/chatwindow.cpp:479 chat/chatwindow.cpp:480 msgctxt "Toolbar button" msgid "Contacts" msgstr "Επαφές" #: chat/chatwindow.cpp:484 msgid "Enable or disable the standard emoticons panel" -msgstr "Ενεργοποίηση ή απενεργοποίηση του πίνακα με τα βασικά εικονίδια διάθεσης" +msgstr "" +"Ενεργοποίηση ή απενεργοποίηση του πίνακα με τα βασικά εικονίδια διάθεσης" -#: chat/chatwindow.cpp:485 -#: chat/chatwindow.cpp:486 +#: chat/chatwindow.cpp:485 chat/chatwindow.cpp:486 msgctxt "Toolbar button" msgid "Emoticons" msgstr "Εικονίδια διάθεσης" #: chat/chatwindow.cpp:490 msgid "Enable or disable the custom emoticons panel" -msgstr "Ενεργοποίηση ή απενεργοποίηση του πίνακα με τα προσωπικά εικονίδια διάθεσης" +msgstr "" +"Ενεργοποίηση ή απενεργοποίηση του πίνακα με τα προσωπικά εικονίδια διάθεσης" -#: chat/chatwindow.cpp:491 -#: chat/chatwindow.cpp:492 +#: chat/chatwindow.cpp:491 chat/chatwindow.cpp:492 msgctxt "Toolbar button" msgid "My Emoticons" msgstr "Εικονίδια διάθεσης" @@ -557,8 +660,15 @@ msgstr "Έναρξη ή Τερματισμός μιας &Συνομιλίας" #: chat/chatwindow.cpp:1008 -msgid "<html>You used an incorrect syntax for the /status command. The correct syntax is: <b>/status online|away|idle|brb|busy|lunch|phone|invisible</b>.<br/>You can also use shortcuts like <b>/online</b> or <b>/phone</b>.</html>" -msgstr "<html>Χρησιμοποιείτε μια λάθος σύνταξη για την εντολή /status. Η σωστή σύνταξη είναι: <b>/status online|away|idle|brb|busy|lunch|phone|invisible</b>.<br/>Μπορείτε επίσης να χρησιμοποιήσετε τις συντομεύσεις όπως <b>/online</b> ή <b>/phone</b>.</html>" +msgid "" +"<html>You used an incorrect syntax for the /status command. The correct " +"syntax is: <b>/status online|away|idle|brb|busy|lunch|phone|invisible</b>." +"<br/>You can also use shortcuts like <b>/online</b> or <b>/phone</b>.</html>" +msgstr "" +"<html>Χρησιμοποιείτε μια λάθος σύνταξη για την εντολή /status. Η σωστή " +"σύνταξη είναι: <b>/status online|away|idle|brb|busy|lunch|phone|invisible</" +"b>.<br/>Μπορείτε επίσης να χρησιμοποιήσετε τις συντομεύσεις όπως <b>/online</" +"b> ή <b>/phone</b>.</html>" #: chat/chatwindow.cpp:1011 msgctxt "Dialog box caption for wrong command syntax warning" @@ -567,7 +677,9 @@ #: chat/chatwindow.cpp:1074 msgid "<html>You cannot use the /block command in a group chat.</html>" -msgstr "<html>Δεν μπορείτε να χρησιμοποιήσετε την εντολή /block σε μια ομαδοποιημένη συνομιλία.</html>" +msgstr "" +"<html>Δεν μπορείτε να χρησιμοποιήσετε την εντολή /block σε μια ομαδοποιημένη " +"συνομιλία.</html>" #: chat/chatwindow.cpp:1076 msgctxt "Caption when trying to block someone in a group chat" @@ -576,7 +688,9 @@ #: chat/chatwindow.cpp:1087 msgid "<html>You cannot use the /unblock command in a group chat.</html>" -msgstr "<html>Δεν μπορείτε να χρησιμοποιήσετε την εντολή /unblock σε μια ομαδοποιημένη συνομιλία.</html>" +msgstr "" +"<html>Δεν μπορείτε να χρησιμοποιήσετε την εντολή /unblock σε μια " +"ομαδοποιημένη συνομιλία.</html>" #: chat/chatwindow.cpp:1089 msgctxt "Caption when trying to unblock someone in a group chat" @@ -585,164 +699,167 @@ #: chat/chatwindow.cpp:1119 #, kde-format -msgid "<html>Unknown command <b>%1</b>. If you did not want this message to be a command, prepend your message with another /.</html>" -msgstr "<html>Άγνωστη εντολή <b>%1</b>. Αν το μήνυμά σας δεν είναι μία εντολή, προσθέστε ακόμα ένα / στην αρχή του μηνύματος.</html>" +msgid "" +"<html>Unknown command <b>%1</b>. If you did not want this message to be a " +"command, prepend your message with another /.</html>" +msgstr "" +"<html>Άγνωστη εντολή <b>%1</b>. Αν το μήνυμά σας δεν είναι μία εντολή, " +"προσθέστε ακόμα ένα / στην αρχή του μηνύματος.</html>" #: chat/chatwindow.cpp:1122 msgctxt "Caption when an unknown command was requested" msgid "Unknown Command" msgstr "Άγνωστη εντολή" -#: chat/chatwindow.cpp:1624 +#: chat/chatwindow.cpp:1598 msgctxt "Chat window caption, without contact name" msgid "Chat" msgstr "Συνομιλία" -#: chat/chatwindow.cpp:1628 +#: chat/chatwindow.cpp:1602 #, kde-format msgctxt "Chat window caption, with contact name" msgid "%1 - Chat" msgstr "%1 - Συνομιλία" -#: chat/chatwindow.cpp:1648 -#: kmessinterface.cpp:674 +#: chat/chatwindow.cpp:1622 kmessinterface.cpp:674 #, kde-format msgctxt "Question dialog box message" -msgid "<html>Are you sure you want to hide the menu bar? You will be able to show it again by using this keyboard shortcut: <b>%1</b></html>" -msgstr "<html>Είστε σίγουρος ότι θέλετε να αποκρύψετε τη γραμμή μενού; Θα μπορείτε να την επανεμφανίσετε με την συντόμευση πληκτρολογίου: <b>%1</b></html>" +msgid "" +"<html>Are you sure you want to hide the menu bar? You will be able to show " +"it again by using this keyboard shortcut: <b>%1</b></html>" +msgstr "" +"<html>Είστε σίγουρος ότι θέλετε να αποκρύψετε τη γραμμή μενού; Θα μπορείτε " +"να την επανεμφανίσετε με την συντόμευση πληκτρολογίου: <b>%1</b></html>" -#: chat/chatwindow.cpp:1652 -#: kmessinterface.cpp:678 +#: chat/chatwindow.cpp:1626 kmessinterface.cpp:678 msgctxt "Dialog box caption: hiding the menu bar" msgid "Hiding the Menu" msgstr "Απόκρυψη γραμμής μενού" -#: chat/chatwindow.cpp:1905 +#: chat/chatwindow.cpp:1879 #, kde-format msgid "%1 is typing..." msgstr "Ο χρήστης %1 πληκτρολογεί..." -#: chat/chatwindow.cpp:1915 +#: chat/chatwindow.cpp:1889 #, kde-format msgid "%1 and %2 are typing..." msgstr "Οι χρηστές %1 και %2 πληκτρολογούν..." -#: chat/chatwindow.cpp:1919 +#: chat/chatwindow.cpp:1893 #, kde-format msgid "%1, %2 and %3 others are typing..." msgstr "Οι χρηστές %1, %2 και %3 άλλοι πληκτρολογούν..." -#: chat/chatwindow.cpp:2378 +#: chat/chatwindow.cpp:2366 #, kde-format msgctxt "Tool tip for chat tabs" -msgid "<html><h2>Chat Info</h2><dl><dt><b>Contacts:</b></dt><dd><ul><li>%1</li></ul></dd><dt><b>Chat started on:</b></dt><dd>%2</dd><dt><b>Connected with account:</b></dt><dd>%3</dd></dl></html>" -msgstr "<html><h2>Πληροφορίες Συνομιλίας</h2><dl><dt><b>Επαφές:</b></dt><dd><ul><li>%1</li></ul></dd><dt><b>Έναρξη συνομιλίας στις:</b></dt><dd>%2</dd><dt><b>Σύνδεση ως:</b></dt><dd>%3</dd></dl></html>" +msgid "" +"<html><h2>Chat Info</h2><dl><dt><b>Contacts:</b></dt><dd><ul><li>%1</li></" +"ul></dd><dt><b>Chat started on:</b></dt><dd>%2</dd><dt><b>Connected with " +"account:</b></dt><dd>%3</dd></dl></html>" +msgstr "" +"<html><h2>Πληροφορίες Συνομιλίας</h2><dl><dt><b>Επαφές:</b></dt><dd><ul><li>%" +"1</li></ul></dd><dt><b>Έναρξη συνομιλίας στις:</b></dt><dd>%2</" +"dd><dt><b>Σύνδεση ως:</b></dt><dd>%3</dd></dl></html>" #. i18n: file: chat/chatwindow.ui:203 #. i18n: ectx: property (toolTip), widget (QToolButton, inkButton_) -#: chat/chatwindow.cpp:2545 -#: rc.cpp:9 +#: chat/chatwindow.cpp:2533 rc.cpp:9 msgid "Handwriting mode" msgstr "Λειτουργία χειρόγραφου" -#: chat/chatwindow.cpp:2554 +#: chat/chatwindow.cpp:2542 msgctxt "Label text" -msgid "Handwriting is disabled: KMess cannot send drawings to some of the contacts." -msgstr "Η λειτουργία χειρόγραφου μηνύματος εχει απενεργοποιηθεί: Το KMess δεν μπορεί να στείλει σχέδια σε ορισμένες από τις επαφές." +msgid "" +"Handwriting is disabled: KMess cannot send drawings to some of the contacts." +msgstr "" +"Η λειτουργία χειρόγραφου μηνύματος εχει απενεργοποιηθεί: Το KMess δεν μπορεί " +"να στείλει σχέδια σε ορισμένες από τις επαφές." -#: chat/chatwindow.cpp:2560 -#, fuzzy +#: chat/chatwindow.cpp:2548 msgctxt "Label text" msgid "Handwriting is disabled: KMess cannot send drawings to this contact." -msgstr "Η λειτουργία χειρόγραφου μηνύματος εχει απενεργοποιηθεί: Το KMess δεν μπορεί να στείλει σχέδια σε ορισμένες από τις επαφές." +msgstr "" +"Η λειτουργία χειρόγραφου μηνύματος εχει απενεργοποιηθεί: Το KMess δεν μπορεί " +"να στείλει χειρόγραφα σχέδια σε αυτή την την επαφή." #. i18n: file: chat/chatwindow.ui:267 #. i18n: ectx: property (toolTip), widget (QToolButton, winksButton_) -#: chat/chatwindow.cpp:2568 -#: rc.cpp:27 +#: chat/chatwindow.cpp:2556 rc.cpp:27 msgid "Winks" msgstr "Νεύματα" -#: chat/chatwindow.cpp:2577 +#: chat/chatwindow.cpp:2565 msgctxt "Label text" msgid "Winks are disabled: KMess cannot send winks to some of the contacts." -msgstr "Τα νεύματα είναι απενεργοποιημένα: Το KMess δεν μπορεί να στείλει νεύματα σε ορισμένες από τις επαφές." +msgstr "" +"Τα νεύματα είναι απενεργοποιημένα: Το KMess δεν μπορεί να στείλει νεύματα σε " +"ορισμένες από τις επαφές." -#: chat/chatwindow.cpp:2583 -#, fuzzy +#: chat/chatwindow.cpp:2571 msgctxt "Label text" msgid "Winks are disabled: KMess cannot send winks to this contact." -msgstr "Τα νεύματα είναι απενεργοποιημένα: Το KMess δεν μπορεί να στείλει νεύματα σε ορισμένες από τις επαφές." +msgstr "" +"Τα νεύματα είναι απενεργοποιημένα: Το KMess δεν μπορεί να στείλει νεύματα σε " +"αυτή την επαφή." #: chat/contactframe.cpp:298 msgid "&Start Private Chat" msgstr "&Ξεκινήστε Ιδιωτική Συνομιλία" -#: chat/contactframe.cpp:299 -#: kmessview.cpp:604 +#: chat/contactframe.cpp:299 kmessview.cpp:601 msgid "&Send Email" msgstr "Αποστολή Email" -#: chat/contactframe.cpp:300 -#: kmessview.cpp:605 +#: chat/contactframe.cpp:300 kmessview.cpp:602 msgid "&View Profile" msgstr "Προβολή προφίλ" -#: chat/contactframe.cpp:302 -#: chat/contactframe.cpp:355 -#: kmessview.cpp:607 +#: chat/contactframe.cpp:302 chat/contactframe.cpp:355 kmessview.cpp:604 msgid "&Properties" msgstr "&Ιδιότητες" -#: chat/contactframe.cpp:304 -#: kmessview.cpp:609 +#: chat/contactframe.cpp:304 kmessview.cpp:606 msgid "&Add Contact" msgstr "Προσθήκη επαφής" -#: chat/contactframe.cpp:305 -#: kmessview.cpp:610 +#: chat/contactframe.cpp:305 kmessview.cpp:607 msgid "A&llow Contact" msgstr "Επιτρεπόμενη επαφή" -#: chat/contactframe.cpp:306 -#: kmessview.cpp:613 +#: chat/contactframe.cpp:306 kmessview.cpp:610 msgid "&Delete Contact" msgstr "&Διαγραφή επαφής" -#: chat/contactframe.cpp:308 -#: kmessview.cpp:611 +#: chat/contactframe.cpp:308 kmessview.cpp:608 msgid "&Block Contact" msgstr "&Φραγή επαφής" -#: chat/contactframe.cpp:309 -#: kmessview.cpp:612 +#: chat/contactframe.cpp:309 kmessview.cpp:609 msgid "&Unblock Contact" msgstr "&Αναίρεση φραγής επαφής" -#: chat/contactframe.cpp:311 -#: kmessview.cpp:616 +#: chat/contactframe.cpp:311 kmessview.cpp:613 msgid "&Friendly Name" msgstr "Ψευδώνυμο" -#: chat/contactframe.cpp:312 -#: kmessview.cpp:617 +#: chat/contactframe.cpp:312 kmessview.cpp:614 msgid "&Personal Message" msgstr "Προσωπικό μήνυμα" -#: chat/contactframe.cpp:313 -#: kmessview.cpp:618 +#: chat/contactframe.cpp:313 kmessview.cpp:615 msgid "&Email Address" msgstr "Διεύθυνση &email" -#: chat/contactframe.cpp:314 -#: kmessview.cpp:619 +#: chat/contactframe.cpp:314 kmessview.cpp:616 msgid "Song &Name" msgstr "&Τίτλος τραγουδιού" #. i18n: file: dialogs/contactpropertiesdialog.ui:24 #. i18n: ectx: attribute (title), widget (QWidget, tab) -#: chat/contactframe.cpp:316 -#: rc.cpp:124 +#: chat/contactframe.cpp:316 rc.cpp:124 msgid "&Information" msgstr "&Πληροφορίες" @@ -752,20 +869,17 @@ #. i18n: file: dialogs/contactpropertiesdialog.ui:342 #. i18n: ectx: attribute (title), widget (QWidget, tab_3) -#: chat/contactframe.cpp:318 -#: rc.cpp:157 +#: chat/contactframe.cpp:318 rc.cpp:157 msgid "&Notes" msgstr "&Σημειώσεις" #. i18n: file: dialogs/contactpropertiesdialog.ui:352 #. i18n: ectx: attribute (title), widget (QWidget, tab_4) -#: chat/contactframe.cpp:319 -#: rc.cpp:160 +#: chat/contactframe.cpp:319 rc.cpp:160 msgid "&Emoticons" msgstr "&Εικονίδια διάθεσης" -#: chat/contactframe.cpp:348 -#: kmessview.cpp:654 +#: chat/contactframe.cpp:348 kmessview.cpp:651 msgid "&Copy" msgstr "&Αντιγραφή" @@ -775,14 +889,21 @@ #: chat/contactframe.cpp:771 #, kde-format -msgctxt "Tooltip for a contact's status icon, arg %1 is the Live Messenger status, like 'Online'" +msgctxt "" +"Tooltip for a contact's status icon, arg %1 is the Live Messenger status, " +"like 'Online'" msgid "The contact is %1" msgstr "Η επαφή είναι %1" #: chat/emoticonswidget.cpp:289 msgctxt "Informative label on the chat's emoticons bar" -msgid "<html><p><b>You have not added any custom emoticons yet.</b></p><p>To add new emoticons, <a href='#'>click here</a>!</p></html>" -msgstr "<html><p><b>Δεν έχετε προσθέσει προσωπικά εικονίδια διάθεσης ακόμα.</b></p><p>Για να προσθέσετε νέα εικονίδια διάθεσης, <a href='#'>πατήστε εδώ</a>!</p></html>" +msgid "" +"<html><p><b>You have not added any custom emoticons yet.</b></p><p>To add " +"new emoticons, <a href='#'>click here</a>!</p></html>" +msgstr "" +"<html><p><b>Δεν έχετε προσθέσει προσωπικά εικονίδια διάθεσης ακόμα.</b></" +"p><p>Για να προσθέσετε νέα εικονίδια διάθεσης, <a href='#'>πατήστε εδώ</a>!</" +"p></html>" #: chat/emoticonswidget.cpp:438 msgid "Add to Chat" @@ -796,15 +917,18 @@ msgid "Edit" msgstr "Επεξεργασία" -#: chat/emoticonswidget.cpp:441 -#: kmess.cpp:579 +#: chat/emoticonswidget.cpp:441 kmess.cpp:579 msgid "Remove" msgstr "Αφαίρεση" #: chat/winkswidget.cpp:106 msgctxt "Informative label on the chat's winks bar" -msgid "<html><p><b>You do not have any winks yet.</b></p><p>To add new ones, have your contacts send you some!</p></html>" -msgstr "<html><p><b>Δεν έχετε κανένα νεύμα ακόμα.</b></p><p>Για να προσθέσετε νέα, ζητήστε στις επαφές σας να σας στείλουν μερικά!</p></html>" +msgid "" +"<html><p><b>You do not have any winks yet.</b></p><p>To add new ones, have " +"your contacts send you some!</p></html>" +msgstr "" +"<html><p><b>Δεν έχετε κανένα νεύμα ακόμα.</b></p><p>Για να προσθέσετε νέα, " +"ζητήστε στις επαφές σας να σας στείλουν μερικά!</p></html>" #: contact/contactbase.cpp:290 msgid "Windows Mobile" @@ -826,8 +950,7 @@ msgid "Windows Media Center" msgstr "Windows Media Center" -#: contact/contactbase.cpp:313 -#: contact/contactbase.cpp:318 +#: contact/contactbase.cpp:313 contact/contactbase.cpp:318 #, kde-format msgid "MSN Messenger %1 compatible" msgstr "Συμβατό MSN Messenger %1" @@ -850,23 +973,16 @@ msgid "Windows Live Messenger compatible" msgstr "Συμβατό Windows Live Messenger" -#: contact/msnstatus.cpp:159 -#: contact/msnstatus.cpp:172 -#: initialview.cpp:85 -#: model/contactlist.cpp:1824 -#: settings/accountpage.cpp:99 +#: contact/msnstatus.cpp:159 contact/msnstatus.cpp:172 initialview.cpp:85 +#: model/contactlist.cpp:1824 settings/accountpage.cpp:98 msgid "Online" msgstr "Σε σύνδεση" -#: contact/msnstatus.cpp:160 -#: initialview.cpp:88 -#: settings/accountpage.cpp:102 +#: contact/msnstatus.cpp:160 initialview.cpp:88 settings/accountpage.cpp:101 msgid "Busy" msgstr "Απασχολημένος" -#: contact/msnstatus.cpp:161 -#: initialview.cpp:86 -#: settings/accountpage.cpp:100 +#: contact/msnstatus.cpp:161 initialview.cpp:86 settings/accountpage.cpp:99 msgid "Away" msgstr "Απουσία" @@ -878,37 +994,27 @@ msgid "Idle" msgstr "Αδρανής" -#: contact/msnstatus.cpp:164 -#: initialview.cpp:87 -#: settings/accountpage.cpp:101 +#: contact/msnstatus.cpp:164 initialview.cpp:87 settings/accountpage.cpp:100 msgid "Be Right Back" msgstr "Παρατεταμένη απουσία" -#: contact/msnstatus.cpp:165 -#: initialview.cpp:90 -#: settings/accountpage.cpp:104 +#: contact/msnstatus.cpp:165 initialview.cpp:90 settings/accountpage.cpp:103 msgid "On the Phone" msgstr "Στο τηλέφωνο" -#: contact/msnstatus.cpp:166 -#: initialview.cpp:89 -#: settings/accountpage.cpp:103 +#: contact/msnstatus.cpp:166 initialview.cpp:89 settings/accountpage.cpp:102 msgid "Out to Lunch" msgstr "Για γεύμα" -#: contact/msnstatus.cpp:167 -#: initialview.cpp:91 -#: settings/accountpage.cpp:105 +#: contact/msnstatus.cpp:167 initialview.cpp:91 settings/accountpage.cpp:104 msgid "Invisible" msgstr "Αόρατος" -#: contact/msnstatus.cpp:168 -#: model/contactlist.cpp:1825 +#: contact/msnstatus.cpp:168 model/contactlist.cpp:1825 msgid "Offline" msgstr "Χώρίς σύνδεση" -#: contact/msnstatus.cpp:195 -#: contact/msnstatus.cpp:197 +#: contact/msnstatus.cpp:195 contact/msnstatus.cpp:197 msgid "&My Status" msgstr "&Κατάσταση" @@ -921,8 +1027,7 @@ msgid "Add a Contact" msgstr "Προσθήκη μίας επαφής" -#: dialogs/addemoticondialog.cpp:61 -#: dialogs/addemoticondialog.cpp:277 +#: dialogs/addemoticondialog.cpp:61 dialogs/addemoticondialog.cpp:277 msgid "Add New Emoticon" msgstr "Προσθήκη νέου εικονιδίου διάθεσης" @@ -930,11 +1035,11 @@ msgid "Edit Emoticon" msgstr "Επεξεργασία εικονιδίου διάθεσης" -#: dialogs/addemoticondialog.cpp:276 -#: settings/emoticonspage.cpp:135 +#: dialogs/addemoticondialog.cpp:276 settings/emoticonspage.cpp:135 #, kde-format msgid "The emoticon \"%1\" already exists. Do you want to replace it?" -msgstr "Το εικονίδιο διάθεσης « %1 » υπάρχει ήδη. Επιθυμείτε την αντικατάστασή του;" +msgstr "" +"Το εικονίδιο διάθεσης « %1 » υπάρχει ήδη. Επιθυμείτε την αντικατάστασή του;" #: dialogs/awaymessagedialog.cpp:37 msgid "Automatic Away Message" @@ -948,8 +1053,15 @@ #: dialogs/chathistorydialog.cpp:260 #, kde-format msgctxt "Dialog box text" -msgid "There has been an error while opening your logs. This is commonly a permission problem, check if you have read/write access to directory <i>"%1"</i>. Otherwise, your logs may be corrupted." -msgstr "Παρουσιάστηκε σφάλμα κατά το άνοιγμα των αρχείων καταγραφών. Συνήθως είναι πρόβλημα αδειών, βεβαιωθείτε ότι έχετε άδεια ανάγνωσης/εγγραφής στον κατάλογο <i>"%1"</i>. Διαφορετικά, τα αρχεία καταγραφών μπορεί να είναι κατεστραμμένα." +msgid "" +"There has been an error while opening your logs. This is commonly a " +"permission problem, check if you have read/write access to directory " +"<i>"%1"</i>. Otherwise, your logs may be corrupted." +msgstr "" +"Παρουσιάστηκε σφάλμα κατά το άνοιγμα των αρχείων καταγραφών. Συνήθως είναι " +"πρόβλημα αδειών, βεβαιωθείτε ότι έχετε άδεια ανάγνωσης/εγγραφής στον " +"κατάλογο <i>"%1"</i>. Διαφορετικά, τα αρχεία καταγραφών μπορεί να " +"είναι κατεστραμμένα." #: dialogs/chathistorydialog.cpp:265 msgctxt "Dialog box title" @@ -993,21 +1105,16 @@ msgid "Contact Properties for %1" msgstr "Ιδιότητες της επαφής %1" -#: dialogs/contactpropertiesdialog.cpp:399 -#: kmess.cpp:815 -#: kmessview.cpp:1192 -#: network/msnsockethttp.cpp:195 -#: network/msnsockettcp.cpp:391 +#: dialogs/contactpropertiesdialog.cpp:399 kmess.cpp:815 kmessview.cpp:1188 +#: network/msnsockethttp.cpp:195 network/msnsockettcp.cpp:391 msgid "Connected" msgstr "Σε Σύνδεση" -#: dialogs/contactpropertiesdialog.cpp:403 -#: kmessview.cpp:1196 +#: dialogs/contactpropertiesdialog.cpp:403 kmessview.cpp:1192 msgid "Not seen yet" msgstr "Δεν εμφανίστηκε ακόμα" -#: dialogs/contactpropertiesdialog.cpp:412 -#: kmessview.cpp:1211 +#: dialogs/contactpropertiesdialog.cpp:412 kmessview.cpp:1207 msgid "No messages yet" msgstr "Κανένα μήνυμα ακόμα" @@ -1038,7 +1145,8 @@ #: dialogs/contactpropertiesdialog.cpp:661 msgctxt "Dialog box text" msgid "Are you sure you want to use the display picture of this contact?" -msgstr "Είστε σίγουρος ότι θέλετε να χρησιμοποιήσετε το avatar αυτής της επαφής;" +msgstr "" +"Είστε σίγουρος ότι θέλετε να χρησιμοποιήσετε το avatar αυτής της επαφής;" #: dialogs/contactpropertiesdialog.cpp:663 msgid "Copy Contact Picture" @@ -1085,10 +1193,8 @@ #. i18n: file: dialogs/networkwindow.ui:13 #. i18n: ectx: property (windowTitle), widget (QWidget, NetworkWindow) -#: dialogs/networkwindow.cpp:57 -#: dialogs/networkwindow.cpp:1279 -#: dialogs/networkwindow.cpp:1306 -#: rc.cpp:220 +#: dialogs/networkwindow.cpp:57 dialogs/networkwindow.cpp:1279 +#: dialogs/networkwindow.cpp:1306 rc.cpp:220 msgid "Network Window" msgstr "Παράθυρο δικτύου" @@ -1113,31 +1219,44 @@ "Αδύνατο το άνοιγμα του παραθύρου δικτύου." #: dialogs/networkwindow.cpp:1130 -msgid "Could not save the Network Window log. Make sure you have permission to write in the folder where it is being saved." -msgstr "Δεν ήταν δυνατή η αποθήκευση της καταγραφής του παράθυρου δικτύου. σιγουρευτείτε πως έχετε άδεια εγγραφής στον φάκελο που γίνεται η αποθήκευση." +msgid "" +"Could not save the Network Window log. Make sure you have permission to " +"write in the folder where it is being saved." +msgstr "" +"Δεν ήταν δυνατή η αποθήκευση της καταγραφής του παράθυρου δικτύου. " +"σιγουρευτείτε πως έχετε άδεια εγγραφής στον φάκελο που γίνεται η αποθήκευση." #: dialogs/networkwindow.cpp:1177 msgid "Cannot close the main connection tab." msgstr "Αδύνατο το κλείσιμο του κεντρικού παραθύρου σύνδεσης." #: dialogs/networkwindow.cpp:1273 -msgid "Sending commands to the server is a risky operation.<br />If you do not know how to exactly do it, you could be lucky and just get disconnected, or <i>you may incur in more serious consequences</i>.<br />You have been warned!<br /><b>Do you want to continue sending this message?</b>" -msgstr "Η αποστολή εντολών στον εξυπηρετητή είναι επικίνδυνο.<br />Αν δεν γνωρίζετε πως ακριβώς να το κάνετε, μπορείτε να σταθείτε τυχερός και απλά να αποσυνδεθείτε, ή <i>μπορεί να έχετε σοβαρότερες συνέπειες</i>.<br />Έχετε προειδοποιηθεί!<br /><b>Θέλετε να συνεχίσετε με την αποστολή του μηνύματος;</b>" +msgid "" +"Sending commands to the server is a risky operation.<br />If you do not know " +"how to exactly do it, you could be lucky and just get disconnected, or " +"<i>you may incur in more serious consequences</i>.<br />You have been warned!" +"<br /><b>Do you want to continue sending this message?</b>" +msgstr "" +"Η αποστολή εντολών στον εξυπηρετητή είναι επικίνδυνο.<br />Αν δεν γνωρίζετε " +"πως ακριβώς να το κάνετε, μπορείτε να σταθείτε τυχερός και απλά να " +"αποσυνδεθείτε, ή <i>μπορεί να έχετε σοβαρότερες συνέπειες</i>.<br />Έχετε " +"προειδοποιηθεί!<br /><b>Θέλετε να συνεχίσετε με την αποστολή του μηνύματος;</" +"b>" #: dialogs/networkwindow.cpp:1303 msgid "" -"The payload you are trying to send does not end with the required newline ('\\r\\n" -"')!<br />Do you want KMess to add it for you?" +"The payload you are trying to send does not end with the required newline " +"('\\r\\n')!<br />Do you want KMess to add it for you?" msgstr "" -"Το ωφέλιμο φορτίο που προσπαθείτε να στείλετε δεν τελειώνει με την απαραίτητη νέα γραμμή ('\\r\\n" -"')!<br />Θέλετε το KMess να την προσθέσει για εσάς;" +"Το ωφέλιμο φορτίο που προσπαθείτε να στείλετε δεν τελειώνει με την " +"απαραίτητη νέα γραμμή ('\\r\\n')!<br />Θέλετε το KMess να την προσθέσει για " +"εσάς;" #: dialogs/networkwindow.cpp:1379 msgid "Cannot send commands to this kind of connection!" msgstr "Αδύνατη η αποστολή αυτής της εντολής γι αυτόν τον τύπο σύνδεσης!" -#: dialogs/transferentry.cpp:132 -#: network/applications/filetransfer.cpp:127 +#: dialogs/transferentry.cpp:132 network/applications/filetransfer.cpp:127 #: network/applications/filetransfer.cpp:658 #: network/applications/filetransferp2p.cpp:99 #: network/applications/filetransferp2p.cpp:766 @@ -1154,22 +1273,19 @@ msgid "Completed" msgstr "Ολοκληρώθηκε" -#: dialogs/transferentry.cpp:270 -#: network/applications/filetransfer.cpp:635 +#: dialogs/transferentry.cpp:270 network/applications/filetransfer.cpp:635 #: network/applications/filetransferp2p.cpp:741 #, kde-format msgid "%1 MB" msgstr "%1 MB" -#: dialogs/transferentry.cpp:275 -#: network/applications/filetransfer.cpp:640 +#: dialogs/transferentry.cpp:275 network/applications/filetransfer.cpp:640 #: network/applications/filetransferp2p.cpp:746 #, kde-format msgid "%1 kB" msgstr "%1 kB" -#: dialogs/transferentry.cpp:279 -#: network/applications/filetransfer.cpp:644 +#: dialogs/transferentry.cpp:279 network/applications/filetransfer.cpp:644 #: network/applications/filetransferp2p.cpp:750 #, kde-format msgid "%1 bytes" @@ -1191,8 +1307,7 @@ #. i18n: file: settings/miscellaneouspage.ui:285 #. i18n: ectx: attribute (title), widget (QWidget, tab_3) -#: dialogs/transferwindow.cpp:52 -#: rc.cpp:874 +#: dialogs/transferwindow.cpp:52 rc.cpp:880 msgid "File Transfers" msgstr "Μεταφορές αρχείων" @@ -1200,8 +1315,7 @@ msgid "&Use" msgstr "&Χρήση" -#: dialogs/userpicturesdialog.cpp:44 -#: settings/accountsettingsdialog.cpp:60 +#: dialogs/userpicturesdialog.cpp:44 settings/accountsettingsdialog.cpp:60 msgid "&Delete" msgstr "&Διαγραφή" @@ -1220,8 +1334,12 @@ #: emoticontheme.cpp:627 #, kde-format -msgid "Could not save the emoticon theme. Make sure you have permission to write to the theme folder '%1'." -msgstr "Δεν ήταν δυνατή η αποθήκευση του θέματος εικονιδίων διάθεσης. σιγουρευτείτε πως έχετε άδεια εγγραφής στο φάκελο θεμάτων « %1 »." +msgid "" +"Could not save the emoticon theme. Make sure you have permission to write to " +"the theme folder '%1'." +msgstr "" +"Δεν ήταν δυνατή η αποθήκευση του θέματος εικονιδίων διάθεσης. σιγουρευτείτε " +"πως έχετε άδεια εγγραφής στο φάκελο θεμάτων « %1 »." #: emoticontheme.cpp:833 msgid "Smile" @@ -1547,14 +1665,18 @@ #: initialview.cpp:258 msgctxt "Status message on login screen" msgid "Cannot reconnect: this account has no saved password" -msgstr "Αδύνατη η επανασύνδεση: αυτός ο λογαριασμός δεν εχει αποθηκευμένο κωδικό" +msgstr "" +"Αδύνατη η επανασύνδεση: αυτός ο λογαριασμός δεν εχει αποθηκευμένο κωδικό" -#: initialview.cpp:286 -#: initialview.cpp:393 +#: initialview.cpp:286 initialview.cpp:393 #, kde-format msgctxt "Status message on login screen" -msgid "Waiting for an Internet connection to reconnect...<br /><a href='%1'>Reconnect now!</a>" -msgstr "Αναμονή σύνδεσης στο διαδίκτυο για επανασύνδεση...<br /><a href='%1'>Επανασύνδεση τώρα!</a>" +msgid "" +"Waiting for an Internet connection to reconnect...<br /><a href='%" +"1'>Reconnect now!</a>" +msgstr "" +"Αναμονή σύνδεσης στο διαδίκτυο για επανασύνδεση...<br /><a href='%" +"1'>Επανασύνδεση τώρα!</a>" #: initialview.cpp:398 msgctxt "Status message on login screen" @@ -1564,10 +1686,17 @@ #: initialview.cpp:419 #, kde-format msgctxt "Status message on login screen" -msgid "Waiting %1 second before reconnection...<br /><a href='%2'>Reconnect now!</a>" -msgid_plural "Waiting %1 seconds before reconnection...<br /><a href='%2'>Reconnect now!</a>" -msgstr[0] "Αναμονή %1 δευτερολέπτου πριν την επανασύνδεση... <br /><a href='2'>Επανασύνδεση τώρα!</a>" -msgstr[1] "Αναμονή %1 δευτερολέπτων πριν την επανασύνδεση...<br /><a href='%2'>Επανασύνδεση τώρα!</a>" +msgid "" +"Waiting %1 second before reconnection...<br /><a href='%2'>Reconnect now!</a>" +msgid_plural "" +"Waiting %1 seconds before reconnection...<br /><a href='%2'>Reconnect now!</" +"a>" +msgstr[0] "" +"Αναμονή %1 δευτερολέπτου πριν την επανασύνδεση... <br /><a " +"href='2'>Επανασύνδεση τώρα!</a>" +msgstr[1] "" +"Αναμονή %1 δευτερολέπτων πριν την επανασύνδεση...<br /><a href='%" +"2'>Επανασύνδεση τώρα!</a>" #: initialview.cpp:614 msgctxt "Button label" @@ -1592,7 +1721,8 @@ #: kmess.cpp:218 #, kde-format msgid "<html>The contact <b>%1</b> is already in your contact list.</html>" -msgstr "<html>Η επαφή <b>%1</b> Η επαφή %1 υπάρχει ήδη στη λίστα επαφών σας.</html>" +msgstr "" +"<html>Η επαφή <b>%1</b> Η επαφή %1 υπάρχει ήδη στη λίστα επαφών σας.</html>" #: kmess.cpp:218 msgid "Contact Information" @@ -1613,8 +1743,12 @@ #: kmess.cpp:576 #, kde-format -msgid "<qt>Are you sure you want to remove the contact <b>%1</b> from your contact list?</qt>" -msgstr "<qt>Επιθυμείτε σίγουρα την αφαίρεση της επαφής <b>%1</b> από την λιστα επαφών σας;</qt>" +msgid "" +"<qt>Are you sure you want to remove the contact <b>%1</b> from your contact " +"list?</qt>" +msgstr "" +"<qt>Επιθυμείτε σίγουρα την αφαίρεση της επαφής <b>%1</b> από την λιστα " +"επαφών σας;</qt>" #: kmess.cpp:578 msgid "Remove Contact" @@ -1627,11 +1761,14 @@ #: kmess.cpp:626 #, kde-format msgctxt "dialog text" -msgid "The group <b>%1</b> is not empty! First remove all contacts from it, then try again!" -msgstr "Η ομάδα <b>%1</b> δεν είναι κενή! Πρώτα αφαιρέστε όλες τις επαφές από αυτή την ομάδα, και έπειτα προσπαθήστε ξανά!" +msgid "" +"The group <b>%1</b> is not empty! First remove all contacts from it, then " +"try again!" +msgstr "" +"Η ομάδα <b>%1</b> δεν είναι κενή! Πρώτα αφαιρέστε όλες τις επαφές από αυτή " +"την ομάδα, και έπειτα προσπαθήστε ξανά!" -#: kmess.cpp:628 -#: kmess.cpp:635 +#: kmess.cpp:628 kmess.cpp:635 msgctxt "dialog title" msgid "Group Removal" msgstr "Αφαίρεση ομάδας" @@ -1639,8 +1776,12 @@ #: kmess.cpp:633 #, kde-format msgctxt "dialog text" -msgid "<qt>Are you sure you want to remove the group <b>%1</b> from your contact list?</qt>" -msgstr "<qt>Επιθυμείτε σίγουρα τη αφαίρεση της ομάδας <b>%1</b> από τη λίστα επαφών σας;</qt>" +msgid "" +"<qt>Are you sure you want to remove the group <b>%1</b> from your contact " +"list?</qt>" +msgstr "" +"<qt>Επιθυμείτε σίγουρα τη αφαίρεση της ομάδας <b>%1</b> από τη λίστα επαφών " +"σας;</qt>" #: kmess.cpp:636 msgctxt "dialog button" @@ -1662,8 +1803,12 @@ #: kmess.cpp:754 #, kde-format msgctxt "dialog text" -msgid "<p>Cannot login automatically with account <b>%1</b>:<br/>you must first save the account password!</p>" -msgstr "<p>Η αυτόματη σύνδεση δεν είναι δυνατή για το λογαριασμό <b>%1</b>:<br/>πρέπει πρώτα να αποθηκεύσετε τον κωδικό του λογαριασμού!</p>" +msgid "" +"<p>Cannot login automatically with account <b>%1</b>:<br/>you must first " +"save the account password!</p>" +msgstr "" +"<p>Η αυτόματη σύνδεση δεν είναι δυνατή για το λογαριασμό <b>%1</b>:<br/" +">πρέπει πρώτα να αποθηκεύσετε τον κωδικό του λογαριασμού!</p>" #: kmess.cpp:757 msgctxt "dialog title" @@ -1681,15 +1826,26 @@ #: kmess.cpp:1451 #, kde-format -msgctxt "Paragraph to be added to the text of a message dialog box, but only when KDE gives a list of folders where to search for an application file" +msgctxt "" +"Paragraph to be added to the text of a message dialog box, but only when KDE " +"gives a list of folders where to search for an application file" msgid "<p>KMess has searched for it in the following folders:<br>%1</p>" msgstr "<p>Το KMess έψαξε γι' αυτό στους παρακάτω φακέλους:<br>%1</p>" #: kmess.cpp:1463 #, kde-format -msgctxt "Text for a message dialog box; %1 is an explanation about the list of folders where the file was searched for, which is only shown if any folders are found" -msgid "<html><p>KMess will not be able to play sounds nor show notifications.</p><p>The required file 'kmess.notifyrc' could not be found in any application folder.</p>%1<p>Please verify your installation.</p></html>" -msgstr "<html><p>Το KMess δεν θα μπορεί να παίξει ήχους ή να εμφανίσει ειδοποιήσεις.</p><p>Το απαραίτητο αρχείο 'kmess.notifyrc' δεν βρέθηκε σε κανένα φάκελο εφαρμογών.</p>%1<p>Παρακαλώ ελέγξτε την εγκατάστασή σας.</p></html>" +msgctxt "" +"Text for a message dialog box; %1 is an explanation about the list of " +"folders where the file was searched for, which is only shown if any folders " +"are found" +msgid "" +"<html><p>KMess will not be able to play sounds nor show notifications.</" +"p><p>The required file 'kmess.notifyrc' could not be found in any " +"application folder.</p>%1<p>Please verify your installation.</p></html>" +msgstr "" +"<html><p>Το KMess δεν θα μπορεί να παίξει ήχους ή να εμφανίσει ειδοποιήσεις." +"</p><p>Το απαραίτητο αρχείο 'kmess.notifyrc' δεν βρέθηκε σε κανένα φάκελο " +"εφαρμογών.</p>%1<p>Παρακαλώ ελέγξτε την εγκατάστασή σας.</p></html>" #: kmess.cpp:1469 msgctxt "Message box title" @@ -1698,14 +1854,14 @@ #: kmess.cpp:1747 #, kde-format -msgctxt "Main window caption: switched order to easily distinguish it from chats" +msgctxt "" +"Main window caption: switched order to easily distinguish it from chats" msgid "KMess - %1" msgstr "KMess - %1" #. i18n: file: initialview.ui:332 #. i18n: ectx: property (text), widget (QPushButton, connectButton_) -#: kmessinterface.cpp:160 -#: rc.cpp:306 +#: kmessinterface.cpp:160 rc.cpp:306 msgid "&Connect" msgstr "&Σύνδεση" @@ -1765,8 +1921,7 @@ msgid "&Export Contact List..." msgstr "Εξαγωγή της λίστας επαφών..." -#: kmessinterface.cpp:183 -#: kmessview.cpp:606 +#: kmessinterface.cpp:183 kmessview.cpp:603 msgid "Show Chat &History..." msgstr "Εμφάνιση ιστορικού συνομιλιών..." @@ -1818,114 +1973,112 @@ msgid "Show &Network Window..." msgstr "Εμφάνιση παραθύρου δικτύου..." -#: kmessview.cpp:322 +#: kmessview.cpp:319 #, kde-format msgid "[%1] Logged in with %2" msgstr "[%1] Σύνδεση ως %2" -#: kmessview.cpp:359 +#: kmessview.cpp:356 #, kde-format msgid "[%1] %2 goes online" msgstr "[%1]Ο χρήστης %2 συνδέθηκε" -#: kmessview.cpp:364 +#: kmessview.cpp:361 #, kde-format msgid "[%1] %2 goes offline" msgstr "[%1]Ο χρήστης %2 αποσυνδέθηκε" -#: kmessview.cpp:603 +#: kmessview.cpp:600 msgid "Cha&t" msgstr "Συνομιλία" -#: kmessview.cpp:614 +#: kmessview.cpp:611 msgid "&Remove From Group" msgstr "Αφαίρεση από την Ομάδα" -#: kmessview.cpp:647 +#: kmessview.cpp:644 msgid "&Copy to Group" msgstr "Αντιγραφή στην Ομάδα" -#: kmessview.cpp:648 +#: kmessview.cpp:645 msgid "&Move to Group" msgstr "Μετακίνηση στην Ομάδα" -#: kmessview.cpp:699 +#: kmessview.cpp:696 msgid "Move Group &Down" msgstr "Μετακινήστε την Ομάδα προς τα Κάτω" -#: kmessview.cpp:700 +#: kmessview.cpp:697 msgid "Move Group &Up" msgstr "Μετακινήστε την Ομάδα προς τα Πάνω" -#: kmessview.cpp:701 +#: kmessview.cpp:698 msgid "Re&move Group" msgstr "Αφαίρεση ομάδας" -#: kmessview.cpp:702 +#: kmessview.cpp:699 msgid "Re&name Group" msgstr "Μετονoμασία ομάδας" -#: kmessview.cpp:1147 +#: kmessview.cpp:1144 msgctxt "Message in list tooltip" msgid "This contact does not have you in his or her contact list." msgstr "Αυτή η επαφή δεν σας εχει στην λίστα επαφών της" -#: kmessview.cpp:1157 +#: kmessview.cpp:1153 msgctxt "Contact email label in list tooltip" msgid "Email address" msgstr "Διεύθυνση email" -#: kmessview.cpp:1164 +#: kmessview.cpp:1160 msgctxt "Contact Live Messenger client label in list tooltip" msgid "Client" msgstr "Πελάτης" -#: kmessview.cpp:1176 +#: kmessview.cpp:1172 msgid "Yes" msgstr "Ναι" -#: kmessview.cpp:1180 +#: kmessview.cpp:1176 msgid "No" msgstr "Όχι" -#: kmessview.cpp:1183 +#: kmessview.cpp:1179 msgctxt "Contact blocked status label in list tooltip" msgid "Blocked" msgstr "Σε φραγή" -#: kmessview.cpp:1203 +#: kmessview.cpp:1199 msgctxt "Contact last presence label in list tooltip" msgid "Last seen" msgstr "Τελευταία παρουσία" -#: kmessview.cpp:1218 +#: kmessview.cpp:1214 msgctxt "Contact last message label in list tooltip" msgid "Last message" msgstr "Τελευταίο μήνυμα" -#: kmessview.cpp:1228 +#: kmessview.cpp:1224 #, kde-format msgctxt "Group name in group tooltip" msgid "Group <b>%1</b>" msgstr "Oμάδα <b>%1</b>" -#: kmessview.cpp:1236 -#, kde-format +#: kmessview.cpp:1232, kde-format msgctxt "Contact counters in normal group tooltip, first part" msgid "%1 contact, " msgid_plural "%1 contacts, " -msgstr[0] "%1 επαφή" -msgstr[1] "%1 επαφές" +msgstr[0] "%1 επαφή," +msgstr[1] "%1 επαφές," -#: kmessview.cpp:1239 -#, kde-format +#: kmessview.cpp:1235, kde-format msgctxt "Contact counters in normal group tooltip, second part" msgid "%1 online" msgid_plural "%1 online" -msgstr[0] "Σε σύνδεση" -msgstr[1] "%1 σε σύνδεση" +msgstr[0] "%1 Σε σύνδεση" +msgstr[1] "%1 Σε σύνδεση" -#: kmessview.cpp:1245 +#: kmessview.cpp:1241 #, kde-format msgctxt "Contacts count in special group tooltip" msgid "%1 contact" @@ -1933,31 +2086,40 @@ msgstr[0] "%1 επαφή" msgstr[1] "%1 επαφές" -#: kmessview.cpp:1672 +#: kmessview.cpp:1668 msgctxt "Default personal message shown in the contact list" msgid "<Enter your personal message here>" msgstr "<Γράψτε το προσωπικό σας μήνυμα>" -#: kmessview.cpp:1673 +#: kmessview.cpp:1669 msgctxt "Default personal message tooltip" -msgid "Enter here a message to show to your contacts: they will see it along with your friendly name" -msgstr "Γράψτε εδώ ένα μήνυμα για να δείξετε στις επαφές σας: θα εμφανίζεται μαζί με το ψευδώνυμό σας" +msgid "" +"Enter here a message to show to your contacts: they will see it along with " +"your friendly name" +msgstr "" +"Γράψτε εδώ ένα μήνυμα για να δείξετε στις επαφές σας: θα εμφανίζεται μαζί με " +"το ψευδώνυμό σας" -#: kmessview.cpp:1860 +#: kmessview.cpp:1856 msgid "No chat logs could be found for this contact." -... [truncated message content] |
From: <pan...@us...> - 2009-07-15 16:43:35
|
Revision: 5076 http://kmess.svn.sourceforge.net/kmess/?rev=5076&view=rev Author: pano9000 Date: 2009-07-15 16:43:31 +0000 (Wed, 15 Jul 2009) Log Message: ----------- Merged an updated Finnish translation by Antony Hussi | 0f0u Modified Paths: -------------- branches/kmess/kmess-2.0.x/ChangeLog branches/kmess/kmess-2.0.x/po/fi.po Modified: branches/kmess/kmess-2.0.x/ChangeLog =================================================================== --- branches/kmess/kmess-2.0.x/ChangeLog 2009-07-15 11:39:33 UTC (rev 5075) +++ branches/kmess/kmess-2.0.x/ChangeLog 2009-07-15 16:43:31 UTC (rev 5076) @@ -2,6 +2,7 @@ 2009-07-15 (Pano) * Merged an updated Greek translation by Dimitrios Glentadakis. + * Merged an updated Finnish translation by Antoni Hussy. 2009-07-14 (Valerio) * Removed BinReloc, AutoPackage, and the other packaging support files. Modified: branches/kmess/kmess-2.0.x/po/fi.po =================================================================== --- branches/kmess/kmess-2.0.x/po/fi.po 2009-07-15 11:39:33 UTC (rev 5075) +++ branches/kmess/kmess-2.0.x/po/fi.po 2009-07-15 16:43:31 UTC (rev 5076) @@ -12,7 +12,7 @@ "Project-Id-Version: fi\n" "Report-Msgid-Bugs-To: http://www.kmess.org/board/\n" "POT-Creation-Date: 2009-07-13 20:29+0200\n" -"PO-Revision-Date: 2009-06-24 13:38+0300\n" +"PO-Revision-Date: 2009-07-15 18:42+0200\n" "Last-Translator: Antony Hussi <ant...@tr...>\n" "Language-Team: American English <ant...@tr...>\n" "MIME-Version: 1.0\n" @@ -102,13 +102,13 @@ #, kde-format msgctxt "Name of a chat tab" msgid "%1 and %2" -msgstr "%1 ja %2 " +msgstr "%1, ja %2 " #: chat/chat.cpp:365 #, kde-format msgctxt "Name of a chat tab" msgid "%1 et al." -msgstr "%1 ja muut" +msgstr "%1, ja muut" #: chat/chat.cpp:661 #, kde-format @@ -122,7 +122,8 @@ "<html>KMess could not save the log for this chat:<br />The chat logs " "directory, "%1", does not exist.</html>" msgstr "" -"<html>Ei voitu tallentaa viestejä keskustelusta:<br />Hakemistoa "%" +"<html>KMess ei voinnu kirjata viestejä keskustelusta:<br />Hakemistoa " +""%" "1" ei ole olemassa.</html>" #: chat/chat.cpp:969 @@ -173,12 +174,11 @@ "messages yet." msgstr "%1 Lähetti toiminta-viestin. Ominaisuutta ei ole tuettuna." -#: chat/chat.cpp:1216 -#, fuzzy, kde-format +#: chat/chat.cpp:1216, kde-format msgctxt "Warning message shown in chat, %1 is the contact's friendly name" msgid "" "%1 has sent you a Live Messenger feature that KMess does not support yet." -msgstr "%! Lähetti Live Messenger! ominaisuuden. Ominaisuutta ei ole tuettuna." +msgstr "%1 Lähetti Live Messenger ominaisuuden, jota KMess ei vielä tue." #: chat/chat.cpp:1242 #, kde-format @@ -219,18 +219,16 @@ msgid "%1 has sent you a wink: "%2"!" msgstr "%1 lähetti vinkkauksen: "%2"!" -#: chat/chat.cpp:1311 -#, fuzzy, kde-format +#: chat/chat.cpp:1311, kde-format msgctxt "Message shown in the chat window, %1 is the contact's friendly name" msgid "" "You received a wink from %1, but it could not be displayed. Make sure you " "have the "cabextract" program installed." msgstr "" -"<html>Vastaanotit vinkkauksen %1, muttei pystytty näyttämään. Tarkista " -"onko"cabextract" paketti asennettuna.</html>" +"Vastaanotit vinkkauksen %1, ei voitu näyttämään. Tarkista " +"onko "cabextract" paketti asennettuna." -#: chat/chat.cpp:1320 -#, fuzzy, kde-format +#: chat/chat.cpp:1320, kde-format msgctxt "" "Message shown in the chat window, %1 is the contact's friendly name, %2 is " "the wink name" @@ -238,18 +236,17 @@ "You received the "%2" wink from %1, but it could not be displayed. " "Make sure you have the "cabextract" program installed." msgstr "" -"<html>Vastaanotit "%2" vinkkauksen %1, mutta ei voitu näyttämään. " -"Tarkista että olet asentanu paketin "cabextract".</html>" +"Vastaanotit "%2" vinkkauksen %1, mutta ei voitu näyttää. " +"Tarkista onko "cabextract"paketti asennettuna." -#: chat/chat.cpp:1332 -#, fuzzy, kde-format +#: chat/chat.cpp:1332, kde-format msgctxt "Message shown in the chat window, %1 is the contact's friendly name" msgid "" "You received a wink from %1, but it could not be displayed. Extracting the " "wink package with "cabextract" has failed." msgstr "" -"<html>Vastaanotit vinkkauksen %1, mutta ei voitu näyttää. Purkaminen " -"epäonnistui paketistä käyttäen "cabextract".</html>" +"Vastaanotit vinkkauksen %1, mutta ei voitu näyttää. Purkaminen " +"vinkkaus-paketistä epäonnistui käyttäen "cabextract"." #: chat/chat.cpp:1341 #, kde-format @@ -263,18 +260,16 @@ "<html>Vastaanotit "%2" vinkkauksen %1, mutta ei voitu näyttää. " "Purkaaminen epäonnistui paketistä käyttäen "cabextract".</html>" -#: chat/chat.cpp:1353 -#, fuzzy, kde-format +#: chat/chat.cpp:1353, kde-format msgctxt "Message shown in the chat window, %1 is the contact's friendly name" msgid "" "You received a wink from %1, but it could not be displayed. The data could " "not be read." msgstr "" -"<html>Vastaanotit vinkkauksen %1, mutta ei voitu näyttämään. Tietoa ei " -"pystytty lukemaan.</html>" +"Vastaanotit vinkkauksen %1, mutta ei voitu näyttää. Tietoa ei " +"pystytty lukemaan." -#: chat/chat.cpp:1362 -#, fuzzy, kde-format +#: chat/chat.cpp:1362, kde-format msgctxt "" "Message shown in the chat window, %1 is the contact's friendly name, %2 is " "the wink name" @@ -282,32 +277,28 @@ "You received the "%2" wink from %1, but it could not be displayed. " "The data could not be read." msgstr "" -"<html>Vastaanotit "%2" vinkkauksen %1, mutta ei voitu näyttämään. " -"Tietoa ei pystytty lukemaan.</html>" +"Vastaanotit "%2" vinkkauksen %1, mutta ei voitu näyttää. " +"Tietoa ei pystytty lukemaan." -#: chat/chat.cpp:1404 -#, fuzzy, kde-format +#: chat/chat.cpp:1404, kde-format msgid "" "%1 has gone offline. Any messages you send will be delivered the next time " "he or she logs in." msgstr "" -"<html>%1 katkaisi yhteyden. Viestit jotka tämän jälkeen lähetetäään. " -"Toimitetaan seuraavana kerran hänen kirjautuessa sisään.</html>" +"%1 poistui. Viestit jotka tämän jälkeen lähetetäään. " +"Toimitetaan seuraavalla kerran hänen kirjautuessa sisään." -#: chat/chat.cpp:1409 -#, fuzzy, kde-format +#: chat/chat.cpp:1409, kde-format msgid "%1 has gone offline." -msgstr "<html>%1 poistui.</html>" +msgstr "%1 poistui." -#: chat/chat.cpp:1419 -#, fuzzy, kde-format +#: chat/chat.cpp:1419, kde-format msgid "%1 has changed his or her status to "%2"." -msgstr "<html>%1 Vaihtoi tilakseen "%2"</html>" +msgstr "%1 vsaihtoi tilakseen "%2"" -#: chat/chat.cpp:1450 -#, fuzzy, kde-format +#: chat/chat.cpp:1450, kde-format msgid "%1 has sent you a nudge!" -msgstr "<html>%1 lähetti herätteen</html>" +msgstr "%1 lähetti herätteen" #: chat/chat.cpp:1483 msgctxt "" @@ -320,13 +311,13 @@ #, kde-format msgctxt "Error message shown in chat, %1 is the contact's friendly name" msgid "Failed to send the nudge to %1." -msgstr "<html>Epäonnistui herätteen lähettämistä käyttäjälle %1.</html>" +msgstr "Epäonnistui herätteen lähettämistä käyttäjälle %1." #: chat/chat.cpp:1501 #, kde-format msgctxt "Error message shown in chat, %1 is the contact's friendly name" msgid "Failed to send the wink to %1." -msgstr "<html>Epäonnistui lähettämään vinkkauksen käyttäjälle %1.</html>" +msgstr "Epäonnistui lähettämään vinkkauksen käyttäjälle %1." #: chat/chat.cpp:1511 #, kde-format @@ -415,7 +406,7 @@ #: chat/chatmessageview.cpp:1143 msgid "Find &Text..." -msgstr "Löydä teksti..." +msgstr "Etsi teksti" #: chat/chatstatusbar.cpp:49 msgctxt "@action:button" @@ -455,12 +446,12 @@ #: chat/chatview.cpp:485 network/applications/filetransfer.cpp:261 #: network/applications/filetransferp2p.cpp:347 msgid "Overwrite File" -msgstr "Ylikirjoita tiedosto" +msgstr "Päällekirjoita tiedosto" #: chat/chatview.cpp:486 network/applications/filetransfer.cpp:261 #: network/applications/filetransferp2p.cpp:347 msgid "Over&write" -msgstr "Yli&kirjoita" +msgstr "Päällekirjoita" #: chat/chatview.cpp:842 msgid "Add this &Emoticon..." @@ -536,11 +527,11 @@ #: chat/chatwindow.cpp:422 msgid "&Invite..." -msgstr "Kutsu..." +msgstr "Kutsu" #: chat/chatwindow.cpp:423 msgid "Send a &File..." -msgstr "Lähetä tiedosto..." +msgstr "Lähetä tiedosto" #: chat/chatwindow.cpp:424 msgid "Webcam Chat" @@ -584,11 +575,11 @@ #: chat/chatwindow.cpp:451 msgid "Use &Spell Checking" -msgstr "Käytä oikeankirjoituksen tarkistamista" +msgstr "Käytä oikeinkirjoituksen tarkistamista" #: chat/chatwindow.cpp:455 msgid "Meeting" -msgstr "Ryhmäkeskustelu" +msgstr "Ryhmä keskustelu" #: chat/chatwindow.cpp:456 msgid "Nudge" @@ -631,7 +622,7 @@ #: chat/chatwindow.cpp:491 chat/chatwindow.cpp:492 msgctxt "Toolbar button" msgid "My Emoticons" -msgstr "Hymiöt" +msgstr "Omat hymiöt" #: chat/chatwindow.cpp:504 msgid "&Font" @@ -731,12 +722,12 @@ #: chat/chatwindow.cpp:1915 #, kde-format msgid "%1 and %2 are typing..." -msgstr "%1 ja %2 kirjoittavat" +msgstr "%1, ja %2 kirjoittavat" #: chat/chatwindow.cpp:1919 #, kde-format msgid "%1, %2 and %3 others are typing..." -msgstr "%1, %2 ja %3 kirjoittavat" +msgstr "%1, %2, ja %3 kirjoittavat" #: chat/chatwindow.cpp:2378 #, kde-format @@ -937,7 +928,7 @@ #: contact/contactbase.cpp:313 contact/contactbase.cpp:318 #, kde-format msgid "MSN Messenger %1 compatible" -msgstr "MSN Messenger %1 yhteensopivuus" +msgstr "MSN Messenger %1 yhteensopiva" #: contact/contactbase.cpp:335 #, kde-format @@ -951,11 +942,11 @@ #: contact/contactbase.cpp:347 #, kde-format msgid "Windows Live Messenger %1 compatible" -msgstr "Windows Live Messenger %1 yhteensopivuus" +msgstr "Windows Live Messenger %1 yhteensopiva" #: contact/contactbase.cpp:354 msgid "Windows Live Messenger compatible" -msgstr "Windows Live Messenger yhteensopivuus" +msgstr "Windows Live Messenger yhteensopiva" #: contact/msnstatus.cpp:159 contact/msnstatus.cpp:172 initialview.cpp:85 #: model/contactlist.cpp:1824 settings/accountpage.cpp:99 @@ -996,7 +987,7 @@ #: contact/msnstatus.cpp:168 model/contactlist.cpp:1825 msgid "Offline" -msgstr "Poissa linjoilta" +msgstr "Poissa" #: contact/msnstatus.cpp:195 contact/msnstatus.cpp:197 msgid "&My Status" @@ -1123,7 +1114,7 @@ #, kde-format msgctxt "Contact props dialog info" msgid "Client: %1" -msgstr "Sähköpostiohjelma: %1" +msgstr "Asiakasohjelmaa: %1" #: dialogs/contactpropertiesdialog.cpp:661 msgctxt "Dialog box text" @@ -1427,7 +1418,7 @@ #: emoticontheme.cpp:859 msgid "Boy" -msgstr "Poju" +msgstr "Poika" #: emoticontheme.cpp:860 msgid "Red heart" @@ -1527,7 +1518,7 @@ #: emoticontheme.cpp:884 msgid "Beer mug" -msgstr "Olutlasi" +msgstr "Olut muki" #: emoticontheme.cpp:885 msgid "Martini glass" @@ -1623,7 +1614,7 @@ #: emoticontheme.cpp:908 msgid "Gift with a bow" -msgstr "Lahja ja kumarrus" +msgstr "Lahja, ja kumarrus" #: emoticontheme.cpp:909 msgid "X-Box" @@ -1654,7 +1645,7 @@ msgid "" "Waiting for an Internet connection to reconnect...<br /><a href='%" "1'>Reconnect now!</a>" -msgstr "Odottaa uudelleen yhdistämistä<br /><<a href='%1'>Yhdistä nyt</a>" +msgstr "Odotetaan uudelleen yhdistämistä<br /><<a href='%1'>Yhdistä nyt</a>" #: initialview.cpp:398 msgctxt "Status message on login screen" @@ -1670,9 +1661,11 @@ "Waiting %1 seconds before reconnection...<br /><a href='%2'>Reconnect now!</" "a>" msgstr[0] "" -"Odota %1 sekunttia uudelleen yhdistämiseen<br /><a href='%2'>Yhdistä nyt</a>" +"Odotetaan %1 sekuntti uudelleen yhdistämiseen<br /><a href='%2'>Yhdistä nyt<" +"/a>" msgstr[1] "" -"Odota %1 sekunttia uudelleen yhdistämiseen<br /><a href='%2'>Yhdistä nyt</a>" +"Odotetaan %1 sekunttia uudelleen yhdistämiseen<br /><a href='%2'>Yhdistä " +"nyt</a>" #: initialview.cpp:614 msgctxt "Button label" @@ -1687,7 +1680,7 @@ #: initialview.cpp:679 msgctxt "Status message on login screen" msgid "Please enter both your email address and password" -msgstr "Kirjoita sähköpostisoitteesi ja salasanasi" +msgstr "Kirjoita sähköpostisoitteesi, ja salasanasi" #: initialview.cpp:698 msgctxt "Status message on login screen" @@ -1731,7 +1724,7 @@ #: kmess.cpp:580 msgid "Remove and Block" -msgstr "Poista ja estä käyttäjä" +msgstr "Poista, ja estä käyttäjä" #: kmess.cpp:626 #, kde-format @@ -1871,7 +1864,7 @@ #: kmessinterface.cpp:173 msgid "&Display Pictures Size" -msgstr "Näytettävän kuvankoko" +msgstr "Näytä käyttäjien kuva" #: kmessinterface.cpp:174 msgid "&Sort Contacts by" @@ -1948,12 +1941,12 @@ #: kmessview.cpp:322 #, kde-format msgid "[%1] Logged in with %2" -msgstr "(%1) Yhdisti %2" +msgstr "(%1) Kirjautui sisään %2" #: kmessview.cpp:359 #, kde-format msgid "[%1] %2 goes online" -msgstr "[%1] %2 yhdisti" +msgstr "[%1] %2 Kirjautui" #: kmessview.cpp:364 #, kde-format @@ -2005,7 +1998,7 @@ #: kmessview.cpp:1164 msgctxt "Contact Live Messenger client label in list tooltip" msgid "Client" -msgstr "Ohjelma" +msgstr "Asiakasohjelma" #: kmessview.cpp:1176 msgid "Yes" @@ -2036,8 +2029,7 @@ msgid "Group <b>%1</b>" msgstr "Ryhmä <b>%1</b>" -#: kmessview.cpp:1236 -#, fuzzy, kde-format +#: kmessview.cpp:1236, kde-format msgctxt "Contact counters in normal group tooltip, first part" msgid "%1 contact, " msgid_plural "%1 contacts, " @@ -2049,8 +2041,8 @@ msgctxt "Contact counters in normal group tooltip, second part" msgid "%1 online" msgid_plural "%1 online" -msgstr[0] "%1 paikalla" -msgstr[1] "%1 paikalla" +msgstr[0] "%1 Paikalla" +msgstr[1] "%1 Paikalla" #: kmessview.cpp:1245 #, kde-format @@ -2128,14 +2120,20 @@ "(c) 2008-2009, Ruben Vandamme\n" "(c) 2009, Sjors Gielen\n" msgstr "" +"(c) 2002-2009, Mike K. Bennett\n" +"(c) 2005-2009, Diederik van der Boor\n" +"(c) 2007-2009, Valerio Pilo\n" +"(c) 2008-2009, Antonio Nastasi\n" +"(c) 2008-2009, Ruben Vandamme\n" +"(c) 2009, Sjors Gielen\n" #: main.cpp:61 msgid "Developer and project founder" -msgstr "Kehittäjä ja projektin aloittaja" +msgstr "Kehittäjä, ja projektin aloittaja" #: main.cpp:61 msgid "Mike K. Bennett" -msgstr "" +msgstr "Mike K. Bennett" #: main.cpp:62 msgid "Developer" @@ -2143,11 +2141,11 @@ #: main.cpp:62 msgid "Michael Curtis" -msgstr "" +msgstr "Michael Curtis" #: main.cpp:63 main.cpp:72 msgid "Jan Tönjes" -msgstr "" +msgstr "Jan Tönjes" #: main.cpp:63 msgid "Project support" @@ -2159,39 +2157,39 @@ #: main.cpp:64 main.cpp:104 msgid "Diederik van der Boor" -msgstr "" +msgstr "Diederik van der Boor" #: main.cpp:65 main.cpp:127 msgid "Valerio Pilo" -msgstr "" +msgstr "Valerio Pilo" #: main.cpp:66 msgid "Antonio Nastasi" -msgstr "" +msgstr "Antonio Nastasi" #: main.cpp:67 msgid "Ruben Vandamme" -msgstr "" +msgstr "Ruben Vandamme" #: main.cpp:68 main.cpp:167 msgid "Sjors Gielen" -msgstr "" +msgstr "Sjors Gielen" #: main.cpp:69 main.cpp:166 msgid "Adam Goossens" -msgstr "" +msgstr "Adam Goossens" #: main.cpp:72 msgid "" "German translation, testing, documentation, web master, project management, " "etc..." msgstr "" -"Saksankielinen kääntämisnen, testaus, dokumentointi, kotisivut, " +"Saksankielinen käännös, testaus, dokumentointi, web-sivujen ylläpito, " "projektinhallinta, jne..." #: main.cpp:73 msgid "Dane Harnett" -msgstr "" +msgstr "Dane Harnett" #: main.cpp:73 msgid "Web design" @@ -2199,13 +2197,13 @@ #: main.cpp:74 msgid "David Vignoni" -msgstr "" +msgstr "David Vignoni" #: main.cpp:74 msgid "Main and yellow/blue/violet emoticon sets, Italian translation" msgstr "" -"Ensisijainen ja keltainen/sininen/violette hymiö paketit, italiaksi " -"kääntäminen" +"Ensisijainen, ja keltainen/sininen/violette hymiöden paketi, italiankielinen " +"käännös" #: main.cpp:75 msgid "Cartoon emoticons" @@ -2213,11 +2211,11 @@ #: main.cpp:75 msgid "Julien Joubin" -msgstr "" +msgstr "Julien Joubin" #: main.cpp:76 msgid "Christian Müller" -msgstr "" +msgstr "Christian Müller" #: main.cpp:76 msgid "Default sound theme" @@ -2229,11 +2227,11 @@ #: main.cpp:77 msgid "Michael Anderton" -msgstr "" +msgstr "Michael Anderton" #: main.cpp:81 main.cpp:110 msgid "Panagiotis Papadopoulos" -msgstr "" +msgstr "Panagiotis Papadopoulos" #: main.cpp:81 msgid "Translations Maintainer" @@ -2246,113 +2244,113 @@ #: main.cpp:83 msgid "Mohamed Aser" -msgstr "" +msgstr "Mohamed Aser" #: main.cpp:84 msgid "More Arabic translation" -msgstr "Lisää Arabiankielistä käännöstä" +msgstr "Lisää Arabiankielinen käännös" #: main.cpp:84 msgid "Youssef Chahibi" -msgstr "" +msgstr "Youssef Chahibi" #: main.cpp:86 msgid "Brazilian Portuguese translation" -msgstr "Brazilian Portugalinen-kielinen käännös" +msgstr "Brazilian-Portugalinenkielinen käännös" #: main.cpp:86 msgid "Mauricio Rother" -msgstr "" +msgstr "Mauricio Rother" #: main.cpp:87 msgid "Leonel Freire" -msgstr "" +msgstr "Leonel Freire" #: main.cpp:87 main.cpp:88 main.cpp:89 msgid "More Brazilian Portuguese translation" -msgstr "Lisää Brasilian-Portugalinkielinen kääntämine" +msgstr "Lisää Brasilian-Portugalinkielinen käännös" #: main.cpp:88 msgid "Sergio Rafael Lemke" -msgstr "" +msgstr "Sergio Rafael Lemke" #: main.cpp:89 msgid "Maurício Arozi Moraes" -msgstr "" +msgstr "Maurício Arozi Moraes" #: main.cpp:91 msgid "Catalan translation" -msgstr "Katalonian käännös" +msgstr "Kataloniankielinen käännös" #: main.cpp:91 msgid "Jaume Cornadó" -msgstr "" +msgstr "Jaume Cornadó" #: main.cpp:92 msgid "Adrià Arrufat" -msgstr "" +msgstr "Adrià Arrufat" #: main.cpp:92 msgid "More Catalan translation" -msgstr "Lisää Kataloniaksi käännöstä" +msgstr "Lisää Kataloniankielinen käännös" #: main.cpp:94 msgid "Lin Haoxiang" -msgstr "" +msgstr "Lin Haoxiang" #: main.cpp:94 msgid "Simplified Chinese translation, file send bug fix, proxy connect code" msgstr "" -"Yksinkertaistettu Kiinaksi käännös, tiedoston lähettämisen virheen " -"korjaaminen, proxy koodi" +"Yksinkertaistettu Kiinankielinen käännös, tiedoston lähettämisen virheen " +"korjaaminen, proxy yhteyden ohjelmointi" #: main.cpp:95 main.cpp:162 msgid "Liu Sizhuang" -msgstr "" +msgstr "Liu Sizhuang" #: main.cpp:95 main.cpp:96 msgid "More Simplified Chinese translation" -msgstr "Lisää Yksinkertaistetun Kiinaksi kääntäminen" +msgstr "Lisää Yksinkertaistetun Kiinankielinen käännös" #: main.cpp:96 msgid "Cheng Yang" -msgstr "" +msgstr "Cheng Yang" #: main.cpp:97 msgid "Traditional Chinese translation" -msgstr "Perinteinen KIinaksi käännös" +msgstr "Perinteinen KIinankielinen käännös" #: main.cpp:97 msgid "Yen-chou Chen" -msgstr "" +msgstr "Yen-chou Chen" #: main.cpp:98 msgid "More Traditional Chinese translation" -msgstr "Lisää perinteistä Kiinaksi käännettynä" +msgstr "Lisää perinteistä Kiinaksikielinen käännös" #: main.cpp:98 msgid "Tryneeds-Chinese" -msgstr "" +msgstr "Tryneeds-Chinese" #: main.cpp:100 msgid "Danish translation" -msgstr "Tanskakielinen käännös" +msgstr "Tanskankielinen käännös" #: main.cpp:100 msgid "Lars Sommer" -msgstr "" +msgstr "Lars Sommer" #: main.cpp:101 msgid "More Danish translation" -msgstr "Lisää Tanskakieliseksi kääntäminen" +msgstr "Lisää Tanskankielinen käännös" #: main.cpp:101 msgid "Pascal d'Hermilly" -msgstr "" +msgstr "Pascal d'Hermilly" #: main.cpp:103 msgid "Arend van Beelen Jr." -msgstr "" +msgstr "Arend van Beelen Jr." #: main.cpp:103 msgid "Dutch translation" @@ -2360,35 +2358,35 @@ #: main.cpp:104 main.cpp:105 main.cpp:106 main.cpp:107 main.cpp:108 msgid "More Dutch translation" -msgstr "Lisää Hollanninkielistä kääntämistä" +msgstr "Lisää Hollanninkielinen käännös" #: main.cpp:105 msgid "Jaap Woldringh" -msgstr "" +msgstr "Jaap Woldringh" #: main.cpp:106 msgid "Elve" -msgstr "" +msgstr "Elve" #: main.cpp:107 msgid "Sander Pientka" -msgstr "" +msgstr "Sander Pientka" #: main.cpp:108 msgid "Heimen Stoffels" -msgstr "" +msgstr "Heimen Stoffels" #: main.cpp:110 msgid "More German translation, Greek translation" -msgstr "Lisää Saksankielisestä kääntämistä ja Kreikaksi kääntäminen" +msgstr "Lisää Saksankielinen, ja Kreikankielinen käännös" #: main.cpp:111 msgid "Dimitrios Glentadakis" -msgstr "" +msgstr "Dimitrios Glentadakis" #: main.cpp:111 msgid "More Greek translation" -msgstr "Lisää Kreikankielisestä kääntämistä" +msgstr "Lisää Kreikankielinen käännös" #: main.cpp:113 msgid "Estonian translation" @@ -2396,7 +2394,7 @@ #: main.cpp:113 msgid "Jyri Toomessoo" -msgstr "" +msgstr "Jyri Toomessoo" #: main.cpp:114 msgid "Finnish translation" @@ -2404,27 +2402,27 @@ #: main.cpp:114 msgid "Markus Vuori" -msgstr "" +msgstr "Markus Vuori" #: main.cpp:115 msgid "Joonas Niilola" -msgstr "" +msgstr "Joonas Niilola" #: main.cpp:115 main.cpp:116 main.cpp:117 msgid "More Finnish translation" -msgstr "Lisää Suomenkielistä kääntämistä" +msgstr "Lisää Suomenkielinen käännös" #: main.cpp:116 msgid "Jussi Timperi" -msgstr "" +msgstr "Jussi Timperi" #: main.cpp:117 msgid "Antony Hussi" -msgstr "" +msgstr "Antony Hussi" #: main.cpp:119 msgid "Choplair" -msgstr "" +msgstr "Choplair" #: main.cpp:119 msgid "French translation" @@ -2432,27 +2430,27 @@ #: main.cpp:120 msgid "More French translation, MSN6 emoticon definitions" -msgstr "Lisää Ranskankielistä kääntämistä, MSN6 hymiö-määritykset" +msgstr "Lisää Ranskankielinen käännäs, MSN6 hymiöt-määritykset" #: main.cpp:120 msgid "Vincent Fretin" -msgstr "" +msgstr "Vincent Fretin" #: main.cpp:121 msgid "Andrea Blankenstijn" -msgstr "" +msgstr "Andrea Blankenstijn" #: main.cpp:121 main.cpp:122 main.cpp:123 msgid "More French translation" -msgstr "Lisää Ranskankielistä kääntämistä" +msgstr "Lisää Ranskan-kielinen käännös" #: main.cpp:122 msgid "Barthe Guillaume" -msgstr "" +msgstr "Barthe Guillaume" #: main.cpp:123 msgid "Scias" -msgstr "" +msgstr "Scias" #: main.cpp:125 msgid "Hungarian translation" @@ -2460,43 +2458,42 @@ #: main.cpp:125 msgid "Páder Rezső" -msgstr "" +msgstr "Páder Rezső" #: main.cpp:126 msgid "More Hungarian translation" -msgstr "Lisää Unkarinkieliset käännökset" +msgstr "Lisää Unkarinkielinen käännös" #: main.cpp:126 msgid "Pauli Henrik" -msgstr "" +msgstr "Pauli Henrik" #: main.cpp:127 main.cpp:128 msgid "More Italian translation" -msgstr "Lisää Italiankielistä kääntämistä" +msgstr "Lisää Italiankielinen käännös" #: main.cpp:128 msgid "Vincenzo Reale" -msgstr "" +msgstr "Vincenzo Reale" #: main.cpp:129 msgid "Andrea Decorte" -msgstr "" +msgstr "Andrea Decorte" #: main.cpp:129 msgid "" "More Italian translation, Group selection in 'contact added user' dialog" msgstr "" -"Lisää Italiankielistä kääntämistä, ryhmä valinnat \"käyttäjän lisääminen\" " -"valinnat" +"Lisää Italian-kielistä käännäs, ryhmä valinnat \"käyttäjän lisääminen\" " +"valintaikkuna" #: main.cpp:131 msgid "Daniel E. Moctezuma" -msgstr "" +msgstr "Daniel E. Moctezuma" #: main.cpp:131 -#, fuzzy msgid "Japanese translation" -msgstr "Espanajankielinen käännös" +msgstr "Japaninkielinen käännös" #: main.cpp:132 msgid "Korean translation" @@ -2504,35 +2501,35 @@ #: main.cpp:132 msgid "Park Dong Cheon" -msgstr "" +msgstr "Park Dong Cheon" #: main.cpp:133 msgid "Norsk Bokmål translation" -msgstr "Norjankielinen käännös" +msgstr "Norjan Bokmålkielinen käännös" #: main.cpp:133 msgid "Øyvind Sæther" -msgstr "" +msgstr "Øyvind Sæther" #: main.cpp:135 msgid "Serbian translation" -msgstr "Sloveniankielinen käännös" +msgstr "Serbiankielinen käännös" #: main.cpp:135 msgid "Zoran Milovanović" -msgstr "" +msgstr "Zoran Milovanović" #: main.cpp:137 msgid "Rastislav Krupanský" -msgstr "" +msgstr "Rastislav Krupanský" #: main.cpp:137 msgid "Slovak translation" -msgstr "Sloveniankielinen käännös" +msgstr "Slovakkielinen käännös" #: main.cpp:138 msgid "Matjaž Kaše" -msgstr "" +msgstr "Matjaž Kaše" #: main.cpp:138 msgid "Slovenian translation" @@ -2540,52 +2537,52 @@ #: main.cpp:140 msgid "Johanna Gersch" -msgstr "" +msgstr "Johanna Gersch" #: main.cpp:140 msgid "Spanish translation" -msgstr "Espanajankielinen käännös" +msgstr "Espaniankielinen käännös" #: main.cpp:141 msgid "J.C.A. Javi" -msgstr "" +msgstr "J.C.A. Javi" #: main.cpp:141 main.cpp:142 main.cpp:143 main.cpp:144 main.cpp:145 #: main.cpp:146 main.cpp:147 main.cpp:148 msgid "More Spanish translation" -msgstr "Lisää Espanankielistä kääntämistä" +msgstr "Lisää Espaniankielinen käännös" #: main.cpp:142 msgid "Alejandro Araiza Alvarado" -msgstr "" +msgstr "Alejandro Araiza Alvarado" #: main.cpp:143 msgid "Jaume Corbí" -msgstr "" +msgstr "Jaume Corbí" #: main.cpp:144 msgid "Christian Kaiser" -msgstr "" +msgstr "Christian Kaiser" #: main.cpp:145 msgid "Juan Pablo González Tognarelli" -msgstr "" +msgstr "Juan Pablo González Tognarelli" #: main.cpp:146 msgid "Alexis Daniel Medina Medina" -msgstr "" +msgstr "Alexis Daniel Medina Medina" #: main.cpp:147 msgid "Manuel Ramírez" -msgstr "" +msgstr "Manuel Ramírez" #: main.cpp:148 msgid "Mauricio Muñoz Lucero" -msgstr "" +msgstr "Mauricio Muñoz Lucero" #: main.cpp:150 msgid "Christian Lundgren" -msgstr "" +msgstr "Christian Lundgren" #: main.cpp:150 msgid "Swedish translation" @@ -2593,15 +2590,15 @@ #: main.cpp:151 msgid "Mattias Newzella" -msgstr "" +msgstr "Mattias Newzella" #: main.cpp:151 msgid "More Swedish translation" -msgstr "Lisää Ruotsinkielistä kääntämistä" +msgstr "Lisää Ruotsinkielinen käännäs" #: main.cpp:153 msgid "Rachan Hongpairote" -msgstr "" +msgstr "Rachan Hongpairote" #: main.cpp:153 msgid "Thai translation" @@ -2609,7 +2606,7 @@ #: main.cpp:154 msgid "Gorkem Cetin" -msgstr "" +msgstr "Gorkem Cetin" #: main.cpp:154 msgid "Turkish translation" @@ -2617,15 +2614,15 @@ #: main.cpp:155 msgid "Barbaros Ulutas" -msgstr "" +msgstr "Barbaros Ulutas" #: main.cpp:155 main.cpp:156 msgid "More Turkish translation" -msgstr "Lisää turkinkielistä kääntämistä" +msgstr "Lisää Turkinkielistä käännös" #: main.cpp:156 msgid "Uğur Çetin" -msgstr "" +msgstr "Uğur Çetin" #: main.cpp:159 msgid "MSNP12 support, various patches" @@ -2633,7 +2630,7 @@ #: main.cpp:159 msgid "Richard Conway" -msgstr "" +msgstr "Richard Conway" #: main.cpp:160 msgid "Guido Solinas" @@ -2642,8 +2639,8 @@ #: main.cpp:160 msgid "Pictures in contact list code, contact client info, chat font zoom" msgstr "" -"Kuvat yhteystietolistalle, käyttäjän asiakasohjelman tiedot ja keskustelun " -"kirjaisimen lähentäminen" +"Kuvat yhteystietolistalla, käyttäjän asiakasohjelman tiedot, keskustelun " +"kirjaisimen kohdistaminen" #: main.cpp:161 msgid "File transfer thumbnails" @@ -2651,15 +2648,15 @@ #: main.cpp:161 msgid "Pedro Ferreira" -msgstr "" +msgstr "Pedro Ferreira" #: main.cpp:162 msgid "P4-Context field support" -msgstr "P4 sisällönhallinnan tuki" +msgstr "P4 Sisältöalueen tuki" #: main.cpp:163 msgid "Scott Morgan" -msgstr "" +msgstr "Scott Morgan" #: main.cpp:163 msgid "Xinerama fixes" @@ -2667,7 +2664,7 @@ #: main.cpp:164 msgid "Laurence Anderson" -msgstr "" +msgstr "Laurence Anderson" #: main.cpp:164 msgid "Original file receive code" @@ -2679,14 +2676,14 @@ #: main.cpp:165 msgid "Matteo Nardi" -msgstr "" +msgstr "Matteo Nardi" #: main.cpp:166 msgid "" "Notifications blocking option, winks disabling option, last message date " "feature" msgstr "" -"Vaihtoehtona ilmoituksien ja vinkkien kieltäminen tai viimeisen viestin " +"Vaihtoehtona ilmoituksien, ja vinkkien kieltäminen tai viimeisen viestin " "päivä ominaisuudet." #: main.cpp:167 @@ -2699,11 +2696,11 @@ #: main.cpp:168 msgid "Dario Freddi" -msgstr "" +msgstr "Dario Freddi" #: main.cpp:171 msgid "Alexandre Peixoto Ferreira" -msgstr "" +msgstr "Alexandre Peixoto Ferreira" #: main.cpp:171 msgid "Various internationalization fixes" @@ -2711,7 +2708,7 @@ #: main.cpp:172 msgid "Choe Hwanjin" -msgstr "" +msgstr "Choe Hwanjin" #: main.cpp:172 msgid "Various internationalization fixes." @@ -2719,7 +2716,7 @@ #: main.cpp:174 msgid "Damien Sandras" -msgstr "" +msgstr "Damien Sandras" #: main.cpp:174 msgid "GnomeMeeting developer" @@ -2731,23 +2728,23 @@ #: main.cpp:175 msgid "Tobias Tönjes" -msgstr "" +msgstr "Tobias Tönjes" #: main.cpp:178 msgid "Inspiration and assorted code" -msgstr "Inspiraatio ja ohjelmakoodi" +msgstr "Inspiraatio, ja ohjelmakoodi" #: main.cpp:178 msgid "KMerlin (kmerlin.olsd.de)" -msgstr "" +msgstr "KMerlin (kmerlin.olsd.de)" #: main.cpp:179 msgid "Kopete (kopete.kde.org)" -msgstr "" +msgstr "Kopete (kopete.kde.org)" #: main.cpp:179 msgid "Old popup balloons code, initial p2p code, MSN challenge handler" -msgstr "Vanhat puhekuplakoodi, p2p koodi ja MSN käyttäytyminen" +msgstr "Vanhat puhekuplakoodi, p2p koodi, ja MSN käyttäytyminen" #: main.cpp:180 msgid "Idle timer code" @@ -2755,11 +2752,11 @@ #: main.cpp:180 msgid "KScreensaver" -msgstr "" +msgstr "KScreensaver" #: main.cpp:181 msgid "BasKet" -msgstr "" +msgstr "BasKet" #: main.cpp:181 msgid "Close-to-tray icon screenshot code" @@ -2767,32 +2764,33 @@ #: main.cpp:182 msgid "Amarok" -msgstr "" +msgstr "Amarok" #: main.cpp:182 -#, fuzzy msgid "" "Custom crash handler implementation, System tray icon overlay implementation" -msgstr "Muokattu kaatumisen hallinnoinnin toteutus" +msgstr "" +"Muokattau kaatumisen hallinnan toteutus. Ilmoitusaluuen ikonien toteuttaminen" #: main.cpp:183 msgid "" "KNotify not giving focus bug fix and KWin focus stealing prevention " "workaround" msgstr "" +"KNotify ei anna keskitynyttä virheenkorjaamista, ja KWin keskittyy estämään " +"huomioin varastamista" #: main.cpp:183 msgid "Quassel" -msgstr "" +msgstr "Quassel" #: main.cpp:186 msgid "" "You are welcome to send bugfixes and patches to the KMess help forum!\n" "If you feel your name is missing here, please contact us too!" msgstr "" -"Tervetuloa lähettämään virhekorjauksia ja päivityksiä KMess " -"keskustelusivuille\n" -"Nimen puuttuessa listalta, ilmoita asiasta" +"Tervetuloa lähettämään virhekorjauksia, ja päivityksiä KMess " +"keskustelusivuille. Nimen puuttuessa listalta, ilmoita asiasta." #: main.cpp:186 msgid "Your name here?" @@ -2801,12 +2799,12 @@ #: main.cpp:189 msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr "Nimesi?" +msgstr "Antony Hussi" #: main.cpp:190 msgctxt "EMAIL OF TRANSLATORS" msgid "Your email addresses" -msgstr "Sähköpostiosoiteesi" +msgstr "ant...@tr..." #: main.cpp:196 msgid "Do not show the contact list window initially" @@ -2897,7 +2895,7 @@ #: network/applications/p2papplication.cpp:2394 #, kde-format msgid "Connecting to %1, port %2" -msgstr "Yhdistetään kohteeseen %1, portti %2" +msgstr "Yhdistetään kohteeseen %1 portti %2" #: network/applications/filetransfer.cpp:421 #: network/applications/filetransferp2p.cpp:548 @@ -3015,7 +3013,7 @@ #: network/applications/mimeapplication.cpp:154 msgid "The invitation was rejected. It is not supported by the other client." -msgstr "Kutsu peruuntui. Toisen käyttäjän ohjelmisto ei tue kutsua." +msgstr "Kutsu peruuntui. Toisen käyttäjän asiakasohjelma ei tue kutsua." #: network/applications/mimeapplication.cpp:164 msgid "The invitation was aborted. An internal error occured." @@ -3448,7 +3446,7 @@ #: network/msnconnection.cpp:562 msgid "Your Passport account needs to be verified first" -msgstr "Passport käyttätili on ensiksi vahvistettava" +msgstr "Passport käyttätilisi tarvitsee ensiksi vahvistaa" #: network/msnconnection.cpp:566 msgid "Bad USR ticket" @@ -3510,15 +3508,15 @@ #: network/msnconnection.cpp:659 network/msnnotificationconnection.cpp:2946 msgctxt "Error dialog box title" msgid "MSN Error" -msgstr "MSN virhe" +msgstr "MSN Virhe" #: network/msnconnection.cpp:964 msgid "Trying the HTTP fallback..." -msgstr "Yrittää takaisinpaluuta HTTP kutsulla..." +msgstr "Yritetään HTTP varmistuksella" #: network/msnnotificationconnection.cpp:1364 msgid "Authenticating..." -msgstr "Tunnistetaan..." +msgstr "Tunnistetaan" #: network/msnnotificationconnection.cpp:1388 msgid "Authenticated" @@ -3526,7 +3524,7 @@ #: network/msnnotificationconnection.cpp:1820 msgid "Connecting..." -msgstr "Yhdistetään..." +msgstr "Yhdistetään" #: network/msnnotificationconnection.cpp:1965 #, kde-format @@ -3558,9 +3556,8 @@ msgstr "Ei voinnu käsitellä poissaolon aikaisia viestejä.<br />Lisätietoja: %1" #: network/msnnotificationconnection.cpp:2335 -#, fuzzy msgid "SOAP client is no longer valid." -msgstr "SOAP ohjelma ei ole enään" +msgstr "SOAP asiakasohjelma ei ole enään kelvollinen" #: network/msnnotificationconnection.cpp:2605 msgid "Authentication time limit exceeded" @@ -3568,7 +3565,7 @@ #: network/msnnotificationconnection.cpp:2787 msgid "Waiting for contact list..." -msgstr "Odotetaan yhteystietolistaa..." +msgstr "Odotetaan yhteystietolistaa" #: network/msnnotificationconnection.cpp:2833 #, kde-format @@ -3579,7 +3576,7 @@ #: network/msnnotificationconnection.cpp:2834 msgctxt "Error dialog box title" msgid "MSN Warning" -msgstr "MSN varoitus" +msgstr "MSN Varoitus" #: network/msnnotificationconnection.cpp:2906 #, kde-format @@ -3592,7 +3589,7 @@ "<p>Authentication has failed, please verify your account email and password." "</p>" msgstr "" -"</p>Tunnustautuminen epäonnistui. Tarkista käyttäjännimi ja salasana.</p>" +"</p>Tunnustautuminen epäonnistui. Tarkista käyttäjännimi, ja salasana.</p>" #: network/msnnotificationconnection.cpp:2957 #, kde-format @@ -3607,8 +3604,8 @@ "<p>You have been disconnected: you have connected with the account <i>%1</i> " "from another Messenger client, or from another location.</p>" msgstr "" -"Yhteys on katkaistiin, olet yhdistäny <i>%1</i> käyttäjällä toiselta " -"ohjelmalta tai muualta." +"Yhteys on katkaistiin, olet yhdistäny <i>%1</i> käyttäjälle toisella " +"asiakasohjelmistolla tai muualta." #: network/msnnotificationconnection.cpp:2972 msgctxt "Connection error: passive notification message" @@ -3717,13 +3714,12 @@ #: network/msnsocketbase.cpp:135 msgctxt "Dialog box message" msgid "Enter your username and password to access the network proxy." -msgstr "Syötä käyttäjänimi ja salasana yhdistäkseen verkko proxyyn." +msgstr "Syötä käyttäjänimi, ja salasana yhdistäkseen verkko proxyyn." -#: network/msnsockethttp.cpp:686 -#, fuzzy, kde-format +#: network/msnsockethttp.cpp:686, kde-format msgctxt "Error message shown with HTTP connection" msgid "%1 (Internal error code: %2)" -msgstr "Tapahtui sisäinen virhe: %1" +msgstr "%1 (Sisäinen virhekoodi: %2)" #: network/msnsockethttp.cpp:696 #, kde-format @@ -4010,7 +4006,7 @@ #: notification/notificationmanager.cpp:134 msgctxt "Button text for KDE notification boxes" msgid "Hide" -msgstr "_Piilota" +msgstr "Piilota" #: notification/systemtraywidget.cpp:79 msgid "" @@ -4043,7 +4039,7 @@ #: settings/accountpage.cpp:82 msgid "Browse and Crop Picture..." -msgstr "Selaa ja rajaa kuva..." +msgstr "Selaa, ja rajaa kuva" #: settings/accountpage.cpp:83 msgid "Set Previous Image..." @@ -4136,7 +4132,7 @@ #: settings/chatstylepage.cpp:371 msgid "Hi, how are you doing? :)" -msgstr "" +msgstr "Hei, miten menee? :)" #: settings/chatstylepage.cpp:372 msgid "Stacy" @@ -4144,11 +4140,11 @@ #: settings/chatstylepage.cpp:373 msgid "Great!" -msgstr "Mahtavaa!" +msgstr "Mahtavaa" #: settings/chatstylepage.cpp:375 msgid "I /just/ got back from my vacation in Italy!" -msgstr "" +msgstr "Tulin äsken lomaltani Italiasta." #: settings/emoticonspage.cpp:118 msgctxt "Dialog box text" @@ -4193,7 +4189,7 @@ #: settings/miscellaneouspage.cpp:101 msgid "No selectable email clients detected." -msgstr "Ei havaittuja valitsettavia sähköposti ohjelmia." +msgstr "Ei valittavia sähköpostiasiakasohjelma." #: settings/miscellaneouspage.cpp:286 msgid "You have to specify a console command to launch a custom web browser!" @@ -4213,7 +4209,8 @@ #: settings/miscellaneouspage.cpp:316 msgid "You have to specify a console command to launch a custom email client!" msgstr "" -"Määriteltävä komento käynnistettäessä toissijaista sähköposti-ohjelmistoa." +"Määriteltävä komento käynnistettäessä toissijaista " +"sähköpostiasiakasohjelmistoa." #: settings/miscellaneouspage.cpp:321 #, c-format @@ -4222,7 +4219,8 @@ "not contain the '%u' parameter. Without this, composing emails will not work." "<br />Do you want KMess to add it for you?</html>" msgstr "" -"<html>Määriteltävä komento käynnistettäessä sähköposti ohjelmaa ei sisällä " +"<html>Määriteltävä komento käynnistettäessä sähköpostiasiakasohjelmaa ei " +"sisällä " "\"%u\" parametriä. Ilman sitä sähköpostin kirjoittaminen ei toimi.<br /" ">Haluatko että komento lisätään?</html>" @@ -4273,7 +4271,7 @@ msgstr "" "Jokaisella kerralla kun tunnet, koet hyvän tai turhauttavan kokemuksen. " "Paina vastaavaa ikonia ikkunan otsikkorivin alhaalta ja lyhyesti mainitse " -"mistä pidit tai inhosit ja paina \"Lähetä\"." +"mistä pidit tai inhosit, ja paina \"Lähetä\"." #: utils/likeback/likeback.cpp:343 msgctxt "Welcome dialog text, explanation for the like button alone" @@ -4283,7 +4281,7 @@ "'Send'." msgstr "" "Jokaisella kerralla kun koet hyvän kokemuksen. Paina hymyilevää naama-ikonia " -"ikkunan otsikkorivin alhaalta ja lyhyesti mainitse mistä pidit tai inhosit " +"ikkunan otsikkorivin alhaalta ja lyhyesti mainitse mistä pidit tai inhosit, " "ja paina \"Lähetä\"." #: utils/likeback/likeback.cpp:350 @@ -4295,7 +4293,7 @@ msgstr "" "Jokaisella kerralla kun koet turhauttavan kokemuksen. Paina alapäin " "osoittavaa naama-ikonia ikkunan otsikkorivin alhaalta ja lyhyesti mainitse " -"mistä pidit tai inhosit ja paina \"Lähetä\"." +"mistä pidit tai inhosit, ja paina \"Lähetä\"." #: utils/likeback/likeback.cpp:360 msgctxt "Welcome dialog text, explanation for the bug button" @@ -4306,7 +4304,7 @@ msgstr "" "Kun koet vääränlaisetn käyttämisen ohjelmistossa. Paina hajalla-olevaa " "ikonia ikkunan otsikkorivin alhaalta ja lyhyesti mainitse mistä pidit tai " -"inhosit ja paina \"Lähetä\"." +"inhosit, ja paina \"Lähetä\"." #: utils/likeback/likeback.cpp:372 msgctxt "Welcome dialog text, usage example" @@ -4344,8 +4342,8 @@ msgctxt "Welcome dialog text, header for the examples" msgid "Example" msgid_plural "Examples" -msgstr[0] "Esimerkki" -msgstr[1] "" +msgstr[0] "Esimerkkiksi" +msgstr[1] "Esimerkki" #: utils/likeback/likeback.cpp:418 msgctxt "Welcome dialog title" @@ -4356,15 +4354,15 @@ msgid "Send a Comment to the Developers" msgstr "Lähetä kommentti kehittäjille" -#: utils/likeback/likebackdialog.cpp:139 -#, fuzzy, kde-format +#: utils/likeback/likebackdialog.cpp:139, kde-format msgctxt "" "Feedback dialog text, message with one accepted language for the comments" msgid "" "Please, write it in <b>%1</b> (you may want to use an <a href=\"%3\">online " "translation tool</a> for this).<br/>" msgstr "" -"Kirjoitaessa %1 (Tarvittaessa voit hyödyntää<a href=\"%3\">verkko kääntäjä-" +"Kirjoitaessa <b>%1</b> (Tarvittaessa voidaan hyödyntää<a href=\"%3\">online " +"käännös-" "työkalua</a> apunasi).<br/>" #: utils/likeback/likebackdialog.cpp:146 @@ -4387,7 +4385,7 @@ "to send the same amount of positive and negative comments.<br/>" msgstr "" "Lähettämällä kommentteja, mahdollistaen ohjelman kehittymisen. Yrittäen " -"lähettää mahdollisiman monta positiivistä ja negatiivistä kommenttia.<br />" +"lähettää mahdollisiman monta positiivistä, ja negatiivistä kommenttia.<br />" #: utils/likeback/likebackdialog.cpp:168 msgctxt "Feedback dialog text, text to disallow feature requests" @@ -4742,7 +4740,8 @@ "this page, you can restore the hidden emoticons.</html>" msgstr "" "<html>Voit valita piilottaakseen vastaanotetut hymiöt. Oikealla " -"klikkauksessa vastaanotetusta hymiöistä ja valitset\"Piilota hymiöt\". Tämän " +"klikkauksessa vastaanotetusta hymiöistä, ja valitset \"Piilota hymiöt\". " +"Tämän " "sivun avulla voidaan myös palauttaa piilotetut hymiöt.</html>" #. i18n: file: dialogs/contactpropertiesdialog.ui:432 @@ -4797,13 +4796,13 @@ #. i18n: ectx: property (text), widget (QRadioButton, csvButton_) #: rc.cpp:199 msgid "CSV" -msgstr "" +msgstr "CSV" #. i18n: file: dialogs/listexportdialog.ui:44 #. i18n: ectx: property (text), widget (QRadioButton, xmlButton_) #: rc.cpp:202 msgid "XML" -msgstr "" +msgstr "XML" #. i18n: file: dialogs/listexportdialog.ui:71 #. i18n: ectx: property (text), widget (QLabel, label) @@ -4875,7 +4874,7 @@ #. i18n: ectx: property (text), widget (QLabel, label_2) #: rc.cpp:241 msgid "Command payload (can be empty):" -msgstr "Komento kuorma (voidaan lähettää tyhjänä):" +msgstr "Komennon tiedonsisältö (voidaan lähettää tyhjänä):" #. i18n: file: dialogs/transferentry.ui:196 #. i18n: ectx: property (text), widget (KUrlLabel, openLabel_) @@ -4887,7 +4886,7 @@ #. i18n: ectx: property (text), widget (KUrlLabel, cancelLabel_) #: rc.cpp:249 msgid "Cancel" -msgstr "Peru" +msgstr "Peruuta" #. i18n: file: dialogs/transferwindow.ui:83 #. i18n: ectx: property (text), widget (QPushButton, downloadButton_) @@ -4972,7 +4971,7 @@ msgid "" "If you choose to remember an account within KMess, you can also save its " "password" -msgstr "Valittuna käyttätilisi muistetaan ja salasanasi tallennetaan." +msgstr "Valittuna käyttätilisi muistetaan, ja salasanasi tallennetaan." #. i18n: file: initialview.ui:282 #. i18n: ectx: property (text), widget (QCheckBox, rememberPasswordCheckBox_) @@ -5259,7 +5258,7 @@ #. i18n: ectx: property (text), widget (KUrlLabel, registerButton_) #: rc.cpp:428 msgid "Register new account" -msgstr "Luo uusi käyttäjätili" +msgstr "Rekistöröi uusi käyttäjätili" #. i18n: file: settings/accountpage.ui:498 #. i18n: ectx: property (tipText), widget (KUrlLabel, registerButton_) @@ -5349,7 +5348,7 @@ #. i18n: ectx: property (text), widget (QCheckBox, hideNotificationsWhenBusyCheckBox_) #: rc.cpp:470 msgid "&Disable notifications when your status is set to \"Busy\"" -msgstr "Kytke pois päältä ilmoittamiset, tilan ollessa \"Kiireinen\"" +msgstr "Kytke pois päältä ilmoittaminen, tilan ollessa \"Kiireinen\"" #. i18n: file: settings/accountsmanagerpage.ui:26 #. i18n: ectx: property (text), widget (QLabel, textLabel1) @@ -5364,7 +5363,7 @@ "Click here to create a new KMess account for an email already associated to " "a Live account" msgstr "" -"Paina tästä luodaakseen uusi käyttäjätili valmiiksi luodulla Live " +"Paina tästä luodakseen uuden käyttäjätili valmiiksi luodulla Live " "käyttäjätilillä" #. i18n: file: settings/accountsmanagerpage.ui:79 @@ -5377,7 +5376,7 @@ #. i18n: ectx: property (toolTip), widget (QPushButton, configureAccountButton_) #: rc.cpp:485 msgid "Select an account and click here to modify it" -msgstr "Valitse käyttätili ja paina tästä tästä muokkaakseen sitä" +msgstr "Valitse käyttätili, ja paina tästä tästä muokkaakseen sitä" #. i18n: file: settings/accountsmanagerpage.ui:95 #. i18n: ectx: property (text), widget (QPushButton, configureAccountButton_) @@ -5389,7 +5388,7 @@ #. i18n: ectx: property (toolTip), widget (QPushButton, removeAccountButton_) #: rc.cpp:494 msgid "Select an account and click here to remove it" -msgstr "Valitse käyttätili ja paina tästä poistaakseen" +msgstr "Valitse käyttätili, ja paina tästä poistaakseen" #. i18n: file: settings/accountsmanagerpage.ui:111 #. i18n: ectx: property (text), widget (QPushButton, removeAccountButton_) @@ -5459,7 +5458,7 @@ #. i18n: ectx: property (text), widget (QLabel, label_2) #: rc.cpp:524 msgid "Save chat logs as:" -msgstr "Talenna keskustelujen viestit:" +msgstr "Tallenna keskustelujen viestit:" #. i18n: file: settings/chatloggingpage.ui:86 #. i18n: ectx: property (whatsThis), widget (QComboBox, fileFormatComboBox_) @@ -5476,10 +5475,10 @@ "</html>" msgstr "" "<html>\n" -"<p>Tiedostonmuodon valittaessa olisi hyvin tärkeätä.</p>\n" +"<p>Tiedostonmuodon valittaessa olisi tärkeätä.</p>\n" "<p>Keskustelun viestit tallennetaan HTML-muotoon, joka on helposti " "luettavissa kaikilla internet selaimillla. Avatessa toiselta tietokoneelta, " -"ei pystytä näyttämään kuvia ja hymiöitä.</p>\n" +"ei pystytä näyttämään kuvia, ja hymiöitä.</p>\n" "<p>Keskustelun viestit tallennetaan teksti-muotoon, joka on helposti " "luettavissa kaikkialla. Eivät sisällä tekstin muotoilua, kuvia eikä hymiöitä." "</p>\n" @@ -5489,13 +5488,13 @@ #. i18n: ectx: property (text), item, widget (QComboBox, fileFormatComboBox_) #: rc.cpp:534 msgid "Web Pages (HTML)" -msgstr "Internet sivu (HTML)" +msgstr "html-tiedostona" #. i18n: file: settings/chatloggingpage.ui:95 #. i18n: ectx: property (text), item, widget (QComboBox, fileFormatComboBox_) #: rc.cpp:537 msgid "Plain Text" -msgstr "Teksti" +msgstr "tekstitiedostona" #. i18n: file: settings/chatloggingpage.ui:134 #. i18n: ectx: property (toolTip), widget (QLabel, label) @@ -5563,7 +5562,7 @@ #: rc.cpp:562 msgid "Create directories to organize chats by year then by month" msgstr "" -"Luo hakemisto järjestäkseen keskusteluviestit vuoden ja kuukauden mukaan" +"Luo hakemisto järjestäkseen keskusteluviestit vuoden, ja kuukauden mukaan" #. i18n: file: settings/chatloggingpage.ui:188 #. i18n: ectx: property (whatsThis), widget (QRadioButton, monthRadioButton_) @@ -5579,10 +5578,10 @@ "<p><chat logs directory here>/2008/11/date-and-contact-name.html</p></" "html>" msgstr "" -"<html><p>Vaihtoehtona on keskutelujen kirjaamisen vuoden ja kuukauden " +"<html><p>Vaihtoehtona on keskutelujen kirjaamisen vuoden, ja kuukauden " "mukaan.\n" "Löydät hakemistosta tallennetut viestit vuosien mukaan jaeteltuna. Sisältäen " -"hakemiston kuukausille johon ovat tallentuneet ja niiden sisältä kuukauden " +"hakemiston kuukausille johon ovat tallentuneet, ja niiden sisältä kuukauden " "tallennetut viestit</p>\n" "\n" "</p>Esimerkiksi käyty keskustelu 29. Lokakuuta 2008 tallenetaan kirjattuihin-" @@ -5594,14 +5593,15 @@ #. i18n: ectx: property (text), widget (QRadioButton, monthRadioButton_) #: rc.cpp:571 msgid "Year then Month" -msgstr "Vuoden ja kuukauden mukaan" +msgstr "Vuoden, ja kuukauden mukaan" #. i18n: file: settings/chatloggingpage.ui:204 #. i18n: ectx: property (toolTip), widget (QRadioButton, dayRadioButton_) #: rc.cpp:574 msgid "Create directories to organize chats by year, by month, then by day" msgstr "" -"Luo hakemisto mihin järjestetetään kirjatut keskustelut vuoden, kuukauden ja " +"Luo hakemisto mihin järjestetetään kirjatut keskustelut vuoden, kuukauden, " +"ja " "päivän mukaan." #. i18n: file: settings/chatloggingpage.ui:211 @@ -5619,7 +5619,7 @@ "<p><chat logs directory here>/2008/11/29/date-and-contact-name.html</" "p></html>" msgstr "" -"<html>Vaihtoehtona on keskutelujen kirjaamisen vuoden, kuukauden ja päivän " +"<html>Vaihtoehtona on keskutelujen kirjaamisen vuoden, kuukauden, ja päivän " "mukaan.\n" " Löydät hakemistosta tallennetut viestit vuosien mukaan jaeteltuna. " "Sisältäen hakemiston kuukausille johon ovat tallentuneet ja niiden sisältä " @@ -5649,8 +5649,8 @@ "This option tells KMess to save all your chat logs in the same folder, " "without organizing them at all." msgstr "" -"Vaihtoehdolla mahdollistetaan tallentamaan kaikki loki-tiedostot samaan " -"kansioon, ilman järjestämistä." +"Vaihtoehdolla mahdollistetaan KMess tallentamaan kirjatut keskustelut samaan " +"kansioon, ilman järjestelyä." #. i18n: file: settings/chatloggingpage.ui:230 #. i18n: ectx: property (text), widget (QRadioButton, singleDirectoryRadioButton_) @@ -5674,7 +5674,7 @@ #. i18n: ectx: property (whatsThis), widget (QLabel, chatSavePathLabel_) #: rc.cpp:605 msgid "Choose a directory where you would like to save your chat logs." -msgstr "Valitse hakemisto johon kirjatut tiedostot tallenetaan" +msgstr "Valitse hakemisto johon kirjatut keskustelut tallennetaan" #. i18n: file: settings/chatloggingpage.ui:308 #. i18n: ectx: property (text), widget (QLabel, chatSavePathLabel_) @@ -5692,10 +5692,7 @@ #. i18n: ectx: property (whatsThis), widget (QLabel, textLabel1) #: rc.cpp:614 msgid "Allows you to change the theme KMess uses to display all chat messages." -msgstr "" -"Sallii KMessin kaikkien keskustelujen teeman vaihdon.\n" -"\n" -"Sallii teeman vaihtamisen keskustelujen viesteissä." +msgstr "Salli vaihtamaan KMess-tyyliä näyttäessä keskustelujen viesteissä." #. i18n: file: settings/chatstylepage.ui:41 #. i18n: ectx: property (text), widget (QLabel, textLabel1) @@ -5760,7 +5757,8 @@ "one single message. The exact appearance depends on the chosen chat style." msgstr "" "<html>Valittuna vaihtoehdoksi viestit ryhmitetään samalta käyttäjältä. Hänen " -"lähettäessä useita viestejä, viestit ryhmitettään yhdeksi viestiksi. " +"lähettäessä useita viestejä, viestit ryhmitetään yhdeksi kokonaiseksi " +"viestiksi. " "Vaihtoehto riippuu valitusta keskustelutyylistä.</html>" #. i18n: file: settings/chatstylepage.ui:259 @@ -5804,7 +5802,7 @@ #: rc.cpp:671 msgid "This is the font style and color used in your chat messages." msgstr "" -"Tämä on kirjasimen tyyli ja väri, jota käytetään keskusteluviesteissäsi." +"Tämä on kirjasimen tyyli, ja väri, jota käytetään keskusteluviesteissäsi." #. i18n: file: settings/chatstylepage.ui:377 #. i18n: ectx: property (text), widget (QLabel, textLabel2) @@ -5826,7 +5824,7 @@ #. i18n: ectx: property (text), widget (QCheckBox, useContactFontCheckBox_) #: rc.cpp:680 msgid "&Force messages from your contacts to use this font:" -msgstr "Pakota viestit käyttämään fonttiasi:" +msgstr "Pakota käyttäjien viestit käyttämään kirjaisinta:" #. i18n: file: settings/chatstylepage.ui:536 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_4) @@ -5842,7 +5840,7 @@ "_underline_ causes those words to appear in a bold, italic or underlined " "font respectively.</html>" msgstr "" -"<html>Salli kirjasin tehosteet. Kirjoita *lihavoitu*, /kursivoituna/ ja " +"<html>Salli kirjasin tehosteet. Kirjoita *lihavoitu*, /kursivoituna/, ja " "_alleviivattuna_ näin mahdollista sanojen ilmestymistä paksunnettuna, " "kursivoituna tai alleviivattuna.</html>" @@ -5863,14 +5861,14 @@ "<html>Enables the use of \"Messenger Plus!\" formattings in the chat window. " "For example, [b]this text[/b] will be replaced with <b>this text</b>.</html>" msgstr "" -"<html>Salli \"Messenger Plus!\" muotoilut keskusteluikkunoissa. \n" +"<html>Salli Messenger Plus-muotoilut keskusteluikkunoissa. \n" "Esimerkkinä (b)tämä viesti(/b) korvaa <b>tämä viestin</b>.</html>" #. i18n: file: settings/chatstylepage.ui:558 #. i18n: ectx: property (text), widget (QCheckBox, enableChatFormattingCheckBox_) #: rc.cpp:698 msgid "Enable \"Messenger Plus!\" formatting" -msgstr "Salli \"Messenger Plus!\" ominaisuus" +msgstr "Salli Messenger Plus-muotoilu" #. i18n: file: settings/chatstylepage.ui:582 #. i18n: ectx: attribute (title), widget (QWidget, tab_2) @@ -5893,7 +5891,7 @@ "herätteen. Oletuksena keskusteluikkuna ravistaa kun heräte vastaanotetaan " "tai on lähetty. Ominaisuuden ollessa liian haitallinen, ominaisuuden voidaan " "kytkeä poispäältä</p>\n" -"<p>Ominaisuuden ollessa kytkettynä päälle KMess yrittää vielä rajoissaan " +"<p>Ominaisuuden ollessa kytkettynä päälle KMess vielä yrittää rajoissaan " "ravistaa. Kontanti voi lähettää useita herätteitä kerrallaan, mutta KMess " "ravistaa vain kerran keskusteluikkunaa.</p></qt>" @@ -5929,7 +5927,7 @@ #. i18n: ectx: property (text), item, widget (QComboBox, tabbedChatMode_) #: rc.cpp:723 msgid "Always" -msgstr "aina" +msgstr "Aina" #. i18n: file: settings/chatstylepage.ui:655 #. i18n: ectx: property (text), item, widget (QComboBox, tabbedChatMode_) @@ -5981,7 +5979,7 @@ #. i18n: ectx: property (text), widget (QCheckBox, nowListeningCheckBox_) #: rc.cpp:744 msgid "Show contacts w&hich song I am listening to" -msgstr "Näytä käyttäjille kuunneltavan kappaleen nimi" +msgstr "Näytä kuunneltavan kappaleen nimi" #. i18n: file: settings/contactlistpage.ui:46 #. i18n: ectx: property (toolTip), widget (QCheckBox, showBirdCheckBox_) @@ -6009,13 +6007,13 @@ #. i18n: ectx: property (text), widget (QCheckBox, enableListFormattingCheckBox_) #: rc.cpp:765 msgid "Enable \"Messenger &Plus!\" formatting" -msgstr "Salli \"Messenger &Plus!\" muotoilua" +msgstr "Salli Messenger &Plus-muotoilua" #. i18n: file: settings/contactlistpage.ui:78 #. i18n: ectx: property (text), widget (QCheckBox, showContactEmailCheckBox_) #: rc.cpp:768 msgid "Show the &email address of contacts instead of their friendly name" -msgstr "Näytä käyttäjien sähköpostiosoite heidän nimimerkkien sijaan." +msgstr "Näytä käyttäjien sähköpostiosoiteet heidän nimimerkkien sijaan." #. i18n: file: settings/emoticonspage.ui:24 #. i18n: ectx: attribute (title), widget (QWidget, tab) @@ -6149,7 +6147,7 @@ #. i18n: ectx: attribute (title), widget (QWidget, tab_2) #: rc.cpp:839 msgid "Email Client" -msgstr "Sähköpostiohjelma" +msgstr "Sähköpostiasiakasohjelma" #. i18n: file: settings/miscellaneouspage.ui:157 #. i18n: ectx: property (whatsThis), widget (QCheckBox, useLiveMailCheckbox_) @@ -6158,8 +6156,9 @@ "Check this box to use the Live Mail webmail site when you connect with " "accounts compatible with Live Mail." msgstr "" -"Valitse vaihtoehdoksi Live Mail verkkosähköposti yhdistäkseen käyttäjätiliä, " -"joka on tuettuna Live Mail palvelussa." +"Valitse vaihtoehdoksi Live Mail verkkosähköposti yhdistäkseen " +"käyttäjätilille," +"joka on yhteensopiva Live Mail palveluun." #. i18n: file: settings/miscellaneouspage.ui:160 #. i18n: ectx: property (text), widget (QCheckBox, useLiveMailCheckbox_) @@ -6172,20 +6171,20 @@ #: rc.cpp:848 msgid "Choose this option to use the email client used by the rest of KDE." msgstr "" -"Valitsemalla vaihtoehdon käyttääkseen sähköpostiohjelmistoa, jota KDE " -"käyttää." +"Valitsemalla vaihtoehdon käyttääkseen sähköpostiasiakasohjelmistoa, jota " +"käytetään KDE:ssa. " #. i18n: file: settings/miscellaneouspage.ui:170 #. i18n: ectx: property (text), widget (QRadioButton, useKDEMailClientRadio_) #: rc.cpp:851 msgid "Use the &KDE default email client" -msgstr "Käytä &KDE:n oletus sähköpostiohjelmaa" +msgstr "Käytä &KDE:n oletus sähköpostiasiakasohjelma" #. i18n: file: settings/miscellaneouspage.ui:180 #. i18n: ectx: property (text), widget (QRadioButton, useListedMailClientRadio_) #: rc.cpp:857 msgid "Use an &installed email client:" -msgstr "Käytä &asennettua sähköpostiohjelma" +msgstr "Käytä &asennettua sähköpostiasiakasohjelma:" #. i18n: file: settings/miscellaneouspage.ui:260 #. i18n: ectx: property (text), widget (QLabel, customMailClientInfo_) @@ -6233,16 +6232,15 @@ #. i18n: file: utils/likeback/likebackbar.ui:87 #. i18n: ectx: property (whatsThis), widget (QToolButton, m_featureButton) #: rc.cpp:895 rc.cpp:902 rc.cpp:909 rc.cpp:916 -#, fuzzy msgid "" "<html>Click on one of these icons to send your feedback to the developers of " "this application. You can disable the icons with the \"Show Feedback Icons\" " -"checkbox in the Help menu.</html>\n" +"checkbox in the Help menu.</html>" " " msgstr "" -"<html>Valitse yhdestä näistä lähettääkseen kehittäjille kommenttia " -"ohjelmistosta. Voit kytkeä ominaisuuden pois päältä \"Show Feedback Icons\" " -"auta valikosta.</html>" +"<html>Valitse yhdestä näistä lähettääkseen palautetta kehittäjille " +"ohjelmistosta. Voit kytkeä ominaisuuden pois päältä \"Näytä palaute ikoni\" " +"valitsemalla laatikosta auta-valikosta.</html>" #. i18n: file: utils/likeback/likebackbar.ui:49 #. i18n: ectx: property (toolTip), widget (QToolButton, m_dislikeButton) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pan...@us...> - 2009-07-15 17:02:38
|
Revision: 5077 http://kmess.svn.sourceforge.net/kmess/?rev=5077&view=rev Author: pano9000 Date: 2009-07-15 17:02:25 +0000 (Wed, 15 Jul 2009) Log Message: ----------- Updated the German translation. | Finally 0f0u :-P Modified Paths: -------------- branches/kmess/kmess-2.0.x/ChangeLog branches/kmess/kmess-2.0.x/po/de.po Modified: branches/kmess/kmess-2.0.x/ChangeLog =================================================================== --- branches/kmess/kmess-2.0.x/ChangeLog 2009-07-15 16:43:31 UTC (rev 5076) +++ branches/kmess/kmess-2.0.x/ChangeLog 2009-07-15 17:02:25 UTC (rev 5077) @@ -3,6 +3,7 @@ 2009-07-15 (Pano) * Merged an updated Greek translation by Dimitrios Glentadakis. * Merged an updated Finnish translation by Antoni Hussy. + * Merged an updated German translation. 2009-07-14 (Valerio) * Removed BinReloc, AutoPackage, and the other packaging support files. Modified: branches/kmess/kmess-2.0.x/po/de.po =================================================================== --- branches/kmess/kmess-2.0.x/po/de.po 2009-07-15 16:43:31 UTC (rev 5076) +++ branches/kmess/kmess-2.0.x/po/de.po 2009-07-15 17:02:25 UTC (rev 5077) @@ -10,7 +10,7 @@ "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: http://www.kmess.org/board/\n" "POT-Creation-Date: 2009-07-13 20:29+0200\n" -"PO-Revision-Date: 2009-07-13 21:06+0200\n" +"PO-Revision-Date: 2009-07-15 19:00+0200\n" "Last-Translator: Panagiotis Papadopoulos <pa...@gm...>\n" "Language-Team: German <kde...@kd...>\n" "MIME-Version: 1.0\n" @@ -2661,9 +2661,8 @@ # ugly #: main.cpp:183 -#, fuzzy msgid "KNotify not giving focus bug fix and KWin focus stealing prevention workaround" -msgstr "Behebung eines Fehlers, der KMess von KNotify den Fokus nicht korrekt erhalten ließ und Umgehungslösung für das Problem mit KWins Funktion „Vorbeugung gegen unerwünschte Aktivierung“" +msgstr "Behebung eines Fehlers, der KNotify das KMess-Fenster nicht korrekt Aktivieren ließ und Umgehungslösung eines Problems mit KWins Funktion „Vorbeugung gegen unerwünschte Aktivierung“" #: main.cpp:183 msgid "Quassel" @@ -4106,11 +4105,11 @@ msgid "Please, write it in <b>%1 or %2</b> (you may want to use an <a href=\"%3\">online translation tool</a> for this).<br/>" msgstr "Bitte verfassen Sie die Kommentare auf <b>%1 oder %2</b> (Sie können dafür auch ein <a href=\"%3\">Online-Übersetzungswerkzeug<a/> verwenden).<br/>" +# ugly #: utils/likeback/likebackdialog.cpp:159 -#, fuzzy msgctxt "Feedback dialog text, message to remind to balance the likes and dislikes" msgid "To make the comments you send more useful in improving this application, try to send the same amount of positive and negative comments.<br/>" -msgstr "Damit die von Ihnen gesendeten Kommentare, für die Verbesserung dieser Anwendung verwendet werden können , sollten Sie versuchen ungefähr die gleiche Anzahl an positiven und negativen Kommentaren zu senden.<br/>" +msgstr "Um den Nutzen Ihrer gesendeten Kommentare für die Verbesserung dieser Anwendung zu vergrößern, sollten Sie versuchen ungefähr die gleiche Anzahl an positiven und negativen Kommentaren zu senden.<br/>" #: utils/likeback/likebackdialog.cpp:168 msgctxt "Feedback dialog text, text to disallow feature requests" @@ -5714,8 +5713,7 @@ #: rc.cpp:902 #: rc.cpp:909 #: rc.cpp:916 -msgid "" -"<html>Click on one of these icons to send your feedback to the developers of this application. You can disable the icons with the \"Show Feedback Icons\" checkbox in the Help menu.</html>\n" +msgid "<html>Click on one of these icons to send your feedback to the developers of this application. You can disable the icons with the \"Show Feedback Icons\" checkbox in the Help menu.</html>\n" msgstr "<html>Klicken Sie auf eines der Symbole, um den Entwicklern Ihre Meinung über diese Anwendung mitzuteilen. Sie können die Symbole mit der Option „Rückmeldungssymbole anzeigen“, die im Hilfe-Menü zu finden ist, deaktivieren.</html>\n" #. i18n: file: utils/likeback/likebackbar.ui:49 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pan...@us...> - 2009-07-15 23:53:28
|
Revision: 5085 http://kmess.svn.sourceforge.net/kmess/?rev=5085&view=rev Author: pano9000 Date: 2009-07-15 23:53:26 +0000 (Wed, 15 Jul 2009) Log Message: ----------- Merged an updated Brazilian Portuguese translation | 0f0u Modified Paths: -------------- branches/kmess/kmess-2.0.x/ChangeLog branches/kmess/kmess-2.0.x/po/pt_BR.po Modified: branches/kmess/kmess-2.0.x/ChangeLog =================================================================== --- branches/kmess/kmess-2.0.x/ChangeLog 2009-07-15 23:44:38 UTC (rev 5084) +++ branches/kmess/kmess-2.0.x/ChangeLog 2009-07-15 23:53:26 UTC (rev 5085) @@ -1,4 +1,6 @@ +2009-07-16 (Pano) + * Merged an updated Brazilian Portuguese translation by Maurício Arozi Moraes. 2009-07-15 (Pano) * Merged an updated Greek translation by Dimitrios Glentadakis. Modified: branches/kmess/kmess-2.0.x/po/pt_BR.po =================================================================== --- branches/kmess/kmess-2.0.x/po/pt_BR.po 2009-07-15 23:44:38 UTC (rev 5084) +++ branches/kmess/kmess-2.0.x/po/pt_BR.po 2009-07-15 23:53:26 UTC (rev 5085) @@ -11,8 +11,8 @@ "Project-Id-Version: pt_BR\n" "Report-Msgid-Bugs-To: http://www.kmess.org/board/\n" "POT-Creation-Date: 2009-07-13 20:29+0200\n" -"PO-Revision-Date: 2009-07-06 22:21+0200\n" -"Last-Translator: Mauricio Arozi Moraes\n" +"PO-Revision-Date: 2009-07-16 01:52+0200\n" +"Last-Translator: \n" "Language-Team: American English <kde...@kd...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2505,12 +2505,11 @@ #: main.cpp:131 msgid "Daniel E. Moctezuma" -msgstr "" +msgstr "Daniel E. Moctezuma" #: main.cpp:131 -#, fuzzy msgid "Japanese translation" -msgstr "Tradução para Espanhol" +msgstr "Tradução para japonês" #: main.cpp:132 msgid "Korean translation" @@ -2786,10 +2785,11 @@ msgstr "Amarok" #: main.cpp:182 -#, fuzzy msgid "" "Custom crash handler implementation, System tray icon overlay implementation" -msgstr "Implementação do gerenciador de erros personalizado" +msgstr "" +"Implementação do gerenciador de erros personalizado, implementação da " +"sobreposição de ícones na bandeja do sistema" #: main.cpp:183 msgid "" @@ -6279,12 +6279,10 @@ #. i18n: file: utils/likeback/likebackbar.ui:87 #. i18n: ectx: property (whatsThis), widget (QToolButton, m_featureButton) #: rc.cpp:895 rc.cpp:902 rc.cpp:909 rc.cpp:916 -#, fuzzy msgid "" "<html>Click on one of these icons to send your feedback to the developers of " "this application. You can disable the icons with the \"Show Feedback Icons\" " "checkbox in the Help menu.</html>\n" -" " msgstr "" "<html>Clique em um destes ícones para enviar sua opinião aos desenvolvedores " "do programa. Você pode desabilitar estes ícones na opção \"Mostrar ícones " This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pan...@us...> - 2009-07-16 12:17:25
|
Revision: 5086 http://kmess.svn.sourceforge.net/kmess/?rev=5086&view=rev Author: pano9000 Date: 2009-07-16 12:16:59 +0000 (Thu, 16 Jul 2009) Log Message: ----------- Merged an updated Japanese translation | 89f268u Modified Paths: -------------- branches/kmess/kmess-2.0.x/ChangeLog branches/kmess/kmess-2.0.x/po/ja.po Modified: branches/kmess/kmess-2.0.x/ChangeLog =================================================================== --- branches/kmess/kmess-2.0.x/ChangeLog 2009-07-15 23:53:26 UTC (rev 5085) +++ branches/kmess/kmess-2.0.x/ChangeLog 2009-07-16 12:16:59 UTC (rev 5086) @@ -1,6 +1,7 @@ 2009-07-16 (Pano) * Merged an updated Brazilian Portuguese translation by Maurício Arozi Moraes. + * Merged an updated Japanese translation by Daniel E. Moctezuma. 2009-07-15 (Pano) * Merged an updated Greek translation by Dimitrios Glentadakis. Modified: branches/kmess/kmess-2.0.x/po/ja.po =================================================================== --- branches/kmess/kmess-2.0.x/po/ja.po 2009-07-15 23:53:26 UTC (rev 5085) +++ branches/kmess/kmess-2.0.x/po/ja.po 2009-07-16 12:16:59 UTC (rev 5086) @@ -1,19 +1,18 @@ # Japanese Translation # by Daniel E. Moctezuma. +# (2009) # # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # # Daniel E. Moctezuma <shi...@gm...>, 2009. -# Daniel E. Moctezuma, 2009. - msgid "" msgstr "" "Project-Id-Version: ja\n" "Report-Msgid-Bugs-To: http://www.kmess.org/board/\n" "POT-Creation-Date: 2009-07-09 22:56+0200\n" -"PO-Revision-Date: 2009-07-14 01:00-0700\n" -"Last-Translator: eduardo\n" +"PO-Revision-Date: 2009-07-15 18:33-0700\n" +"Last-Translator: Daniel E. Moctezuma <shi...@gm...>\n" "Language-Team: Japanese <kde...@kd...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -66,15 +65,12 @@ msgstr "保存" #: chat/chat.cpp:112 -#, fuzzy msgctxt "Error dialog box text" msgid "" "You cannot send invitations when there are multiple contacts in a chat. " "Please start a separate chat with the contact you wanted to send the " "invitation to." -msgstr "" -"チャットでコンタクトが多かったら招待を送信できません。コンタクトと別々の" -"チャットで招待を送信できます。" +msgstr "チャットでコンタクトが多かったら招待を送信できません。コンタクトと別々のチャットで招待を送信できます。" #: chat/chat.cpp:136 #, kde-format @@ -99,11 +95,10 @@ msgid "%1 and %2" msgstr "%1 さんと %2 さん" -#: chat/chat.cpp:365 -#, fuzzy, kde-format +#: chat/chat.cpp:365, kde-format msgctxt "Name of a chat tab" msgid "%1 et al." -msgstr "%1 さんと他人。" +msgstr "%1 さんと、その他の人。" #: chat/chat.cpp:661 #, kde-format @@ -143,41 +138,33 @@ msgstr "接続の問題が発生しました。" #: chat/chat.cpp:1174 -#, fuzzy msgctxt "Warning message shown in chat" msgid "" "There were too many different custom emoticons in your last message. Only " "the first 7 will be sent." -msgstr "" -"最後のメッセージには別のカスタム絵文字がたくさんありました。最初の7つだ" -"け送信します。" +msgstr "最後のメッセージには別のカスタム絵文字がたくさんありました。最初の7つだけ送信します。" -#: chat/chat.cpp:1187 -#, fuzzy, kde-format +#: chat/chat.cpp:1187, kde-format msgctxt "Warning message shown in chat, %1 is the contact's friendly name" msgid "" "%1 has sent you a voice clip, but KMess does not support voice clips yet." -msgstr "" -"%1 さんからボイスクリップを受信しましたがその機能はまだサポートしていま" -"せん。" +msgstr "%1 さんからボイスクリップを受信しましたがその機能はまだサポートしていません。" -#: chat/chat.cpp:1201 -#, fuzzy, kde-format +#: chat/chat.cpp:1201, kde-format msgctxt "Warning message shown in chat, %1 is the contact's friendly name" msgid "" "%1 has sent you an action message, but KMess does not support action " "messages yet." msgstr "%1 さんからアクションメッセージを受信しましたがその機能はまだサポートしていません。" -#: chat/chat.cpp:1216 -#, fuzzy, kde-format +#: chat/chat.cpp:1216, kde-format msgctxt "Warning message shown in chat, %1 is the contact's friendly name" msgid "" "%1 has sent you a Live Messenger feature that KMess does not support yet." -msgstr "%1 さんはKMessがまだサポートしないLive Messengerの機能を送信しました。" +msgstr "%1 さんからKMessがまだサポートしないLive Messengerの機能を受信しました。" -#: chat/chat.cpp:1242 -#, fuzzy, kde-format +#: chat/chat.cpp:1242, kde-format +#, fuzzy msgctxt "Message shown in the chat window, %1 is the contact's friendly name" msgid "" "You received a wink from %1, but displaying winks has been disabled. You can " @@ -214,18 +201,16 @@ msgid "%1 has sent you a wink: "%2"!" msgstr "%1 さんが "%2" のウインクを送信しました!" -#: chat/chat.cpp:1311 -#, fuzzy, kde-format +#: chat/chat.cpp:1311, kde-format msgctxt "Message shown in the chat window, %1 is the contact's friendly name" msgid "" "You received a wink from %1, but it could not be displayed. Make sure you " "have the "cabextract" program installed." msgstr "" -"%1 さんから受信したウインクを表示できませんでした。 "" -"cabextract" のプログラムがインストールされているのを検証してください。" +"%1 さんから受信したウインクを表示できませんでした。"cabextract" " +"のプログラムがインストールされているのを検証してください。" -#: chat/chat.cpp:1320 -#, fuzzy, kde-format +#: chat/chat.cpp:1320, kde-format msgctxt "" "Message shown in the chat window, %1 is the contact's friendly name, %2 is " "the wink name" @@ -236,17 +221,15 @@ "%1 さんから受信した "%2" のウインクを表示できませんでした。 " ""cabextract" のプログラムがインストールされているのを検証してください。" -#: chat/chat.cpp:1332 -#, fuzzy, kde-format +#: chat/chat.cpp:1332, kde-format msgctxt "Message shown in the chat window, %1 is the contact's friendly name" msgid "" "You received a wink from %1, but it could not be displayed. Extracting the " "wink package with "cabextract" has failed." msgstr "" -"%1 さんから受信したウインクを表示できませんでした。 "cabextract" でウインクのパッケージの展開に失敗しました。" +"%1 さんから受信したウインクを表示できませんでした。"cabextract" でウインクのパッケージの展開に失敗しました。" -#: chat/chat.cpp:1341 -#, fuzzy, kde-format +#: chat/chat.cpp:1341, kde-format msgctxt "" "Message shown in the chat window, %1 is the contact's friendly name, %2 is " "the wink name" @@ -257,18 +240,14 @@ "%1 さんから受信した "%2" のウインクを表示できませんでした。 " ""cabextract" でウインクのパッケージの展開に失敗しました。" -#: chat/chat.cpp:1353 -#, fuzzy, kde-format +#: chat/chat.cpp:1353, kde-format msgctxt "Message shown in the chat window, %1 is the contact's friendly name" msgid "" "You received a wink from %1, but it could not be displayed. The data could " "not be read." -msgstr "" -"%1 さんから受信したウインクを表示できませんでした。 データが読み取れま" -"せんでした。" +msgstr "%1 さんから受信したウインクを表示できませんでした。 データが読み取れませんでした。" -#: chat/chat.cpp:1362 -#, fuzzy, kde-format +#: chat/chat.cpp:1362, kde-format msgctxt "" "Message shown in the chat window, %1 is the contact's friendly name, %2 is " "the wink name" @@ -279,8 +258,8 @@ "%1 さんから受信した "%2" のウインクを表示できませんでした。" "データが読み取れませんでした。" -#: chat/chat.cpp:1404 -#, fuzzy, kde-format +#: chat/chat.cpp:1404, kde-format +#, fuzzy msgid "" "%1 has gone offline. Any messages you send will be delivered the next time " "he or she logs in." @@ -293,10 +272,9 @@ msgid "%1 has gone offline." msgstr "%1 さんはオフラインです。" -#: chat/chat.cpp:1419 -#, fuzzy, kde-format +#: chat/chat.cpp:1419, kde-format msgid "%1 has changed his or her status to "%2"." -msgstr "%1 さんの状態は "%2" に変更しました" +msgstr "%1 さんは "%2" に状態を変更しました。" #: chat/chat.cpp:1450 #, kde-format @@ -316,17 +294,15 @@ msgid "Failed to send the nudge to %1." msgstr "%1 さんにシェイクを送信できませんでした。" -#: chat/chat.cpp:1501 -#, fuzzy, kde-format +#: chat/chat.cpp:1501, kde-format msgctxt "Error message shown in chat, %1 is the contact's friendly name" msgid "Failed to send the wink to %1." -msgstr "%1 さんに送信したウインクに失敗しました。" +msgstr "%1 さんにウインクの送信に失敗しました。" -#: chat/chat.cpp:1511 -#, fuzzy, kde-format +#: chat/chat.cpp:1511, kde-format msgctxt "Error message shown in chat, %1 is the contact's friendly name" msgid "Failed to send the handwritten message to %1." -msgstr "%1 さんに送信した手書きのメッセージに失敗しました。" +msgstr "%1 さんに手書きのメッセージの送信に失敗しました。" #: chat/chat.cpp:1526 #, kde-format @@ -336,14 +312,11 @@ msgid "Failed to send the message to %2:<br/>%1" msgstr "%2 さんにこのメッセージの配信に失敗しました:<br/>%1" -#: chat/chat.cpp:1609 -#, fuzzy, kde-format +#: chat/chat.cpp:1609, kde-format msgid "" "The file "%1" could not be found on your computer, and the " "download failed." -msgstr "" -""%1" のファイルは見つからなくて、ダウンロードすることは失敗し" -"ました。" +msgstr ""%1" のファイルは見つからなくて、ダウンロードに失敗しました。" #: chat/chat.cpp:1646 #, kde-format @@ -639,11 +612,15 @@ msgstr "会話を開始または終わります(&C)" #: chat/chatwindow.cpp:1008 +#, fuzzy msgid "" "<html>You used an incorrect syntax for the /status command. The correct " "syntax is: <b>/status online|away|idle|brb|busy|lunch|phone|invisible</b>." "<br/>You can also use shortcuts like <b>/online</b> or <b>/phone</b>.</html>" msgstr "" +"<html>/status のコマンドは正しくない構文があります。正しいは <b>/status " +"online|away|idle|brb|busy|lunch|phone|invisible</b> です。<br/>" +"及びこのショートカットを使えます:<b>/online</b> または <b>/phone</b>。</html>" #: chat/chatwindow.cpp:1011 #, fuzzy @@ -746,10 +723,9 @@ msgctxt "Label text" msgid "" "Handwriting is disabled: KMess cannot send drawings to some of the contacts." -msgstr "" +msgstr "手書きが無効にしています:KMessはあるコンタクトに手書きが送信できません。" #: chat/chatwindow.cpp:2560 -#, fuzzy msgctxt "Label text" msgid "Handwriting is disabled: KMess cannot send drawings to this contact." msgstr "手書きモードは無効化されています:KMess はこのコンタクトに手書きを送信できません。" @@ -763,12 +739,12 @@ #: chat/chatwindow.cpp:2577 msgctxt "Label text" msgid "Winks are disabled: KMess cannot send winks to some of the contacts." -msgstr "" +msgstr "ウインクが無効にしています:KMessはあるコンタクトにウインクが送信できません。" #: chat/chatwindow.cpp:2583 msgctxt "Label text" msgid "Winks are disabled: KMess cannot send winks to this contact." -msgstr "" +msgstr "ウインクが無効にしています:KMessはこのコンタクトにウインクが送信できません。" #: chat/contactframe.cpp:298 msgid "&Start Private Chat" @@ -1627,7 +1603,7 @@ msgid "" "Waiting for an Internet connection to reconnect...<br /><a href='%" "1'>Reconnect now!</a>" -msgstr "" +msgstr "再接続するためにインターネット接続を待っています...<br /><a href='%1'>すぐに再接続!</a>" #: initialview.cpp:398 #, fuzzy @@ -1644,6 +1620,8 @@ "Waiting %1 seconds before reconnection...<br /><a href='%2'>Reconnect now!</" "a>" msgstr[0] "" +"再接続する前に%1秒を待っています...<br /><a href='%2'>すぐに再接続!</" +"a>" #: initialview.cpp:614 msgctxt "Button label" @@ -2048,18 +2026,19 @@ #: kmessview.cpp:1860 msgid "No chat logs could be found for this contact." -msgstr "" +msgstr "このコンタクトとチャット履歴が見つかりませんでした。" #: kmessview.cpp:1861 kmessview.cpp:1867 msgid "No chat history found" msgstr "チャット履歴が見つかりませんでした" #: kmessview.cpp:1866 +#, fuzzy msgid "" "No chat logs could be found for this contact. Note that new chats are not " "logged; if you want your chats to be logged, you can enable it in your " "account settings." -msgstr "" +msgstr "このコンタクトとチャット履歴が見つかりませんでした。新規チャットは保存されていません。アカウントの設定で有効にできます。" #: kmessview.cpp:2058 #, kde-format @@ -2171,9 +2150,8 @@ msgstr "" #: main.cpp:74 -#, fuzzy msgid "Main and yellow/blue/violet emoticon sets, Italian translation" -msgstr "黄色・青い・紫色の絵文字セット、イタリア語の翻訳" +msgstr "メインの黄色・青色・紫色の絵文字セット、イタリア語の翻訳" #: main.cpp:75 msgid "Cartoon emoticons" @@ -2448,6 +2426,7 @@ msgstr "" #: main.cpp:129 +#, fuzzy msgid "" "More Italian translation, Group selection in 'contact added user' dialog" msgstr "もっとイタリア語の翻訳、" @@ -2734,10 +2713,9 @@ msgstr "" #: main.cpp:182 -#, fuzzy msgid "" "Custom crash handler implementation, System tray icon overlay implementation" -msgstr "カスタムクラッシュハンドラの実装" +msgstr "カスタムクラッシュハンドラとシステムトレイのオーバーレイの実装" #: main.cpp:183 msgid "" @@ -2756,8 +2734,9 @@ msgstr "" #: main.cpp:186 +#, fuzzy msgid "Your name here?" -msgstr "" +msgstr "あなたの名前は?" #: main.cpp:189 msgctxt "NAME OF TRANSLATORS" @@ -2774,9 +2753,8 @@ msgstr "最初にコンタクトリストのウィンドウを表示しません" #: main.cpp:197 -#, fuzzy msgid "Autologin with the given email address" -msgstr "書いたメールアドレスで自動ログイン" +msgstr "入力したメールアドレスで自動ログイン" #: main.cpp:202 msgid "Run a debug test (developer build only)" @@ -2859,7 +2837,7 @@ #: network/applications/p2papplication.cpp:2394 #, kde-format msgid "Connecting to %1, port %2" -msgstr "%1(%2 ポート)に接続しています" +msgstr "%1(%2 ポート)に接続中" #: network/applications/filetransfer.cpp:421 #: network/applications/filetransferp2p.cpp:548 @@ -2950,10 +2928,9 @@ msgid "You are invited to start a meeting (using GnomeMeeting)." msgstr "あなたはミーティングに招待されました(GnomeMeetingで)" -#: network/applications/gnomemeeting.cpp:118 -#, fuzzy, kde-format +#: network/applications/gnomemeeting.cpp:118, kde-format msgid "Starting GnomeMeeting. Connecting to %1." -msgstr "GnomeMeetingを開始中。%1 に接続中。" +msgstr "GnomeMeetingを開始。%1 に接続中。" #: network/applications/gnomemeeting.cpp:161 msgid "Inviting the contact to a meeting." @@ -2999,17 +2976,18 @@ msgstr "招待が中止されました。" #: network/applications/msnremotedesktop.cpp:52 +#, fuzzy msgid "You are invited to share this contact's desktop." -msgstr "" +msgstr "コンタクトからリモートアシスタンスに招待しています。" -#: network/applications/msnremotedesktop.cpp:159 -#, fuzzy, kde-format +#: network/applications/msnremotedesktop.cpp:159, kde-format msgid "Starting KRDC. Connecting to %1." -msgstr "KRDCを開始。%1 に接続しています。" +msgstr "KRDCを開始。%1 に接続中。" #: network/applications/p2papplication.cpp:215 +#, fuzzy msgid "The contact has invited you to an activity not yet supported by KMess." -msgstr "" +msgstr "コンタクトにまだサポートしていない活動に招待されています。" #: network/applications/p2papplication.cpp:520 #: network/applications/p2papplication.cpp:687 @@ -3031,15 +3009,17 @@ msgstr "転送に失敗しました。データの準備に失敗しました。" #: network/applications/p2papplication.cpp:1192 +#, fuzzy msgid "The invitation was cancelled. Message was not directed to us." -msgstr "" +msgstr "招待がキャンセルされました。あなたへのメッセージではありませんでした。" #: network/applications/p2papplication.cpp:1744 +#, fuzzy #: network/applications/p2papplicationbase.cpp:855 #: network/applications/p2papplicationbase.cpp:935 msgid "" "The transfer failed. The contact sent bad data, or KMess does not support it." -msgstr "" +msgstr "転送に失敗しました。コンタクトは不良データを送信またはKMessがサポートしていません。" #: network/applications/p2papplication.cpp:1810 #: network/applications/p2papplication.cpp:1828 @@ -3099,7 +3079,7 @@ #: network/applications/p2papplicationbase.cpp:1210 msgid "The transfer failed. Could not open data source." -msgstr "" +msgstr "転送に失敗しました。データソースが開けられません。" #: network/applications/voiceconversation.cpp:71 msgid "You are invited to start a voice conversation." @@ -3117,12 +3097,11 @@ #: network/applications/voiceconversation.cpp:205 msgid "The invitation was cancelled. The audio device could not be opened." -msgstr "" +msgstr "招待がキャンセルされました。オーディオデバイスが開けません。" -#: network/applications/voiceconversation.cpp:218 -#, fuzzy, kde-format +#: network/applications/voiceconversation.cpp:218, kde-format msgid "Start voice conversation. Connecting to %1." -msgstr "ボイスチャットを開始。%1 に接続しています。" +msgstr "ボイスチャットを開始。%1 に接続中。" #: network/applications/voiceconversation.cpp:224 #, kde-format @@ -3135,14 +3114,15 @@ msgstr "コンタクトをボイスチャットに招待しています" #: network/applications/webapplicationp2p.cpp:101 -#: network/applications/webcamtransferp2p.cpp:146 -#, kde-format +#, fuzzy +#: network/applications/webcamtransferp2p.cpp:146, kde-format msgid "The contact is inviting you for '%1', but this is not implemented yet." -msgstr "" +msgstr "コンタクトは '%1' にあなたを招待していますがまだ実装されていません。" #: network/applications/webcamtransferp2p.cpp:113 +#, fuzzy msgid "The webcam invitation was cancelled. Bad data was received." -msgstr "" +msgstr "ウェブカムの招待がキャンセルされました。不良データを受信しました。" #: network/applications/webcamtransferp2p.cpp:134 msgid "You are asked to show your webcam." @@ -3161,8 +3141,8 @@ msgid "You have cancelled the transfer of file "%1"." msgstr ""%1" のファイル転送をキャンセルしました。" -#: network/extra/msnftpconnection.cpp:126 -#, fuzzy, kde-format +#: network/extra/msnftpconnection.cpp:126, kde-format +#, fuzzy msgid "The contact has cancelled the transfer of file "%1"." msgstr "コンタクトが "%1" のファイル転送をキャンセルしました。" @@ -3175,10 +3155,10 @@ msgid "Sending file %1" msgstr "%1 のファイルを送信しています" -#: network/extra/msnftpconnection.cpp:398 -#, kde-format +#: network/extra/msnftpconnection.cpp:398, kde-format +#, fuzzy msgid "The transfer of %1 failed. Could not open a local port." -msgstr "" +msgstr "%1 のファイル転送に失敗しました。ロカールポートが開けられませんでした。" #: network/extra/msnftpconnection.cpp:399 msgid "Could not open a local port." @@ -3212,7 +3192,7 @@ #: network/msnconnection.cpp:385 msgid "The email address you have tried to add is not a Live Messenger account" -msgstr "" +msgstr "追加してみたメールアドレスはLive Messengerアカウントではありません。" #: network/msnconnection.cpp:390 #, fuzzy @@ -3229,10 +3209,11 @@ msgstr "アカウントは無効です" #: network/msnconnection.cpp:401 +#, fuzzy msgid "" "This account name is invalid, or your Passport account has not been " "confirmed yet" -msgstr "" +msgstr "このアカウントは無効またはパスポートアカウントはまだ確認していません。" #: network/msnconnection.cpp:404 msgid "Your contact list is full" @@ -3261,19 +3242,21 @@ #: network/msnconnection.cpp:429 msgctxt "MSN error" msgid "This contact cannot be added to both allow and block list" -msgstr "" +msgstr "コンタクトは許可及びブロックリストに追加できません" #: network/msnconnection.cpp:433 +#, fuzzy msgid "" "The group name is already present in your contact list. Please use a " "different name" -msgstr "" +msgstr "グループ名はコンタクトリストに既にあります。他の名前を使ってください。" #: network/msnconnection.cpp:437 +#, fuzzy msgid "" "Your contact list has too many groups; you are allowed to only have at most " "30" -msgstr "" +msgstr "コンタクトリストはたくさんのグループがあります。最大のグループ数は30つです。" #: network/msnconnection.cpp:441 msgid "This group cannot be changed" @@ -3288,8 +3271,9 @@ msgstr "グループは空きではありません" #: network/msnconnection.cpp:454 +#, fuzzy msgid "The group name is too long; it cannot be longer than 61 bytes" -msgstr "" +msgstr "グループ名は長過ぎます。61バイトを超えられません。" #: network/msnconnection.cpp:459 msgid "Attempted to change group \"0\"" @@ -3314,12 +3298,10 @@ msgstr "" #: network/msnconnection.cpp:474 -#, fuzzy msgid "Switchboard server failed" msgstr "配電盤サーバに失敗しました" #: network/msnconnection.cpp:477 -#, fuzzy msgid "Transfer to switchboard server failed" msgstr "配電盤サーバの転送に失敗しました" @@ -3329,7 +3311,7 @@ #: network/msnconnection.cpp:485 msgid "Required field missing" -msgstr "" +msgstr "必要なフィールドが見つかりません" #: network/msnconnection.cpp:489 msgid "Not logged in" @@ -3339,7 +3321,7 @@ msgctxt "" "MSN error, due to e.g. trying the beta service without an allowed account" msgid "This account was denied access to the Live Messenger service" -msgstr "" +msgstr "このアカウントはLive Messengerサービスへのアクセスが拒否されました" #: network/msnconnection.cpp:498 msgid "Command is disabled" @@ -3355,12 +3337,14 @@ msgstr "" #: network/msnconnection.cpp:510 +#, fuzzy msgid "Bad command data" -msgstr "" +msgstr "不良なコマンドデータ" #: network/msnconnection.cpp:514 +#, fuzzy msgid "You are opening chat sessions too fast" -msgstr "" +msgstr "チャットセッションを速過ぎに開いています" #: network/msnconnection.cpp:518 msgid "You have too many open chat sessions" @@ -3371,12 +3355,14 @@ msgstr "" #: network/msnconnection.cpp:529 +#, fuzzy msgid "Bad friend name" -msgstr "" +msgstr "不良なニックネーム" #: network/msnconnection.cpp:535 +#, fuzzy msgid "Bad CVR data" -msgstr "" +msgstr "不良なCVRデータ" #: network/msnconnection.cpp:541 msgid "The server reports KMess is flooding it with too much data" @@ -3432,12 +3418,14 @@ msgstr "" #: network/msnconnection.cpp:604 +#, fuzzy msgid "The server is going down" -msgstr "" +msgstr "サーバがダウンしています" #: network/msnconnection.cpp:608 +#, fuzzy msgid "The server is going down soon" -msgstr "" +msgstr "サーバがすぐにダウンしています" #: network/msnconnection.cpp:615 msgid "Write is blocking" @@ -3697,14 +3685,15 @@ msgstr "" #: network/msnsockettcp.cpp:400 +#, fuzzy msgid "The connection to the server was lost" -msgstr "" +msgstr "サーバへの接続が失われました" #: network/soap/addressbookservice.cpp:777 #, kde-format msgctxt "Warning message" msgid "The specified email address, \"%1\", is not a valid email address!" -msgstr "書いたメールアドレス \"%1\" は無効です。" +msgstr "入力したメールアドレス \"%1\" は無効です。" #: network/soap/addressbookservice.cpp:787 #, kde-format @@ -3712,7 +3701,7 @@ msgid "" "The specified email address, \"%1\", does not belong to a Live Messenger " "account!" -msgstr "書いたメールアドレス \"%1\" は、Live Messengerのアカウントに属しません!" +msgstr "入力したメールアドレス \"%1\" は、Live Messengerのアカウントに属しません!" #: network/soap/addressbookservice.cpp:795 #: network/soap/addressbookservice.cpp:818 @@ -3752,7 +3741,7 @@ #: network/soap/httpsoapconnection.cpp:607 msgctxt "Error message" msgid "No response from web service" -msgstr "" +msgstr "ウェブサービスから応答がありません" #: network/soap/passportloginservice.cpp:208 #, kde-format @@ -3776,9 +3765,9 @@ msgstr "<html><b>%1</b> さんがあなたにオフラインメッセージを送信しました:<br/>'%2'</html>" #: notification/chatnotification.cpp:187 -#, kde-format +#, fuzzy, kde-format msgid "<html>%1's chat requests attention!</html>" -msgstr "" +msgstr "<html>%1 さんは注意を要求しています!</html>" #: notification/chatnotification.cpp:192 #, kde-format @@ -3932,9 +3921,10 @@ msgstr "チャットを開始" #: notification/notificationmanager.cpp:118 +#, fuzzy msgctxt "Button text for KDE notification boxes" msgid "Leave a Message" -msgstr "" +msgstr "メッセージを残す" #: notification/notificationmanager.cpp:122 msgctxt "Button text for KDE notification boxes" @@ -3984,7 +3974,6 @@ msgstr "参照..." #: settings/accountpage.cpp:82 -#, fuzzy msgid "Browse and Crop Picture..." msgstr "画像の参照と切り抜く..." @@ -4000,7 +3989,7 @@ #: settings/accountpage.cpp:489 msgid "Downloading of display picture failed" -msgstr "" +msgstr "表示アイコンのダウンロードに失敗しました" #: settings/accountpage.cpp:548 msgid "" @@ -4047,12 +4036,11 @@ "ここをクリックして、登録したアカウントリストからアカウントを削除します。\n" "現在接続しているアカウントとゲストアカウントを削除できません。" -#: settings/accountsettingsdialog.cpp:207 -#, kde-format +#: settings/accountsettingsdialog.cpp:207, kde-format msgid "" "The email address you have entered is not valid, and cannot be used as an " "account: '%1'" -msgstr "" +msgstr "入力したメールアドレスは無効で、アカウントとして使えません:'%1'" #: settings/accountsettingsdialog.cpp:215 #, kde-format @@ -4322,7 +4310,7 @@ #, kde-format msgid "" "The email address you have entered is not valid, and cannot be used: '%1'" -msgstr "" +msgstr "入力したメールアドレスは無効で使えません: '%1'" #: utils/likeback/likebackdialog.cpp:290 msgctxt "Dialog box text" @@ -4332,9 +4320,10 @@ msgstr "" #: utils/likeback/likebackdialog.cpp:293 +#, fuzzy msgctxt "Dialog box title" msgid "Comment Sent" -msgstr "" +msgstr "コメントが送信されました" #: utils/likeback/likebackdialog.cpp:304 msgctxt "Dialog box text" @@ -4344,9 +4333,10 @@ msgstr "" #: utils/likeback/likebackdialog.cpp:306 +#, fuzzy msgctxt "Dialog box title" msgid "Comment Sending Error" -msgstr "" +msgstr "コメントの送信エラー" #. i18n: file: chat/chatwindow.ui:181 #. i18n: ectx: property (toolTip), widget (QToolButton, textButton_) @@ -4357,7 +4347,6 @@ #. i18n: file: chat/chatwindow.ui:184 #. i18n: ectx: property (whatsThis), widget (QToolButton, textButton_) #: rc.cpp:6 -#, fuzzy msgid "Click this button to switch to the standard text mode." msgstr "このボタンをクリックして、テキストモードに切り換える。" @@ -4396,7 +4385,7 @@ msgid "" "Click this button to show all custom emoticons, so you can easily insert " "them in your messages." -msgstr "" +msgstr "このボタンをクリックして、すべてのカスタム絵文字を表示して、簡単にメッセージを挿入することができます。" #. i18n: file: chat/chatwindow.ui:270 #. i18n: ectx: property (whatsThis), widget (QToolButton, winksButton_) @@ -4479,7 +4468,7 @@ msgid "" "Enter here the email address of the person you wish to add to your contact " "list" -msgstr "" +msgstr "コンタクトリストに追加したい人のメールアドレスを入力してください。" #. i18n: file: dialogs/addcontactdialog.ui:50 #. i18n: ectx: property (text), widget (QLabel, label) @@ -4674,7 +4663,7 @@ #. i18n: ectx: property (toolTip), widget (QLineEdit, otherEdit_) #: rc.cpp:181 msgid "Enter the email address of a person to invite" -msgstr "" +msgstr "招待したい人のメールアドレスを入力してください。" #. i18n: file: dialogs/invitedialog.ui:101 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_2) @@ -4817,10 +4806,14 @@ #. i18n: file: initialview.ui:97 #. i18n: ectx: property (toolTip), widget (QLabel, pictureLabel_) #: rc.cpp:264 +#, fuzzy msgid "" "<html>Click here to display the options for the currently selected account, " "or scroll using the mouse wheel to switch between the saved accounts</html>" msgstr "" +"<html>" +"ここをクリックして、今選択しているアカウントのオプションを表示、または保存したアカウントを切り替えるには、マウスホイールを使用してスクロールできる。</h" +"tml>" #. i18n: file: initialview.ui:179 #. i18n: ectx: property (toolTip), widget (KComboBox, handleCombobox_) @@ -4963,7 +4956,7 @@ #. i18n: ectx: property (whatsThis), widget (QLabel, friendlyNameLabel_) #: rc.cpp:342 msgid "Enter a name other contacts should see when you are connected." -msgstr "" +msgstr "接続する時にコンタクトが見えるニックネームを入力してください。" #. i18n: file: settings/accountpage.ui:44 #. i18n: ectx: property (text), widget (QLabel, friendlyNameLabel_) @@ -4978,8 +4971,8 @@ "Enter the email address of your MSN Passport account. You can register a new " "account at http://register.passport.com/" msgstr "" -"MSN パスポートアカウントのメールアドレスドを入力してください。新規アカウント" -"は http://register.passport.com/ で登録できます。" +"MSN パスポートアカウントのメールアドレスドを入力してください。新規アカウントは http://register.passport.com/ " +"で登録できます。" #. i18n: file: settings/accountpage.ui:63 #. i18n: ectx: property (text), widget (QLabel, handleLabel_4) @@ -4994,8 +4987,7 @@ "Enter the password of your MSN Passport account. You can register a new " "account at http://register.passport.com/" msgstr "" -"MSN パスポートアカウントのパスワードを入力してください。新規アカウントは " -"http://register.passport.com/ で登録できます。" +"MSN パスポートアカウントのパスワードを入力してください。新規アカウントは http://register.passport.com/ で登録できます。" #. i18n: file: settings/accountpage.ui:82 #. i18n: ectx: property (text), widget (QLabel, passwordLabel_) @@ -5108,8 +5100,9 @@ #. i18n: file: settings/accountpage.ui:418 #. i18n: ectx: property (text), widget (KUrlLabel, verifyButton_) #: rc.cpp:416 +#, fuzzy msgid "Request verification email" -msgstr "" +msgstr "メールの確認をリクエストする" #. i18n: file: settings/accountpage.ui:427 #. i18n: ectx: property (tipText), widget (KUrlLabel, verifyButton_) @@ -5166,7 +5159,7 @@ #. i18n: ectx: property (text), widget (QCheckBox, useIdleTimerCheckBox_) #: rc.cpp:440 msgid "Change status to \"&Idle\" when inactive" -msgstr "アクティブではないときに状態は\"アイドル\"に変更(&I)" +msgstr "アクティブではないときに\"アイドル\"に状態を変更(&I)" #. i18n: file: settings/accountpage.ui:556 #. i18n: ectx: property (whatsThis), widget (QLabel, idleLabel1_) @@ -5175,9 +5168,10 @@ #. i18n: file: settings/accountpage.ui:582 #. i18n: ectx: property (whatsThis), widget (QLabel, idleLabel2_) #: rc.cpp:446 rc.cpp:452 rc.cpp:455 +#, fuzzy msgid "" "Controls the number of minutes before KMess changes the status to \"Idle\"." -msgstr "" +msgstr "アイドルになる前の数分をコントロールできます。" #. i18n: file: settings/accountpage.ui:559 #. i18n: ectx: property (text), widget (QLabel, idleLabel1_) @@ -5209,11 +5203,10 @@ #. i18n: file: settings/accountpage.ui:647 #. i18n: ectx: property (toolTip), widget (QCheckBox, hideNotificationsWhenBusyCheckBox_) #: rc.cpp:467 -#, fuzzy msgid "" "If enabled, you will not receive any notifications when your status is set " "to \"Busy\"." -msgstr "\"取り込み中\"の場合には通知を表示しません(&D)" +msgstr "有効にすると、状態は\"取り込み中\"になるときに通知を表示しません。" #. i18n: file: settings/accountpage.ui:650 #. i18n: ectx: property (text), widget (QCheckBox, hideNotificationsWhenBusyCheckBox_) @@ -5307,13 +5300,13 @@ #. i18n: ectx: property (title), widget (QGroupBox, saveChatsToFileCheckBox_) #: rc.cpp:518 msgid "Additionally save chat logs to file" -msgstr "" +msgstr "ファイルに保存する" #. i18n: file: settings/chatloggingpage.ui:51 #. i18n: ectx: property (toolTip), widget (QLabel, label_2) #: rc.cpp:521 msgid "With this option, you can choose how KMess will save your chats" -msgstr "" +msgstr "このオプションで保存方を選択できます。" #. i18n: file: settings/chatloggingpage.ui:54 #. i18n: ectx: property (text), widget (QLabel, label_2) @@ -5471,8 +5464,9 @@ #. i18n: file: settings/chatloggingpage.ui:230 #. i18n: ectx: property (text), widget (QRadioButton, singleDirectoryRadioButton_) #: rc.cpp:593 +#, fuzzy msgid "Do not organize files" -msgstr "" +msgstr "ファイルを整理しません" #. i18n: file: settings/chatloggingpage.ui:273 #. i18n: ectx: property (toolTip), widget (QToolButton, chatSavePathButton_) @@ -5543,9 +5537,8 @@ #. i18n: file: settings/chatstylepage.ui:243 #. i18n: ectx: property (toolTip), widget (QCheckBox, showWinksCheckBox_) #: rc.cpp:635 -#, fuzzy msgid "Enables the appearance of winks in the chat window." -msgstr "メッセージにタイムスタンプを表示するのを有効にする。" +msgstr "チャットウィンドウでウインクを表示するのを有効にする。" #. i18n: file: settings/chatstylepage.ui:246 #. i18n: ectx: property (whatsThis), widget (QCheckBox, showWinksCheckBox_) @@ -5632,7 +5625,7 @@ #. i18n: ectx: property (text), widget (QCheckBox, useContactFontCheckBox_) #: rc.cpp:680 msgid "&Force messages from your contacts to use this font:" -msgstr "" +msgstr "コンタクトからメッセージは強制的にこのフォントを使用する(&F):" #. i18n: file: settings/chatstylepage.ui:536 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_4) @@ -5700,7 +5693,6 @@ #. i18n: file: settings/chatstylepage.ui:602 #. i18n: ectx: property (whatsThis), widget (QCheckBox, displayChatUserPictureCheckBox_) #: rc.cpp:714 -#, fuzzy msgid "" "If this option is enabled, your own display picture will be shown in the " "contacts panel, along with the pictures of the contacts in that chat." @@ -5762,11 +5754,10 @@ #. i18n: file: settings/contactlistpage.ui:33 #. i18n: ectx: property (whatsThis), widget (QCheckBox, nowListeningCheckBox_) #: rc.cpp:741 -#, fuzzy msgid "" "If enabled, your contacts can see which song you are listening to. This " "information is retrieved from the currently active media player." -msgstr "有効にする場合にはコンタクトは今聴いている曲名を見えます。この情報は今使っているメディアプレイヤーから取得されます。" +msgstr "有効にすると、コンタクトは今あなたが聴いている曲名を見えます。この情報は今使っているメディアプレイヤーから取得します。" #. i18n: file: settings/contactlistpage.ui:36 #. i18n: ectx: property (text), widget (QCheckBox, nowListeningCheckBox_) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pan...@us...> - 2009-07-16 14:50:25
|
Revision: 5087 http://kmess.svn.sourceforge.net/kmess/?rev=5087&view=rev Author: pano9000 Date: 2009-07-16 14:49:53 +0000 (Thu, 16 Jul 2009) Log Message: ----------- * Merged an updated Arabic translation | 0f7u * Some small fixes for the German translation | still 0f0u Modified Paths: -------------- branches/kmess/kmess-2.0.x/ChangeLog branches/kmess/kmess-2.0.x/po/ar.po branches/kmess/kmess-2.0.x/po/de.po Modified: branches/kmess/kmess-2.0.x/ChangeLog =================================================================== --- branches/kmess/kmess-2.0.x/ChangeLog 2009-07-16 12:16:59 UTC (rev 5086) +++ branches/kmess/kmess-2.0.x/ChangeLog 2009-07-16 14:49:53 UTC (rev 5087) @@ -2,6 +2,8 @@ 2009-07-16 (Pano) * Merged an updated Brazilian Portuguese translation by Maurício Arozi Moraes. * Merged an updated Japanese translation by Daniel E. Moctezuma. + * Merged an updated Arabic translation by Ma'moun Diraneyya. + * Merged an updated German translation. 2009-07-15 (Pano) * Merged an updated Greek translation by Dimitrios Glentadakis. Modified: branches/kmess/kmess-2.0.x/po/ar.po =================================================================== --- branches/kmess/kmess-2.0.x/po/ar.po 2009-07-16 12:16:59 UTC (rev 5086) +++ branches/kmess/kmess-2.0.x/po/ar.po 2009-07-16 14:49:53 UTC (rev 5087) @@ -10,7 +10,7 @@ "Project-Id-Version: KMess\n" "Report-Msgid-Bugs-To: http://www.kmess.org/board/\n" "POT-Creation-Date: 2009-07-13 20:29+0200\n" -"PO-Revision-Date: 2009-06-11 08:07+0300\n" +"PO-Revision-Date: 2009-07-16 17:07+0300\n" "Last-Translator: Ma'moun Diraneyya <mam...@gm...>\n" "Language-Team: Arabic <do...@ar...>\n" "MIME-Version: 1.0\n" @@ -19,8 +19,7 @@ "X-Generator: KBabel 1.11.4\n" "X-Poedit-Language: Arabic\n" "X-Poedit-SourceCharset: utf-8\n" -"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " -"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" +"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" #: account.cpp:45 account.cpp:744 msgid "I am away from my computer" @@ -152,14 +151,12 @@ msgid "" "There were too many different custom emoticons in your last message. Only " "the first 7 will be sent." -msgstr "" -"احتوت رسالتك الأخيرة على عدد ضخم من الوجوه المُخصَّصة، لذا سيُبعث منهم أول 7 فقط." +msgstr "احتوت رسالتك الأخيرة على عدد ضخم من الوجوه المُخصَّصة، لذا سيُبعث منهم أول 7 فقط." #: chat/chat.cpp:1187 #, kde-format msgctxt "Warning message shown in chat, %1 is the contact's friendly name" -msgid "" -"%1 has sent you a voice clip, but KMess does not support voice clips yet." +msgid "%1 has sent you a voice clip, but KMess does not support voice clips yet." msgstr "لقد بعث %1 لك مقطعًا صوتيًا، لكن خميس لا يدعم المقاطع الصوتية بعد." #: chat/chat.cpp:1201 @@ -173,8 +170,7 @@ #: chat/chat.cpp:1216 #, kde-format msgctxt "Warning message shown in chat, %1 is the contact's friendly name" -msgid "" -"%1 has sent you a Live Messenger feature that KMess does not support yet." +msgid "%1 has sent you a Live Messenger feature that KMess does not support yet." msgstr "لقد أرسل %1 لك إحدى مزايا مرسال لايف غير المدعومة بعد في خميس." #: chat/chat.cpp:1242 @@ -369,8 +365,7 @@ #: chat/chatmessageview.cpp:345 #, kde-format -msgctxt "" -"Header of a chat file saved in HTML: %1 is the contact, %2 the date and time" +msgctxt "Header of a chat file saved in HTML: %1 is the contact, %2 the date and time" msgid "Chat with %1<br/>Started on: %2" msgstr "محادثة مع %1<br/>بدأت في: %2" @@ -746,8 +741,7 @@ #: chat/chatwindow.cpp:2554 msgctxt "Label text" -msgid "" -"Handwriting is disabled: KMess cannot send drawings to some of the contacts." +msgid "Handwriting is disabled: KMess cannot send drawings to some of the contacts." msgstr "التخطيط معطَّل: لا يستطيع خميس إرسال الرسمات إلى بعض المتراسلين." #: chat/chatwindow.cpp:2560 @@ -1184,8 +1178,7 @@ msgid "" "Could not save the Network Window log. Make sure you have permission to " "write in the folder where it is being saved." -msgstr "" -"تعذَّر حفظ سجل نافذة الشبكة. تأكد من امتلاكك الإذن للكتابة في مجلد السجلات." +msgstr "تعذَّر حفظ سجل نافذة الشبكة. تأكد من امتلاكك الإذن للكتابة في مجلد السجلات." #: dialogs/networkwindow.cpp:1177 msgid "Cannot close the main connection tab." @@ -1641,8 +1634,7 @@ #: initialview.cpp:419 #, kde-format msgctxt "Status message on login screen" -msgid "" -"Waiting %1 second before reconnection...<br /><a href='%2'>Reconnect now!</a>" +msgid "Waiting %1 second before reconnection...<br /><a href='%2'>Reconnect now!</a>" msgid_plural "" "Waiting %1 seconds before reconnection...<br /><a href='%2'>Reconnect now!</" "a>" @@ -1650,14 +1642,10 @@ msgstr[1] "" "سيلبث ثانية واحدة قبل إعادة الاتصال...<br /><a href='%2'>أعِد الاتصال الآن!</" "a>" -msgstr[2] "" -"سيلبث ثانيتين قبل إعادة الاتصال...<br /><a href='%2'>أعِد الاتصال الآن!</a>" -msgstr[3] "" -"سيلبث %1 ثوانٍ قبل إعادة الاتصال...<br /><a href='%2'>أعِد الاتصال الآن!</a>" -msgstr[4] "" -"سيلبث %1 ثانية قبل إعادة الاتصال...<br /><a href='%2'>أعِد الاتصال الآن!</a>" -msgstr[5] "" -"سيلبث %1 ثانية قبل إعادة الاتصال...<br /><a href='%2'>أعِد الاتصال الآن!</a>" +msgstr[2] "سيلبث ثانيتين قبل إعادة الاتصال...<br /><a href='%2'>أعِد الاتصال الآن!</a>" +msgstr[3] "سيلبث %1 ثوانٍ قبل إعادة الاتصال...<br /><a href='%2'>أعِد الاتصال الآن!</a>" +msgstr[4] "سيلبث %1 ثانية قبل إعادة الاتصال...<br /><a href='%2'>أعِد الاتصال الآن!</a>" +msgstr[5] "سيلبث %1 ثانية قبل إعادة الاتصال...<br /><a href='%2'>أعِد الاتصال الآن!</a>" #: initialview.cpp:614 msgctxt "Button label" @@ -1722,8 +1710,7 @@ msgid "" "The group <b>%1</b> is not empty! First remove all contacts from it, then " "try again!" -msgstr "" -"المجموعة <b>%1</b> ليست فارغة: أزل جميع المتراسلين منها، ثم حاول مجددًا!" +msgstr "المجموعة <b>%1</b> ليست فارغة: أزل جميع المتراسلين منها، ثم حاول مجددًا!" #: kmess.cpp:628 kmess.cpp:635 msgctxt "dialog title" @@ -1761,8 +1748,7 @@ msgid "" "<p>Cannot login automatically with account <b>%1</b>:<br/>you must first " "save the account password!</p>" -msgstr "" -"<p>لا يمكن الولوج آليًا بالحساب <b>%1</b>:<br/>يجب عليك أولاً حفظ كلمة سره!</p>" +msgstr "<p>لا يمكن الولوج آليًا بالحساب <b>%1</b>:<br/>يجب عليك أولاً حفظ كلمة سره!</p>" #: kmess.cpp:757 msgctxt "dialog title" @@ -1808,8 +1794,7 @@ #: kmess.cpp:1747 #, kde-format -msgctxt "" -"Main window caption: switched order to easily distinguish it from chats" +msgctxt "Main window caption: switched order to easily distinguish it from chats" msgid "KMess - %1" msgstr "خميس - %1" @@ -2096,8 +2081,7 @@ #: kmessviewdelegate.cpp:293 #, kde-format -msgctxt "" -"Group name in the contact list with online/total contacts of that group" +msgctxt "Group name in the contact list with online/total contacts of that group" msgid "%1 (%2/%3)" msgstr "%1 (%2/%3)" @@ -2301,8 +2285,7 @@ #: main.cpp:94 msgid "Simplified Chinese translation, file send bug fix, proxy connect code" -msgstr "" -"الترجمة الصينية المبسطة، وإصلاح علَّة إرسال ملف، وكتابة شفرة الاتصال عبر وسيط" +msgstr "الترجمة الصينية المبسطة، وإصلاح علَّة إرسال ملف، وكتابة شفرة الاتصال عبر وسيط" #: main.cpp:95 main.cpp:162 msgid "Liu Sizhuang" @@ -2481,19 +2464,16 @@ msgstr "Andrea Decorte" #: main.cpp:129 -msgid "" -"More Italian translation, Group selection in 'contact added user' dialog" -msgstr "" -"ترجمة إيطالية إضافية، واختيار مجموعة في صندوق حوار 'المُستخدم المُضاف للمتراسل'" +msgid "More Italian translation, Group selection in 'contact added user' dialog" +msgstr "ترجمة إيطالية إضافية، واختيار مجموعة في صندوق حوار 'المُستخدم المُضاف للمتراسل'" #: main.cpp:131 msgid "Daniel E. Moctezuma" -msgstr "" +msgstr "Daniel E. Moctezuma" #: main.cpp:131 -#, fuzzy msgid "Japanese translation" -msgstr "الترجمة الإسبانية" +msgstr "الترجمة اليابانية" #: main.cpp:132 msgid "Korean translation" @@ -2765,16 +2745,14 @@ msgstr "أمارُك" #: main.cpp:182 -#, fuzzy -msgid "" -"Custom crash handler implementation, System tray icon overlay implementation" -msgstr "تنفيذ مدبِّر انهيار مخصَّص" +msgid "Custom crash handler implementation, System tray icon overlay implementation" +msgstr "تنفيذ مدبِّر انهيار مخصَّص، بالإضافة إلى تنفيذ تراكب أيقونة صينية النظام" #: main.cpp:183 msgid "" "KNotify not giving focus bug fix and KWin focus stealing prevention " "workaround" -msgstr "" +msgstr "إصلاح علَّة اختلال التركيز في مبلِّغك، بالإضافة إلى تحايل منع اختطاف التركيز في نافذةك" #: main.cpp:183 msgid "Quassel" @@ -2871,8 +2849,7 @@ #: network/applications/filetransfer.cpp:290 #: network/applications/filetransferp2p.cpp:376 #, kde-format -msgid "" -"The transfer of the file "%1" failed. Could not save the file." +msgid "The transfer of the file "%1" failed. Could not save the file." msgstr "فشل نقل الملف "%1"؛ تعذَّر حفظه." #: network/applications/filetransfer.cpp:295 @@ -2930,15 +2907,13 @@ #: network/applications/filetransfer.cpp:742 #: network/applications/filetransferp2p.cpp:811 #, kde-format -msgid "" -"The transfer of the file "%1" failed. The file does not exist." +msgid "The transfer of the file "%1" failed. The file does not exist." msgstr "فشل نقل الملف "%1"، فالملف غير موجود." #: network/applications/filetransfer.cpp:747 #: network/applications/filetransferp2p.cpp:816 #, kde-format -msgid "" -"The transfer of the file "%1" failed. The file could not be read." +msgid "The transfer of the file "%1" failed. The file could not be read." msgstr "فشل نقل الملف "%1"، فقراءته متعذِّرة." #: network/applications/filetransfer.cpp:774 @@ -3062,8 +3037,7 @@ #: network/applications/p2papplication.cpp:1744 #: network/applications/p2papplicationbase.cpp:855 #: network/applications/p2papplicationbase.cpp:935 -msgid "" -"The transfer failed. The contact sent bad data, or KMess does not support it." +msgid "The transfer failed. The contact sent bad data, or KMess does not support it." msgstr "فشل النقل؛ فإما أن المتراسل بعث بيانات فاسدة، أو أن خميس لا يدعمها." #: network/applications/p2papplication.cpp:1810 @@ -3288,8 +3262,7 @@ msgid "" "The group name is already present in your contact list. Please use a " "different name" -msgstr "" -"اسم المجموعة هذا موجود سلفًا في لائحة متراسليك، لذا استخدم من فضلك اسمًا مختلفًا" +msgstr "اسم المجموعة هذا موجود سلفًا في لائحة متراسليك، لذا استخدم من فضلك اسمًا مختلفًا" #: network/msnconnection.cpp:437 msgid "" @@ -3355,8 +3328,7 @@ msgstr "لم تلج" #: network/msnconnection.cpp:493 -msgctxt "" -"MSN error, due to e.g. trying the beta service without an allowed account" +msgctxt "MSN error, due to e.g. trying the beta service without an allowed account" msgid "This account was denied access to the Live Messenger service" msgstr "مُنع هذا الحساب من النفاذ إلى خدمة مِرسال لايف" @@ -3413,8 +3385,7 @@ msgstr "لا يقبل المتراسلين الجُدُد" #: network/msnconnection.cpp:559 -msgid "" -"You have a Kids Passport account, you need parental consent to chat online" +msgid "You have a Kids Passport account, you need parental consent to chat online" msgstr "" "تملك حساب باسبورت للأطفال، لذا أنت بحاجة لموافقة ذويك حتى تتمكن من التحدث " "على الشبكة" @@ -3438,8 +3409,7 @@ msgstr "خدمة مِرسال لايف غير متاحة مؤقتًا؛ هناك خطأ داخلي في الخادوم" #: network/msnconnection.cpp:596 -msgid "" -"The Live Messenger service is temporarily unavailable. The server is too busy" +msgid "The Live Messenger service is temporarily unavailable. The server is too busy" msgstr "خدمة مِرسال لايف غير متاحة مؤقتًا؛ الخادوم مشغول جدًا" #: network/msnconnection.cpp:600 @@ -3472,8 +3442,7 @@ #: network/msnconnection.cpp:637 #, kde-format -msgid "" -"Unknown error code received from the server: %1<br/>Technical details: %2" +msgid "Unknown error code received from the server: %1<br/>Technical details: %2" msgstr "استُقبلت شفرة خطأ مجهولة من الخادوم: %1<br/>التفاصيل التقنية: %2" #: network/msnconnection.cpp:659 network/msnnotificationconnection.cpp:2946 @@ -3625,8 +3594,7 @@ #: network/msnnotificationconnection.cpp:3019 #, kde-format -msgctxt "" -"Connection error (Server-reported user error): passive notification message" +msgctxt "Connection error (Server-reported user error): passive notification message" msgid "<p><i>Error</i>: %1</p>" msgstr "<p><i>خطأ</i>: %1</p>" @@ -3638,8 +3606,7 @@ #: network/msnnotificationconnection.cpp:3032 #, kde-format -msgctxt "" -"Connection error (Server-reported server error): passive notification message" +msgctxt "Connection error (Server-reported server error): passive notification message" msgid "<p><i>Messenger Service Error</i>: %1</p>" msgstr "<p><i>خطأ في خدمة المرسال</i>: %1</p>" @@ -3651,8 +3618,7 @@ #: network/msnnotificationconnection.cpp:3042 #, kde-format -msgctxt "" -"Connection error (Server-reported client error): passive notification message" +msgctxt "Connection error (Server-reported client error): passive notification message" msgid "<p><i>KMess Error</i>: %1</p>" msgstr "<p><i>خطأ في خميس</i>: %1</p>" @@ -4224,8 +4190,7 @@ msgstr "مرحبًا بك في %1." #: utils/likeback/likeback.cpp:336 -msgctxt "" -"Welcome dialog text, explanation for both the like and dislike buttons" +msgctxt "Welcome dialog text, explanation for both the like and dislike buttons" msgid "" "Each time you have a great or frustrating experience, please click on the " "appropriate face below the window title-bar, briefly describe what you like " @@ -4271,8 +4236,7 @@ #: utils/likeback/likeback.cpp:380 msgctxt "Welcome dialog text, usage example" -msgid "" -"<b>I dislike</b> the welcome page of this assistant. Too time consuming." +msgid "<b>I dislike</b> the welcome page of this assistant. Too time consuming." msgstr "<b>لم ترقني</b> صفحة الترحيب لهذا المُساعِد، إنها مستهلكة للوقت كثيرًا." #: utils/likeback/likeback.cpp:388 @@ -4314,8 +4278,7 @@ #: utils/likeback/likebackdialog.cpp:139 #, kde-format -msgctxt "" -"Feedback dialog text, message with one accepted language for the comments" +msgctxt "Feedback dialog text, message with one accepted language for the comments" msgid "" "Please, write it in <b>%1</b> (you may want to use an <a href=\"%3\">online " "translation tool</a> for this).<br/>" @@ -4336,8 +4299,7 @@ "ترجمة شبكية</a> لهذا).<br/>" #: utils/likeback/likebackdialog.cpp:159 -msgctxt "" -"Feedback dialog text, message to remind to balance the likes and dislikes" +msgctxt "Feedback dialog text, message to remind to balance the likes and dislikes" msgid "" "To make the comments you send more useful in improving this application, try " "to send the same amount of positive and negative comments.<br/>" @@ -4365,8 +4327,7 @@ #: utils/likeback/likebackdialog.cpp:216 #, kde-format -msgid "" -"The email address you have entered is not valid, and cannot be used: '%1'" +msgid "The email address you have entered is not valid, and cannot be used: '%1'" msgstr "العنوان البريدي الذي أدخلته غير صالح، ولا يُمكن استخدامه: '%1'" #: utils/likeback/likebackdialog.cpp:290 @@ -4388,8 +4349,7 @@ msgid "" "<p>There has been an error while trying to send the comment.</p><p>Please, " "try again later.</p>" -msgstr "" -"<p>حدث خطأ أثناء محاولة إرسال التقرير.</p><p>حاول مجددًا من فضلك لاحقًا.</p>" +msgstr "<p>حدث خطأ أثناء محاولة إرسال التقرير.</p><p>حاول مجددًا من فضلك لاحقًا.</p>" #: utils/likeback/likebackdialog.cpp:306 msgctxt "Dialog box title" @@ -4555,8 +4515,7 @@ #. i18n: file: dialogs/awaymessagedialog.ui:19 #. i18n: ectx: property (whatsThis), widget (QLabel, label) #: rc.cpp:87 -msgid "" -"Enter a message to be automatically sent to people who try to message you." +msgid "Enter a message to be automatically sent to people who try to message you." msgstr "أدخل رسالة تُبعث تلقائيًا إلى من يحاول مراسلتك." #. i18n: file: dialogs/awaymessagedialog.ui:22 @@ -4797,7 +4756,7 @@ #. i18n: ectx: property (text), widget (QLabel, label) #: rc.cpp:226 msgid "Command:" -msgstr "أمر:" +msgstr "الأمر:" #. i18n: file: dialogs/networkwindow.ui:53 #. i18n: ectx: property (text), widget (QLabel, label_3) @@ -4857,7 +4816,7 @@ #. i18n: ectx: property (text), widget (QPushButton, cleanupButton_) #: rc.cpp:258 msgid "C&lean Up" -msgstr "ا&مسح" +msgstr "ا&محِ" #. i18n: file: dialogs/transferwindow.ui:141 #. i18n: ectx: property (text), widget (QPushButton, closeButton_) @@ -4878,8 +4837,7 @@ #. i18n: file: initialview.ui:179 #. i18n: ectx: property (toolTip), widget (KComboBox, handleCombobox_) #: rc.cpp:270 -msgid "" -"Enter here the email address of your registered Passport or Live account" +msgid "Enter here the email address of your registered Passport or Live account" msgstr "أدخل هنا عنوان بريد حسابك المسجَّل في خدمة لايف أو باسبورت" #. i18n: file: initialview.ui:195 @@ -4930,13 +4888,12 @@ #. i18n: ectx: property (text), widget (QCheckBox, rememberPasswordCheckBox_) #: rc.cpp:297 msgid "R&emember password" -msgstr "تذ&كر كلمة السر" +msgstr "تذ&كَّر كلمة السر" #. i18n: file: initialview.ui:329 #. i18n: ectx: property (toolTip), widget (QPushButton, connectButton_) #: rc.cpp:303 -msgid "" -"Click this button to start using KMess, or to cancel a connection attempt" +msgid "Click this button to start using KMess, or to cancel a connection attempt" msgstr "انقر هذا الزر لبدء استخدام خميس، أو لإلغاء طلب اتصال" #. i18n: file: initialview.ui:428 @@ -4979,8 +4936,7 @@ msgid "" "<html>Click here to go to the Live web site, to reset your account's " "password</html>" -msgstr "" -"<html>انقر هنا لتذهب إلى صفحة لايف على الوِب، لتصفير كلمة سر حسابك</html>" +msgstr "<html>انقر هنا لتذهب إلى صفحة لايف على الوِب، لتصفير كلمة سر حسابك</html>" #. i18n: file: kmessinterfaceui.rc:5 #. i18n: ectx: Menu (file) @@ -5241,8 +5197,7 @@ #. i18n: file: settings/accountpage.ui:582 #. i18n: ectx: property (whatsThis), widget (QLabel, idleLabel2_) #: rc.cpp:446 rc.cpp:452 rc.cpp:455 -msgid "" -"Controls the number of minutes before KMess changes the status to \"Idle\"." +msgid "Controls the number of minutes before KMess changes the status to \"Idle\"." msgstr "تحكَّم بعدد الدقائق قبل أن يُغيِّر خميس حالتك إلى \"خامل\"." #. i18n: file: settings/accountpage.ui:559 @@ -5373,8 +5328,7 @@ msgid "" "If enabled, KMess additionaly saves your chat logs as HTML or plain text " "files" -msgstr "" -"إذا فعَّلته، فسيحفظ خميس بشكل إضافي سجلات محادثاتك بنسق HTML أو بملفات نصٍّ صِرف" +msgstr "إذا فعَّلته، فسيحفظ خميس بشكل إضافي سجلات محادثاتك بنسق HTML أو بملفات نصٍّ صِرف" #. i18n: file: settings/chatloggingpage.ui:39 #. i18n: ectx: property (title), widget (QGroupBox, saveChatsToFileCheckBox_) @@ -6050,8 +6004,7 @@ msgid "" "Specify the path of a program to use to open links; a '%u' here will be " "replaced with the links' URL." -msgstr "" -"حدِّد مسار برنامج لاستخدامه في فتح الروابط. ستُستبدل '%u' هنا بعناوين الروابط." +msgstr "حدِّد مسار برنامج لاستخدامه في فتح الروابط. ستُستبدل '%u' هنا بعناوين الروابط." #. i18n: file: settings/miscellaneouspage.ui:126 #. i18n: ectx: property (text), widget (QLabel, customBrowserInfo_) @@ -6233,41 +6186,3 @@ "تقريرك، أو ليخبروك عن موعد إنجاز الميزة التي طلبتها.<br/>\n" "<b>لن يُستخدم عنوان بريدك لأي غرض سوى هذا التقرير.</b></html>" -#~ msgid "https://accountservices.passport.net/" -#~ msgstr "https://accountservices.passport.net/" - -#~ msgid "http://register.passport.com/" -#~ msgstr "http://register.passport.com/" - -#~ msgid "Form" -#~ msgstr "استمارة" - -#~ msgid "" -#~ "Triple DES encryption is not supported. This means you probably do not " -#~ "have installed qca2 or qca2-openssl. Please install it and retry" -#~ msgstr "" -#~ "تعمية DES الثلاثيِّ غير مدعومة، وهذا يعني أنك ربما لا تملك qca2 أو qca2-" -#~ "openssl مثبتًا. ثبِّته من فضلك ثم أعِد المحاولة." - -#~ msgid "" -#~ "<p>Unable to resolve the authentication on the client<br/>Maybe you do " -#~ "not have installed qca2 and/or qca2-plugin-ossl?</p>" -#~ msgstr "" -#~ "<p>عاجز عن حلِّ الاستيثاق عند العميل<br/>ربما لم تثبِّت qca2 و/أو qca2-plugin-" -#~ "ossl؟</p>" - -#~ msgid "" -#~ "<p>KMess could not connect to the Live Messenger servers.<br />You " -#~ "probably need to install qca2 and qca2-plugin-ossl to make KMess work.<br/" -#~ ">It is also possible that the MSN network is unavailable at the moment.</" -#~ "p>" -#~ msgstr "" -#~ "<p>الاتِّصال بخواديم مِرسال لايف متعذِّر على خميس.<br />يُحتمل أنك تحتاج إلى " -#~ "تثبيت qca2 وqca2-plugin-ossl ليعمل خميس.<br/>و يُحتمل أيضًا أن تكون شبكة " -#~ "MSN غير مُتاحة في هذه اللحظة.</p>" - -#~ msgctxt "" -#~ "Do not translate: undeletable default name, will be overwritten in the " -#~ "code" -#~ msgid "KSqueezedTextLabel" -#~ msgstr "KSqueezedTextLabel" Modified: branches/kmess/kmess-2.0.x/po/de.po =================================================================== --- branches/kmess/kmess-2.0.x/po/de.po 2009-07-16 12:16:59 UTC (rev 5086) +++ branches/kmess/kmess-2.0.x/po/de.po 2009-07-16 14:49:53 UTC (rev 5087) @@ -10,7 +10,7 @@ "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: http://www.kmess.org/board/\n" "POT-Creation-Date: 2009-07-13 20:29+0200\n" -"PO-Revision-Date: 2009-07-15 19:00+0200\n" +"PO-Revision-Date: 2009-07-16 16:44+0200\n" "Last-Translator: Panagiotis Papadopoulos <pa...@gm...>\n" "Language-Team: German <kde...@kd...>\n" "MIME-Version: 1.0\n" @@ -2081,7 +2081,7 @@ #: main.cpp:74 msgid "Main and yellow/blue/violet emoticon sets, Italian translation" -msgstr "Erstellen des Standard-Emoticon-Stil und der gelben, blauen und violetten Emoticon-Stile, Italienische Übersetzung" +msgstr "Erstellen des Standard-Emoticon-Stils und der gelben, blauen und violetten Emoticon-Stile, Italienische Übersetzung" #: main.cpp:75 msgid "Cartoon emoticons" @@ -2118,7 +2118,7 @@ #: main.cpp:83 msgid "Arabic translation, internationalization of file saving fix." -msgstr "Arabische Übersetzung, Internationalisierung der Korrektur, für das Speichern von Dateien." +msgstr "Arabische Übersetzung, Internationalisierung der Korrektur für das Speichern von Dateien." #: main.cpp:83 msgid "Mohamed Aser" @@ -3353,7 +3353,7 @@ #: network/msnnotificationconnection.cpp:1364 msgid "Authenticating..." -msgstr "Authentifiziere ..." +msgstr "Authentisiere ..." #: network/msnnotificationconnection.cpp:1388 msgid "Authenticated" @@ -3447,7 +3447,7 @@ #, kde-format msgctxt "Connection error: detailed message" msgid "<p>KMess could not connect to the Live Messenger servers.<br />There may be a problem with your Internet connection, or the Live Messenger servers may be temporarily unavailable.<br/>It is also possible that an authentication to a web page or proxy may be required to access the network.</p><p><a href='%1'>Click here</a> to visit the Messenger service status page.</p>" -msgstr "<p>KMess kann sich nicht mit den Live-Messenger-Servern verbinden.<br /> Entweder besteht ein Problem mit Ihrer Internetverbindung, oder die Live-Messenger-Server sind zur Zeit nicht erreichbar.<br/>Es kann auch sein, dass eine Authentifizierung bei einer Webseite oder einem Proxy nötig ist, um zu den Servern verbunden zu werden,</p><p><a href='%1'>Klicken Sie hier</a>, um die Messenger-Statusseite anzuzeigen.</p>" +msgstr "<p>KMess kann sich nicht mit den Live-Messenger-Servern verbinden.<br /> Entweder besteht ein Problem mit Ihrer Internetverbindung oder die Live-Messenger-Server sind zur Zeit nicht erreichbar.<br/>Es kann auch sein, dass eine Authentisierung bei einer Webseite oder einem Proxy nötig ist, um zu den Servern verbunden zu werden.</p><p><a href='%1'>Klicken Sie hier</a>, um die Messenger-Statusseite anzuzeigen.</p>" #: network/msnnotificationconnection.cpp:3006 msgctxt "Connection error: passive notification message" @@ -3993,7 +3993,7 @@ #: settings/miscellaneouspage.cpp:321 #, c-format msgid "<html>The console command you specified to launch a custom email client does not contain the '%u' parameter. Without this, composing emails will not work.<br />Do you want KMess to add it for you?</html>" -msgstr "<html>Dem Befehl, für das benutzerdefinierte E-Mail-Programm, fehlt der „%u“-Parameter. Ohne diesen, wird es nicht möglich sein, E-Mails zu erstellen.<br />Wollen Sie, dass KMess es hinzufügt?</html>" +msgstr "<html>Dem Befehl, für das benutzerdefinierte E-Mail-Programm, fehlt der „%u“-Parameter. Ohne diesen wird es nicht möglich sein E-Mails zu erstellen.<br />Wollen Sie, dass KMess es hinzufügt?</html>" #: settings/miscellaneouspage.cpp:344 msgid "You have to select a directory for the received files!" @@ -5408,7 +5408,7 @@ #. i18n: ectx: property (whatsThis), widget (QCheckBox, displayChatUserPictureCheckBox_) #: rc.cpp:714 msgid "If this option is enabled, your own display picture will be shown in the contacts panel, along with the pictures of the contacts in that chat." -msgstr "Ist diese Option aktiviert, wird, neben den Anzeigebildern der Kontakte im jeweiligen Chat, auch Ihr eigenes Anzeigebild in der Kontakseitenleiste angezeigt." +msgstr "Ist diese Option aktiviert, wird, neben den Anzeigebildern der Kontakte im jeweiligen Chat, auch Ihr eigenes Anzeigebild in der Kontaktseitenleiste angezeigt." #. i18n: file: settings/chatstylepage.ui:605 #. i18n: ectx: property (text), widget (QCheckBox, displayChatUserPictureCheckBox_) @@ -5726,7 +5726,7 @@ #. i18n: ectx: property (toolTip), widget (QToolButton, m_bugButton) #: rc.cpp:906 msgid "Click here to tell the developers about a problem in the application" -msgstr "Klicken Sie hier, um den Entwicklern über ein Problem in der Anwendung zu berichten" +msgstr "Klicken Sie hier, um den Entwicklern über ein Problem in der Anwendung zu berichten." #. i18n: file: utils/likeback/likebackbar.ui:83 #. i18n: ectx: property (toolTip), widget (QToolButton, m_featureButton) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <it_...@us...> - 2009-07-17 09:33:28
|
Revision: 5094 http://kmess.svn.sourceforge.net/kmess/?rev=5094&view=rev Author: it_amroth Date: 2009-07-17 09:33:21 +0000 (Fri, 17 Jul 2009) Log Message: ----------- kmess-2.0.x: Backported fix: Fixed contact list tooltips with Right-to-Left text layouts. Modified Paths: -------------- branches/kmess/kmess-2.0.x/ChangeLog branches/kmess/kmess-2.0.x/src/kmessview.cpp Modified: branches/kmess/kmess-2.0.x/ChangeLog =================================================================== --- branches/kmess/kmess-2.0.x/ChangeLog 2009-07-17 09:28:16 UTC (rev 5093) +++ branches/kmess/kmess-2.0.x/ChangeLog 2009-07-17 09:33:21 UTC (rev 5094) @@ -1,4 +1,7 @@ +2009-07-17 (Valerio) + * Fixed contact list tooltips with Right-to-Left text layouts. + 2009-07-16 (Pano) * Merged an updated Brazilian Portuguese translation by Maurício Arozi Moraes. * Merged an updated Japanese translation by Daniel E. Moctezuma. Modified: branches/kmess/kmess-2.0.x/src/kmessview.cpp =================================================================== --- branches/kmess/kmess-2.0.x/src/kmessview.cpp 2009-07-17 09:28:16 UTC (rev 5093) +++ branches/kmess/kmess-2.0.x/src/kmessview.cpp 2009-07-17 09:33:21 UTC (rev 5094) @@ -1056,13 +1056,15 @@ return; } + const QString textDirection( "dir='" + QString(QApplication::isRightToLeft() ? "rtl" : "ltr") + "'" ); + // Paint the different types of list items // see ContactListModelItem::data() for a list of itemData elements (role == DataRole) switch( itemData[ "type" ].toInt() ) { case ContactListModelItem::ItemContact: { - tipText = "<html><table border='0'>" + tipText = "<html " + textDirection + "><table border='0' " + textDirection + ">" "<tr>" "<td valign='top'>" "<table style='border-width:1px;border-color:palette(mid);border-style:solid;'>" @@ -1151,7 +1153,15 @@ // Here starts the list of simple property:value lines // Adding a space to better separate the properties and values - const QString propertyLine( "<tr><td align='right'><i>%1:</i> </td><td>%2</td></tr>" ); + QString propertyLine; + if( QApplication::isLeftToRight() ) + { + propertyLine = "<tr><td align='right'><i>%1:</i> </td><td>%2</td></tr>"; + } + else + { + propertyLine = "<tr><td align='left'>%2</td><td> <i>%1:</i></td></tr>"; + } // Add handle tipText = tipText.arg( propertyLine.arg( i18nc( "Contact email label in list tooltip", "Email address" ) ) @@ -1222,7 +1232,7 @@ case ContactListModelItem::ItemGroup: - tipText = "<qt>%1<br/><i>(%2)</i></qt>"; + tipText = "<qt><div " + textDirection + ">%1<br/><i>(%2)</i></div></qt>"; // Add the group name tipText = tipText.arg( i18nc( "Group name in group tooltip", "Group <b>%1</b>", itemData[ "name" ].toString() ) ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <it_...@us...> - 2009-07-18 09:43:30
|
Revision: 5101 http://kmess.svn.sourceforge.net/kmess/?rev=5101&view=rev Author: it_amroth Date: 2009-07-18 09:43:22 +0000 (Sat, 18 Jul 2009) Log Message: ----------- kmess-2.0.x: Further improved the fix for contact list tooltips with RTL languages. Modified Paths: -------------- branches/kmess/kmess-2.0.x/ChangeLog branches/kmess/kmess-2.0.x/src/kmessview.cpp Modified: branches/kmess/kmess-2.0.x/ChangeLog =================================================================== --- branches/kmess/kmess-2.0.x/ChangeLog 2009-07-17 16:49:26 UTC (rev 5100) +++ branches/kmess/kmess-2.0.x/ChangeLog 2009-07-18 09:43:22 UTC (rev 5101) @@ -1,4 +1,7 @@ +2009-07-18 (Valerio) + * Further improved the fix for contact list tooltips with RTL languages. + 2009-07-17 (Valerio) * Fixed contact list tooltips with Right-to-Left text layouts. Modified: branches/kmess/kmess-2.0.x/src/kmessview.cpp =================================================================== --- branches/kmess/kmess-2.0.x/src/kmessview.cpp 2009-07-17 16:49:26 UTC (rev 5100) +++ branches/kmess/kmess-2.0.x/src/kmessview.cpp 2009-07-18 09:43:22 UTC (rev 5101) @@ -1056,6 +1056,7 @@ return; } + const QString textAlignment( QApplication::isRightToLeft() ? "right" : "left" ); const QString textDirection( "dir='" + QString(QApplication::isRightToLeft() ? "rtl" : "ltr") + "'" ); // Paint the different types of list items @@ -1071,7 +1072,7 @@ "<tr><td><img src='%1' width='96' height='96'/></td></tr>" "</table>" "</td>" - "<td align='left' valign='top' style='padding-left:10px;'>" + "<td align='" + textAlignment + "' valign='top' style='padding-" + textAlignment + ":10px;'>" "<b>%2</b> (%3)<br/>" "%4 %5 %6" "</td>" @@ -1080,7 +1081,7 @@ "<td colspan='2'><hr width='98%'/></td>" "</tr>" "</table>" - "<table border='0'>" + "<table border='0' " + textDirection + " align='" + textAlignment + "'>" "%7%8%9%10%11" "</table>" "</html>"; @@ -1156,11 +1157,11 @@ QString propertyLine; if( QApplication::isLeftToRight() ) { - propertyLine = "<tr><td align='right'><i>%1:</i> </td><td>%2</td></tr>"; + propertyLine = "<tr><td align='right'><i>%1:</i> </td><td align='left'>%2</td></tr>"; } else { - propertyLine = "<tr><td align='left'>%2</td><td> <i>%1:</i></td></tr>"; + propertyLine = "<tr><td align='right'>%2</td><td align='left'> <i>%1:</i></td></tr>"; } // Add handle This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pan...@us...> - 2009-07-19 22:36:35
|
Revision: 5103 http://kmess.svn.sourceforge.net/kmess/?rev=5103&view=rev Author: pano9000 Date: 2009-07-19 22:36:27 +0000 (Sun, 19 Jul 2009) Log Message: ----------- * Merged an updated Siplified Chinese translation | 258f279u * Updated the NEWS file Modified Paths: -------------- branches/kmess/kmess-2.0.x/ChangeLog branches/kmess/kmess-2.0.x/NEWS branches/kmess/kmess-2.0.x/po/zh_CN.po Modified: branches/kmess/kmess-2.0.x/ChangeLog =================================================================== --- branches/kmess/kmess-2.0.x/ChangeLog 2009-07-19 11:58:13 UTC (rev 5102) +++ branches/kmess/kmess-2.0.x/ChangeLog 2009-07-19 22:36:27 UTC (rev 5103) @@ -1,3 +1,5 @@ +2009-07-20 (Pano) + * Merged an updated Simplified Chinese translation by Cheng Yang. 2009-07-18 (Valerio) * Further improved the fix for contact list tooltips with RTL languages. Modified: branches/kmess/kmess-2.0.x/NEWS =================================================================== --- branches/kmess/kmess-2.0.x/NEWS 2009-07-19 11:58:13 UTC (rev 5102) +++ branches/kmess/kmess-2.0.x/NEWS 2009-07-19 22:36:27 UTC (rev 5103) @@ -15,6 +15,7 @@ - updated Italian translation by Valerio Pilo. - updated Slovak translation by Rastislav Krupanský. - updated Spanish translation by Mauricio Muñoz Lucero. +- updated Simplified Chinese translation by Cheng Yang. - updated Traditional Chinese translation by Yen-chou Chen. Changes between KMess 2.0-beta2 and 2.0-beta1: Modified: branches/kmess/kmess-2.0.x/po/zh_CN.po =================================================================== --- branches/kmess/kmess-2.0.x/po/zh_CN.po 2009-07-19 11:58:13 UTC (rev 5102) +++ branches/kmess/kmess-2.0.x/po/zh_CN.po 2009-07-19 22:36:27 UTC (rev 5103) @@ -6,21 +6,22 @@ # # 林昊翔 <lin...@ho...>, 2003. # Liu Sizhuang(刘思壮) <chi...@ho...>, 2007. -# Narsil <nar...@gm...>, 2007. +# Narsil <nar...@gm...>, 2007, 2009. msgid "" msgstr "" "Project-Id-Version: KMess\n" "Report-Msgid-Bugs-To: http://www.kmess.org/board/\n" "POT-Creation-Date: 2009-07-13 20:29+0200\n" -"PO-Revision-Date: 2008-06-01 17:47+0800\n" -"Last-Translator: Liu Sizhuang <chi...@ho...>\n" -"Language-Team: Chinese/Simplified <zh...@li...>\n" +"PO-Revision-Date: 2009-07-18 21:39-0400\n" +"Last-Translator: \n" +"Language-Team: en_US <kde...@kd...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=(0);\n" "X-Poedit-Language: Chinese\n" "X-Poedit-Country: CHINA\n" +"X-Generator: Lokalize 0.3\n" #: account.cpp:45 account.cpp:744 #, fuzzy @@ -70,13 +71,12 @@ msgstr "保持" #: chat/chat.cpp:112 -#, fuzzy msgctxt "Error dialog box text" msgid "" "You cannot send invitations when there are multiple contacts in a chat. " "Please start a separate chat with the contact you wanted to send the " "invitation to." -msgstr "你无法开启这个邀请,因为这个聊天中有多个联系人。" +msgstr " 你无法开启这个邀请,因为这个聊天中有多个联系人。" #: chat/chat.cpp:136 #, fuzzy, kde-format @@ -121,10 +121,9 @@ msgstr "" #: chat/chat.cpp:969 -#, fuzzy msgctxt "Message shown in the chat window (when the wink name is unknown)" msgid "You have sent a wink!" -msgstr "您发送了闪屏振动!" +msgstr " 您发送了闪屏振动!" #: chat/chat.cpp:974 #, fuzzy, kde-format @@ -181,8 +180,7 @@ "re-enable it in the <a href='kmess://accountconfig'>account settings</a>." msgstr "传情动漫无法显示。无法读取数据。" -#: chat/chat.cpp:1252 -#, fuzzy, kde-format +#: chat/chat.cpp:1252, kde-format msgctxt "" "Message shown in the chat window, %1 is the contact's friendly name, %2 is " "the wink name" @@ -190,7 +188,7 @@ "You received the "%2" wink from %1, but displaying winks has been " "disabled. You can re-enable it in the <a href='kmess://" "accountconfig'>account settings</a>." -msgstr "传情动漫无法显示。无法读取数据。" +msgstr " 传情动漫无法显示。无法读取数据。" #: chat/chat.cpp:1282 #, fuzzy, kde-format @@ -206,23 +204,21 @@ msgid "%1 has sent you a wink: "%2"!" msgstr "<html><b>%1</b>给您发送了传情动漫!</html>" -#: chat/chat.cpp:1311 -#, fuzzy, kde-format +#: chat/chat.cpp:1311, kde-format msgctxt "Message shown in the chat window, %1 is the contact's friendly name" msgid "" "You received a wink from %1, but it could not be displayed. Make sure you " "have the "cabextract" program installed." -msgstr "你从%1收到了一个传情动漫, 但无法播放。请确认你安装了'cabextract'。" +msgstr " 你从%1收到了一个传情动漫, 但无法播放。请确认你安装了'cabextract'。" -#: chat/chat.cpp:1320 -#, fuzzy, kde-format +#: chat/chat.cpp:1320, kde-format msgctxt "" "Message shown in the chat window, %1 is the contact's friendly name, %2 is " "the wink name" msgid "" "You received the "%2" wink from %1, but it could not be displayed. " "Make sure you have the "cabextract" program installed." -msgstr "你从%1收到了一个传情动漫, 但无法播放。请确认你安装了'cabextract'。" +msgstr " 你从%1收到了一个传情动漫, 但无法播放。请确认你安装了'cabextract'。" #: chat/chat.cpp:1332 #, fuzzy, kde-format @@ -322,16 +318,14 @@ "download failed." msgstr "消息 '%1' 无法发送。" -#: chat/chat.cpp:1646 -#, fuzzy, kde-format +#: chat/chat.cpp:1646, kde-format msgctxt "Message shown in chat window, %1 is the contact's friendly name" msgid "You have sent a nudge to %1!" -msgstr "你向%1发送了闪屏震动!" +msgstr " 你向%1发送了闪屏震动!" #: chat/chat.cpp:1652 -#, fuzzy msgid "You have sent a nudge!" -msgstr "您发送了闪屏振动!" +msgstr " 您发送了闪屏振动!" #: chat/chat.cpp:1718 #, kde-format @@ -365,11 +359,10 @@ msgid "Chat started on: %2" msgstr "" -#: chat/chatmessageview.cpp:432 -#, fuzzy, kde-format +#: chat/chatmessageview.cpp:432, kde-format msgctxt "Header of a chat file saved in plain text: %1 is the contact" msgid "Saved KMess chats with %1" -msgstr "启动语音对话。接听%1" +msgstr " 启动语音对话。接听%1" #: chat/chatmessageview.cpp:1095 utils/richtextparser.cpp:658 #, kde-format @@ -393,13 +386,12 @@ msgid "Reconnect" msgstr "重新登录" -#: chat/chatview.cpp:323 -#, fuzzy, kde-format +#: chat/chatview.cpp:323, kde-format msgid "" "Could not save chat log in directory '%1'.\n" "Make sure you have permission to write in the folder where logs are being " "saved." -msgstr "无法保存聊天记录。请确保你对保存记录文件的文件夹有写权限。" +msgstr " 无法在%1中保存聊天记录。请确保你对保存记录文件的文件夹有写权限。" #: chat/chatview.cpp:465 msgctxt "Chat log saving dialog, file type filter" @@ -409,13 +401,12 @@ "*.xml|XML Document (*.xml)" msgstr "" -#: chat/chatview.cpp:484 -#, fuzzy, kde-format +#: chat/chatview.cpp:484, kde-format msgid "" "The file '%1' already exists.\n" "Do you want to overwrite it?" msgstr "" -"文件“%1”已存在。\n" +" 文件“%1”已存在。\n" "您要覆盖它吗?" #: chat/chatview.cpp:485 network/applications/filetransfer.cpp:261 @@ -749,9 +740,8 @@ msgstr "点击这里给这个联系人发送 email" #: chat/contactframe.cpp:298 -#, fuzzy msgid "&Start Private Chat" -msgstr "开始私聊(&S)" +msgstr " 开始私聊(&S)" #: chat/contactframe.cpp:299 kmessview.cpp:604 #, fuzzy @@ -1152,7 +1142,6 @@ msgstr "网络窗口" #: dialogs/networkwindow.cpp:78 -#, fuzzy msgid "S&ave Tab" msgstr "保存标签" @@ -1174,11 +1163,10 @@ msgstr "没有网络连接。无法打开网络窗口。" #: dialogs/networkwindow.cpp:1130 -#, fuzzy msgid "" "Could not save the Network Window log. Make sure you have permission to " "write in the folder where it is being saved." -msgstr "无法记录网络窗口记录。请确保你对保存记录文件的文件夹有写权限。" +msgstr " 无法记录网络窗口记录。请确保你对保存记录文件的文件夹有写权限。" #: dialogs/networkwindow.cpp:1177 msgid "Cannot close the main connection tab." @@ -1269,9 +1257,8 @@ msgstr "删除联系人(&D)" #: dialogs/userpicturesdialog.cpp:46 -#, fuzzy msgid "Choose or Remove Your Display Picture" -msgstr "选择或删除你的头像" +msgstr " 选择或删除你的头像" #: dialogs/userpicturesdialog.cpp:128 #, fuzzy @@ -1616,10 +1603,9 @@ msgstr "无法连接:没有找到账户" #: initialview.cpp:258 -#, fuzzy msgctxt "Status message on login screen" msgid "Cannot reconnect: this account has no saved password" -msgstr "无法连接:没有找到账户" +msgstr " 无法连接:该账户没有保存密码" #: initialview.cpp:286 initialview.cpp:393 #, fuzzy, kde-format @@ -1700,14 +1686,12 @@ msgstr "<qt>你确定要从你的联系人列表中删除 <b>%1</b> 吗?</qt>" #: kmess.cpp:578 -#, fuzzy msgid "Remove Contact" -msgstr "删除联系人(&R)" +msgstr " 删除联系人" #: kmess.cpp:580 -#, fuzzy msgid "Remove and Block" -msgstr "删除并且屏蔽" +msgstr " 删除并且屏蔽" #: kmess.cpp:626 #, kde-format @@ -1782,8 +1766,7 @@ msgid "<p>KMess has searched for it in the following folders:<br>%1</p>" msgstr "" -#: kmess.cpp:1463 -#, fuzzy, kde-format +#: kmess.cpp:1463, kde-format msgctxt "" "Text for a message dialog box; %1 is an explanation about the list of " "folders where the file was searched for, which is only shown if any folders " @@ -1793,9 +1776,8 @@ "p><p>The required file 'kmess.notifyrc' could not be found in any " "application folder.</p>%1<p>Please verify your installation.</p></html>" msgstr "" -"<qt><p>KMess 将不能播放声音和弹出提示。</p><p>在以下文件夹中:%1,KMess 文件 " -"'eventsrc' 无法找到。</p><p>请检查你的安装,然后把缺失的文件复制到任何一个列" -"出的文件夹中。</p></qt>" +"<html><p>KMess 将不能播放声音和弹出提示。</p><p>无法在程序目录中找到所需文件'kmess.notifyrc'</p><p>" +"请检查你的安装。</p></html>" #: kmess.cpp:1469 #, fuzzy @@ -1950,9 +1932,8 @@ msgstr "聊天(&t)" #: kmessview.cpp:614 -#, fuzzy msgid "&Remove From Group" -msgstr "从组中删除(&R)" +msgstr " 从组中删除(&R)" #: kmessview.cpp:647 msgid "&Copy to Group" @@ -1979,10 +1960,9 @@ msgstr "重命名组(&n)" #: kmessview.cpp:1147 -#, fuzzy msgctxt "Message in list tooltip" msgid "This contact does not have you in his or her contact list." -msgstr "将这个联系人加入您的列表中(&A)" +msgstr "您不在该联系人的联系人列表中" #: kmessview.cpp:1157 #, fuzzy @@ -2104,7 +2084,7 @@ #: main.cpp:44 msgid "A Live Messenger client for KDE" -msgstr "" +msgstr "KDE的Live Messenger客户端" #: main.cpp:46 msgid "" @@ -2188,9 +2168,8 @@ msgstr "" #: main.cpp:74 -#, fuzzy msgid "Main and yellow/blue/violet emoticon sets, Italian translation" -msgstr "黄/蓝/紫色表情集和意大利语翻译" +msgstr " 黄/蓝/紫色表情集和意大利语翻译" #: main.cpp:75 msgid "Cartoon emoticons" @@ -2693,9 +2672,8 @@ msgstr "" #: main.cpp:171 -#, fuzzy msgid "Various internationalization fixes" -msgstr "各种国际化问题的修正" +msgstr " 各种国际化问题的修正" #: main.cpp:172 msgid "Choe Hwanjin" @@ -2811,9 +2789,8 @@ msgstr "" #: model/contactlist.cpp:1823 -#, fuzzy msgid "Individuals" -msgstr "个人" +msgstr " 个人" #: model/contactlist.cpp:1826 msgid "Allowed" @@ -2856,21 +2833,19 @@ msgstr "" #: network/applications/filetransfer.cpp:260 -#: network/applications/filetransferp2p.cpp:346 -#, fuzzy, kde-format +#: network/applications/filetransferp2p.cpp:346, kde-format msgid "" "The file "%1" already exists.\n" "Do you want to overwrite it?" msgstr "" -"文件“%1”已存在。\n" +" 文件“%1”已存在。\n" "您要覆盖它吗?" #: network/applications/filetransfer.cpp:290 -#: network/applications/filetransferp2p.cpp:376 -#, fuzzy, kde-format +#: network/applications/filetransferp2p.cpp:376, kde-format msgid "" "The transfer of the file "%1" failed. Could not save the file." -msgstr "文件传送失败,无法打开文件%1。" +msgstr " 文件传送失败,无法打开文件%1。" #: network/applications/filetransfer.cpp:295 #, fuzzy, kde-format @@ -2897,16 +2872,14 @@ msgstr "联系人取消了文件传送。" #: network/applications/filetransfer.cpp:432 -#: network/applications/filetransferp2p.cpp:559 -#, fuzzy, kde-format +#: network/applications/filetransferp2p.cpp:559, kde-format msgid "You have cancelled the transfer of the file "%1"." -msgstr "您取消了邀请。" +msgstr "您取消了传送文件%1。" #: network/applications/filetransfer.cpp:443 -#: network/applications/filetransferp2p.cpp:570 -#, fuzzy, kde-format +#: network/applications/filetransferp2p.cpp:570, kde-format msgid "You have rejected the transfer of the file "%1"." -msgstr "您取消了邀请。" +msgstr "您拒绝了传送文件%1。" #: network/applications/filetransfer.cpp:490 msgid "Connection established" @@ -2919,10 +2892,9 @@ msgstr "成功传送文件:%1" #: network/applications/filetransfer.cpp:585 -#: network/applications/filetransferp2p.cpp:678 -#, fuzzy, kde-format +#: network/applications/filetransferp2p.cpp:678, kde-format msgid "Successfully received the file "%1"." -msgstr "成功收到文件:%1" +msgstr " 成功收到文件:%1" #: network/applications/filetransfer.cpp:742 #: network/applications/filetransferp2p.cpp:811 @@ -2963,10 +2935,9 @@ msgid "The file transfer invitation was cancelled. Bad data was received." msgstr "文件传送邀请被取消。接收的数据已损坏。" -#: network/applications/filetransferp2p.cpp:404 -#, fuzzy, kde-format +#: network/applications/filetransferp2p.cpp:404, kde-format msgid "You have accepted the transfer of the file "%1"." -msgstr "您取消了邀请。" +msgstr " 您接收了传送文件%1的邀请。" #: network/applications/filetransferp2p.cpp:614 msgid "File could not be written" @@ -2985,53 +2956,45 @@ msgid "Inviting the contact to a meeting." msgstr "正在邀请联系人参加会议。" -#: network/applications/inktransferp2p.cpp:108 -#, fuzzy, kde-format +#: network/applications/inktransferp2p.cpp:108, kde-format msgctxt "Error message shown in chat, %1 is the contact's friendly name" msgid "" "<html>%1 has tried to send you an handwritten message, but it could not be " "received.</html>" -msgstr "%1 已经加入聊天" +msgstr "<html>%1 给您发送了一条手写信息,但无法收到</html>" -#: network/applications/inktransferp2p.cpp:114 -#, fuzzy, kde-format +#: network/applications/inktransferp2p.cpp:114, kde-format msgctxt "Error message shown in chat, %1 is the contact's friendly name" msgid "<html>The handwritten message to %1 could not be delivered.</html>" -msgstr "消息 '%1' 无法发送。" +msgstr "<html>手写消息 '%1' 无法发送。</html>" #: network/applications/mimeapplication.cpp:154 -#, fuzzy msgid "The invitation was rejected. It is not supported by the other client." -msgstr "邀请被取消。另一方客户端不支持。" +msgstr " 邀请被取消。另一方客户端不支持。" #: network/applications/mimeapplication.cpp:164 -#, fuzzy msgid "The invitation was aborted. An internal error occured." -msgstr "邀请被终止。发生了内部错误。" +msgstr " 邀请被终止。发生了内部错误。" #: network/applications/mimeapplication.cpp:170 -#, fuzzy msgid "The invitation was aborted. Timeout while waiting for user to accept." -msgstr "邀请被终止。等待用户接受超时。" +msgstr " 邀请被终止。等待用户接受超时。" #: network/applications/mimeapplication.cpp:175 -#, fuzzy msgid "The invitation was aborted. Timeout while waiting for file data." -msgstr "邀请被终止。等待文件数据超时。" +msgstr " 邀请被终止。等待文件数据超时。" #: network/applications/mimeapplication.cpp:180 -#, fuzzy msgid "The invitation was aborted. The switchboard closed the chat connection." -msgstr "邀请被终止。切换板关闭了聊天连接。" +msgstr " 邀请被终止。切换板关闭了聊天连接。" #: network/applications/mimeapplication.cpp:186 msgid "The invitation was aborted." msgstr "邀请被终止。" #: network/applications/msnremotedesktop.cpp:52 -#, fuzzy msgid "You are invited to share this contact's desktop." -msgstr "您被邀请共享此人的桌面。" +msgstr " 您被邀请共享此人的桌面。" #: network/applications/msnremotedesktop.cpp:159 #, kde-format @@ -3039,9 +3002,8 @@ msgstr "启动 KRDC。正在连接到 %1。" #: network/applications/p2papplication.cpp:215 -#, fuzzy msgid "The contact has invited you to an activity not yet supported by KMess." -msgstr "联系人邀请您使用“%1”,但是现在KMess还没有开发此功能。" +msgstr " 联系人邀请您使用,但是现在KMess还没有开发此功能。" #: network/applications/p2papplication.cpp:520 #: network/applications/p2papplication.cpp:687 @@ -3050,11 +3012,10 @@ #: network/applications/p2papplication.cpp:1763 #: network/applications/p2papplication.cpp:1887 #: network/applications/p2papplicationbase.cpp:706 -#, fuzzy msgid "" "The invitation was cancelled. The contact sent bad data, or KMess does not " "support it." -msgstr "邀请被取消。联系人发送了损坏的数据,或者KMess不支持它。" +msgstr " 邀请被取消。联系人发送了损坏的数据,或者KMess不支持它。" #: network/applications/p2papplication.cpp:1085 #, fuzzy @@ -3076,9 +3037,8 @@ #: network/applications/p2papplication.cpp:1810 #: network/applications/p2papplication.cpp:1828 #: network/applications/p2papplication.cpp:1860 -#, fuzzy msgid "The contact rejected the invitation. An internal error occurred." -msgstr "联系人拒绝了邀请。发生了内部错误。" +msgstr " 联系人拒绝了邀请。发生了内部错误。" #: network/applications/p2papplication.cpp:2101 #: network/extra/msnftpconnection.cpp:389 @@ -3096,30 +3056,26 @@ msgstr "等待连接" #: network/applications/p2papplication.cpp:3423 -#, fuzzy msgid "" "The invitation was cancelled. A timeout occurred waiting for the contact to " "accept." -msgstr "邀请被取消。等待用户接受超时。" +msgstr " 邀请被取消。等待用户接受超时。" #: network/applications/p2papplication.cpp:3432 -#, fuzzy msgid "" "The invitation was cancelled. A timeout occurred waiting for a connection to " "succeed or fail." -msgstr "邀请被取消。等待确认连接是否成功超时。" +msgstr " 邀请被取消。等待确认连接是否成功超时。" #: network/applications/p2papplication.cpp:3499 #: network/applications/p2papplication.cpp:3583 -#, fuzzy msgid "The invitation was cancelled. A timeout occurred waiting for data." -msgstr "邀请被取消。等待数据超时。" +msgstr " 邀请被取消。等待数据超时。" #: network/applications/p2papplicationbase.cpp:622 #: network/applications/p2papplicationbase.cpp:1045 -#, fuzzy msgid "The contact rejected the invitation. An internal error occured." -msgstr "联系人拒绝了邀请。发生了内部错误。" +msgstr " 联系人拒绝了邀请。发生了内部错误。" #: network/applications/p2papplicationbase.cpp:629 msgid "The transfer failed." @@ -3155,9 +3111,8 @@ msgstr "您取消了语音聊天。" #: network/applications/voiceconversation.cpp:205 -#, fuzzy msgid "The invitation was cancelled. The audio device could not be opened." -msgstr "邀请被取消。音频设备无法打开。" +msgstr " 邀请被取消。音频设备无法打开。" #: network/applications/voiceconversation.cpp:218 #, kde-format @@ -3180,27 +3135,24 @@ msgstr "联系人邀请您使用“%1”,但是现在KMess还没有开发此功能。" #: network/applications/webcamtransferp2p.cpp:113 -#, fuzzy msgid "The webcam invitation was cancelled. Bad data was received." -msgstr "视频邀请被取消。接收的数据已损坏。" +msgstr " 视频邀请被取消。接收的数据已损坏。" #: network/applications/webcamtransferp2p.cpp:134 msgid "You are asked to show your webcam." msgstr "" #: network/applications/webcamtransferp2p.cpp:138 -#, fuzzy msgid "You are invited to view this contact's webcam." -msgstr "您被邀请共享此人的桌面。" +msgstr " 您被邀请共享此人的桌面。" #: network/applications/webcamtransferp2p.cpp:147 msgid "webcam" msgstr "" -#: network/extra/msnftpconnection.cpp:120 -#, fuzzy, kde-format +#: network/extra/msnftpconnection.cpp:120, kde-format msgid "You have cancelled the transfer of file "%1"." -msgstr "您取消了邀请。" +msgstr " 您取消了邀请。" #: network/extra/msnftpconnection.cpp:126 #, fuzzy, kde-format @@ -3253,9 +3205,8 @@ msgstr "" #: network/msnconnection.cpp:385 -#, fuzzy msgid "The email address you have tried to add is not a Live Messenger account" -msgstr "你试图添加的email地址不是MSN Messenger帐号" +msgstr " 你试图添加的email地址不是Live Messenger帐号" #: network/msnconnection.cpp:390 msgid "Domain name missing" @@ -3270,11 +3221,10 @@ msgstr "用户名无效" #: network/msnconnection.cpp:401 -#, fuzzy msgid "" "This account name is invalid, or your Passport account has not been " "confirmed yet" -msgstr "帐号无效,或者你的passport还没有确认。" +msgstr " 帐号无效,或者你的passport账户还没有确认。" #: network/msnconnection.cpp:404 msgid "Your contact list is full" @@ -3313,11 +3263,10 @@ msgstr "在你的MSN Messenger或者Hotmail联系人列表中已经使用了这个组名" #: network/msnconnection.cpp:437 -#, fuzzy msgid "" "Your contact list has too many groups; you are allowed to only have at most " "30" -msgstr "您的联系人列表中分组太多了" +msgstr " 您的联系人列表中分组数量超多了最大30个的限制" #: network/msnconnection.cpp:441 #, fuzzy @@ -3347,9 +3296,8 @@ msgstr "KMess内部错误: %1" #: network/msnconnection.cpp:463 -#, fuzzy msgid "Invalid Group" -msgstr "重命名组(&n)" +msgstr " 无效组" #: network/msnconnection.cpp:467 msgid "Empty domain" @@ -3380,11 +3328,10 @@ msgstr "" #: network/msnconnection.cpp:493 -#, fuzzy msgctxt "" "MSN error, due to e.g. trying the beta service without an allowed account" msgid "This account was denied access to the Live Messenger service" -msgstr "如果选中,将会使用代理服务器连接到MSN Messenger服务器。" +msgstr "该账户被禁止连接到Live Messenger服务器。" #: network/msnconnection.cpp:498 msgid "Command is disabled" @@ -3410,9 +3357,8 @@ msgstr "你开启会话太快了" #: network/msnconnection.cpp:518 -#, fuzzy msgid "You have too many open chat sessions" -msgstr "你已开启的会话太多了" +msgstr " 你已开启的会话太多了" #: network/msnconnection.cpp:525 msgid "Unexpected command sequence" @@ -3424,12 +3370,11 @@ #: network/msnconnection.cpp:535 msgid "Bad CVR data" -msgstr "" +msgstr "损坏的CVR数据" #: network/msnconnection.cpp:541 -#, fuzzy msgid "The server reports KMess is flooding it with too much data" -msgstr "服务器报告,KMess发送的数据太多了,造成泛滥" +msgstr " 服务器报告,KMess发送的数据太多了,造成泛滥" #: network/msnconnection.cpp:548 #, fuzzy @@ -3437,9 +3382,8 @@ msgstr "验证失败" #: network/msnconnection.cpp:551 -#, fuzzy msgid "You cannot start a chat with someone while you are invisible" -msgstr "您不能在隐身的状态下进行聊天。" +msgstr " 您不能在隐身的状态下进行聊天。" #: network/msnconnection.cpp:555 #, fuzzy @@ -3447,15 +3391,13 @@ msgstr "不接受新的规则" #: network/msnconnection.cpp:559 -#, fuzzy msgid "" "You have a Kids Passport account, you need parental consent to chat online" -msgstr "你的passport是儿童型的,聊天时需要父母的同意。" +msgstr " 你的passport是儿童型的,聊天时需要父母的同意。" #: network/msnconnection.cpp:562 -#, fuzzy msgid "Your Passport account needs to be verified first" -msgstr "你的passport需要先验证。" +msgstr " 你的passport需要先验证。" #: network/msnconnection.cpp:566 msgid "Bad USR ticket" @@ -3466,17 +3408,15 @@ msgstr "访问联系人列表时发生错误,稍后再试" #: network/msnconnection.cpp:585 -#, fuzzy msgid "" "The Live Messenger service is temporarily unavailable. There was an internal " "server error" -msgstr "服务器内部错误" +msgstr " Live Messenger 服务暂时不可用。服务器内部错误" #: network/msnconnection.cpp:596 -#, fuzzy msgid "" "The Live Messenger service is temporarily unavailable. The server is too busy" -msgstr "服务器内部错误" +msgstr " Live Messenger 服务暂时不可用。服务器繁忙" #: network/msnconnection.cpp:600 msgid "Peer notification server down" @@ -3506,11 +3446,10 @@ msgid "Authentication failed" msgstr "验证失败" -#: network/msnconnection.cpp:637 -#, fuzzy, kde-format +#: network/msnconnection.cpp:637, kde-format msgid "" "Unknown error code received from the server: %1<br/>Technical details: %2" -msgstr "KMess从服务器接到了一个未知命令:%1" +msgstr "KMess从服务器接到了一个未知命令:%1 参考代码%2" #: network/msnconnection.cpp:659 network/msnnotificationconnection.cpp:2946 #, fuzzy @@ -3536,10 +3475,9 @@ msgid "Connecting..." msgstr "正在连接……" -#: network/msnnotificationconnection.cpp:1965 -#, fuzzy, kde-format +#: network/msnnotificationconnection.cpp:1965, kde-format msgid "Unknown command received from the server: %1" -msgstr "KMess从服务器接到了一个未知命令:%1" +msgstr "KMess从服务器接到了一 个未知命令:%1" #: network/msnnotificationconnection.cpp:2125 #, fuzzy, kde-format @@ -3548,16 +3486,14 @@ msgid_plural "%1 minutes" msgstr[0] "分钟后" -#: network/msnnotificationconnection.cpp:2128 -#, fuzzy, kde-format +#: network/msnnotificationconnection.cpp:2128, kde-format msgid "Server closes for maintenance in %1!" -msgstr "警告:服务器%1分钟后因维护而关闭!" +msgstr "警告:服务器% 1分钟后因维护而关闭!" -#: network/msnnotificationconnection.cpp:2133 -#, fuzzy, kde-format +#: network/msnnotificationconnection.cpp:2133, kde-format msgctxt "Server maintenance dialog box text" msgid "The Live Messenger server will be going down in %1 for maintenance." -msgstr "MSN服务器报告,它1分钟后将会关闭进行维护。" +msgstr " Live Messenger服务器报告,它1分钟后将会关闭进行维护。" #: network/msnnotificationconnection.cpp:2334 #, fuzzy, kde-format @@ -3569,7 +3505,7 @@ #: network/msnnotificationconnection.cpp:2335 msgid "SOAP client is no longer valid." -msgstr "" +msgstr " SOAP客户端不可用" #: network/msnnotificationconnection.cpp:2605 #, fuzzy @@ -3597,12 +3533,13 @@ msgstr "KMess内部错误: %1" #: network/msnnotificationconnection.cpp:2944 -#, fuzzy msgctxt "Connection error: dialog box" msgid "" "<p>Authentication has failed, please verify your account email and password." "</p>" -msgstr "验证失败,请检查你的用户名和密码。" +msgstr "" +" <p>验证失败,请检查你的用户名和密码。 " +"</p>" #: network/msnnotificationconnection.cpp:2957 #, kde-format @@ -3610,24 +3547,21 @@ msgid "<p>The account <i>%1</i> has been connected from another location.</p>" msgstr "" -#: network/msnnotificationconnection.cpp:2960 -#, fuzzy, kde-format +#: network/msnnotificationconnection.cpp:2960, kde-format msgctxt "Connection error: detailed message" msgid "" "<p>You have been disconnected: you have connected with the account <i>%1</i> " "from another Messenger client, or from another location.</p>" -msgstr "" -"您已经失去连接,因为您使用了另一个MSN Messenger客户端程序或在另一个地方登录。" +msgstr " <p>您已经失去连接,因为您的Live Messenger帐号在另一个地方登录。</p>" #: network/msnnotificationconnection.cpp:2972 msgctxt "Connection error: passive notification message" msgid "" "<p>Unable to connect to the Live Messenger service.<br/>Maybe you need to " "authenticate before you can access the network?</p>" -msgstr "" +msgstr "<p> 无法连接到Live Messenger服务<br>可能个你需要通过验证取得上网权限</p>" -#: network/msnnotificationconnection.cpp:2975 -#, fuzzy, kde-format +#: network/msnnotificationconnection.cpp:2975, kde-format msgctxt "Connection error: detailed message" msgid "" "<p>KMess could not connect to the Live Messenger servers.<br />There may be " @@ -3636,17 +3570,15 @@ "to a web page or proxy may be required to access the network.</p><p><a " "href='%1'>Click here</a> to visit the Messenger service status page.</p>" msgstr "" -"KMess 无法连接到 MSN Messenger 服务器。MSN Messenger服务器可能暂时无法工作或" -"者你的网络连接有问题。" +"<p>KMess 无法连接到 Live Messenger 服务器。<br/>Live Messenger服务器可能暂时无法工作或" +"者你的网络连接有问题。<br/><p>请点击查看<a href='%1'>Live Messenger服务状态</a></p></p>" #: network/msnnotificationconnection.cpp:3006 -#, fuzzy msgctxt "Connection error: passive notification message" msgid "<p>Unable to connect to the Live Messenger service.</p>" -msgstr "如果选中,将会使用代理服务器连接到MSN Messenger服务器。" +msgstr "无法连接到Live Messenger服务" -#: network/msnnotificationconnection.cpp:3008 -#, fuzzy, kde-format +#: network/msnnotificationconnection.cpp:3008, kde-format msgctxt "Connection error: detailed message" msgid "" "<p>KMess could not connect to the Live Messenger servers.<br />There may be " @@ -3654,7 +3586,7 @@ "be temporarily unavailable.</p><p><a href='%1'>Click here</a> to visit the " "Messenger service status page.</p>" msgstr "" -"KMess 无法连接到 MSN Messenger 服务器。MSN Messenger服务器可能暂时无法工作或" +" KMess 无法连接到 MSN Messenger 服务器。MSN Messenger服务器可能暂时无法工作或" "者你的网络连接有问题。" #: network/msnnotificationconnection.cpp:3019 @@ -3702,10 +3634,9 @@ msgstr "" #: network/msnnotificationconnection.cpp:3057 -#, fuzzy msgctxt "Connection error: detailed message" msgid "<p>Connection to the Live Messenger server has been lost.</p>" -msgstr "到服务器的连接丢失。" +msgstr "<p>与Live Messenger服务器的连接丢失。<p>" #: network/msnnotificationconnection.cpp:3113 #, kde-format @@ -3713,7 +3644,7 @@ msgid "" "<p><b>Developer info:</b><br/><i>Error number:</i> %1<br/><i>Error string:</" "i> %2</p>" -msgstr "" +msgstr "<p><b>开发者信息</b><br/>错误代码 %1 <br/>错误信息 %2</p>" #: network/msnsocketbase.cpp:135 msgctxt "Dialog box message" @@ -3749,23 +3680,20 @@ msgstr "丢失了%1个 ping 数据包" #: network/msnsockettcp.cpp:400 -#, fuzzy msgid "The connection to the server was lost" -msgstr "到服务器的连接丢失。" +msgstr " 到服务器的连接丢失。" -#: network/soap/addressbookservice.cpp:777 -#, fuzzy, kde-format +#: network/soap/addressbookservice.cpp:777, kde-format msgctxt "Warning message" msgid "The specified email address, \"%1\", is not a valid email address!" -msgstr "你试图添加的email地址不是MSN Messenger帐号" +msgstr "你试图添加的email地址 \"%1\"不是合法的Live Messenger帐号" -#: network/soap/addressbookservice.cpp:787 -#, fuzzy, kde-format +#: network/soap/addressbookservice.cpp:787, kde-format msgctxt "Error message" msgid "" "The specified email address, \"%1\", does not belong to a Live Messenger " "account!" -msgstr "你试图添加的email地址不是MSN Messenger帐号" +msgstr "你试图添加的email地址 \"%1\"不是合法的Live Messenger帐号" #: network/soap/addressbookservice.cpp:795 #: network/soap/addressbookservice.cpp:818 @@ -3773,47 +3701,44 @@ #, kde-format msgctxt "Error message (system-generated description)" msgid "Invalid web service request (%1)" -msgstr "" +msgstr "非法web服务请求%1" -#: network/soap/httpsoapconnection.cpp:427 -#, fuzzy, kde-format +#: network/soap/httpsoapconnection.cpp:427, kde-format msgctxt "Error message (system-generated description)" msgid "The web service is not accessible (%1)" -msgstr "服务器不可用" +msgstr " 服务器不可用%1" #: network/soap/httpsoapconnection.cpp:504 -#, fuzzy msgctxt "Error message" msgid "Too many redirections by web service" -msgstr "登录服务器的重定向过多" +msgstr " 登录服务器的重定向过多" #: network/soap/httpsoapconnection.cpp:548 -#, fuzzy msgctxt "Warning message" msgid "The Offline Messages web service is currently not available" -msgstr "服务器不可用" +msgstr "离线消息服务器暂时不可用" #: network/soap/httpsoapconnection.cpp:554 msgctxt "Warning message" msgid "The Live Messenger web service is experiencing problems" -msgstr "" +msgstr "Live Messenger web服务暂时遇到问题 " #: network/soap/httpsoapconnection.cpp:568 #, kde-format msgctxt "Error message with description (system-generated description)" msgid "Invalid web service response %1 (%2)" -msgstr "" +msgstr "非法web 服务回复%1(%2) " #: network/soap/httpsoapconnection.cpp:607 msgctxt "Error message" msgid "No response from web service" -msgstr "" +msgstr "未收到web 服务回应" #: network/soap/passportloginservice.cpp:208 #, kde-format msgctxt "Error message (sytem-generated description)" msgid "Unexpected response from server (%1)" -msgstr "" +msgstr "收到不支持的服务器回应%1" #: notification/chatnotification.cpp:172 #, fuzzy, kde-format @@ -3988,16 +3913,14 @@ msgstr "开始会议(&M)" #: notification/notificationmanager.cpp:118 -#, fuzzy msgctxt "Button text for KDE notification boxes" msgid "Leave a Message" -msgstr "个人消息(&P)" +msgstr "发送消息" #: notification/notificationmanager.cpp:122 -#, fuzzy msgctxt "Button text for KDE notification boxes" msgid "View Message" -msgstr "给您发送了消息(&e)" +msgstr "参看消息" #: notification/notificationmanager.cpp:126 #, fuzzy @@ -4021,8 +3944,7 @@ msgid "" "Closing the main window will keep KMess running in the system tray. Use " "'Quit' from the 'Connect' menu to quit the application." -msgstr "" -"关闭主窗口后 KMess 将在系统托盘中继续运行。可用文件菜单中的退出来退出程序。" +msgstr "关闭主窗口后 KMess 将在系统托盘中继续运行。可用文件菜单中的退出来退出程序。" #: notification/systemtraywidget.cpp:90 notification/systemtraywidget.cpp:189 #: notification/systemtraywidget.cpp:199 @@ -4052,7 +3974,7 @@ #: settings/accountpage.cpp:83 msgid "Set Previous Image..." -msgstr "" +msgstr "设置上一个图像" #. i18n: file: settings/accountpage.ui:133 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_2) @@ -4066,7 +3988,6 @@ msgstr "下载显示图像失败" #: settings/accountpage.cpp:548 -#, fuzzy msgid "" "An error occurred while trying to change the display picture.\n" "Make sure that you have selected an existing image file." @@ -4110,17 +4031,15 @@ "will be deleted when you disconnect." msgstr "" -#: settings/accountsettingsdialog.cpp:207 -#, fuzzy, kde-format +#: settings/accountsettingsdialog.cpp:207, kde-format msgid "" "The email address you have entered is not valid, and cannot be used as an " "account: '%1'" -msgstr "你输入的联系人地址不正确:'%1'" +msgstr " 你输入的联系人地址不正确:'%1'" -#: settings/accountsettingsdialog.cpp:215 -#, fuzzy, kde-format +#: settings/accountsettingsdialog.cpp:215, kde-format msgid "The email address you have entered is already in use: '%1'" -msgstr "你输入的联系人地址不正确:'%1'" +msgstr " 你输入的email已经被使用:'%1'" #: settings/accountsettingsdialog.cpp:221 #, fuzzy @@ -4162,7 +4081,7 @@ #: settings/emoticonspage.cpp:119 msgctxt "Dialog box title" msgid "Invalid Emoticon Name" -msgstr "" +msgstr "非法表情名" #: settings/emoticonspage.cpp:136 #, fuzzy @@ -4205,7 +4124,7 @@ #: settings/miscellaneouspage.cpp:286 msgid "You have to specify a console command to launch a custom web browser!" -msgstr "" +msgstr "你必须指定一条命令来启动web浏览器" #: settings/miscellaneouspage.cpp:291 #, c-format @@ -4213,11 +4132,11 @@ "<html>The console command you have specified to launch a custom web browser " "does not contain the '%u' parameter. Without this, opening web sites will " "not work.<br />Do you want KMess to add it for you?</html>" -msgstr "" +msgstr "<html>启动web浏览器的命令未包含 '%u'参数。将不会打开所点击的网址,您需要Kmess自动添加它吗? </html>" #: settings/miscellaneouspage.cpp:316 msgid "You have to specify a console command to launch a custom email client!" -msgstr "" +msgstr "你必须指定一条命令来启动电子邮件客户端" #: settings/miscellaneouspage.cpp:321 #, c-format @@ -4229,7 +4148,7 @@ #: settings/miscellaneouspage.cpp:344 msgid "You have to select a directory for the received files!" -msgstr "" +msgstr "你必须指定一个接收文件的目录" #: settings/miscellaneouspage.cpp:406 #, fuzzy @@ -4247,7 +4166,7 @@ #: utils/likeback/likeback.cpp:242 msgid "&Send a Comment to the Developers" -msgstr "" +msgstr "&(S)给Kmess开发着发送评论" #: utils/likeback/likeback.cpp:251 #, fuzzy @@ -4258,7 +4177,7 @@ #, kde-format msgctxt "Welcome dialog text, header text for test apps" msgid "Welcome to this testing version of %1." -msgstr "" +msgstr "欢迎使用本测试版%1" #: utils/likeback/likeback.cpp:328 #, kde-format @@ -4273,7 +4192,7 @@ "Each time you have a great or frustrating experience, please click on the " "appropriate face below the window title-bar, briefly describe what you like " "or dislike and click on 'Send'." -msgstr "" +msgstr "当你对Kmess某功能满意或者不满意时候,请点击选择的笑脸图片,并点击‘发送’" #: utils/likeback/likeback.cpp:343 msgctxt "Welcome dialog text, explanation for the like button alone" @@ -4387,11 +4306,10 @@ "%1.<br/>%2 %3%4</p>" msgstr "" -#: utils/likeback/likebackdialog.cpp:216 -#, fuzzy, kde-format +#: utils/likeback/likebackdialog.cpp:216, kde-format msgid "" "The email address you have entered is not valid, and cannot be used: '%1'" -msgstr "你输入的联系人地址不正确:'%1'" +msgstr "你输入的联系人地址不正确:'%1' " #: utils/likeback/likebackdialog.cpp:290 msgctxt "Dialog box text" @@ -4473,9 +4391,8 @@ #. i18n: file: chat/chatwindow.ui:270 #. i18n: ectx: property (whatsThis), widget (QToolButton, winksButton_) #: rc.cpp:30 -#, fuzzy msgid "Click this button to view the available winks." -msgstr "点击此处恢复联络人的头像" +msgstr " 点击此处查看可以用的wink" #. i18n: file: chat/chatwindow.ui:305 #. i18n: ectx: property (text), widget (QPushButton, newLineButton_) @@ -4679,7 +4596,6 @@ #. i18n: file: dialogs/contactpropertiesdialog.ui:217 #. i18n: ectx: property (text), widget (QCheckBox, alternativeNameCheckBox_) #: rc.cpp:136 -#, fuzzy msgid "Use an &alternative name for this contact" msgstr "使用另一个名字(&a)" @@ -4750,9 +4666,8 @@ #. i18n: file: dialogs/invitedialog.ui:19 #. i18n: ectx: property (title), widget (QGroupBox, groupBox) #: rc.cpp:175 -#, fuzzy msgid "Available Contacts" -msgstr "允许联系人(&A)" +msgstr " 允许联系人(&A)" #. i18n: file: dialogs/invitedialog.ui:70 #. i18n: ectx: property (text), widget (QLabel, label) @@ -4764,9 +4679,8 @@ #. i18n: file: dialogs/invitedialog.ui:82 #. i18n: ectx: property (toolTip), widget (QLineEdit, otherEdit_) #: rc.cpp:181 -#, fuzzy msgid "Enter the email address of a person to invite" -msgstr "输入你想邀请的联系人的电子邮件" +msgstr " 输入你想邀请的联系人的电子邮件" #. i18n: file: dialogs/invitedialog.ui:101 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_2) @@ -4918,10 +4832,9 @@ #. i18n: file: initialview.ui:179 #. i18n: ectx: property (toolTip), widget (KComboBox, handleCombobox_) #: rc.cpp:270 -#, fuzzy msgid "" "Enter here the email address of your registered Passport or Live account" -msgstr "请输入您的Passport或者Live账号的邮件地址:" +msgstr " 请输入您的Passport或者Live账号的邮件地址:" #. i18n: file: initialview.ui:195 #. i18n: ectx: property (text), widget (QLabel, TextLabel3) @@ -5104,9 +5017,8 @@ #. i18n: file: settings/accountpage.ui:111 #. i18n: ectx: property (toolTip), widget (QCheckBox, rememberPasswordCheckBox_) #: rc.cpp:360 -#, fuzzy msgid "Click here to have your password saved by KMess" -msgstr "单击这里重命名选中的表情" +msgstr " 单击这里保存密码" #. i18n: file: settings/accountpage.ui:114 #. i18n: ectx: property (whatsThis), widget (QCheckBox, rememberPasswordCheckBox_) @@ -5146,7 +5058,6 @@ #. i18n: file: settings/accountpage.ui:291 #. i18n: ectx: property (whatsThis), widget (QCheckBox, rememberCheckbox_) #: rc.cpp:387 -#, fuzzy msgid "" "<html>The option \"Remember account\" was left unchecked while logging in, " "so your settings will not be saved by default. Enable this option if you " @@ -5155,7 +5066,7 @@ "It is recommended to enable this option, unless you are using KMess as guest " "or you are using a public system (e.g. Internet cafe).</html>" msgstr "" -"登录时选项\"记住这个档案\"被留空,所以默认情况下不会保存你的设置。如果你想要" +" 登录时选项\"记住这个档案\"被留空,所以默认情况下不会保存你的设置。如果你想要" "把你的帐号设置永久地保存在这里的话,请选中这个选项。\n" "\n" "建议选中这个选项,除非你是以客人身份使用KMess或者你在使用公共计算机系统(比如" @@ -5203,11 +5114,10 @@ #. i18n: file: settings/accountpage.ui:378 #. i18n: ectx: property (text), widget (QLabel, verifyLabel_) #: rc.cpp:413 -#, fuzzy msgid "" "You cannot change your friendly name because your Passport email address is " "not verified." -msgstr "你无法改变你的昵称,因为你的passport email地址尚未验证。" +msgstr " 你无法改变你的昵称,因为你的passport email地址尚未验证。" #. i18n: file: settings/accountpage.ui:418 #. i18n: ectx: property (text), widget (KUrlLabel, verifyButton_) @@ -5224,14 +5134,13 @@ #. i18n: file: settings/accountpage.ui:446 #. i18n: ectx: property (whatsThis), widget (QLabel, registerLabel_) #: rc.cpp:422 -#, fuzzy msgid "" "<html>You need a Passport account to connect to the Live Messenger network. " "You can register your current email address at register.passport.com or use " "a Live Mail account to connect.</html>" msgstr "" -"你需要一个 passport 帐号来连接到 MSN Messenger 网络。你可以在 https://" -"register.passport.com 注册你目前的 e-mail,或使用 Hotmail 帐号来连接。" +"<html>你需要一个 passport 帐号来连接到 Live Messenger 网络。你可以在 https://" +"register.passport.com 注册你目前的 e-mail,或使用 Live Mail 帐号来登录。<html>" #. i18n: file: settings/accountpage.ui:449 #. i18n: ectx: property (text), widget (QLabel, registerLabel_) @@ -5240,8 +5149,7 @@ msgid "" "To connect to the Live Messenger service, you will need to register an email " "address as Passport account." -msgstr "" -"连接到 MSN Messenger 服务,你需要注册一个 e-mail 来当作 Passport 帐号。" +msgstr "连接到 MSN Messenger 服务,你需要注册一个 e-mail 来当作 Passport 帐号。" #. i18n: file: settings/accountpage.ui:489 #. i18n: ectx: property (text), widget (KUrlLabel, registerButton_) @@ -5265,13 +5173,11 @@ #. i18n: file: settings/accountpage.ui:522 #. i18n: ectx: property (whatsThis), widget (QCheckBox, useIdleTimerCheckBox_) #: rc.cpp:437 -#, fuzzy msgid "" "If enabled, your status will be changed automatically to \"Idle\" when you " "are not using the computer for a few minutes. If this option is not " "available, KMess was built without support for this feature." msgstr "" -"如果选中,当你几分钟不是用电脑时,你的状态会自动切换到\"离开 - 发呆\"。" #. i18n: file: settings/accountpage.ui:525 #. i18n: ectx: property (text), widget (QCheckBox, useIdleTimerCheckBox_) @@ -5322,11 +5228,10 @@ #. i18n: file: settings/accountpage.ui:647 #. i18n: ectx: property (toolTip), widget (QCheckBox, hideNotificationsWhenBusyCheckBox_) #: rc.cpp:467 -#, fuzzy msgid "" "If enabled, you will not receive any notifications when your status is set " "to \"Busy\"." -msgstr "当我的状态(&H)" +msgstr "如果选中, 您的状态将变为忙碌,你不会收到任何消息提醒" #. i18n: file: settings/accountpage.ui:650 #. i18n: ectx: property (text), widget (QCheckBox, hideNotificationsWhenBusyCheckBox_) @@ -5420,9 +5325,8 @@ #. i18n: file: settings/chatloggingpage.ui:39 #. i18n: ectx: property (title), widget (QGroupBox, saveChatsToFileCheckBox_) #: rc.cpp:518 -#, fuzzy msgid "Additionally save chat logs to file" -msgstr "将聊天记录保存到文件" +msgstr " 将聊天记录保存到文件" #. i18n: file: settings/chatloggingpage.ui:51 #. i18n: ectx: property (toolTip), widget (QLabel, label_2) @@ -5433,9 +5337,8 @@ #. i18n: file: settings/chatloggingpage.ui:54 #. i18n: ectx: property (text), widget (QLabel, label_2) #: rc.cpp:524 -#, fuzzy msgid "Save chat logs as:" -msgstr "将聊天记录保存到文件" +msgstr " 将聊天记录另存为文件" #. i18n: file: settings/chatloggingpage.ui:86 #. i18n: ectx: property (whatsThis), widget (QComboBox, fileFormatComboBox_) @@ -5575,9 +5478,8 @@ #. i18n: file: settings/chatloggingpage.ui:224 #. i18n: ectx: property (toolTip), widget (QRadioButton, singleDirectoryRadioButton_) #: rc.cpp:587 -#, fuzzy msgid "Place all saved chat logs directly in the directory specified below" -msgstr "在顶级目录中保存所有聊天记录" +msgstr " 在指定目录中保存所有聊天记录" #. i18n: file: settings/chatloggingpage.ui:227 #. i18n: ectx: property (whatsThis), widget (QRadioButton, singleDirectoryRadioButton_) @@ -5609,16 +5511,14 @@ #. i18n: file: settings/chatloggingpage.ui:305 #. i18n: ectx: property (whatsThis), widget (QLabel, chatSavePathLabel_) #: rc.cpp:605 -#, fuzzy msgid "Choose a directory where you would like to save your chat logs." -msgstr "选择一个你想要保存聊天记录的文件夹。" +msgstr " 选择一个你想要保存聊天记录的文件夹。" #. i18n: file: settings/chatloggingpage.ui:308 #. i18n: ectx: property (text), widget (QLabel, chatSavePathLabel_) #: rc.cpp:608 -#, fuzzy msgid "Save chat logs in the following directory:" -msgstr "在此目录中保存聊天记录:" +msgstr " 在此目录中保存聊天记录:" #. i18n: file: settings/chatstylepage.ui:27 #. i18n: ectx: attribute (title), widget (QWidget, tab_4) @@ -5690,15 +5590,13 @@ #. i18n: file: settings/chatstylepage.ui:256 #. i18n: ectx: property (whatsThis), widget (QCheckBox, groupFollowupCheckbox_) #: rc.cpp:644 -#, fuzzy msgid "" "This option enables the grouping of messages from the same contact. Whenever " "a contact sends you multiple messages, KMess will group those messages to " "one single message. The exact appearance depends on the chosen chat style." msgstr "" -"这个选项使同一个联系人的信息组合在一起。当联系人输入多个信息来解释某事时," -"KMess 把这些信息组合成单个的信息。具体的外观则依主题的不同而不同。\n" -"当你使用小i的MSN群时,此功能可能会引起显示混乱。" +" 这个选项使同一个联系人的信息组合在一起。当联系人输入多个信息来," +"KMess 把这些信息组合成单个的信息。具体显示形式取决于聊天风格" #. i18n: file: settings/chatstylepage.ui:259 #. i18n: ectx: property (text), widget (QCheckBox, groupFollowupCheckbox_) @@ -5755,12 +5653,11 @@ #. i18n: file: settings/chatstylepage.ui:458 #. i18n: ectx: property (whatsThis), widget (QCheckBox, useContactFontCheckBox_) #: rc.cpp:677 -#, fuzzy msgid "" "This option allows you to override the font style and color of your " "contacts' messages with the chosen font style and color below." msgstr "" -"允许用以下已选的字型、形式和颜色来覆盖你的联系人的聊天信息中的字型、形式和颜" +" 允许用以下已选的字型、形式和颜色来覆盖你的联系人的聊天信息中的字型、形式和颜" "色。" #. i18n: file: settings/chatstylepage.ui:461 @@ -5780,13 +5677,12 @@ #. i18n: file: settings/chatstylepage.ui:542 #. i18n: ectx: property (whatsThis), widget (QCheckBox, useFontEffectsCheckBox_) #: rc.cpp:686 -#, fuzzy msgid "" "<html>Enables the use of font effects. Typing *bold*, /italic/, and " "_underline_ causes those words to appear in a bold, italic or underlined " "font respectively.</html>" msgstr "" -"使用字体效果。输入 *粗体*,/斜体/ 和 _下划线_,可使字呈现相应的粗体、斜体和下" +" 使用字体效果。输入 *粗体*,/斜体/ 和 _下划线_,可使字呈现相应的粗体、斜体和下" "划线样式。" #. i18n: file: settings/chatstylepage.ui:545 @@ -5821,7 +5717,6 @@ #. i18n: file: settings/chatstylepage.ui:589 #. i18n: ectx: property (whatsThis), widget (QCheckBox, shakeNudgeCheckBox_) #: rc.cpp:704 -#, fuzzy msgid "" "<qt><p>When contacts would like to have your attention they can send you a " "nudge. By default the chat window shakes when a nudge is received or sent. " @@ -5830,7 +5725,7 @@ "Contacts may send multiple nudges at once, but KMess only shakes the chat " "window with the first nudge.</p></qt>" msgstr "" -"<qt><p>当联系人想要引起你的注意时,他们会发出闪屏震动。默认状态下当收到或发出" +"<qt><p> 当联系人想要引起你的注意时,他们会发出闪屏震动。默认状态下当收到或发出" "闪屏震动时,窗口会摇晃。当药晃效果太打扰你时,可以关闭此选项。</p>\n" "<p>当开启此选项时,KMess 依然限制摇晃效果。联系人可能会一次发出许多个闪屏震" "动,但是 KMess 只会摇晃窗口一次。</p></qt>" @@ -5891,14 +5786,13 @@ #. i18n: file: settings/contactlistpage.ui:23 #. i18n: ectx: property (whatsThis), widget (QCheckBox, showEmailInfoCheckBox_) #: rc.cpp:735 -#, fuzzy msgid "" "If enabled, a notification is shown when an email message is received in " "your inbox. The number of unread email messages is shown above the contact " "list. This option is only available for Live Mail accounts." msgstr "" -"如果选中,当你在收件箱中收到邮件时,会弹出气泡。未读邮件的数目会在联系人列表" -"的上方出现。此选项仅适用于 Hotmail 帐户。" +" 如果选中,当你在收件箱中收到邮件时,未读邮件的数目会在联系人列表" +"的上方出现。此选项仅适用于Live Mail 帐户。" #. i18n: file: settings/contactlistpage.ui:26 #. i18n: ectx: property (text), widget (QCheckBox, showEmailInfoCheckBox_) @@ -5909,12 +5803,11 @@ #. i18n: file: settings/contactlistpage.ui:33 #. i18n: ectx: property (whatsThis), widget (QCheckBox, nowListeningCheckBox_) #: rc.cpp:741 -#, fuzzy msgid "" "If enabled, your contacts can see which song you are listening to. This " "information is retrieved from the currently active media player." msgstr "" -"如果选中,KMess 会通知你的联系人你正在收听什么。这个信息是从当前运行的音频播" +" 如果选中,KMess 会通知你的联系人你正在收听什么。这个信息是从当前运行的音频播" "放软件中获取的。" #. i18n: file: settings/contactlistpage.ui:36 @@ -5965,9 +5858,8 @@ #. i18n: file: settings/emoticonspage.ui:36 #. i18n: ectx: property (text), widget (QLabel, textLabel1) #: rc.cpp:774 -#, fuzzy msgid "Available emoticon themes:" -msgstr "可用的表情主题:" +msgstr " 可用的表情主题:" #. i18n: file: settings/emoticonspage.ui:73 #. i18n: ectx: attribute (title), widget (QWidget, tab) @@ -5978,9 +5870,8 @@ #. i18n: file: settings/emoticonspage.ui:79 #. i18n: ectx: property (text), widget (QLabel, textLabel1_2) #: rc.cpp:780 -#, fuzzy msgid "Available custom emoticons:" -msgstr "可用的表情主题:" +msgstr " 可用的自定义表情:" #. i18n: file: settings/emoticonspage.ui:156 #. i18n: ectx: property (toolTip), widget (QPushButton, addEmoticonButton_) @@ -6009,9 +5900,8 @@ #. i18n: file: settings/emoticonspage.ui:204 #. i18n: ectx: property (toolTip), widget (QPushButton, removeEmoticonButton_) #: rc.cpp:801 -#, fuzzy msgid "Click here to remove the selected emoticon" -msgstr "单击这里重命名选中的表情" +msgstr " 单击这里删除选中的表情" #. i18n: file: settings/emoticonspage.ui:207 #. i18n: ectx: property (text), widget (QPushButton, removeEmoticonButton_) @@ -6058,9 +5948,8 @@ #. i18n: file: settings/miscellaneouspage.ui:214 #. i18n: ectx: property (toolTip), widget (QRadioButton, useCustomMailClientRadio_) #: rc.cpp:825 rc.cpp:860 -#, fuzzy msgid "Choose this option to enter the path to your favorite browser." -msgstr "选中这个选项, 输入你偏爱的浏览器路径" +msgstr " 选中这个选项, 输入你偏爱的浏览器路径" #. i18n: file: settings/miscellaneouspage.ui:83 #. i18n: ectx: property (text), widget (QRadioButton, useCustomBrowserRadio_) @@ -6101,7 +5990,7 @@ msgid "" "Check this box to use the Live Mail webmail site when you connect with " "accounts compatible with Live Mail." -msgstr "" +msgstr "选中这个选项,当你的账户支持Live Mail时,使用Live Mail webmail。" #. i18n: file: settings/miscellaneouspage.ui:160 #. i18n: ectx: property (text), widget (QCheckBox, useLiveMailCheckbox_) @@ -6138,9 +6027,8 @@ #. i18n: file: settings/miscellaneouspage.ui:294 #. i18n: ectx: property (text), widget (QCheckBox, useReceivedFilesDir_) #: rc.cpp:877 -#, fuzzy msgid "&Save all received files in one directory:" -msgstr "将所有接受的文件保存在同一目录(&S):" +msgstr " 将所有接受的文件保存在同一目录(&S):" #. i18n: file: settings/miscellaneouspage.ui:343 #. i18n: ectx: property (text), widget (QLabel, label_2) @@ -6166,9 +6054,8 @@ #. i18n: file: utils/likeback/likebackbar.ui:32 #. i18n: ectx: property (toolTip), widget (QToolButton, m_likeButton) #: rc.cpp:892 -#, fuzzy msgid "Click here to tell the developers about something you liked" -msgstr "单击这里重命名选中的表情" +msgstr "告诉开发者你喜欢的功能" #. i18n: file: utils/likeback/likebackbar.ui:36 #. i18n: ectx: property (whatsThis), widget (QToolButton, m_likeButton) @@ -6195,9 +6082,8 @@ #. i18n: file: utils/likeback/likebackbar.ui:66 #. i18n: ectx: property (toolTip), widget (QToolButton, m_bugButton) #: rc.cpp:906 -#, fuzzy msgid "Click here to tell the developers about a problem in the application" -msgstr "单击这里删除选中的表情。" +msgstr " 单击这里向开发者报告程序错误。" #. i18n: file: utils/likeback/likebackbar.ui:83 #. i18n: ectx: property (toolTip), widget (QToolButton, m_featureButton) @@ -6205,7 +6091,7 @@ msgid "" "Click here to tell the developers about new features you would like to have " "in this application" -msgstr "" +msgstr "点击这里,告诉开发者您希望kmess的新功能" #. i18n: file: utils/likeback/likebackdialog.ui:48 #. i18n: ectx: property (text), widget (QLabel, label_2) @@ -6237,9 +6123,8 @@ #. i18n: file: utils/likeback/likebackdialog.ui:112 #. i18n: ectx: property (text), widget (QRadioButton, bugRadio_) #: rc.cpp:932 -#, fuzzy msgid "An improper behavior of the application" -msgstr "本程序不切当的表现" +msgstr " 本程序不切当的表现" #. i18n: file: utils/likeback/likebackdialog.ui:125 #. i18n: ectx: property (text), widget (QRadioButton, featureRadio_) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fon...@us...> - 2009-07-19 23:17:45
|
Revision: 5104 http://kmess.svn.sourceforge.net/kmess/?rev=5104&view=rev Author: fontknocker Date: 2009-07-19 23:17:42 +0000 (Sun, 19 Jul 2009) Log Message: ----------- Fix KMess crashing when transferring display pictures (hopefully). This isn't a complete fix but it should fix the symptoms at least. Modified Paths: -------------- branches/kmess/kmess-2.0.x/ChangeLog branches/kmess/kmess-2.0.x/src/network/applications/p2papplicationbase.h Modified: branches/kmess/kmess-2.0.x/ChangeLog =================================================================== --- branches/kmess/kmess-2.0.x/ChangeLog 2009-07-19 22:36:27 UTC (rev 5103) +++ branches/kmess/kmess-2.0.x/ChangeLog 2009-07-19 23:17:42 UTC (rev 5104) @@ -1,3 +1,7 @@ +2009-07-20 (Adam) + * Fix KMess crashing when transferring display pictures: note this is a + band aid fix and will need to be properly investigated for later releases. + 2009-07-20 (Pano) * Merged an updated Simplified Chinese translation by Cheng Yang. Modified: branches/kmess/kmess-2.0.x/src/network/applications/p2papplicationbase.h =================================================================== --- branches/kmess/kmess-2.0.x/src/network/applications/p2papplicationbase.h 2009-07-19 22:36:27 UTC (rev 5103) +++ branches/kmess/kmess-2.0.x/src/network/applications/p2papplicationbase.h 2009-07-19 23:17:42 UTC (rev 5104) @@ -23,6 +23,7 @@ #include "../extra/p2pfragmenttracker.h" #include "../p2pmessage.h" +#include <QPointer> #include <QList> @@ -413,7 +414,7 @@ // Message buffer, required to deal with splitted MSNSLP messages QBuffer *buffer_; // The data source - QIODevice *dataSource_; + QPointer<QIODevice> dataSource_; // The type of data to send. P2PDataType dataType_; // Message ID, if we're sending "fragmented" content This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pan...@us...> - 2009-07-21 17:12:32
|
Revision: 5107 http://kmess.svn.sourceforge.net/kmess/?rev=5107&view=rev Author: pano9000 Date: 2009-07-21 17:12:26 +0000 (Tue, 21 Jul 2009) Log Message: ----------- Merged an updated Arabic translation Modified Paths: -------------- branches/kmess/kmess-2.0.x/ChangeLog branches/kmess/kmess-2.0.x/po/ar.po Modified: branches/kmess/kmess-2.0.x/ChangeLog =================================================================== --- branches/kmess/kmess-2.0.x/ChangeLog 2009-07-20 20:49:39 UTC (rev 5106) +++ branches/kmess/kmess-2.0.x/ChangeLog 2009-07-21 17:12:26 UTC (rev 5107) @@ -1,3 +1,7 @@ + +2009-07-21 (Pano) + * Merged an updated Arabic translation by Ma'moun Diraneyya. + 2009-07-20 (Adam) * Fix KMess crashing when transferring display pictures: note this is a band aid fix and will need to be properly investigated for later releases. Modified: branches/kmess/kmess-2.0.x/po/ar.po =================================================================== --- branches/kmess/kmess-2.0.x/po/ar.po 2009-07-20 20:49:39 UTC (rev 5106) +++ branches/kmess/kmess-2.0.x/po/ar.po 2009-07-21 17:12:26 UTC (rev 5107) @@ -7,10 +7,10 @@ # Ma'moun Diraneyya (مأمون ديرانية) <mam...@gm...>, 2008, 2009. msgid "" msgstr "" -"Project-Id-Version: KMess\n" +"Project-Id-Version: ar\n" "Report-Msgid-Bugs-To: http://www.kmess.org/board/\n" "POT-Creation-Date: 2009-07-13 20:29+0200\n" -"PO-Revision-Date: 2009-07-16 17:07+0300\n" +"PO-Revision-Date: 2009-07-21 18:00+0300\n" "Last-Translator: Ma'moun Diraneyya <mam...@gm...>\n" "Language-Team: Arabic <do...@ar...>\n" "MIME-Version: 1.0\n" @@ -1324,11 +1324,11 @@ #: emoticontheme.cpp:841 msgid "Embarrassed" -msgstr "حرج" +msgstr "خجل" #: emoticontheme.cpp:842 msgid "Disappointed" -msgstr "خيبة أمل" +msgstr "إحباط" #: emoticontheme.cpp:843 msgid "Hot" @@ -1548,7 +1548,7 @@ #: emoticontheme.cpp:897 msgid "Mobile Phone" -msgstr "هاتف نقال" +msgstr "هاتف نقَّال" #: emoticontheme.cpp:898 msgid "Email" @@ -2920,7 +2920,7 @@ #: network/applications/filetransferp2p.cpp:850 #, kde-format msgid "Sending file "%1" (%2)." -msgstr "إرسال الملف "%1" (%2)." +msgstr "يرسل الملف "%1" (%2)." #: network/applications/filetransfer.cpp:799 #: network/applications/filetransferp2p.cpp:888 @@ -3948,7 +3948,7 @@ "'Quit' from the 'Connect' menu to quit the application." msgstr "" "إغلاق النافذة الرئيسية سيُبقي خميس عاملاً في صينية النظام. استخدم 'أنهِ' من " -"قائمة 'اتصال' للخروج من التطبيق." +"قائمة 'اتصال' لإنهاء التطبيق." #: notification/systemtraywidget.cpp:90 notification/systemtraywidget.cpp:189 #: notification/systemtraywidget.cpp:199 @@ -4162,7 +4162,7 @@ #: utils/kmess-send/kmesssendplugin.cpp:116 msgid "Send with KMess" -msgstr "أرسل بخميس" +msgstr "أرسل عبر خميس" #: utils/kmessconfig.cpp:424 msgctxt "Passive notification message" @@ -4260,9 +4260,9 @@ msgctxt "Welcome dialog text, header for the examples" msgid "Example" msgid_plural "Examples" -msgstr[0] "لا أمثلة" +msgstr[0] "مثال" msgstr[1] "مثال" -msgstr[2] "مثالان" +msgstr[2] "أمثلة" msgstr[3] "أمثلة" msgstr[4] "أمثلة" msgstr[5] "أمثلة" @@ -4582,7 +4582,7 @@ #. i18n: ectx: property (text), widget (QRadioButton, blockContactOption_) #: rc.cpp:121 msgid "&Block this person from contacting you and seeing your status" -msgstr "اح&ظره من الاتصال بي أو معرفة حالتي" +msgstr "اح&ظر هذا الشخص من الاتصال بي أو معرفة حالتي" #. i18n: file: dialogs/contactpropertiesdialog.ui:65 #. i18n: ectx: property (toolTip), widget (QPushButton, restoreButton_) @@ -4600,7 +4600,7 @@ #. i18n: ectx: property (text), widget (QLabel, label_2) #: rc.cpp:133 msgid "&Groups:" -msgstr "الم&جموعات:" +msgstr "المجموعا&ت:" #. i18n: file: dialogs/contactpropertiesdialog.ui:217 #. i18n: ectx: property (text), widget (QCheckBox, alternativeNameCheckBox_) @@ -4888,7 +4888,7 @@ #. i18n: ectx: property (text), widget (QCheckBox, rememberPasswordCheckBox_) #: rc.cpp:297 msgid "R&emember password" -msgstr "تذ&كَّر كلمة السر" +msgstr "تذكَّ&ر كلمة السر" #. i18n: file: initialview.ui:329 #. i18n: ectx: property (toolTip), widget (QPushButton, connectButton_) @@ -5903,7 +5903,7 @@ #. i18n: ectx: attribute (title), widget (QWidget, tab) #: rc.cpp:777 msgid "&Custom Emoticons" -msgstr "وجوه مُ&خَّصصة" +msgstr "الوجوه المُ&خَّصصة" #. i18n: file: settings/emoticonspage.ui:79 #. i18n: ectx: property (text), widget (QLabel, textLabel1_2) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <it_...@us...> - 2009-07-23 14:31:37
|
Revision: 5127 http://kmess.svn.sourceforge.net/kmess/?rev=5127&view=rev Author: it_amroth Date: 2009-07-23 14:31:32 +0000 (Thu, 23 Jul 2009) Log Message: ----------- kmess-2.0.x: Added a class giving meaningful error messages for unsupported applications. Modified Paths: -------------- branches/kmess/kmess-2.0.x/ChangeLog branches/kmess/kmess-2.0.x/src/CMakeLists.txt branches/kmess/kmess-2.0.x/src/network/applications/applicationlist.cpp Added Paths: ----------- branches/kmess/kmess-2.0.x/src/network/applications/unknownapplication.cpp branches/kmess/kmess-2.0.x/src/network/applications/unknownapplication.h Modified: branches/kmess/kmess-2.0.x/ChangeLog =================================================================== --- branches/kmess/kmess-2.0.x/ChangeLog 2009-07-23 13:15:23 UTC (rev 5126) +++ branches/kmess/kmess-2.0.x/ChangeLog 2009-07-23 14:31:32 UTC (rev 5127) @@ -1,9 +1,12 @@ +2009-07-23 (Valerio) + * Added a class giving meaningful error messages for unsupported applications. + 2009-07-21 (Pano) * Merged an updated Arabic translation by Ma'moun Diraneyya. 2009-07-20 (Adam) - * Fix KMess crashing when transferring display pictures: note this is a + * Fix KMess crashing when transferring display pictures: note this is a band aid fix and will need to be properly investigated for later releases. 2009-07-20 (Pano) Modified: branches/kmess/kmess-2.0.x/src/CMakeLists.txt =================================================================== --- branches/kmess/kmess-2.0.x/src/CMakeLists.txt 2009-07-23 13:15:23 UTC (rev 5126) +++ branches/kmess/kmess-2.0.x/src/CMakeLists.txt 2009-07-23 14:31:32 UTC (rev 5127) @@ -60,6 +60,7 @@ network/applications/p2papplicationbase.cpp network/applications/p2papplication.cpp network/applications/msnobjecttransferp2p.cpp + network/applications/unknownapplication.cpp network/extra/directconnectionbase.cpp network/extra/directconnectionpool.cpp network/extra/msndirectconnection.cpp Modified: branches/kmess/kmess-2.0.x/src/network/applications/applicationlist.cpp =================================================================== --- branches/kmess/kmess-2.0.x/src/network/applications/applicationlist.cpp 2009-07-23 13:15:23 UTC (rev 5126) +++ branches/kmess/kmess-2.0.x/src/network/applications/applicationlist.cpp 2009-07-23 14:31:32 UTC (rev 5127) @@ -33,6 +33,7 @@ #include "mimeapplication.h" #include "msnobjecttransferp2p.h" #include "p2papplication.h" +#include "unknownapplication.h" #include <QRegExp> @@ -636,6 +637,15 @@ { return new FileTransferP2P( this ); } + else if( eufGuid == UnknownApplication::getGamesAppId() + || eufGuid == UnknownApplication::getMeetingAppId() + || eufGuid == UnknownApplication::getRemoteDesktopAppId() + || eufGuid == UnknownApplication::getWebcamPullAppId() + || eufGuid == UnknownApplication::getWebcamPushAppId() + || eufGuid == UnknownApplication::getVoiceAppId() ) + { + return new UnknownApplication( this, eufGuid ); + } else { #ifdef KMESSDEBUG_APPLICATIONLIST_GENERAL Added: branches/kmess/kmess-2.0.x/src/network/applications/unknownapplication.cpp =================================================================== --- branches/kmess/kmess-2.0.x/src/network/applications/unknownapplication.cpp (rev 0) +++ branches/kmess/kmess-2.0.x/src/network/applications/unknownapplication.cpp 2009-07-23 14:31:32 UTC (rev 5127) @@ -0,0 +1,142 @@ +/*************************************************************************** + unknownapplication.cpp - description + ------------------- + begin : Thu Jul 23 2009 + copyright : (C) 2009 by Valerio Pilo + email : "project" --at-- "kmess" --dot-- "org" + ***************************************************************************/ + +/*************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + ***************************************************************************/ + +#include "unknownapplication.h" + +#include "../mimemessage.h" + +#include <KLocalizedString> + + + +/** + * The constructor + */ +UnknownApplication::UnknownApplication( ApplicationList *applicationList, const QString &eufGuid ) +: P2PApplication( applicationList ) +, applicationGuid_( eufGuid ) +{ +} + + + +/** + * The destructor + */ +UnknownApplication::~UnknownApplication() +{ +} + + + +/** + * Step one of a contact-started chat: the contact invites the user + * + * @param message The invitation message + */ +void UnknownApplication::contactStarted1_ContactInvitesUser( const MimeMessage &message ) +{ + QString errorMessage( i18n( "The contact is inviting you for '%1', but this is not implemented yet." ) ); + QString appName; + + if( applicationGuid_ == getWebcamPullAppId() + || applicationGuid_ == getWebcamPushAppId() ) + { + errorMessage = errorMessage.arg( i18n( "webcam" ) ); + } + else if( applicationGuid_ == getMeetingAppId() ) + { +#warning Translate this after the release! + errorMessage = errorMessage.arg( I18N_NOOP( "meeting" ) ); + } + else if( applicationGuid_ == getRemoteDesktopAppId() ) + { +#warning Translate this after the release! + errorMessage = errorMessage.arg( I18N_NOOP( "remote desktop" ) ); + } + else if( applicationGuid_ == getVoiceAppId() ) + { + errorMessage = i18n( "You are invited to start a voice conversation but support for this was not installed" ); + } + else if( applicationGuid_ == getGamesAppId() ) + { + // Parse the context + // Contents is something like '10331021;1;Tic Tac Toe' + QByteArray decodedContext( QByteArray::fromBase64( message.getValue("Context").toLatin1() ) ); + QString contextString ( QString::fromUtf16( reinterpret_cast<const ushort*>( decodedContext.data() ), + decodedContext.size() / 2 ) ); + + errorMessage = errorMessage.arg( contextString.section( ';', 2, 2 ) ); + } + + // Tell the contact we don't support the application + showSystemMessage( errorMessage, ChatMessage::CONTENT_SYSTEM_NOTICE, true ); + sendCancelMessage( CANCEL_NOT_INSTALLED ); +} + + + + +// Return the GUID for web applications (games) +QString UnknownApplication::getGamesAppId() +{ + return "{6A13AF9C-5308-4F35-923A-67E8DDA40C2F}"; +} + + + +// Return the GUID for meeting +QString UnknownApplication::getMeetingAppId() +{ + return "{44BBA842-CC51-11CF-AAFA-00AA00B6015C}"; +} + + + +// Return the GUID for remote desktop +QString UnknownApplication::getRemoteDesktopAppId() +{ + return "{56b994a7-380f-410b-9985-c809d78c1bdc}"; +} + + + +// Return the GUID for webcam transfer sending +QString UnknownApplication::getWebcamPushAppId() +{ + return "{4BD96FC0-AB17-4425-A14A-439185962DC8}"; +} + + + + // Return the GUID for webcam transfer receiving +QString UnknownApplication::getWebcamPullAppId() +{ + return "{1C9AA97E-9C05-4583-A3BD-908A196F1E92}"; +} + + + +// Return the GUID for voice conversations +QString UnknownApplication::getVoiceAppId() +{ + return "{02D3C01F-BF30-4825-A83A-DE7AF41648AA}"; +} + + + +#include "unknownapplication.moc" Added: branches/kmess/kmess-2.0.x/src/network/applications/unknownapplication.h =================================================================== --- branches/kmess/kmess-2.0.x/src/network/applications/unknownapplication.h (rev 0) +++ branches/kmess/kmess-2.0.x/src/network/applications/unknownapplication.h 2009-07-23 14:31:32 UTC (rev 5127) @@ -0,0 +1,70 @@ +/*************************************************************************** + unknownapplication.h - description + ------------------- + begin : Thu Jul 23 2009 + copyright : (C) 2009 by Valerio Pilo + email : "project" --at-- "kmess" --dot-- "org" + ***************************************************************************/ + +/*************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + ***************************************************************************/ + +#ifndef UNKNOWNAPPLICATION_H +#define UNKNOWNAPPLICATION_H + +#include "p2papplication.h" + + + +/** + * Unknown application notification class. + * + * This class can be used to give useful error messages to the user when + * unsupported applications are requested by contacts. + * + * @author Valerio Pilo + * @ingroup Applications + */ +class UnknownApplication : public P2PApplication +{ + Q_OBJECT + + public: + // The constructor + UnknownApplication( ApplicationList *applicationList, const QString &eufGuid ); + // The destructor + virtual ~UnknownApplication(); + + + public: // Static public members + + // Return the GUID for web applications (games) + static QString getGamesAppId(); + // Return the GUID for meeting + static QString getMeetingAppId(); + // Return the GUID for remote desktop + static QString getRemoteDesktopAppId(); + // Return the GUID for webcam transfer sending + static QString getWebcamPushAppId(); + // Return the GUID for webcam transfer receiving + static QString getWebcamPullAppId(); + // Return the GUID for voice conversations + static QString getVoiceAppId(); + + + private: + // Step one of a contact-started chat: the contact invites the user + void contactStarted1_ContactInvitesUser( const MimeMessage& message ); + + private: // Private members + // The GUID of the unsupported but known application + const QString applicationGuid_; +}; + +#endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <it_...@us...> - 2009-07-23 16:22:57
|
Revision: 5128 http://kmess.svn.sourceforge.net/kmess/?rev=5128&view=rev Author: it_amroth Date: 2009-07-23 16:22:55 +0000 (Thu, 23 Jul 2009) Log Message: ----------- kmess-2.0.x: Bumped version numbers to RC1 in branch. Modified Paths: -------------- branches/kmess/kmess-2.0.x/CMakeLists.txt branches/kmess/kmess-2.0.x/ChangeLog branches/kmess/kmess-2.0.x/Doxyfile Modified: branches/kmess/kmess-2.0.x/CMakeLists.txt =================================================================== --- branches/kmess/kmess-2.0.x/CMakeLists.txt 2009-07-23 14:31:32 UTC (rev 5127) +++ branches/kmess/kmess-2.0.x/CMakeLists.txt 2009-07-23 16:22:55 UTC (rev 5128) @@ -128,7 +128,7 @@ # Switch between the following two commands to force using a predefined version number EXECUTE_PROCESS( COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/cmake/get-svn-version.sh OUTPUT_VARIABLE KMESS_VERSION ) -# SET( KMESS_VERSION "2.0beta2" ) +# SET( KMESS_VERSION "2.0rc1" ) #### Define compiler flags #### Modified: branches/kmess/kmess-2.0.x/ChangeLog =================================================================== --- branches/kmess/kmess-2.0.x/ChangeLog 2009-07-23 14:31:32 UTC (rev 5127) +++ branches/kmess/kmess-2.0.x/ChangeLog 2009-07-23 16:22:55 UTC (rev 5128) @@ -15,6 +15,8 @@ 2009-07-18 (Valerio) * Further improved the fix for contact list tooltips with RTL languages. +--- 2.0rc1 released --- + 2009-07-17 (Valerio) * Fixed contact list tooltips with Right-to-Left text layouts. Modified: branches/kmess/kmess-2.0.x/Doxyfile =================================================================== --- branches/kmess/kmess-2.0.x/Doxyfile 2009-07-23 14:31:32 UTC (rev 5127) +++ branches/kmess/kmess-2.0.x/Doxyfile 2009-07-23 16:22:55 UTC (rev 5128) @@ -5,7 +5,7 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = KMess -PROJECT_NUMBER = 2.0-beta2 +PROJECT_NUMBER = 2.0-rc1 OUTPUT_DIRECTORY = ./apidocs CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pan...@us...> - 2009-07-23 22:23:09
|
Revision: 5130 http://kmess.svn.sourceforge.net/kmess/?rev=5130&view=rev Author: pano9000 Date: 2009-07-23 22:22:35 +0000 (Thu, 23 Jul 2009) Log Message: ----------- Merged an updated Simplified Chinese translation Modified Paths: -------------- branches/kmess/kmess-2.0.x/ChangeLog branches/kmess/kmess-2.0.x/NEWS branches/kmess/kmess-2.0.x/po/zh_CN.po Modified: branches/kmess/kmess-2.0.x/ChangeLog =================================================================== --- branches/kmess/kmess-2.0.x/ChangeLog 2009-07-23 17:03:40 UTC (rev 5129) +++ branches/kmess/kmess-2.0.x/ChangeLog 2009-07-23 22:22:35 UTC (rev 5130) @@ -1,3 +1,6 @@ +2009-07-24 (Pano) + * Merged an updated German translation. + * Merged an updated Simplified Chinese translation by Cheng Yang. 2009-07-23 (Valerio) * Added a class giving meaningful error messages for unsupported applications. Modified: branches/kmess/kmess-2.0.x/NEWS =================================================================== --- branches/kmess/kmess-2.0.x/NEWS 2009-07-23 17:03:40 UTC (rev 5129) +++ branches/kmess/kmess-2.0.x/NEWS 2009-07-23 22:22:35 UTC (rev 5130) @@ -1,6 +1,8 @@ Changes between KMess SVN and 2.0-rc1: -------------------------------------- +- updated German translation by Panagiotis Papadopoulos. +- updated Simplified Chinese translation by Cheng Yang. Changes between KMess 2.0-rc1 and 2.0-beta2: -------------------------------------- Modified: branches/kmess/kmess-2.0.x/po/zh_CN.po =================================================================== --- branches/kmess/kmess-2.0.x/po/zh_CN.po 2009-07-23 17:03:40 UTC (rev 5129) +++ branches/kmess/kmess-2.0.x/po/zh_CN.po 2009-07-23 22:22:35 UTC (rev 5130) @@ -12,7 +12,7 @@ "Project-Id-Version: KMess\n" "Report-Msgid-Bugs-To: http://www.kmess.org/board/\n" "POT-Creation-Date: 2009-07-13 20:29+0200\n" -"PO-Revision-Date: 2009-07-18 21:39-0400\n" +"PO-Revision-Date: 2009-07-23 14:54-0400\n" "Last-Translator: \n" "Language-Team: en_US <kde...@kd...>\n" "MIME-Version: 1.0\n" @@ -24,7 +24,6 @@ "X-Generator: Lokalize 0.3\n" #: account.cpp:45 account.cpp:744 -#, fuzzy msgid "I am away from my computer" msgstr "我已离开电脑" @@ -51,21 +50,19 @@ #: accountsmanager.cpp:567 msgctxt "Dialog box caption" msgid "Secure Password Storage" -msgstr "" +msgstr "安全的密码存储" #: accountsmanager.cpp:569 msgctxt "Dialog button: Import passwords to a KDE wallet" msgid "Import" -msgstr "" +msgstr "导入" #: accountsmanager.cpp:572 -#, fuzzy msgctxt "Dialog button: Delete insecurely stored passwords" msgid "Delete" -msgstr "删除(&D)" +msgstr "删除" #: accountsmanager.cpp:575 -#, fuzzy msgctxt "Dialog button: Keep insecurely stored passwords" msgid "Keep" msgstr "保持" @@ -78,31 +75,26 @@ "invitation to." msgstr " 你无法开启这个邀请,因为这个聊天中有多个联系人。" -#: chat/chat.cpp:136 -#, fuzzy, kde-format +#: chat/chat.cpp:136, kde-format msgid "%1 has joined the chat." -msgstr "%1 已经加入聊天" +msgstr "%1 已经加入聊天 " -#: chat/chat.cpp:189 -#, fuzzy, kde-format +#: chat/chat.cpp:189, kde-format msgctxt "Message shown in chat, %1 is the contact's friendly name" msgid "The chat went idle, %1 has left it." msgstr "对话闲置。%1 已经离开聊天。" -#: chat/chat.cpp:195 -#, fuzzy, kde-format +#: chat/chat.cpp:195, kde-format msgctxt "Message shown in chat, %1 is the contact's friendly name" msgid "%1 has left the chat." msgstr "%1 已经离开聊天" -#: chat/chat.cpp:357 -#, fuzzy, kde-format +#: chat/chat.cpp:357, kde-format msgctxt "Name of a chat tab" msgid "%1 and %2" -msgstr " %1 和 %2 聊天" +msgstr " %1 和 %2 " -#: chat/chat.cpp:365 -#, fuzzy, kde-format +#: chat/chat.cpp:365, kde-format msgctxt "Name of a chat tab" msgid "%1 et al." msgstr "%1 ..等 - 聊天" @@ -125,11 +117,10 @@ msgid "You have sent a wink!" msgstr " 您发送了闪屏振动!" -#: chat/chat.cpp:974 -#, fuzzy, kde-format +#: chat/chat.cpp:974, kde-format msgctxt "Message shown in the chat window, %1 is the wink name" msgid "You have sent the "%1" wink!" -msgstr "<html>你收到了%1发来的传情动漫。</html>" +msgstr "你发送了传情动漫%1。" #: chat/chat.cpp:1007 msgid "" @@ -138,7 +129,6 @@ msgstr "" #: chat/chat.cpp:1164 -#, fuzzy msgctxt "Warning message shown in chat" msgid "There has been a connection problem." msgstr "<html>连接故障</html>" @@ -150,35 +140,32 @@ "the first 7 will be sent." msgstr "" -#: chat/chat.cpp:1187 -#, fuzzy, kde-format +#: chat/chat.cpp:1187, kde-format msgctxt "Warning message shown in chat, %1 is the contact's friendly name" msgid "" "%1 has sent you a voice clip, but KMess does not support voice clips yet." -msgstr "<html>%1给你发送了动作消息, 但KMess目前还不支持</html>" +msgstr "%1给你发送了语音片段, 但KMess目前还不支持" -#: chat/chat.cpp:1201 -#, fuzzy, kde-format +#: chat/chat.cpp:1201, kde-format msgctxt "Warning message shown in chat, %1 is the contact's friendly name" msgid "" "%1 has sent you an action message, but KMess does not support action " "messages yet." -msgstr "<html>%1给你发送了动作消息, 但KMess目前还不支持</html>" +msgstr "%1给你发送了动作消息, 但KMess目前还不支持" -#: chat/chat.cpp:1216 -#, fuzzy, kde-format +#: chat/chat.cpp:1216, kde-format msgctxt "Warning message shown in chat, %1 is the contact's friendly name" msgid "" "%1 has sent you a Live Messenger feature that KMess does not support yet." -msgstr "<html>%1给你发送了目前KMess还不支持的MSN特性</html>" +msgstr "<html>%1给你发送了目前KMess还不支持的Live Messenger特性</html>" -#: chat/chat.cpp:1242 -#, fuzzy, kde-format +#: chat/chat.cpp:1242, kde-format msgctxt "Message shown in the chat window, %1 is the contact's friendly name" msgid "" "You received a wink from %1, but displaying winks has been disabled. You can " "re-enable it in the <a href='kmess://accountconfig'>account settings</a>." -msgstr "传情动漫无法显示。无法读取数据。" +msgstr "" +"%1给您发送了传情动漫, 但播放功能已经被禁止,请在 <a href='kmess://accountconfig'>账户设置</a>中启用." #: chat/chat.cpp:1252, kde-format msgctxt "" @@ -190,19 +177,17 @@ "accountconfig'>account settings</a>." msgstr " 传情动漫无法显示。无法读取数据。" -#: chat/chat.cpp:1282 -#, fuzzy, kde-format +#: chat/chat.cpp:1282, kde-format msgctxt "Message shown in the chat window, %1 is the contact's friendly name" msgid "%1 has sent you a wink!" -msgstr "<html><b>%1</b>给您发送了传情动漫!</html>" +msgstr " %1给您发送了传情动漫!" -#: chat/chat.cpp:1289 -#, fuzzy, kde-format +#: chat/chat.cpp:1289, kde-format msgctxt "" "Message shown in the chat window, %1 is the contact's friendly name, %2 is " "the wink name" msgid "%1 has sent you a wink: "%2"!" -msgstr "<html><b>%1</b>给您发送了传情动漫!</html>" +msgstr "1给您发送了传情动漫%2" #: chat/chat.cpp:1311, kde-format msgctxt "Message shown in the chat window, %1 is the contact's friendly name" @@ -220,61 +205,54 @@ "Make sure you have the "cabextract" program installed." msgstr " 你从%1收到了一个传情动漫, 但无法播放。请确认你安装了'cabextract'。" -#: chat/chat.cpp:1332 -#, fuzzy, kde-format +#: chat/chat.cpp:1332, kde-format msgctxt "Message shown in the chat window, %1 is the contact's friendly name" msgid "" "You received a wink from %1, but it could not be displayed. Extracting the " "wink package with "cabextract" has failed." -msgstr "传情动漫无法播放。请确认你安装了'cabextract'。" +msgstr "%1给你发送了传情动漫,但无法播放。请确认你安装了'cabextract'。" -#: chat/chat.cpp:1341 -#, fuzzy, kde-format +#: chat/chat.cpp:1341, kde-format msgctxt "" "Message shown in the chat window, %1 is the contact's friendly name, %2 is " "the wink name" msgid "" "You received the "%2" wink from %1, but it could not be displayed. " "Extracting the wink package with "cabextract" has failed." -msgstr "传情动漫无法播放。请确认你安装了'cabextract'。" +msgstr "%1给您发送了传情动漫%2,但无法播放。请确认你安装了'cabextract'。" -#: chat/chat.cpp:1353 -#, fuzzy, kde-format +#: chat/chat.cpp:1353, kde-format msgctxt "Message shown in the chat window, %1 is the contact's friendly name" msgid "" "You received a wink from %1, but it could not be displayed. The data could " "not be read." -msgstr "传情动漫无法显示。无法读取数据。" +msgstr "%1给您发送了传情动漫,但无法播放。无法读取数据。" -#: chat/chat.cpp:1362 -#, fuzzy, kde-format +#: chat/chat.cpp:1362, kde-format msgctxt "" "Message shown in the chat window, %1 is the contact's friendly name, %2 is " "the wink name" msgid "" "You received the "%2" wink from %1, but it could not be displayed. " "The data could not be read." -msgstr "传情动漫无法显示。无法读取数据。" +msgstr "%1给您发送了传情动漫%2,但无法播放。无法读取数据。" #: chat/chat.cpp:1404 #, kde-format msgid "" "%1 has gone offline. Any messages you send will be delivered the next time " "he or she logs in." -msgstr "" +msgstr "%1已经离线。您所发送的任何消息将会在他或她下次登录是被接收" -#: chat/chat.cpp:1409 -#, fuzzy, kde-format +#: chat/chat.cpp:1409, kde-format msgid "%1 has gone offline." -msgstr "%1 已经加入聊天" +msgstr "%1 已经离线" -#: chat/chat.cpp:1419 -#, fuzzy, kde-format +#: chat/chat.cpp:1419, kde-format msgid "%1 has changed his or her status to "%2"." -msgstr "%1 已经加入聊天" +msgstr "%1 状态变为%2" -#: chat/chat.cpp:1450 -#, fuzzy, kde-format +#: chat/chat.cpp:1450, kde-format msgid "%1 has sent you a nudge!" msgstr "</html><b>%1</b>给您发送了闪屏振动!</html>" @@ -285,38 +263,33 @@ msgid "all contacts" msgstr "所有联系人(&A)" -#: chat/chat.cpp:1496 -#, fuzzy, kde-format +#: chat/chat.cpp:1496, kde-format msgctxt "Error message shown in chat, %1 is the contact's friendly name" msgid "Failed to send the nudge to %1." -msgstr "<html>你收到了%1发来的闪屏震动!</html>" +msgstr "从%1发来的闪屏震动接收失败" -#: chat/chat.cpp:1501 -#, fuzzy, kde-format +#: chat/chat.cpp:1501, kde-format msgctxt "Error message shown in chat, %1 is the contact's friendly name" msgid "Failed to send the wink to %1." -msgstr "<html>你收到了%1发来的传情动漫。</html>" +msgstr "接受%1发来的传情动漫失败。" -#: chat/chat.cpp:1511 -#, fuzzy, kde-format +#: chat/chat.cpp:1511, kde-format msgctxt "Error message shown in chat, %1 is the contact's friendly name" msgid "Failed to send the handwritten message to %1." -msgstr "%1 已经加入聊天" +msgstr "给%1发送手写消息失败" -#: chat/chat.cpp:1526 -#, fuzzy, kde-format +#: chat/chat.cpp:1526, kde-format msgctxt "" "Error message shown in chat, %1 is the sent message, %2 is the contact's " "friendly name" msgid "Failed to send the message to %2:<br/>%1" -msgstr "<b>%1</b>给你发送了离线消息: <br>'%2'" +msgstr "给%1发送了消息: '%2' 失败" -#: chat/chat.cpp:1609 -#, fuzzy, kde-format +#: chat/chat.cpp:1609, kde-format msgid "" "The file "%1" could not be found on your computer, and the " "download failed." -msgstr "消息 '%1' 无法发送。" +msgstr "无法找到文件 '%1' ,下载失败。" #: chat/chat.cpp:1646, kde-format msgctxt "Message shown in chat window, %1 is the contact's friendly name" @@ -334,8 +307,7 @@ "time he or she logs in." msgstr "" -#: chat/chatmaster.cpp:1387 -#, fuzzy, kde-format +#: chat/chatmaster.cpp:1387, kde-format msgid "%1 is sending a wink: "%2"" msgstr "%1 正在发送传情动漫: %2" @@ -357,7 +329,7 @@ "Header of a single chat saved as plain text chat log: %1 is the chat date " "and time" msgid "Chat started on: %2" -msgstr "" +msgstr "自%2开始聊天" #: chat/chatmessageview.cpp:432, kde-format msgctxt "Header of a chat file saved in plain text: %1 is the contact" @@ -379,7 +351,7 @@ #: chat/chatmessageview.cpp:1143 msgid "Find &Text..." -msgstr "" +msgstr "查找文本(&T)" #: chat/chatstatusbar.cpp:49 msgctxt "@action:button" @@ -424,9 +396,8 @@ msgstr "添加这个表情(&E)…" #: chat/chatview.cpp:845 -#, fuzzy msgid "Hide this &Emoticon" -msgstr "添加这个表情(&E)…" +msgstr "隐藏这个表情(&E)…" #: chat/chatview.cpp:851 msgid "Send &Email" @@ -437,7 +408,6 @@ msgstr "添加联系人(&A)" #: chat/chatview.cpp:859 -#, fuzzy msgid "Copy E&mail Address" msgstr "复制电子邮件地址(&m)" @@ -450,9 +420,8 @@ msgstr "复制地址(&A)" #: chat/chatview.cpp:882 chat/chatwindow.cpp:507 -#, fuzzy msgid "C&lear Chat" -msgstr "清除标签" +msgstr "清除标签 " #: chat/chatview.cpp:883 msgid "Save Chat to &File..." @@ -484,14 +453,12 @@ msgstr "关闭聊天标签" #: chat/chatwindow.cpp:345 -#, fuzzy msgid "Close All Tabs" msgstr "关闭所有标签(&A)" #: chat/chatwindow.cpp:346 -#, fuzzy msgid "Close Current Tab" -msgstr "关闭这个标签" +msgstr "关闭当前标签" #: chat/chatwindow.cpp:422 msgid "&Invite..." @@ -534,9 +501,8 @@ msgstr "显示表情(&E)" #: chat/chatwindow.cpp:442 -#, fuzzy msgid "Show S&tatus Messages" -msgstr "在显示消息时间(&h)" +msgstr "在显示状态消息(&h)" #: chat/chatwindow.cpp:448 msgid "&Panels" @@ -560,16 +526,15 @@ #: chat/chatwindow.cpp:460 chat/chatwindow.cpp:461 msgid "P&revious Tab" -msgstr "" +msgstr "上一个标签(P)" #: chat/chatwindow.cpp:462 chat/chatwindow.cpp:463 msgid "Ne&xt Tab" -msgstr "" +msgstr "下一个标签(x)" #: chat/chatwindow.cpp:478 -#, fuzzy msgid "Enable or disable the contacts panel" -msgstr "等待联系人列表……" +msgstr "启用或者禁用联系人面板" #: chat/chatwindow.cpp:479 chat/chatwindow.cpp:480 msgctxt "Toolbar button" @@ -577,9 +542,8 @@ msgstr "联系人" #: chat/chatwindow.cpp:484 -#, fuzzy msgid "Enable or disable the standard emoticons panel" -msgstr "等待联系人列表……" +msgstr "启用或者禁用标准表情面板" #: chat/chatwindow.cpp:485 chat/chatwindow.cpp:486 msgctxt "Toolbar button" @@ -587,9 +551,8 @@ msgstr "表情" #: chat/chatwindow.cpp:490 -#, fuzzy msgid "Enable or disable the custom emoticons panel" -msgstr "等待联系人列表……" +msgstr "启用或者禁用自定义表情面板" #: chat/chatwindow.cpp:491 chat/chatwindow.cpp:492 msgctxt "Toolbar button" @@ -605,9 +568,8 @@ msgstr "改变字体颜色(&C)" #: chat/chatwindow.cpp:506 -#, fuzzy msgid "C&lear Chat Window" -msgstr "清除标签" +msgstr "清除聊天窗口" #: chat/chatwindow.cpp:574 msgctxt "Menu/toolbar action for voice conversations (KPhone support)" @@ -654,7 +616,7 @@ #: chat/chatwindow.cpp:1122 msgctxt "Caption when an unknown command was requested" msgid "Unknown Command" -msgstr "" +msgstr "未知命令" #: chat/chatwindow.cpp:1624 msgctxt "Chat window caption, without contact name" @@ -678,7 +640,7 @@ #: chat/chatwindow.cpp:1652 kmessinterface.cpp:678 msgctxt "Dialog box caption: hiding the menu bar" msgid "Hiding the Menu" -msgstr "" +msgstr "隐藏菜单" #: chat/chatwindow.cpp:1905 #, kde-format @@ -708,7 +670,7 @@ #. i18n: ectx: property (toolTip), widget (QToolButton, inkButton_) #: chat/chatwindow.cpp:2545 rc.cpp:9 msgid "Handwriting mode" -msgstr "" +msgstr "手写模式" #: chat/chatwindow.cpp:2554 msgctxt "Label text" @@ -724,9 +686,8 @@ #. i18n: file: chat/chatwindow.ui:267 #. i18n: ectx: property (toolTip), widget (QToolButton, winksButton_) #: chat/chatwindow.cpp:2568 rc.cpp:27 -#, fuzzy msgid "Winks" -msgstr "眨眼" +msgstr "传情动漫" #: chat/chatwindow.cpp:2577 msgctxt "Label text" @@ -734,17 +695,15 @@ msgstr "" #: chat/chatwindow.cpp:2583 -#, fuzzy msgctxt "Label text" msgid "Winks are disabled: KMess cannot send winks to this contact." -msgstr "点击这里给这个联系人发送 email" +msgstr "传情动漫被禁用,无法发送传情动漫" #: chat/contactframe.cpp:298 msgid "&Start Private Chat" msgstr " 开始私聊(&S)" #: chat/contactframe.cpp:299 kmessview.cpp:604 -#, fuzzy msgid "&Send Email" msgstr "发送电子邮件(&E)" @@ -790,19 +749,17 @@ #: chat/contactframe.cpp:314 kmessview.cpp:619 msgid "Song &Name" -msgstr "" +msgstr "歌曲名(N)" #. i18n: file: dialogs/contactpropertiesdialog.ui:24 #. i18n: ectx: attribute (title), widget (QWidget, tab) #: chat/contactframe.cpp:316 rc.cpp:124 -#, fuzzy msgid "&Information" -msgstr "信息" +msgstr "信息(&I)" #: chat/contactframe.cpp:317 -#, fuzzy msgid "Display Pictures" -msgstr "显示头像" +msgstr "头像" #. i18n: file: dialogs/contactpropertiesdialog.ui:342 #. i18n: ectx: attribute (title), widget (QWidget, tab_3) @@ -813,12 +770,10 @@ #. i18n: file: dialogs/contactpropertiesdialog.ui:352 #. i18n: ectx: attribute (title), widget (QWidget, tab_4) #: chat/contactframe.cpp:319 rc.cpp:160 -#, fuzzy msgid "&Emoticons" -msgstr "表情" +msgstr "表情(&E)" #: chat/contactframe.cpp:348 kmessview.cpp:654 -#, fuzzy msgid "&Copy" msgstr "复制(&C)..." @@ -826,8 +781,7 @@ msgid "Blocked" msgstr "被阻止" -#: chat/contactframe.cpp:771 -#, fuzzy, kde-format +#: chat/contactframe.cpp:771, kde-format msgctxt "" "Tooltip for a contact's status icon, arg %1 is the Live Messenger status, " "like 'Online'" @@ -842,12 +796,10 @@ msgstr "" #: chat/emoticonswidget.cpp:438 -#, fuzzy msgid "Add to Chat" msgstr "添加到聊天" #: chat/emoticonswidget.cpp:439 -#, fuzzy msgid "Add New" msgstr "添加(&w)..." @@ -868,11 +820,11 @@ #: contact/contactbase.cpp:290 msgid "Windows Mobile" -msgstr "" +msgstr "Windows Mobile" #: contact/contactbase.cpp:294 msgid "Web Messenger" -msgstr "" +msgstr "网页Messenger" #: contact/contactbase.cpp:298 msgid "Office Communicator" @@ -884,7 +836,7 @@ #: contact/contactbase.cpp:306 msgid "Windows Media Center" -msgstr "" +msgstr "Windows媒体中心" #: contact/contactbase.cpp:313 contact/contactbase.cpp:318 #, kde-format @@ -906,9 +858,8 @@ msgstr "Window Live Messenger %1 兼容" #: contact/contactbase.cpp:354 -#, fuzzy msgid "Windows Live Messenger compatible" -msgstr "Window Live Messenger %1 兼容" +msgstr "Window Live Messenger 兼容" #: contact/msnstatus.cpp:159 contact/msnstatus.cpp:172 initialview.cpp:85 #: model/contactlist.cpp:1824 settings/accountpage.cpp:99 @@ -924,7 +875,6 @@ msgstr "离开" #: contact/msnstatus.cpp:162 -#, fuzzy msgid "Away with Auto-Reply" msgstr "离开后自动回复" @@ -957,7 +907,6 @@ msgstr "我的状态(&M)" #: contact/msnstatus.cpp:218 -#, fuzzy msgctxt "Menu action name" msgid "Disconnect" msgstr "注销(&D)" @@ -974,21 +923,18 @@ msgid "Edit Emoticon" msgstr "编辑表情" -#: dialogs/addemoticondialog.cpp:276 settings/emoticonspage.cpp:135 -#, fuzzy, kde-format +#: dialogs/addemoticondialog.cpp:276 settings/emoticonspage.cpp:135, kde-format msgid "The emoticon \"%1\" already exists. Do you want to replace it?" msgstr "表情“%1”已存在,你要覆盖它吗?" #: dialogs/awaymessagedialog.cpp:37 -#, fuzzy msgid "Automatic Away Message" msgstr "指定处于离开状态时发送的消息" #: dialogs/chathistorydialog.cpp:65 -#, fuzzy msgctxt "Dialog window title" msgid "Chat History" -msgstr "聊天主题(&C):" +msgstr "聊天记录" #: dialogs/chathistorydialog.cpp:260 #, kde-format @@ -1000,34 +946,30 @@ msgstr "" #: dialogs/chathistorydialog.cpp:265 -#, fuzzy msgctxt "Dialog box title" msgid "Could not open chat history" -msgstr "无法打开本地端口。" +msgstr "无法打开聊天记录。" #: dialogs/chathistorydialog.cpp:601 -#, fuzzy msgctxt "Combo box default item" msgid "Loading..." -msgstr "正在登录..." +msgstr "正在载入..." #: dialogs/chathistorydialog.cpp:623 -#, fuzzy msgctxt "Combo box default item" msgid "No logged chats" -msgstr "保存所有聊天记录(&a)" +msgstr "聊天记录为空(&a)" #: dialogs/contactaddeduserdialog.cpp:55 msgid "You have been added by someone" msgstr "你被添加位好友了" -#: dialogs/contactaddeduserdialog.cpp:60 -#, fuzzy, kde-format +#: dialogs/contactaddeduserdialog.cpp:60, kde-format msgid "" "%1\n" "has added you to his or her contact list." msgstr "" -"%1 (%2)\n" +"%1 \n" "已将您加入他(她)的联系人列表。" #: dialogs/contactaddeduserdialog.cpp:65 @@ -1051,7 +993,7 @@ #: dialogs/contactpropertiesdialog.cpp:403 kmessview.cpp:1196 msgid "Not seen yet" -msgstr "" +msgstr "从未上线" #: dialogs/contactpropertiesdialog.cpp:412 kmessview.cpp:1211 msgid "No messages yet" @@ -1082,24 +1024,21 @@ msgstr "客户端: %1" #: dialogs/contactpropertiesdialog.cpp:661 -#, fuzzy msgctxt "Dialog box text" msgid "Are you sure you want to use the display picture of this contact?" -msgstr "点击此处恢复联络人的头像" +msgstr "您确定要用使用该联系人的头像吗?" #: dialogs/contactpropertiesdialog.cpp:663 -#, fuzzy msgid "Copy Contact Picture" -msgstr "联系人" +msgstr "复制联系人头像" #: dialogs/contactpropertiesdialog.cpp:716 -#, fuzzy msgid "The selected filetype is not supported by Phonon." -msgstr "邀请被取消。另一方客户端不支持。" +msgstr "Phonon不支持的文件类型。 " #: dialogs/contactpropertiesdialog.cpp:716 msgid "Unsupported filetype" -msgstr "" +msgstr "不支持的文件类型" #: dialogs/invitedialog.cpp:41 msgctxt "Caption of a dialog box" @@ -1112,7 +1051,6 @@ msgstr "导出联系人%1的列表:" #: dialogs/listexportdialog.cpp:102 -#, fuzzy msgid "Nothing to export" msgstr "没有导出任何信息" @@ -1127,12 +1065,11 @@ #: dialogs/listexportdialog.cpp:270 msgid "Export Finished" -msgstr "" +msgstr "导出完成" #: dialogs/listexportdialog.cpp:270 -#, fuzzy msgid "The export of the contact list is finished" -msgstr "联系人列表已保存完毕" +msgstr "联系人列表已导出完毕" #. i18n: file: dialogs/networkwindow.ui:13 #. i18n: ectx: property (windowTitle), widget (QWidget, NetworkWindow) @@ -1146,21 +1083,20 @@ msgstr "保存标签" #: dialogs/networkwindow.cpp:79 -#, fuzzy msgid "C&lear Tab" -msgstr "清除标签" +msgstr "清除标签(&l)" #: dialogs/networkwindow.cpp:80 -#, fuzzy msgid "C&lose All Tabs" -msgstr "关闭所有标签(&A)" +msgstr "关闭所有标签(&l)" #: dialogs/networkwindow.cpp:1086 -#, fuzzy msgid "" "No connections are present.\n" "Cannot open the Network Window." -msgstr "没有网络连接。无法打开网络窗口。" +msgstr "" +"没有网络连接。 \n" +"无法打开网络窗口。" #: dialogs/networkwindow.cpp:1130 msgid "" @@ -1187,9 +1123,8 @@ msgstr "" #: dialogs/networkwindow.cpp:1379 -#, fuzzy msgid "Cannot send commands to this kind of connection!" -msgstr "不能关闭主连接标签。" +msgstr "这种链接下无法发送命令。" #: dialogs/transferentry.cpp:132 network/applications/filetransfer.cpp:127 #: network/applications/filetransfer.cpp:658 @@ -1247,29 +1182,25 @@ msgstr "文件传送" #: dialogs/userpicturesdialog.cpp:43 -#, fuzzy msgid "&Use" -msgstr "使用" +msgstr "使用(&U)" #: dialogs/userpicturesdialog.cpp:44 settings/accountsettingsdialog.cpp:60 -#, fuzzy msgid "&Delete" -msgstr "删除联系人(&D)" +msgstr "删除(&D)" #: dialogs/userpicturesdialog.cpp:46 msgid "Choose or Remove Your Display Picture" msgstr " 选择或删除你的头像" #: dialogs/userpicturesdialog.cpp:128 -#, fuzzy msgid "Are you sure you want to delete this display picture?" -msgstr "您确定要删除这个帐号吗?" +msgstr "您确定要删除这个头像吗?" #: dialogs/userpicturesdialog.cpp:129 -#, fuzzy msgctxt "Dialog box title" msgid "Delete Display Picture" -msgstr "显示头像" +msgstr "删除头像" #: emoticontheme.cpp:627 #, kde-format @@ -1467,9 +1398,8 @@ msgstr "蜗牛" #: emoticontheme.cpp:880 -#, fuzzy msgid "Sheep" -msgstr "困" +msgstr "绵羊" #: emoticontheme.cpp:881 msgid "Goat" @@ -1577,7 +1507,7 @@ #: emoticontheme.cpp:907 msgid "Football ball" -msgstr "" +msgstr "足球" #: emoticontheme.cpp:908 msgid "Gift with a bow" @@ -1592,12 +1522,10 @@ msgstr "计算机" #: emoticontheme.cpp:911 -#, fuzzy msgid "KMess icon" msgstr "KMess 图标" #: initialview.cpp:245 -#, fuzzy msgctxt "Status message on login screen" msgid "Cannot reconnect: account not found" msgstr "无法连接:没有找到账户" @@ -1607,8 +1535,7 @@ msgid "Cannot reconnect: this account has no saved password" msgstr " 无法连接:该账户没有保存密码" -#: initialview.cpp:286 initialview.cpp:393 -#, fuzzy, kde-format +#: initialview.cpp:286 initialview.cpp:393, kde-format msgctxt "Status message on login screen" msgid "" "Waiting for an Internet connection to reconnect...<br /><a href='%" @@ -1616,7 +1543,6 @@ msgstr "正在等待网络重新连接" #: initialview.cpp:398 -#, fuzzy msgctxt "Status message on login screen" msgid "Internet connection not available" msgstr "互联网连接不可用" @@ -1632,36 +1558,30 @@ msgstr[0] "" #: initialview.cpp:614 -#, fuzzy msgctxt "Button label" msgid "&Connect" msgstr "登录(&C)" #: initialview.cpp:619 -#, fuzzy msgctxt "Button label" msgid "&Cancel" -msgstr "取消" +msgstr "取消(&C)" #: initialview.cpp:679 -#, fuzzy msgctxt "Status message on login screen" msgid "Please enter both your email address and password" msgstr "请输入您的电子邮件地址和密码" #: initialview.cpp:698 -#, fuzzy msgctxt "Status message on login screen" msgid "Please enter a valid email address" -msgstr "不合法的电子邮件地址" +msgstr "请输入有效的电子邮件地址" -#: kmess.cpp:218 -#, fuzzy, kde-format +#: kmess.cpp:218, kde-format msgid "<html>The contact <b>%1</b> is already in your contact list.</html>" -msgstr "联系人%1已经在您的列表中" +msgstr "<html>联系人%1已经在您的列表中</html>" #: kmess.cpp:218 -#, fuzzy msgid "Contact Information" msgstr "联系信息" @@ -1706,8 +1626,7 @@ msgid "Group Removal" msgstr "" -#: kmess.cpp:633 -#, fuzzy, kde-format +#: kmess.cpp:633, kde-format msgctxt "dialog text" msgid "" "<qt>Are you sure you want to remove the group <b>%1</b> from your contact " @@ -1720,17 +1639,14 @@ msgstr "删除的" #: kmess.cpp:665 -#, fuzzy msgid "This is a special group, which cannot be changed." msgstr "这是一个特殊组,不能被改变。" #: kmess.cpp:676 -#, fuzzy msgid "Rename Group" -msgstr "重命名组(&n)" +msgstr "重命名组" #: kmess.cpp:677 -#, fuzzy msgid "Enter a new name for this group:" msgstr "输入新组名:" @@ -1743,15 +1659,13 @@ msgstr "" #: kmess.cpp:757 -#, fuzzy msgctxt "dialog title" msgid "Autologin Failed" msgstr "自动登陆失败" #: kmess.cpp:1042 -#, fuzzy msgid "Connection could be down..." -msgstr "正在连接……" +msgstr "连接已丢失……" #: kmess.cpp:1112 msgctxt "Status bar message" @@ -1819,14 +1733,12 @@ msgstr "显示被删除的联系人(&R)" #: kmessinterface.cpp:170 -#, fuzzy msgid "Show &History Box" -msgstr "聊天主题(&C):" +msgstr "显示聊天历史(&H):" #: kmessinterface.cpp:171 -#, fuzzy msgid "&Show Search Bar" -msgstr "侧边栏" +msgstr "显示搜索栏(&S)" #: kmessinterface.cpp:172 msgid "Show &Empty Groups" @@ -1841,7 +1753,6 @@ msgstr "对联系人进行排序(&S)" #: kmessinterface.cpp:175 -#, fuzzy msgid "Show &Transfer Window..." msgstr "显示文件传送窗口(&T)" @@ -1858,18 +1769,16 @@ msgstr "导出联系人列表(&E)" #: kmessinterface.cpp:183 kmessview.cpp:606 -#, fuzzy msgid "Show Chat &History..." -msgstr "聊天主题(&C):" +msgstr "显示聊天记录(&H):" #: kmessinterface.cpp:184 msgid "New &Account..." msgstr "添加新帐号(&A)" #: kmessinterface.cpp:185 -#, fuzzy msgid "Configure Account..." -msgstr "添加新帐号(&A)" +msgstr "设置账户(&A)" #: kmessinterface.cpp:186 msgid "Configure &KMess..." @@ -1908,12 +1817,10 @@ msgstr "混合" #: kmessinterface.cpp:289 -#, fuzzy msgid "Show &Network Window..." msgstr "显示网络窗口(&N)" -#: kmessview.cpp:322 -#, fuzzy, kde-format +#: kmessview.cpp:322, kde-format msgid "[%1] Logged in with %2" msgstr "[%1]以 %2 登陆" @@ -1971,14 +1878,13 @@ msgstr "电子邮件地址" #: kmessview.cpp:1164 -#, fuzzy msgctxt "Contact Live Messenger client label in list tooltip" msgid "Client" -msgstr "客户端: %1" +msgstr "客户端:" #: kmessview.cpp:1176 msgid "Yes" -msgstr "" +msgstr "是" #: kmessview.cpp:1180 #, fuzzy @@ -1986,22 +1892,19 @@ msgstr "音符" #: kmessview.cpp:1183 -#, fuzzy msgctxt "Contact blocked status label in list tooltip" msgid "Blocked" msgstr "被阻止" #: kmessview.cpp:1203 -#, fuzzy msgctxt "Contact last presence label in list tooltip" msgid "Last seen" -msgstr "最后登陆: %1" +msgstr "最后登陆" #: kmessview.cpp:1218 -#, fuzzy msgctxt "Contact last message label in list tooltip" msgid "Last message" -msgstr "最后消息: %1" +msgstr "最后消息:" #: kmessview.cpp:1228 #, kde-format @@ -2009,29 +1912,25 @@ msgid "Group <b>%1</b>" msgstr "组<b>%1</b> " -#: kmessview.cpp:1236 -#, fuzzy, kde-format +#: kmessview.cpp:1236, kde-format msgctxt "Contact counters in normal group tooltip, first part" msgid "%1 contact, " msgid_plural "%1 contacts, " -msgstr[0] "联系人" +msgstr[0] "%1个联系人" -#: kmessview.cpp:1239 -#, fuzzy, kde-format +#: kmessview.cpp:1239, kde-format msgctxt "Contact counters in normal group tooltip, second part" msgid "%1 online" msgid_plural "%1 online" -msgstr[0] "上线(&G)" +msgstr[0] "%1上线" -#: kmessview.cpp:1245 -#, fuzzy, kde-format +#: kmessview.cpp:1245, kde-format msgctxt "Contacts count in special group tooltip" msgid "%1 contact" msgid_plural "%1 contacts" -msgstr[0] "联系人" +msgstr[0] "%1个联系人" #: kmessview.cpp:1672 -#, fuzzy msgctxt "Default personal message shown in the contact list" msgid "<Enter your personal message here>" msgstr "请在此处输入您的个人信息" @@ -2048,9 +1947,8 @@ msgstr "" #: kmessview.cpp:1861 kmessview.cpp:1867 -#, fuzzy msgid "No chat history found" -msgstr "聊天主题(&C):" +msgstr "未找到聊天记录(&C):" #: kmessview.cpp:1866 msgid "" @@ -2063,7 +1961,7 @@ #, kde-format msgid "%1 new email message" msgid_plural "%1 new email messages" -msgstr[0] "" +msgstr[0] "%1封新邮件" #: kmessviewdelegate.cpp:293 #, kde-format @@ -2106,7 +2004,7 @@ #: main.cpp:62 msgid "Developer" -msgstr "" +msgstr "开发者" #: main.cpp:62 msgid "Michael Curtis" @@ -2117,9 +2015,8 @@ msgstr "" #: main.cpp:63 -#, fuzzy msgid "Project support" -msgstr "P4-Context 域的支持" +msgstr "项目支持" #: main.cpp:64 main.cpp:65 main.cpp:66 main.cpp:67 main.cpp:68 main.cpp:69 msgid "Current developer" @@ -2278,7 +2175,7 @@ #: main.cpp:96 msgid "Cheng Yang" -msgstr "" +msgstr "杨成" #: main.cpp:97 msgid "Traditional Chinese translation" @@ -2289,9 +2186,8 @@ msgstr "" #: main.cpp:98 -#, fuzzy msgid "More Traditional Chinese translation" -msgstr "繁体中文翻译" +msgstr "更多繁体中文翻译" #: main.cpp:98 msgid "Tryneeds-Chinese" @@ -2342,18 +2238,16 @@ msgstr "" #: main.cpp:110 -#, fuzzy msgid "More German translation, Greek translation" -msgstr "更多阿拉伯语翻译" +msgstr "更多德语翻译" #: main.cpp:111 msgid "Dimitrios Glentadakis" msgstr "" #: main.cpp:111 -#, fuzzy msgid "More Greek translation" -msgstr "更多法语翻译" +msgstr "更多希腊语翻译" #: main.cpp:113 msgid "Estonian translation" @@ -2458,9 +2352,8 @@ msgstr "" #: main.cpp:131 -#, fuzzy msgid "Japanese translation" -msgstr "西班牙语翻译" +msgstr "日语翻译" #: main.cpp:132 msgid "Korean translation" @@ -2562,9 +2455,8 @@ msgstr "" #: main.cpp:151 -#, fuzzy msgid "More Swedish translation" -msgstr "瑞典语翻译" +msgstr "更多瑞典语翻译" #: main.cpp:153 msgid "Rachan Hongpairote" @@ -2612,7 +2504,6 @@ msgstr "联系人列表中的图片代码,联系人客户端信息,聊天字体缩放" #: main.cpp:161 -#, fuzzy msgid "File transfer thumbnails" msgstr "文件传送" @@ -2659,9 +2550,8 @@ msgstr "" #: main.cpp:168 -#, fuzzy msgid "Chat history dialog" -msgstr "聊天主题(&C):" +msgstr "聊天记录对话框(&C):" #: main.cpp:168 msgid "Dario Freddi" @@ -2712,7 +2602,6 @@ msgstr "" #: main.cpp:179 -#, fuzzy msgid "Old popup balloons code, initial p2p code, MSN challenge handler" msgstr "旧的弹出气泡代码、最初的 p2p 代码和处理 msn challenge" @@ -2752,7 +2641,6 @@ msgstr "" #: main.cpp:186 -#, fuzzy msgid "" "You are welcome to send bugfixes and patches to the KMess help forum!\n" "If you feel your name is missing here, please contact us too!" @@ -2776,9 +2664,8 @@ msgstr "电子邮件地址" #: main.cpp:196 -#, fuzzy msgid "Do not show the contact list window initially" -msgstr "联系人列表已保存完毕" +msgstr "不在初始时显示联系人列表" #: main.cpp:197 msgid "Autologin with the given email address" @@ -2816,13 +2703,11 @@ msgid "You have rejected the invitation." msgstr "您拒绝了邀请。" -#: network/applications/application.cpp:540 -#, fuzzy, kde-format +#: network/applications/application.cpp:540, kde-format msgid "Do you want to <a href=%1>accept</a> or <a href=%2>cancel</a>?" msgstr "你想<a href=%1>接受</a>还是<a href=%2>取消</a>?" -#: network/applications/application.cpp:581 -#, fuzzy, kde-format +#: network/applications/application.cpp:581, kde-format msgid "Click to <a href=%1>cancel</a>." msgstr "单击这里<a href=%1>取消</a>" @@ -2847,8 +2732,7 @@ "The transfer of the file "%1" failed. Could not save the file." msgstr " 文件传送失败,无法打开文件%1。" -#: network/applications/filetransfer.cpp:295 -#, fuzzy, kde-format +#: network/applications/filetransfer.cpp:295, kde-format msgid "" "The transfer of the file "%1" failed. Could not open the " "destination file." @@ -2866,10 +2750,9 @@ msgstr "正在连接到 %1, %2 端口" #: network/applications/filetransfer.cpp:421 -#: network/applications/filetransferp2p.cpp:548 -#, fuzzy, kde-format +#: network/applications/filetransferp2p.cpp:548, kde-format msgid "The contact has cancelled the transfer of the file "%1"." -msgstr "联系人取消了文件传送。" +msgstr "联系人取消了文件传送%1。" #: network/applications/filetransfer.cpp:432 #: network/applications/filetransferp2p.cpp:559, kde-format @@ -2886,8 +2769,7 @@ msgstr "连接已建立" #: network/applications/filetransfer.cpp:581 -#: network/applications/filetransferp2p.cpp:674 -#, fuzzy, kde-format +#: network/applications/filetransferp2p.cpp:674, kde-format msgid "Successfully sent the file "%1"." msgstr "成功传送文件:%1" @@ -2897,15 +2779,13 @@ msgstr " 成功收到文件:%1" #: network/applications/filetransfer.cpp:742 -#: network/applications/filetransferp2p.cpp:811 -#, fuzzy, kde-format +#: network/applications/filetransferp2p.cpp:811, kde-format msgid "" "The transfer of the file "%1" failed. The file does not exist." msgstr "文件传送失败,文件%1不存在。" #: network/applications/filetransfer.cpp:747 -#: network/applications/filetransferp2p.cpp:816 -#, fuzzy, kde-format +#: network/applications/filetransferp2p.cpp:816, kde-format msgid "" "The transfer of the file "%1" failed. The file could not be read." msgstr "文件传送失败,无法读取 %1。" @@ -2917,10 +2797,9 @@ msgstr "正在发送文件 %1 (%2)" #: network/applications/filetransfer.cpp:799 -#: network/applications/filetransferp2p.cpp:888 -#, fuzzy, kde-format +#: network/applications/filetransferp2p.cpp:888, kde-format msgid "The contact has accepted the transfer of the file "%1"." -msgstr "联系人接受了文件传送。" +msgstr "联系人接受了文件传送%1。" #: network/applications/filetransfer.cpp:817 #: network/applications/filetransferp2p.cpp:393 @@ -3018,7 +2897,6 @@ msgstr " 邀请被取消。联系人发送了损坏的数据,或者KMess不支持它。" #: network/applications/p2papplication.cpp:1085 -#, fuzzy msgid "The transfer failed. Data preparation failed." msgstr "文件传送失败。数据准备失败" @@ -3029,7 +2907,6 @@ #: network/applications/p2papplication.cpp:1744 #: network/applications/p2papplicationbase.cpp:855 #: network/applications/p2papplicationbase.cpp:935 -#, fuzzy msgid "" "The transfer failed. The contact sent bad data, or KMess does not support it." msgstr "文件传送失败。联系人发送了损坏的数据,或者KMess不支持。" @@ -3082,17 +2959,14 @@ msgstr "传输失败。" #: network/applications/p2papplicationbase.cpp:1030 -#, fuzzy msgid "The transfer failed. Timeout while waiting for user to accept." msgstr "文件传送失败。等待用户接受超时。" #: network/applications/p2papplicationbase.cpp:1049 -#, fuzzy msgid "The transfer failed. An internal error occured." msgstr "文件传送失败。发生了内部错误。" #: network/applications/p2papplicationbase.cpp:1210 -#, fuzzy msgid "The transfer failed. Could not open data source." msgstr "文件传送失败。无法打开数据源。" @@ -3148,16 +3022,15 @@ #: network/applications/webcamtransferp2p.cpp:147 msgid "webcam" -msgstr "" +msgstr "摄像头" #: network/extra/msnftpconnection.cpp:120, kde-format msgid "You have cancelled the transfer of file "%1"." msgstr " 您取消了邀请。" -#: network/extra/msnftpconnection.cpp:126 -#, fuzzy, kde-format +#: network/extra/msnftpconnection.cpp:126, kde-format msgid "The contact has cancelled the transfer of file "%1"." -msgstr "联系人取消了文件传送。" +msgstr "联系人取消了文件传送%1。" #: network/extra/msnftpconnection.cpp:133 msgid "Failed" @@ -3168,13 +3041,11 @@ msgid "Sending file %1" msgstr "正在发送文件 %1" -#: network/extra/msnftpconnection.cpp:398 -#, fuzzy, kde-format +#: network/extra/msnftpconnection.cpp:398, kde-format msgid "The transfer of %1 failed. Could not open a local port." msgstr "%1的传送失败,无法打开本地端口。" #: network/extra/msnftpconnection.cpp:399 -#, fuzzy msgid "Could not open a local port." msgstr "无法打开本地端口。" @@ -3210,11 +3081,11 @@ #: network/msnconnection.cpp:390 msgid "Domain name missing" -msgstr "" +msgstr "域名缺失" #: network/msnconnection.cpp:394 msgid "Already logged in" -msgstr "" +msgstr "已经登录" #: network/msnconnection.cpp:397 msgid "The given account name is invalid" @@ -3248,7 +3119,7 @@ #: network/msnconnection.cpp:425 msgid "Already in this mode" -msgstr "" +msgstr "已经在该模式" #: network/msnconnection.cpp:429 msgctxt "MSN error" @@ -3256,11 +3127,10 @@ msgstr "" #: network/msnconnection.cpp:433 -#, fuzzy msgid "" "The group name is already present in your contact list. Please use a " "different name" -msgstr "在你的MSN Messenger或者Hotmail联系人列表中已经使用了这个组名" +msgstr "在联系人列表中已经使用了这个组名,请使用其他名字" #: network/msnconnection.cpp:437 msgid "" @@ -3269,14 +3139,12 @@ msgstr " 您的联系人列表中分组数量超多了最大30个的限制" #: network/msnconnection.cpp:441 -#, fuzzy msgid "This group cannot be changed" msgstr "这个组不能被改变。" #: network/msnconnection.cpp:446 -#, fuzzy msgid "Contact is not added to this group" -msgstr "您的联系人列表中分组太多了" +msgstr "联系人未加入该分组" #: network/msnconnection.cpp:450 msgid "This group is not empty" @@ -3301,7 +3169,7 @@ #: network/msnconnection.cpp:467 msgid "Empty domain" -msgstr "" +msgstr "空域" #: network/msnconnection.cpp:471 msgid "Wrong ADL command format" @@ -3325,7 +3193,7 @@ #: network/msnconnection.cpp:489 msgid "Not logged in" -msgstr "" +msgstr "没有登录" #: network/msnconnection.cpp:493 msgctxt "" @@ -3335,10 +3203,9 @@ #: network/msnconnection.cpp:498 msgid "Command is disabled" -msgstr "" +msgstr "命令被禁用" #: network/msnconnection.cpp:501 -#, fuzzy msgid "Your account is banned" msgstr "您的账户被停用。" @@ -3349,10 +3216,9 @@ #: network/msnconnection.cpp:510 msgid "Bad command data" -msgstr "" +msgstr "损坏的命令数据" #: network/msnconnection.cpp:514 -#, fuzzy msgid "You are opening chat sessions too fast" msgstr "你开启会话太快了" @@ -3377,7 +3243,6 @@ msgstr " 服务器报告,KMess发送的数据太多了,造成泛滥" #: network/msnconnection.cpp:548 -#, fuzzy msgid "Authentication ticket was incorrect" msgstr "验证失败" @@ -3386,7 +3251,6 @@ msgstr " 您不能在隐身的状态下进行聊天。" #: network/msnconnection.cpp:555 -#, fuzzy msgid "Not accepting new contacts" msgstr "不接受新的规则" @@ -3452,24 +3316,21 @@ msgstr "KMess从服务器接到了一个未知命令:%1 参考代码%2" #: network/msnconnection.cpp:659 network/msnnotificationconnection.cpp:2946 -#, fuzzy msgctxt "Error dialog box title" msgid "MSN Error" -msgstr "KMess - MSN 错误" +msgstr "MSN 错误" #: network/msnconnection.cpp:964 msgid "Trying the HTTP fallback..." msgstr "" #: network/msnnotificationconnection.cpp:1364 -#, fuzzy msgid "Authenticating..." msgstr "正在验证" #: network/msnnotificationconnection.cpp:1388 -#, fuzzy msgid "Authenticated" -msgstr "验证失败" +msgstr "验证" #: network/msnnotificationconnection.cpp:1820 msgid "Connecting..." @@ -3479,12 +3340,11 @@ msgid "Unknown command received from the server: %1" msgstr "KMess从服务器接到了一 个未知命令:%1" -#: network/msnnotificationconnection.cpp:2125 -#, fuzzy, kde-format +#: network/msnnotificationconnection.cpp:2125, kde-format msgctxt "Time left before server maintenance" msgid "%1 minute" msgid_plural "%1 minutes" -msgstr[0] "分钟后" +msgstr[0] "%1分钟后" #: network/msnnotificationconnection.cpp:2128, kde-format msgid "Server closes for maintenance in %1!" @@ -3495,8 +3355,7 @@ msgid "The Live Messenger server will be going down in %1 for maintenance." msgstr " Live Messenger服务器报告,它1分钟后将会关闭进行维护。" -#: network/msnnotificationconnection.cpp:2334 -#, fuzzy, kde-format +#: network/msnnotificationconnection.cpp:2334, kde-format msgid "KMess could not process Offline-IM messages.<br/>Details: %1" msgstr "" "KMess不能处理离线消息。\n" @@ -3508,9 +3367,8 @@ msgstr " SOAP客户端不可用" #: network/msnnotificationconnection.cpp:2605 -#, fuzzy msgid "Authentication time limit exceeded" -msgstr "验证失败" +msgstr "验证超时" #: network/msnnotificationconnection.cpp:2787 msgid "Waiting for contact list..." @@ -3525,10 +3383,9 @@ #: network/msnnotificationconnection.cpp:2834 msgctxt "Error dialog box title" msgid "MSN Warning" -msgstr "" +msgstr "MSN警告" -#: network/msnnotificationconnection.cpp:2906 -#, fuzzy, kde-format +#: network/msnnotificationconnection.cpp:2906, kde-format msgid "<br />Internal error reason: %1" msgstr "KMess内部错误: %1" @@ -3649,13 +3506,12 @@ #: network/msnsocketbase.cpp:135 msgctxt "Dialog box message" msgid "Enter your username and password to access the network proxy." -msgstr "" +msgstr "输入访问网络代理的用户名和密码" -#: network/msnsockethttp.cpp:686 -#, fuzzy, kde-format +#: network/msnsockethttp.cpp:686, kde-format msgctxt "Error message shown with HTTP connection" msgid "%1 (Internal error code: %2)" -msgstr "KMess内部错误: %1" +msgstr "KMess内部错误: %1,代码%2" #: network/msnsockethttp.cpp:696 #, kde-format @@ -3740,28 +3596,23 @@ msgid "Unexpected response from server (%1)" msgstr "收到不支持的服务器回应%1" -#: notification/chatnotification.cpp:172 -#, fuzzy, kde-format +#: notification/chatnotification.cpp:172, kde-format msgid "<html>In <b>%1</b>'s chat:<br/>%2</html>" msgstr "在<b>%1</b>的聊天中: %2" -#: notification/chatnotification.cpp:176 -#, fuzzy, kde-format +#: notification/chatnotification.cpp:176, kde-format msgid "<html><b>%1</b> says:<br/>'%2'</html>" msgstr "<b>%1</b> 说:<br>'%2'" -#: notification/chatnotification.cpp:180 -#, fuzzy, kde-format +#: notification/chatnotification.cpp:180, kde-format msgid "<html><b>%1</b> has sent you an offline message:<br/>'%2'</html>" -msgstr "<b>%1</b>给你发送了离线消息: <br>'%2'" +msgstr "<html><b>%1</b>给你发送了离线消息: <br>'%2'</html>" -#: notification/chatnotification.cpp:187 -#, fuzzy, kde-format +#: notification/chatnotification.cpp:187, kde-format msgid "<html>%1's chat requests attention!</html>" -msgstr "%1的聊天请求注意!" +msgstr "<html>%1的聊天请求注意!</html>" -#: notification/chatnotification.cpp:192 -#, fuzzy, kde-format +#: notification/chatnotification.cpp:192, kde-format msgid "<html><b>%1</b>:<br/>%2</html>" msgstr "<b>%1</b>:<br>%2" @@ -3855,13 +3706,11 @@ msgid "<html><b>%1</b>'s activity has ended with an error!</html>" msgstr "<html><b>%1</b>的活动因有错误而结束!</html>" -#: notification/contactstatusnotification.cpp:91 -#, fuzzy, kde-format +#: notification/contactstatusnotification.cpp:91, kde-format msgid "<html><b>%1</b><br/>is now online</html>" -msgstr "<html><b>%1</n>正在线</html>" +msgstr "<html><b>%1</b></n>正在线</html>" -#: notification/contactstatusnotification.cpp:92 -#, fuzzy, kde-format +#: notification/contactstatusnotification.cpp:92, kde-format msgid "<html><b>%1</b><br/>has gone away</html>" msgstr "<htm><b>%1</b>离开</html>" @@ -3890,27 +3739,23 @@ msgid "<html><b>%1</b><br/>has logged out</html>" msgstr "<html><b>%1</b>已登出</html>" -#: notification/contactstatusnotification.cpp:98 -#, fuzzy, kde-format +#: notification/contactstatusnotification.cpp:98, kde-format msgid "<html><b>%1</b><br/>is on the phone</html>" -msgstr "<html><b>%1</b>在电话上 </html>" +msgstr "<html><b>%1</b>电话中 </html>" -#: notification/contactstatusnotification.cpp:99 -#, fuzzy, kde-format +#: notification/contactstatusnotification.cpp:99, kde-format msgid "<html><b>%1</b><br/>is out for lunch</html>" msgstr "<b>%1</b>出去吃饭了" -#: notification/newemailnotification.cpp:92 -#, fuzzy, kde-format +#: notification/newemailnotification.cpp:92, kde-format msgctxt "%1 is the subject of the mail, %2 is the sender of the mail" msgid "<html><b>New email:</b><br/>'%1'<br/>by '%2'</html>" msgstr "<b>新电子邮件:</b><br>来自'%2'的<br>%1" #: notification/notificationmanager.cpp:114 -#, fuzzy msgctxt "Button text for KDE notification boxes" msgid "Start Chatting" -msgstr "开始会议(&M)" +msgstr "开始聊天" #: notification/notificationmanager.cpp:118 msgctxt "Button text for KDE notification boxes" @@ -3923,24 +3768,21 @@ msgstr "参看消息" #: notification/notificationmanager.cpp:126 -#, fuzzy msgctxt "Button text for KDE notification boxes" msgid "Details" -msgstr "邪恶" +msgstr "细节" #: notification/notificationmanager.cpp:130 -#, fuzzy msgctxt "Button text for KDE notification boxes" msgid "Read Email" -msgstr "发送电子邮件(&E)" +msgstr "阅读电子邮件" #: notification/notificationmanager.cpp:134 msgctxt "Button text for KDE notification boxes" msgid "Hide" -msgstr "" +msgstr "隐藏" #: notification/systemtraywidget.cpp:79 -#, fuzzy msgid "" "Closing the main window will keep KMess running in the system tray. Use " "'Quit' from the 'Connect' menu to quit the application." @@ -3951,24 +3793,21 @@ msgid "Docking in System Tray" msgstr "使用系统托盘" -#: notification/systemtraywidget.cpp:250 -#, fuzzy, kde-format +#: notification/systemtraywidget.cpp:250, kde-format msgctxt "Tray icon tooltip, HTML version" msgid "<br><b>%1</b> (%2)" msgstr "<br><b>%1</b> (%2)" -#: notification/systemtraywidget.cpp:256 -#, fuzzy, kde-format +#: notification/systemtraywidget.cpp:256, kde-format msgctxt "Tray icon tooltip, text version" msgid " - %1 (%2)" msgstr "%1 %2" #: settings/accountpage.cpp:81 msgid "Browse..." -msgstr "" +msgstr "浏览..." #: settings/accountpage.cpp:82 -#, fuzzy msgid "Browse and Crop Picture..." msgstr "浏览并裁剪图片……" @@ -3980,10 +3819,9 @@ #. i18n: ectx: property (title), widget (QGroupBox, groupBox_2) #: settings/accountpage.cpp:459 rc.cpp:369 msgid "Display Picture" -msgstr "显示头像" +msgstr "头像" #: settings/accountpage.cpp:489 -#, fuzzy msgid "Downloading of display picture failed" msgstr "下载显示图像失败" @@ -4005,14 +3843,12 @@ msgstr "帐号" #: settings/accountsettingsdialog.cpp:80 -#, fuzzy msgid "My Account" -msgstr "帐号" +msgstr "我的帐号" #: settings/accountsettingsdialog.cpp:85 settings/accountsettingsdialog.cpp:86 -#, fuzzy msgid "Contact List" -msgstr "联系人" +msgstr "联系人列表" #: settings/accountsettingsdialog.cpp:96 settings/accountsettingsdialog.cpp:97 msgid "Chatting" @@ -4042,20 +3878,18 @@ msgstr " 你输入的email已经被使用:'%1'" #: settings/accountsettingsdialog.cpp:221 -#, fuzzy msgid "Please enter a friendly name for this account." -msgstr "使用另一个名字(&a)" +msgstr "输入账户的昵称" #: settings/accountsettingsdialog.cpp:313 msgid "Are you sure you want to delete this account?" msgstr "您确定要删除这个帐号吗?" -#: settings/accountsmanagerpage.cpp:160 -#, fuzzy, kde-format +#: settings/accountsmanagerpage.cpp:160, kde-format msgid "" "<html>Are you sure you want to delete the account '%1' ?<br/>All settings of " "this account will be lost.</html>" -msgstr "您确定要删除这个帐号吗?" +msgstr "您确定要删除这个帐号\"%1\"吗?所有的设置将丢失" #: settings/chatstylepage.cpp:371 msgid "Hi, how are you doing? :)" @@ -4076,7 +3910,7 @@ #: settings/emoticonspage.cpp:118 msgctxt "Dialog box text" msgid "You can only use 7 characters for the emoticon shortcuts." -msgstr "" +msgstr "你只能使用7个字母作为表情的快捷方式" #: settings/emoticonspage.cpp:119 msgctxt "Dialog box title" @@ -4084,43 +3918,38 @@ msgstr "非法表情名" #: settings/emoticonspage.cpp:136 -#, fuzzy msgctxt "Dialog box title" msgid "Replace Existing Emoticon" -msgstr "编辑表情" +msgstr "替换已有表情" -#: settings/emoticonspage.cpp:233 -#, fuzzy, kde-format +#: settings/emoticonspage.cpp:233, kde-format msgid "Are you sure you want to delete the emoticon \"%1\" ?" -msgstr "您确定要删除这个帐号吗?" +msgstr "您确定要删除表情\"%1\"吗?" #: settings/emoticonspage.cpp:234 -#, fuzzy msgctxt "Dialog box title" msgid "Delete Emoticon" -msgstr "编辑表情" +msgstr "删除表情" #: settings/globalsettingsdialog.cpp:47 -#, fuzzy msgid "KMess Settings" -msgstr "设置" +msgstr "Kmess设置" #: settings/globalsettingsdialog.cpp:61 settings/globalsettingsdialog.cpp:62 msgid "Accounts" msgstr "帐号" #: settings/globalsettingsdialog.cpp:65 settings/globalsettingsdialog.cpp:67 -#, fuzzy msgid "Notifications" msgstr "KMess 通知" #: settings/miscellaneouspage.cpp:74 msgid "No selectable web browsers detected." -msgstr "" +msgstr "没有检测到可用的浏览器" #: settings/miscellaneouspage.cpp:101 msgid "No selectable email clients detected." -msgstr "" +msgstr "没有检测到可用的电子邮件客户端" #: settings/miscellaneouspage.cpp:286 msgid "You have to specify a console command to launch a custom web browser!" @@ -4151,7 +3980,6 @@ msgstr "你必须指定一个接收文件的目录" #: settings/miscellaneouspage.cpp:406 -#, fuzzy msgid "Select Directory" msgstr "在此目录中保存聊天记录:" @@ -4169,9 +3997,8 @@ msgstr "&(S)给Kmess开发着发送评论" #: utils/likeback/likeback.cpp:251 -#, fuzzy msgid "Show &Feedback Icons" -msgstr "显示表情(&S)" +msgstr "显示反馈图标(&S)" #: utils/likeback/likeback.cpp:323 #, kde-format @@ -4250,12 +4077,12 @@ msgctxt "Welcome dialog text, header for the examples" msgid "Example" msgid_plural "Examples" -msgstr[0] "" +msgstr[0] "例子" #: utils/likeback/likeback.cpp:418 msgctxt "Welcome dialog title" msgid "Help Improve the Application" -msgstr "" +msgstr "帮助改进本程序" #: utils/likeback/likebackdialog.cpp:28 msgid "Send a Comment to the Developers" @@ -4319,10 +4146,9 @@ msgstr "" #: utils/likeback/likebackdialog.cpp:293 -#, fuzzy msgctxt "Dialog box title" msgid "Comment Sent" -msgstr "联系人" +msgstr "评论已发送" #: utils/likeback/likebackdialog.cpp:304 msgctxt "Dialog box text" @@ -4339,16 +4165,14 @@ #. i18n: file: chat/chatwindow.ui:181 #. i18n: ectx: property (toolTip), widget (QToolButton, textButton_) #: rc.cpp:3 -#, fuzzy msgid "Standard text mode" -msgstr "卡通表情" +msgstr "标准文本模式" #. i18n: file: chat/chatwindow.ui:184 #. i18n: ectx: property (whatsThis), widget (QToolButton, textButton_) #: rc.cpp:6 -#, fuzzy msgid "Click this button to switch to the standard text mode." -msgstr "点击此处恢复联络人的头像" +msgstr "点击此处切换到标准文本模式" #. i18n: file: chat/chatwindow.ui:206 #. i18n: ectx: property (whatsThis), widget (QToolButton, inkButton_) @@ -4361,9 +4185,8 @@ #. i18n: file: chat/chatwindow.ui:229 #. i18n: ectx: property (toolTip), widget (QToolButton, standardEmoticonButton_) #: rc.cpp:15 -#, fuzzy msgid "Standard emoticons" -msgstr "卡通表情" +msgstr "标准表情" #. i18n: file: chat/chatwindow.ui:232 #. i18n: ectx: property (whatsThis), widget (QToolButton, standardEmoticonButton_) @@ -4376,9 +4199,8 @@ #. i18n: file: chat/chatwindow.ui:248 #. i18n: ectx: property (toolTip), widget (QToolButton, customEmoticonButton_) #: rc.cpp:21 -#, fuzzy msgid "Custom emoticons" -msgstr "自定义表情(&C)" +msgstr "自定义表情" #. i18n: file: chat/chatwindow.ui:251 #. i18n: ectx: property (whatsThis), widget (QToolButton, customEmoticonButton_) @@ -4392,7 +4214,7 @@ #. i18n: ectx: property (whatsThis), widget (QToolButton, winksButton_) #: rc.cpp:30 msgid "Click this button to view the available winks." -msgstr " 点击此处查看可以用的wink" +msgstr " 点击此处查看可以用的传情动漫" #. i18n: file: chat/chatwindow.ui:305 #. i18n: ectx: property (text), widget (QPushButton, newLineButton_) @@ -4416,10 +4238,9 @@ #. i18n: file: chat/chatwindowui.rc:37 #. i18n: ectx: ToolBar (mainToolBar) #: rc.cpp:48 -#, fuzzy msgctxt "@title:menu" msgid "Main Toolbar" -msgstr "侧边栏" +msgstr "主工具栏" #. i18n: file: chat/contactframe.ui:153 #. i18n: ectx: property (toolTip), widget (QLabel, contactPixmapLabel_) @@ -4430,21 +4251,18 @@ #. i18n: file: chat/contactswidget.ui:107 #. i18n: ectx: property (toolTip), widget (QLabel, userPixmapLabel_) #: rc.cpp:54 -#, fuzzy msgid "Click here to open your account settings" -msgstr "单击这里重命名选中的表情" +msgstr "单击这里打开帐号设置" #. i18n: file: chat/inkedit.ui:72 #. i18n: ectx: property (toolTip), widget (QToolButton, clearButton_) #: rc.cpp:57 -#, fuzzy msgid "Clear area" -msgstr "清除标签" +msgstr "清除区域" #. i18n: file: chat/inkedit.ui:85 #. i18n: ectx: property (toolTip), widget (QToolButton, colorButton_) #: rc.cpp:60 -#, fuzzy msgid "Pen color" msgstr "改变字体颜色(&C)" @@ -4452,7 +4270,7 @@ #. i18n: ectx: property (toolTip), widget (QSlider, sizePen_) #: rc.cpp:63 msgid "Pen size" -msgstr "" +msgstr "字体大小" #. i18n: file: chat/inkedit.ui:126 #. i18n: ectx: property (toolTip), widget (QToolButton, eraseButton_) @@ -4463,9 +4281,8 @@ #. i18n: file: dialogs/addcontactdialog.ui:33 #. i18n: ectx: property (title), widget (QGroupBox, groupBox) #: rc.cpp:69 -#, fuzzy msgid "Initial groups" -msgstr "重命名组(&n)" +msgstr "初始组" #. i18n: file: dialogs/addcontactdialog.ui:47 #. i18n: ectx: property (whatsThis), widget (QLabel, label) @@ -4511,42 +4328,38 @@ #. i18n: file: dialogs/chathistorydialog.ui:30 #. i18n: ectx: property (clickMessage), widget (KLineEdit, searchEdit_) #: rc.cpp:93 -#, fuzzy msgid "Search through contacts..." -msgstr "搜索联系人(&o)" +msgstr "搜索联系人" #. i18n: file: dialogs/chathistorydialog.ui:70 #. i18n: ectx: property (title), widget (QGroupBox, groupBox) #: rc.cpp:96 -#, fuzzy msgid "Chat Log Filter" -msgstr "聊天记录" +msgstr "聊天记录过滤" #. i18n: file: dialogs/chathistorydialog.ui:84 #. i18n: ectx: property (text), widget (QRadioButton, conversationRadio_) #: rc.cpp:99 -#, fuzzy msgid "Filter by &chat" -msgstr "开始或停止一个对话(&C)" +msgstr "(&C)" #. i18n: file: dialogs/chathistorydialog.ui:149 #. i18n: ectx: property (text), widget (QRadioButton, dateRadio_) #: rc.cpp:103 msgid "Filter by &date" -msgstr "" +msgstr "按日期过滤" #. i18n: file: dialogs/chathistorydialog.ui:164 #. i18n: ectx: property (text), widget (QCheckBox, fromBox_) #: rc.cpp:106 msgid "from" -msgstr "" +msgstr "从" #. i18n: file: dialogs/chathistorydialog.ui:181 #. i18n: ectx: property (text), widget (QCheckBox, toBox_) #: rc.cpp:109 -#, fuzzy msgid "to" -msgstr "汽车" +msgstr "到" #. i18n: file: dialogs/contactaddeduserdialog.ui:52 #. i18n: ectx: property (title), widget (QGroupBox, groupBox) @@ -4557,16 +4370,14 @@ #. i18n: file: dialogs/contactaddeduserdialog.ui:58 #. i18n: ectx: property (text), widget (QRadioButton, addContactOption_) #: rc.cpp:115 -#, fuzzy msgid "&Add this person to the following groups of your contact list:" msgstr "将这个联系人加入您的列表中(&A)" #. i18n: file: dialogs/contactaddeduserdialog.ui:114 #. i18n: ectx: property (text), widget (QRadioButton, allowContactOption_) #: rc.cpp:118 -#, fuzzy msgid "&Do not add this person, but allow him or her to see your status" -msgstr "不添加这个联系人,但让他看到您的状态(&N)" +msgstr "不添加这个联系人,但让他看到您的状态(&D)" #. i18n: file: dialogs/contactaddeduserdialog.ui:121 #. i18n: ectx: property (text), widget (QRadioButton, blockContactOption_) @@ -4602,37 +4413,32 @@ #. i18n: file: dialogs/contactpropertiesdialog.ui:227 #. i18n: ectx: property (text), widget (QCheckBox, disableNotificationsCheckBox_) #: rc.cpp:139 -#, fuzzy msgid "Disable notifications for this contact" -msgstr "当联系人有如下动作时通知你:" +msgstr "禁用来自该联系人的通知:" #. i18n: file: dialogs/contactpropertiesdialog.ui:236 #. i18n: ectx: property (text), widget (QLabel, soundSelectLabel_) #: rc.cpp:142 -#, fuzzy msgid "&Sound:" msgstr "声音(&S):" #. i18n: file: dialogs/contactpropertiesdialog.ui:273 #. i18n: ectx: attribute (title), widget (QWidget, tab_2) #: rc.cpp:145 -#, fuzzy msgid "&Display Pictures" -msgstr "显示头像" +msgstr "头像" #. i18n: file: dialogs/contactpropertiesdialog.ui:322 #. i18n: ectx: property (toolTip), widget (QPushButton, useButton_) #: rc.cpp:148 -#, fuzzy msgid "Click here to use the selected picture as your display picture" -msgstr "单击这里删除选中的表情。" +msgstr "单击这里把选择的图片设置为头像。" #. i18n: file: dialogs/contactpropertiesdialog.ui:325 #. i18n: ectx: property (text), widget (QPushButton, useButton_) #: rc.cpp:151 -#, fuzzy msgid "Use As Display Picture" -msgstr "显示头像" +msgstr "设置为头像" #. i18n: file: dialogs/contactpropertiesdialog.ui:332 #. i18n: ectx: property (text), widget (QPushButton, clearCacheButton_) @@ -4652,14 +4458,12 @@ #. i18n: file: dialogs/contactpropertiesdialog.ui:432 #. i18n: ectx: property (toolTip), widget (QPushButton, removeEmoticonButton_) #: rc.cpp:166 -#, fuzzy msgid "Click here to restore the selected emoticon" -msgstr "单击这里删除选中的表情。" +msgstr "单击这恢复选中的表情。" #. i18n: file: dialogs/contactpropertiesdialog.ui:435 #. i18n: ectx: property (text), widget (QPushButton, removeEmoticonButton_) #: rc.cpp:169 -#, fuzzy msgid "Resto&re" msgstr "恢复(&R)" @@ -4672,7 +4476,6 @@ #. i18n: file: dialogs/invitedialog.ui:70 #. i18n: ectx: property (text), widget (QLabel, label) #: rc.cpp:178 -#, fuzzy msgid "Invite a person not on your contact list:" msgstr "邀请一个不在您的列表中的联系人" @@ -4781,7 +4584,6 @@ #. i18n: file: dialogs/networkwindow.ui:132 #. i18n: ectx: property (text), widget (QLabel, label_2) #: rc.cpp:241 -#, fuzzy msgid "Command payload (can be empty):" msgstr "命令附加(可以为空)" @@ -4845,7 +4647,6 @@ #. i18n: file: initialview.ui:208 #. i18n: ectx: property (toolTip), widget (QLineEdit, passwordEdit_) #: rc.cpp:276 -#, fuzzy msgid "Enter here your account's password" msgstr "输入您的账号密码" @@ -4959,9 +4760,8 @@ #. i18n: file: settings/accountpage.ui:21 #. i18n: ectx: attribute (title), widget (QWidget, tab) #: rc.cpp:336 -#, fuzzy msgid "Account &Info" -msgstr "帐号" +msgstr "帐号信息" #. i18n: file: settings/accountpage.ui:35 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_) @@ -4972,7 +4772,6 @@ #. i18n: file: settings/accountpage.ui:41 #. i18n: ectx: property (whatsThis), widget (QLabel, friendlyNameLabel_) #: rc.cpp:342 -#, fuzzy msgid "Enter a name other contacts should see when you are connected." msgstr "输入你在线时其他联系人将看到的名字。" @@ -5051,7 +4850,6 @@ #. i18n: file: settings/accountpage.ui:261 #. i18n: ectx: property (text), widget (QCheckBox, noPictureCheckbox_) #: rc.cpp:381 -#, fuzzy msgid "&Do not use" msgstr "不启用(&D)" @@ -5087,7 +4885,6 @@ #. i18n: file: settings/accountpage.ui:307 #. i18n: ectx: property (text), widget (QCheckBox, autologinCheckBox_) #: rc.cpp:398 -#, fuzzy msgid "Log in &with this account automatically" msgstr "自动登录此帐号(&w)" @@ -5145,11 +4942,10 @@ #. i18n: file: settings/accountpage.ui:449 #. i18n: ectx: property (text), widget (QLabel, registerLabel_) #: rc.cpp:425 -#, fuzzy msgid "" "To connect to the Live Messenger service, you will need to register an email " "address as Passport account." -msgstr "连接到 MSN Messenger 服务,你需要注册一个 e-mail 来当作 Passport 帐号。" +msgstr "连接到 Live Messenger 服务,你需要注册一个 e-mail 来当作 Passport 帐号。" #. i18n: file: settings/accountpage.ui:489 #. i18n: ectx: property (text), widget (KUrlLabel, registerButton_) @@ -5166,7 +4962,6 @@ #. i18n: file: settings/accountpage.ui:516 #. i18n: ectx: attribute (title), widget (QWidget, tab_2) #: rc.cpp:434 -#, fuzzy msgid "&Status Options" msgstr "登录时的状态" @@ -5182,9 +4977,8 @@ #. i18n: file: settings/accountpage.ui:525 #. i18n: ectx: property (text), widget (QCheckBox, useIdleTimerCheckBox_) #: rc.cpp:440 -#, fuzzy msgid "Change status to \"&Idle\" when inactive" -msgstr "不活跃时将状态改为\"离开-空闲\" (&y)" +msgstr "不活跃时将状态改为\"离开-空闲\" " #. i18n: file: settings/accountpage.ui:556 #. i18n: ectx: property (whatsThis), widget (QLabel, idleLabel1_) @@ -5193,7 +4987,6 @@ #. i18n: file: settings/accountpage.ui:582 #. i18n: ectx: property (whatsThis), widget (QLabel, idleLabel2_) #: rc.cpp:446 rc.cpp:452 rc.cpp:455 -#, fuzzy msgid "" "Controls the number of minutes before KMess changes the status to \"Idle\"." msgstr "控制 KMess 转变状态为 \"离开 - 发呆\" 前的分钟数。" @@ -5236,9 +5029,8 @@ #. i18n: file: settings/accountpage.ui:650 #. i18n: ectx: property (text), widget (QCheckBox, hideNotificationsWhenBusyCheckBox_) #: rc.cpp:470 -#, fuzzy msgid "&Disable notifications when your status is set to \"Busy\"" -msgstr "当我的状态(&H)" +msgstr "当状态为\"忙碌\"时禁用通知" #. i18n: file: settings/accountsmanagerpage.ui:26 #. i18n: ectx: property (text), widget (QLabel, textLabel1) @@ -5257,7 +5049,6 @@ #. i18n: file: settings/accountsmanagerpage.ui:79 #. i18n: ectx: property (text), widget (QPushButton, addAccountButton_) #: rc.cpp:479 -#, fuzzy msgid "&Add Account..." msgstr "添加联系人(&A)..." @@ -5387,16 +5178,14 @@ #. i18n: file: settings/chatloggingpage.ui:140 #. i18n: ectx: property (text), widget (QLabel, label) #: rc.cpp:546 -#, fuzzy msgid "Separate logged chats by:" -msgstr "保存聊天" +msgstr "聊天记录分组依据" #. i18n: file: settings/chatloggingpage.ui:156 #. i18n: ectx: property (toolTip), widget (QRadioButton, yearRadioButton_) #: rc.cpp:549 -#, fuzzy msgid "Create a directory to organize chats by year" -msgstr "当你选择“以年、月、日组织聊天记录”时,KMess 会自动建立子文件夹。" +msgstr "按年份为依据建立文件夹存放聊天记录" #. i18n: file: settings/chatloggingpage.ui:163 #. i18n: ectx: property (whatsThis), widget (QRadioButton, yearRadioButton_) @@ -5421,9 +5210,8 @@ #. i18n: file: settings/chatloggingpage.ui:182 #. i18n: ectx: property (toolTip), widget (QRadioButton, monthRadioButton_) #: rc.cpp:562 -#, fuzzy msgid "Create directories to organize chats by year then by month" -msgstr "当你选择“以年、月、日组织聊天记录”时,KMess 会自动建立子文件夹。" +msgstr "按年份,月份为依据建立文件夹存放聊天记录" #. i18n: file: settings/chatloggingpage.ui:188 #. i18n: ectx: property (whatsThis), widget (QRadioButton, monthRadioButton_) @@ -5449,9 +5237,8 @@ #. i18n: file: settings/chatloggingpage.ui:204 #. i18n: ectx: property (toolTip), widget (QRadioButton, dayRadioButton_) #: rc.cpp:574 -#, fuzzy msgid "Create directories to organize chats by year, by month, then by day" -msgstr "当你选择“以年、月、日组织聊天记录”时,KMess 会自动建立子文件夹。" +msgstr "按年份,月份,天为依据建立文件夹存放聊天记录" #. i18n: file: settings/chatloggingpage.ui:211 #. i18n: ectx: property (whatsThis), widget (QRadioButton, dayRadioButton_) @@ -5498,9 +5285,8 @@ #. i18n: file: settings/chatloggingpage.ui:273 #. i18n: ectx: property (toolTip), widget (QToolButton, chatSavePathButton_) #: rc.cpp:596 -#, fuzzy msgid "Click here to choose a directory" -msgstr "单击这里重命名选中的表情。" +msgstr "单击这里选择目录。" #. i18n: file: settings/chatloggingpage.ui:302 #. i18n: ectx: property (toolTip), widget (QLabel, chatSavePathLabel_) @@ -5524,7 +5310,7 @@ #. i18n: ectx: attribute (title), widget (QWidget, tab_4) #: rc.cpp:611 msgid "St&yle" -msgstr "" +msgstr "主题(&y)" #. i18n: file: settings/chatstylepage.ui:38 #. i18n: ectx: property (whatsThis), widget (QLabel, textLabel1) @@ -5535,7 +5321,6 @@ #. i18n: file: settings/chatstylepage.ui:41 #. i18n: ectx: property (text), widget (QLabel, textLabel1) #: rc.cpp:617 -#, fuzzy msgid "&Chat style:" msgstr "聊天主题(&C):" @@ -5543,7 +5328,7 @@ #. i18n: ectx: property (text), widget (KPu... [truncated message content] |
From: <da...@us...> - 2009-07-24 07:02:44
|
Revision: 5134 http://kmess.svn.sourceforge.net/kmess/?rev=5134&view=rev Author: dazjorz Date: 2009-07-24 07:02:34 +0000 (Fri, 24 Jul 2009) Log Message: ----------- * Fixed bug in cmake/get-svn-version.sh on platforms where builtin echo doesn't understand -n. Backport from trunk. Modified Paths: -------------- branches/kmess/kmess-2.0.x/ChangeLog branches/kmess/kmess-2.0.x/cmake/get-svn-version.sh Modified: branches/kmess/kmess-2.0.x/ChangeLog =================================================================== --- branches/kmess/kmess-2.0.x/ChangeLog 2009-07-24 06:55:23 UTC (rev 5133) +++ branches/kmess/kmess-2.0.x/ChangeLog 2009-07-24 07:02:34 UTC (rev 5134) @@ -1,3 +1,8 @@ + +2009-07-24 (dazjorz) + * Fixed bug in cmake/get-svn-version.sh on platforms where builtin echo + doesn't understand -n. + 2009-07-24 (Pano) * Merged an updated German translation. * Merged an updated Simplified Chinese translation by Cheng Yang. Modified: branches/kmess/kmess-2.0.x/cmake/get-svn-version.sh =================================================================== --- branches/kmess/kmess-2.0.x/cmake/get-svn-version.sh 2009-07-24 06:55:23 UTC (rev 5133) +++ branches/kmess/kmess-2.0.x/cmake/get-svn-version.sh 2009-07-24 07:02:34 UTC (rev 5134) @@ -8,13 +8,13 @@ # Make sure we have the right repository if [ ! -f kmess.kdevelop ]; then - echo -n "svn (unknown)" + /bin/echo -n "svn (unknown)" exit fi # Display normal version if subversion is not installed if [ ! -x `which svnversion 2>/dev/null` ]; then - echo -n "$appver" + /bin/echo -n "$appver" exit fi @@ -24,9 +24,9 @@ # see if this is not a repository. if [ "$svnver" = "exported" ]; then if [ -z "$KMESS_VER" ]; then - echo -n "$appver"; + /bin/echo -n "$appver"; else - echo -n "$KMESS_VER"; + /bin/echo -n "$KMESS_VER"; fi exit; fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <da...@us...> - 2009-07-24 21:11:15
|
Revision: 5140 http://kmess.svn.sourceforge.net/kmess/?rev=5140&view=rev Author: dazjorz Date: 2009-07-24 21:11:02 +0000 (Fri, 24 Jul 2009) Log Message: ----------- * Fixed contact list sorting etc issue ONCE AND FOR ALL. Modified Paths: -------------- branches/kmess/kmess-2.0.x/ChangeLog branches/kmess/kmess-2.0.x/src/contact/group.cpp branches/kmess/kmess-2.0.x/src/contact/group.h branches/kmess/kmess-2.0.x/src/model/contactlist.cpp Modified: branches/kmess/kmess-2.0.x/ChangeLog =================================================================== --- branches/kmess/kmess-2.0.x/ChangeLog 2009-07-24 20:31:59 UTC (rev 5139) +++ branches/kmess/kmess-2.0.x/ChangeLog 2009-07-24 21:11:02 UTC (rev 5140) @@ -2,6 +2,7 @@ 2009-07-24 (dazjorz) * Fixed bug in cmake/get-svn-version.sh on platforms where builtin echo doesn't understand -n. + * Fixed contact list sorting etc issue ONCE AND FOR ALL. 2009-07-24 (Pano) * Merged an updated German translation. Modified: branches/kmess/kmess-2.0.x/src/contact/group.cpp =================================================================== --- branches/kmess/kmess-2.0.x/src/contact/group.cpp 2009-07-24 20:31:59 UTC (rev 5139) +++ branches/kmess/kmess-2.0.x/src/contact/group.cpp 2009-07-24 21:11:02 UTC (rev 5140) @@ -160,7 +160,7 @@ // Change the sort position -void Group::setSortPosition( int sortPosition ) +void Group::setSortPosition( int sortPosition, bool signal ) { #ifdef KMESSDEBUG_GROUP kDebug() << "Group " << name_ << " old sort position = " << sortPosition_ @@ -169,7 +169,10 @@ oldSortPosition_ = sortPosition_; sortPosition_ = sortPosition; - emit changedPosition( this, oldSortPosition_, sortPosition_ ); + if( signal ) + { + emit changedPosition( this, oldSortPosition_, sortPosition_ ); + } } Modified: branches/kmess/kmess-2.0.x/src/contact/group.h =================================================================== --- branches/kmess/kmess-2.0.x/src/contact/group.h 2009-07-24 20:31:59 UTC (rev 5139) +++ branches/kmess/kmess-2.0.x/src/contact/group.h 2009-07-24 21:11:02 UTC (rev 5140) @@ -62,7 +62,7 @@ // Change the group name void setName( const QString& newName ); // Change the sort position - void setSortPosition( int sortPosition ); + void setSortPosition( int sortPosition, bool signal = true ); // Change the old sort position (XXX HACK FIXME OMG) void setOldSortPosition( int oldSortPosition ); // Change the expanded state Modified: branches/kmess/kmess-2.0.x/src/model/contactlist.cpp =================================================================== --- branches/kmess/kmess-2.0.x/src/model/contactlist.cpp 2009-07-24 20:31:59 UTC (rev 5139) +++ branches/kmess/kmess-2.0.x/src/model/contactlist.cpp 2009-07-24 21:11:02 UTC (rev 5140) @@ -806,7 +806,7 @@ kWarning() << "Found a non-special group with sortPosition < 5, resetting to " << group->getSortPosition() + 5; #endif // the part below will automatically fix any duplicates caused by this: - group->setSortPosition( group->getSortPosition() + 5 ); + group->setSortPosition( group->getSortPosition() + 5, false ); } else if( group->isSpecialGroup() ) { @@ -821,14 +821,14 @@ int highestPosition = 0; for( int i = 0; i < groups_.count(); ++i) { - if( groups_.at( i )->getSortPosition() > highestPosition) + if( !groups_.at( i )->isSpecialGroup() && groups_.at( i )->getSortPosition() > highestPosition) { highestPosition = groups_.at( i )->getSortPosition(); } } // check for duplicates and gaps (only check non-special groups) - for( int pos = 5; pos < groups_.count(); ++pos ) + for( int pos = 5; pos <= highestPosition; ++pos ) { matches.clear(); @@ -856,13 +856,13 @@ if( matches.count() == 1 ) { // it's OK, just copy this group - matches.at( 0 )->setSortPosition( pos + fillOffset ); + matches.at( 0 )->setSortPosition( pos + fillOffset, false ); newGroupList << matches.at( 0 ); } else if( matches.count() == 0 ) { #ifdef KMESSDEBUG_CONTACTLIST_GENERAL - kWarning() << "Gap found in group list for position " << pos << ", fixing."; + kDebug() << "Gap found in group list for position " << pos << ", fixing."; gaps++; #endif // there's a gap, lower all other indices in the group list @@ -871,19 +871,20 @@ else { #ifdef KMESSDEBUG_CONTACTLIST_GENERAL - kWarning() << "Duplicate found in group list for position " << pos << ", fixing."; + kDebug() << "Duplicate found in group list for position " << pos << ", fixing."; duplicates++; #endif // don't increase the fillOffset for the first one - matches.at( 0 )->setSortPosition( pos + fillOffset ); + matches.at( 0 )->setSortPosition( pos + fillOffset, false ); newGroupList << matches.at( 0 ); // add all the others, incrementing the index fix for every add for( int dup = 1; dup < matches.count(); ++dup ) { + highestPosition++; fillOffset++; - matches.at( dup )->setSortPosition( pos + fillOffset ); + matches.at( dup )->setSortPosition( pos + fillOffset, false ); newGroupList << matches.at( dup ); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <it_...@us...> - 2009-07-25 11:09:20
|
Revision: 5157 http://kmess.svn.sourceforge.net/kmess/?rev=5157&view=rev Author: it_amroth Date: 2009-07-25 11:09:08 +0000 (Sat, 25 Jul 2009) Log Message: ----------- kmess-2.0.x: Bumped version numbers; updated the NEWS file. Modified Paths: -------------- branches/kmess/kmess-2.0.x/CMakeLists.txt branches/kmess/kmess-2.0.x/ChangeLog branches/kmess/kmess-2.0.x/Doxyfile branches/kmess/kmess-2.0.x/NEWS Modified: branches/kmess/kmess-2.0.x/CMakeLists.txt =================================================================== --- branches/kmess/kmess-2.0.x/CMakeLists.txt 2009-07-25 10:53:00 UTC (rev 5156) +++ branches/kmess/kmess-2.0.x/CMakeLists.txt 2009-07-25 11:09:08 UTC (rev 5157) @@ -128,7 +128,7 @@ # Switch between the following two commands to force using a predefined version number EXECUTE_PROCESS( COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/cmake/get-svn-version.sh OUTPUT_VARIABLE KMESS_VERSION ) -# SET( KMESS_VERSION "2.0rc1" ) +# SET( KMESS_VERSION "2.0.1dev" ) #### Define compiler flags #### Modified: branches/kmess/kmess-2.0.x/ChangeLog =================================================================== --- branches/kmess/kmess-2.0.x/ChangeLog 2009-07-25 10:53:00 UTC (rev 5156) +++ branches/kmess/kmess-2.0.x/ChangeLog 2009-07-25 11:09:08 UTC (rev 5157) @@ -1,4 +1,6 @@ +--- 2.0 released --- + 2009-07-24 (dazjorz) * Fixed bug in cmake/get-svn-version.sh on platforms where builtin echo doesn't understand -n. Modified: branches/kmess/kmess-2.0.x/Doxyfile =================================================================== --- branches/kmess/kmess-2.0.x/Doxyfile 2009-07-25 10:53:00 UTC (rev 5156) +++ branches/kmess/kmess-2.0.x/Doxyfile 2009-07-25 11:09:08 UTC (rev 5157) @@ -5,7 +5,7 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = KMess -PROJECT_NUMBER = 2.0-rc1 +PROJECT_NUMBER = 2.0.1-dev OUTPUT_DIRECTORY = ./apidocs CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English Modified: branches/kmess/kmess-2.0.x/NEWS =================================================================== --- branches/kmess/kmess-2.0.x/NEWS 2009-07-25 10:53:00 UTC (rev 5156) +++ branches/kmess/kmess-2.0.x/NEWS 2009-07-25 11:09:08 UTC (rev 5157) @@ -1,9 +1,18 @@ -Changes between KMess SVN and 2.0-rc1: +Changes between KMess SVN and 2.0: -------------------------------------- - updated German translation by Panagiotis Papadopoulos. - updated Simplified Chinese translation by Cheng Yang. +Changes between KMess 2.0 and 2.0-rc1: +-------------------------------------- +- added back meaningful error messages for unsupported applications. +- fixed crashing when transferring display pictures. +- fixed a small bug in group sorting. +- improved further the RTL languages support. +- updated Arabic translation by Ma'moun Diraneyya. +- updated Simplified Chinese translation by Cheng Yang. + Changes between KMess 2.0-rc1 and 2.0-beta2: -------------------------------------- - added Japanese translation by Daniel E. Moctezuma. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pan...@us...> - 2009-07-26 10:18:13
|
Revision: 5170 http://kmess.svn.sourceforge.net/kmess/?rev=5170&view=rev Author: pano9000 Date: 2009-07-26 10:18:04 +0000 (Sun, 26 Jul 2009) Log Message: ----------- Merged an updated Japanese translation Modified Paths: -------------- branches/kmess/kmess-2.0.x/ChangeLog branches/kmess/kmess-2.0.x/po/ja.po Modified: branches/kmess/kmess-2.0.x/ChangeLog =================================================================== --- branches/kmess/kmess-2.0.x/ChangeLog 2009-07-25 23:10:54 UTC (rev 5169) +++ branches/kmess/kmess-2.0.x/ChangeLog 2009-07-26 10:18:04 UTC (rev 5170) @@ -1,4 +1,7 @@ +2009-07-26 (Pano) + * Merged an updated Japanese translation by Daniel E. Moctezuma. + --- 2.0 released --- 2009-07-24 (dazjorz) Modified: branches/kmess/kmess-2.0.x/po/ja.po =================================================================== --- branches/kmess/kmess-2.0.x/po/ja.po 2009-07-25 23:10:54 UTC (rev 5169) +++ branches/kmess/kmess-2.0.x/po/ja.po 2009-07-26 10:18:04 UTC (rev 5170) @@ -11,8 +11,8 @@ "Project-Id-Version: ja\n" "Report-Msgid-Bugs-To: http://www.kmess.org/board/\n" "POT-Creation-Date: 2009-07-24 19:50+0200\n" -"PO-Revision-Date: 2009-07-24 21:21+0200\n" -"Last-Translator: Panagiotis Papadopoulos <pa...@gm...>\n" +"PO-Revision-Date: 2009-07-25 19:07-0700\n" +"Last-Translator: Daniel E. Moctezuma <shi...@gm...>\n" "Language-Team: Japanese <kde...@kd...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -3081,8 +3081,9 @@ msgstr "コンタクトがオンラインではありません" #: network/msnconnection.cpp:425 +#, fuzzy msgid "Already in this mode" -msgstr "" +msgstr "このモードに既にいます" #: network/msnconnection.cpp:429 msgctxt "MSN error" @@ -3135,8 +3136,9 @@ msgstr "空きドメイン" #: network/msnconnection.cpp:471 +#, fuzzy msgid "Wrong ADL command format" -msgstr "" +msgstr "不良 ADL コマンドのフォーマット" #: network/msnconnection.cpp:474 msgid "Switchboard server failed" @@ -3232,8 +3234,9 @@ msgstr "あなたのパスポートアカウントを最初に確認する必要があります。" #: network/msnconnection.cpp:566 +#, fuzzy msgid "Bad USR ticket" -msgstr "" +msgstr "不良 USR チケット" #: network/msnconnection.cpp:576 msgid "Error accessing contact list, try again later" @@ -3504,18 +3507,18 @@ msgstr "入力したメールアドレス \"%1\" は、Live Messengerのアカウントに属しません!" #: network/soap/addressbookservice.cpp:795 +#, fuzzy #: network/soap/addressbookservice.cpp:818 -#: network/soap/httpsoapconnection.cpp:295 -#, kde-format +#: network/soap/httpsoapconnection.cpp:295, kde-format msgctxt "Error message (system-generated description)" msgid "Invalid web service request (%1)" -msgstr "" +msgstr "無効なウェブサービスリクエスト(%1)" #: network/soap/httpsoapconnection.cpp:427 -#, kde-format +#, fuzzy, kde-format msgctxt "Error message (system-generated description)" msgid "The web service is not accessible (%1)" -msgstr "" +msgstr "ウェブサービスにアクセスできません(%1)" #: network/soap/httpsoapconnection.cpp:504 msgctxt "Error message" @@ -3523,9 +3526,10 @@ msgstr "" #: network/soap/httpsoapconnection.cpp:548 +#, fuzzy msgctxt "Warning message" msgid "The Offline Messages web service is currently not available" -msgstr "" +msgstr "オフラインメッセージのウェブサービスは使用可能ではありません。" #: network/soap/httpsoapconnection.cpp:554 msgctxt "Warning message" @@ -3567,12 +3571,12 @@ #: notification/chatnotification.cpp:185 #, fuzzy, kde-format msgid "<html>%1's chat requests attention!</html>" -msgstr "<html>%1 さんは注意を要求しています!</html>" +msgstr "<html>%1 さんがシェイクを送信しました!</html>" #: notification/chatnotification.cpp:190 #, kde-format msgid "<html><b>%1</b>:<br/>%2</html>" -msgstr "" +msgstr "<html><b>%1</b>:<br/>%2</html>" #: notification/chatnotification.cpp:197 #, kde-format @@ -3696,7 +3700,6 @@ msgstr "チャットを開始" #: notification/notificationmanager.cpp:118 -#, fuzzy msgctxt "Button text for KDE notification boxes" msgid "Leave a Message" msgstr "メッセージを残す" @@ -3842,7 +3845,7 @@ #: settings/chatstylepage.cpp:372 msgid "Stacy" -msgstr "" +msgstr "Stacy" #: settings/chatstylepage.cpp:373 msgid "Great!" @@ -3952,11 +3955,10 @@ msgid "Welcome to this testing version of %1." msgstr "" -#: utils/likeback/likeback.cpp:328 -#, fuzzy, kde-format +#: utils/likeback/likeback.cpp:328, kde-format msgctxt "Welcome dialog text, header text for released apps" msgid "Welcome to %1." -msgstr "&1 へようこそ。" +msgstr "%1 へようこそ。" #: utils/likeback/likeback.cpp:336 msgctxt "Welcome dialog text, explanation for both the like and dislike buttons" @@ -4018,17 +4020,17 @@ msgid "Send a Comment to the Developers" msgstr "開発者にコメントを送信" -#: utils/likeback/likebackdialog.cpp:139 -#, kde-format +#: utils/likeback/likebackdialog.cpp:139, kde-format +#, fuzzy msgctxt "Feedback dialog text, message with one accepted language for the comments" msgid "Please, write it in <b>%1</b> (you may want to use an <a href=\"%3\">online translation tool</a> for this).<br/>" -msgstr "" +msgstr "<b>%1</b>で書いてください(<a href=\"%3\">翻訳機経由</a>もできます)。<br/>" -#: utils/likeback/likebackdialog.cpp:146 -#, kde-format +#: utils/likeback/likebackdialog.cpp:146, kde-format +#, fuzzy msgctxt "Feedback dialog text, message with list of accepted languages for the comments" msgid "Please, write it in <b>%1 or %2</b> (you may want to use an <a href=\"%3\">online translation tool</a> for this).<br/>" -msgstr "" +msgstr "<b>%1か%2</b>で書いてください(<a href=\"%3\">翻訳機経由</a>もできます)。<br/>" #: utils/likeback/likebackdialog.cpp:159 msgctxt "Feedback dialog text, message to remind to balance the likes and dislikes" @@ -4231,8 +4233,9 @@ #. i18n: file: dialogs/chathistorydialog.ui:30 #. i18n: ectx: property (clickMessage), widget (KLineEdit, searchEdit_) #: rc.cpp:93 +#, fuzzy msgid "Search through contacts..." -msgstr "" +msgstr "コンタクトで検索..." #. i18n: file: dialogs/chathistorydialog.ui:70 #. i18n: ectx: property (title), widget (QGroupBox, groupBox) @@ -4275,7 +4278,7 @@ #. i18n: ectx: property (text), widget (QRadioButton, addContactOption_) #: rc.cpp:115 msgid "&Add this person to the following groups of your contact list:" -msgstr "" +msgstr "以下のグループに追加します(&A):" #. i18n: file: dialogs/contactaddeduserdialog.ui:114 #. i18n: ectx: property (text), widget (QRadioButton, allowContactOption_) @@ -4299,7 +4302,7 @@ #. i18n: ectx: property (text), widget (QPushButton, restoreButton_) #: rc.cpp:130 msgid "&Restore" -msgstr "回復(&R)" +msgstr "復元(&R)" #. i18n: file: dialogs/contactpropertiesdialog.ui:179 #. i18n: ectx: property (text), widget (QLabel, label_2) @@ -4366,13 +4369,13 @@ #. i18n: ectx: property (text), widget (QPushButton, removeEmoticonButton_) #: rc.cpp:169 msgid "Resto&re" -msgstr "" +msgstr "復元(&R)" #. i18n: file: dialogs/invitedialog.ui:19 #. i18n: ectx: property (title), widget (QGroupBox, groupBox) #: rc.cpp:175 msgid "Available Contacts" -msgstr "" +msgstr "利用可能なコンタクト" #. i18n: file: dialogs/invitedialog.ui:70 #. i18n: ectx: property (text), widget (QLabel, label) @@ -4449,8 +4452,9 @@ #. i18n: file: dialogs/networkwindow.ui:25 #. i18n: ectx: property (title), widget (QGroupBox, commandSendingGroup_) #: rc.cpp:223 +#, fuzzy msgid "Command to Current Tab" -msgstr "" +msgstr "現在のタブのコマンド" #. i18n: file: dialogs/networkwindow.ui:37 #. i18n: ectx: property (text), widget (QLabel, label) @@ -4467,8 +4471,9 @@ #. i18n: file: dialogs/networkwindow.ui:60 #. i18n: ectx: property (text), widget (QRadioButton, sendStandardCmdRadio_) #: rc.cpp:232 +#, fuzzy msgid "Standard" -msgstr "" +msgstr "標準" #. i18n: file: dialogs/networkwindow.ui:67 #. i18n: ectx: property (text), widget (QRadioButton, sendMimeCmdRadio_) @@ -4606,8 +4611,9 @@ #. i18n: file: initialview.ui:434 #. i18n: ectx: property (tipText), widget (KUrlLabel, newAccountLabel_) #: rc.cpp:315 +#, fuzzy msgid "<html>Click here to register a new Live account, which you can use to connect to MSN.<br/>You can also use your existing email address</html>" -msgstr "" +msgstr "<html>ここをクリックして、新規 Live アカウントを登録して、MSN に接続できます。<br/>あなたの存在しているメールアドレスも使えます。</html>" #. i18n: file: initialview.ui:463 #. i18n: ectx: property (text), widget (KUrlLabel, forgottenPasswordLabel_) @@ -4619,13 +4625,14 @@ #. i18n: ectx: property (url), widget (KUrlLabel, forgottenPasswordLabel_) #: rc.cpp:321 msgid "https://login.live.com/resetpw.srf" -msgstr "" +msgstr "https://login.live.com/resetpw.srf" #. i18n: file: initialview.ui:469 #. i18n: ectx: property (tipText), widget (KUrlLabel, forgottenPasswordLabel_) #: rc.cpp:324 +#, fuzzy msgid "<html>Click here to go to the Live web site, to reset your account's password</html>" -msgstr "" +msgstr "<html>ここをクリックして、Live ウェブサイトでアカウントのパスワードをリセットできます。</html>" #. i18n: file: kmessinterfaceui.rc:5 #. i18n: ectx: Menu (file) @@ -4723,7 +4730,6 @@ #. i18n: file: settings/accountpage.ui:258 #. i18n: ectx: property (toolTip), widget (QCheckBox, noPictureCheckbox_) #: rc.cpp:378 -#, fuzzy msgid "Enable this option, if you do not want to use a display picture." msgstr "表示アイコンを使いたくない場合にはこのオプションを有効にできます。" @@ -4858,7 +4864,7 @@ #. i18n: file: settings/accountpage.ui:559 #. i18n: ectx: property (text), widget (QLabel, idleLabel1_) #: rc.cpp:449 -#, fuzzy +msgctxt "DON'T TRANSLATE OR MODIFY THIS STRING! This string is not needed because of japanese grammar, it should be a single white space ' ' so it can fit with the next string. PLEASE DON'T ERASE THAT WHITE SPACE." msgid "Become idle after" msgstr " " @@ -4913,9 +4919,8 @@ #. i18n: file: settings/accountsmanagerpage.ui:92 #. i18n: ectx: property (toolTip), widget (QPushButton, configureAccountButton_) #: rc.cpp:485 -#, fuzzy msgid "Select an account and click here to modify it" -msgstr "アカウントを選択して、ここをクリックして変更します" +msgstr "アカウントを選択して、ここをクリックして変更できます" #. i18n: file: settings/accountsmanagerpage.ui:95 #. i18n: ectx: property (text), widget (QPushButton, configureAccountButton_) @@ -4926,9 +4931,8 @@ #. i18n: file: settings/accountsmanagerpage.ui:108 #. i18n: ectx: property (toolTip), widget (QPushButton, removeAccountButton_) #: rc.cpp:494 -#, fuzzy msgid "Select an account and click here to remove it" -msgstr "アカウントを選択して、ここをクリックして削除します" +msgstr "アカウントを選択して、ここをクリックして削除できます" #. i18n: file: settings/accountsmanagerpage.ui:111 #. i18n: ectx: property (text), widget (QPushButton, removeAccountButton_) @@ -4961,8 +4965,9 @@ #. i18n: file: settings/chatloggingpage.ui:36 #. i18n: ectx: property (toolTip), widget (QGroupBox, saveChatsToFileCheckBox_) #: rc.cpp:515 +#, fuzzy msgid "If enabled, KMess additionaly saves your chat logs as HTML or plain text files" -msgstr "" +msgstr "有効にすると、チャット履歴は HTML またはプレーンテキストとして保存します" #. i18n: file: settings/chatloggingpage.ui:39 #. i18n: ectx: property (title), widget (QGroupBox, saveChatsToFileCheckBox_) @@ -5021,7 +5026,7 @@ #. i18n: ectx: property (text), widget (QLabel, label) #: rc.cpp:546 msgid "Separate logged chats by:" -msgstr "" +msgstr "チャット履歴の分類:" #. i18n: file: settings/chatloggingpage.ui:156 #. i18n: ectx: property (toolTip), widget (QRadioButton, yearRadioButton_) @@ -5065,7 +5070,6 @@ #. i18n: file: settings/chatloggingpage.ui:191 #. i18n: ectx: property (text), widget (QRadioButton, monthRadioButton_) #: rc.cpp:571 -#, fuzzy msgid "Year then Month" msgstr "年と月" @@ -5089,9 +5093,8 @@ #. i18n: file: settings/chatloggingpage.ui:214 #. i18n: ectx: property (text), widget (QRadioButton, dayRadioButton_) #: rc.cpp:584 -#, fuzzy msgid "Year, Month then Day" -msgstr "年、月と曜日" +msgstr "年、月、日" #. i18n: file: settings/chatloggingpage.ui:224 #. i18n: ectx: property (toolTip), widget (QRadioButton, singleDirectoryRadioButton_) @@ -5108,9 +5111,8 @@ #. i18n: file: settings/chatloggingpage.ui:230 #. i18n: ectx: property (text), widget (QRadioButton, singleDirectoryRadioButton_) #: rc.cpp:593 -#, fuzzy msgid "Do not organize files" -msgstr "ファイルを整理しません" +msgstr "ファイルを分類しません" #. i18n: file: settings/chatloggingpage.ui:273 #. i18n: ectx: property (toolTip), widget (QToolButton, chatSavePathButton_) @@ -5299,8 +5301,9 @@ #. i18n: file: settings/chatstylepage.ui:582 #. i18n: ectx: attribute (title), widget (QWidget, tab_2) #: rc.cpp:701 +#, fuzzy msgid "&Behavior" -msgstr "" +msgstr "行動(&B)" #. i18n: file: settings/chatstylepage.ui:589 #. i18n: ectx: property (whatsThis), widget (QCheckBox, shakeNudgeCheckBox_) @@ -5615,7 +5618,7 @@ #. i18n: ectx: property (toolTip), widget (QToolButton, m_likeButton) #: rc.cpp:892 msgid "Click here to tell the developers about something you liked" -msgstr "" +msgstr "ここをクリックして、開発者に好きなことについて伝えます" #. i18n: file: utils/likeback/likebackbar.ui:36 #. i18n: ectx: property (whatsThis), widget (QToolButton, m_likeButton) @@ -5638,19 +5641,19 @@ #. i18n: ectx: property (toolTip), widget (QToolButton, m_dislikeButton) #: rc.cpp:899 msgid "Click here to tell the developers about something you did not like" -msgstr "" +msgstr "ここをクリックして、開発者に好きではないことについて伝えます" #. i18n: file: utils/likeback/likebackbar.ui:66 #. i18n: ectx: property (toolTip), widget (QToolButton, m_bugButton) #: rc.cpp:906 msgid "Click here to tell the developers about a problem in the application" -msgstr "" +msgstr "ここをクリックして、開発者にアプリケーションの問題について伝えます" #. i18n: file: utils/likeback/likebackbar.ui:83 #. i18n: ectx: property (toolTip), widget (QToolButton, m_featureButton) #: rc.cpp:913 msgid "Click here to tell the developers about new features you would like to have in this application" -msgstr "" +msgstr "ここをクリックして、開発者に希望する新しい機能について伝えます" #. i18n: file: utils/likeback/likebackdialog.ui:48 #. i18n: ectx: property (text), widget (QLabel, label_2) @@ -5679,7 +5682,6 @@ #. i18n: file: utils/likeback/likebackdialog.ui:112 #. i18n: ectx: property (text), widget (QRadioButton, bugRadio_) #: rc.cpp:932 -#, fuzzy msgid "An improper behavior of the application" msgstr "アプリケーションの不適切な行動" @@ -5687,7 +5689,7 @@ #. i18n: ectx: property (text), widget (QRadioButton, featureRadio_) #: rc.cpp:935 msgid "A new feature you desire" -msgstr "" +msgstr "希望する新しい機能" #. i18n: file: utils/likeback/likebackdialog.ui:141 #. i18n: ectx: property (text), widget (QCheckBox, specifyEmailCheckBox_) @@ -5703,3 +5705,4 @@ "<b>Your email address will not be used for anything else but this report.</b></html>" msgstr "" + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fon...@us...> - 2009-07-26 21:45:26
|
Revision: 5176 http://kmess.svn.sourceforge.net/kmess/?rev=5176&view=rev Author: fontknocker Date: 2009-07-26 21:45:19 +0000 (Sun, 26 Jul 2009) Log Message: ----------- Use smooth pixmap scaling in the contact list. Check for any potential speed problems. Modified Paths: -------------- branches/kmess/kmess-2.0.x/ChangeLog branches/kmess/kmess-2.0.x/src/kmessviewdelegate.cpp Modified: branches/kmess/kmess-2.0.x/ChangeLog =================================================================== --- branches/kmess/kmess-2.0.x/ChangeLog 2009-07-26 21:33:44 UTC (rev 5175) +++ branches/kmess/kmess-2.0.x/ChangeLog 2009-07-26 21:45:19 UTC (rev 5176) @@ -1,3 +1,6 @@ +2009-07-27 (Adam) + * Use smooth pixmap scaling for display pictures in contact list. + Check for any serious performance hits. 2009-07-26 (Pano) * Merged an updated Japanese translation by Daniel E. Moctezuma. Modified: branches/kmess/kmess-2.0.x/src/kmessviewdelegate.cpp =================================================================== --- branches/kmess/kmess-2.0.x/src/kmessviewdelegate.cpp 2009-07-26 21:33:44 UTC (rev 5175) +++ branches/kmess/kmess-2.0.x/src/kmessviewdelegate.cpp 2009-07-26 21:45:19 UTC (rev 5176) @@ -177,7 +177,7 @@ // Fast scaled picturePixmap = picturePixmap.scaled( displayPictureSize , displayPictureSize - , Qt::KeepAspectRatio ); + , Qt::KeepAspectRatio, Qt::SmoothTransformation ); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pan...@us...> - 2009-07-31 23:22:15
|
Revision: 5223 http://kmess.svn.sourceforge.net/kmess/?rev=5223&view=rev Author: pano9000 Date: 2009-07-31 23:21:44 +0000 (Fri, 31 Jul 2009) Log Message: ----------- Merged an updated Japanese translation Modified Paths: -------------- branches/kmess/kmess-2.0.x/ChangeLog branches/kmess/kmess-2.0.x/po/ja.po Modified: branches/kmess/kmess-2.0.x/ChangeLog =================================================================== --- branches/kmess/kmess-2.0.x/ChangeLog 2009-07-31 13:38:46 UTC (rev 5222) +++ branches/kmess/kmess-2.0.x/ChangeLog 2009-07-31 23:21:44 UTC (rev 5223) @@ -1,3 +1,6 @@ +2009-08-01 (Pano) + * Merged an updated Japanese translation by Daniel E. Moctezuma. + 2009-07-27 (Adam) * Use smooth pixmap scaling for display pictures in contact list. Check for any serious performance hits. Modified: branches/kmess/kmess-2.0.x/po/ja.po =================================================================== --- branches/kmess/kmess-2.0.x/po/ja.po 2009-07-31 13:38:46 UTC (rev 5222) +++ branches/kmess/kmess-2.0.x/po/ja.po 2009-07-31 23:21:44 UTC (rev 5223) @@ -11,7 +11,7 @@ "Project-Id-Version: ja\n" "Report-Msgid-Bugs-To: http://www.kmess.org/board/\n" "POT-Creation-Date: 2009-07-24 19:50+0200\n" -"PO-Revision-Date: 2009-07-25 19:07-0700\n" +"PO-Revision-Date: 2009-07-30 21:57-0700\n" "Last-Translator: Daniel E. Moctezuma <shi...@gm...>\n" "Language-Team: Japanese <kde...@kd...>\n" "MIME-Version: 1.0\n" @@ -208,10 +208,9 @@ msgid "You received the "%2" wink from %1, but it could not be displayed. The data could not be read." msgstr "%1 さんから受信した "%2" のウインクを表示できませんでした。データが読み取れませんでした。" -#: chat/chat.cpp:1404 -#, fuzzy, kde-format +#: chat/chat.cpp:1404, kde-format msgid "%1 has gone offline. Any messages you send will be delivered the next time he or she logs in." -msgstr "%1 さんはオフラインと記されました。メッセージを送信すると、その人は次回のサインイン時にメッセージを受け取ります。" +msgstr "%1 さんはオフラインです。メッセージを送信すると、その人は次回のサインイン時にメッセージを受け取ります。" #: chat/chat.cpp:1409 #, kde-format @@ -605,7 +604,7 @@ #: chat/chatwindow.cpp:1881 #, kde-format msgid "%1 is typing..." -msgstr "%1 はメッセージを入力中..." +msgstr "%1 さんはメッセージを入力中..." #: chat/chatwindow.cpp:1891 #, kde-format @@ -1798,16 +1797,16 @@ #: kmessinterface.cpp:199 msgid "Mixed" -msgstr "" +msgstr "混ぜる" #: kmessinterface.cpp:289 msgid "Show &Network Window..." msgstr "ネットワークウィンドウを表示(&N)..." #: kmessview.cpp:322 -#, kde-format +#, fuzzy, kde-format msgid "[%1] Logged in with %2" -msgstr "" +msgstr "[%1] %2 としてログインしました" #: kmessview.cpp:359 #, kde-format @@ -2832,12 +2831,10 @@ #: network/applications/filetransferp2p.cpp:143 #: network/applications/filetransferp2p.cpp:160 #: network/extra/msnftpconnection.cpp:132 -#, fuzzy msgid "The file transfer invitation was cancelled. Bad data was received." msgstr "ファイル転送の招待がキャンセルしました。不良データが受信しました。" -#: network/applications/filetransferp2p.cpp:404 -#, fuzzy, kde-format +#: network/applications/filetransferp2p.cpp:404, kde-format msgid "You have accepted the transfer of the file "%1"." msgstr ""%1" のファイル転送を承諾しました。" @@ -2851,11 +2848,10 @@ msgid "<html>%1 has tried to send you an handwritten message, but it could not be received.</html>" msgstr "<html>%1 さんが手書きのメッセージを送信しましたが受信できませんでした。</html>" -#: network/applications/inktransferp2p.cpp:114 -#, fuzzy, kde-format +#: network/applications/inktransferp2p.cpp:114, kde-format msgctxt "Error message shown in chat, %1 is the contact's friendly name" msgid "<html>The handwritten message to %1 could not be delivered.</html>" -msgstr "<html>%1 さんに送信した手書きのメッセージに失敗しました。</html>" +msgstr "<html>%1 さんに手書きのメッセージが配信できませんでした。</html>" #: network/applications/mimeapplication.cpp:154 msgid "The invitation was rejected. It is not supported by the other client." @@ -2894,7 +2890,6 @@ #: network/applications/p2papplication.cpp:1763 #: network/applications/p2papplication.cpp:1887 #: network/applications/p2papplicationbase.cpp:706 -#, fuzzy msgid "The invitation was cancelled. The contact sent bad data, or KMess does not support it." msgstr "招待が中止されました。コンタクトは不良データを送信または KMess はまだサポートされていません。" @@ -2910,7 +2905,6 @@ #: network/applications/p2papplication.cpp:1744 #: network/applications/p2papplicationbase.cpp:855 #: network/applications/p2papplicationbase.cpp:935 -#, fuzzy msgid "The transfer failed. The contact sent bad data, or KMess does not support it." msgstr "転送に失敗しました。コンタクトは不良データを送信または KMess がサポートしていません。" @@ -2983,8 +2977,7 @@ msgid "You are invited to start a voice conversation but support for this was not installed" msgstr "ボイスチャットを開始するに招待されていますがそんなサポートをインストールしていません" -#: network/extra/msnftpconnection.cpp:120 -#, fuzzy, kde-format +#: network/extra/msnftpconnection.cpp:120, kde-format msgid "You have cancelled the transfer of file "%1"." msgstr ""%1" のファイル転送をキャンセルしました。" @@ -3066,7 +3059,7 @@ #: network/msnconnection.cpp:409 msgid "Invalid SBP parameter" -msgstr "" +msgstr "無効な SBP パラメータ" #: network/msnconnection.cpp:412 msgid "This contact is already on your list" @@ -3131,12 +3124,10 @@ msgstr "無効なグループ" #: network/msnconnection.cpp:467 -#, fuzzy msgid "Empty domain" msgstr "空きドメイン" #: network/msnconnection.cpp:471 -#, fuzzy msgid "Wrong ADL command format" msgstr "不良 ADL コマンドのフォーマット" @@ -3170,7 +3161,6 @@ msgstr "コマンドが無効化しています" #: network/msnconnection.cpp:501 -#, fuzzy msgid "Your account is banned" msgstr "あなたのアカウントは禁止されています" @@ -3179,7 +3169,6 @@ msgstr "" #: network/msnconnection.cpp:510 -#, fuzzy msgid "Bad command data" msgstr "不良なコマンドデータ" @@ -3197,14 +3186,12 @@ msgstr "" #: network/msnconnection.cpp:529 -#, fuzzy msgid "Bad friend name" msgstr "不良なニックネーム" #: network/msnconnection.cpp:535 -#, fuzzy msgid "Bad CVR data" -msgstr "不良なCVRデータ" +msgstr "不良な CVR データ" #: network/msnconnection.cpp:541 msgid "The server reports KMess is flooding it with too much data" @@ -3234,7 +3221,6 @@ msgstr "あなたのパスポートアカウントを最初に確認する必要があります。" #: network/msnconnection.cpp:566 -#, fuzzy msgid "Bad USR ticket" msgstr "不良 USR チケット" @@ -3251,8 +3237,9 @@ msgstr "ライブメッセンジャーサービスは一時的に利用できなくなっています。サーバが非常に混み合っています。" #: network/msnconnection.cpp:600 +#, fuzzy msgid "Peer notification server down" -msgstr "" +msgstr "ピア通知のサーバはダウンしています" #: network/msnconnection.cpp:604 #, fuzzy @@ -3265,13 +3252,13 @@ msgstr "サーバがすぐにダウンしています" #: network/msnconnection.cpp:615 +#, fuzzy msgid "Write is blocking" -msgstr "" +msgstr "入力はブロックしています" #: network/msnconnection.cpp:619 -#, fuzzy msgid "Session is overloaded" -msgstr "セッションがオーバーロードしています。" +msgstr "セッションがオーバーロードしています" #: network/msnconnection.cpp:626 #, fuzzy @@ -3295,7 +3282,7 @@ #: network/msnconnection.cpp:964 msgid "Trying the HTTP fallback..." -msgstr "" +msgstr "HTTP のフォールバック中..." #: network/msnnotificationconnection.cpp:1359 msgid "Authenticating..." @@ -3321,16 +3308,16 @@ msgid_plural "%1 minutes" msgstr[0] "%1 分" -#: network/msnnotificationconnection.cpp:2123 -#, kde-format +#: network/msnnotificationconnection.cpp:2123, kde-format +#, fuzzy msgid "Server closes for maintenance in %1!" -msgstr "" +msgstr "%1でサーバーメはンテナンスのために終了します!" #: network/msnnotificationconnection.cpp:2128 -#, kde-format +#, fuzzy, kde-format msgctxt "Server maintenance dialog box text" msgid "The Live Messenger server will be going down in %1 for maintenance." -msgstr "" +msgstr "%1で Live Messenger サーバーはメンテナンスのために終了します。" #: network/msnnotificationconnection.cpp:2329 #, kde-format @@ -3372,10 +3359,10 @@ msgstr "<p>認証に失敗しました。アカウントとパスワードを検証してください。</p>" #: network/msnnotificationconnection.cpp:2966 -#, kde-format +#, fuzzy, kde-format msgctxt "Connection error: passive notification message" msgid "<p>The account <i>%1</i> has been connected from another location.</p>" -msgstr "" +msgstr "<p><i>%1</i> のアカウントは他の場所にサインインしました。</p>" #: network/msnnotificationconnection.cpp:2969 #, fuzzy, kde-format @@ -3456,7 +3443,7 @@ #, kde-format msgctxt "Developer details placed on the network error dialog box" msgid "<p><b>Developer info:</b><br/><i>Error number:</i> %1<br/><i>Error string:</i> %2</p>" -msgstr "" +msgstr "<p><b>開発者情報:</b><br/><i>エラー番号:</i> %1<br/><i>エラー文字列:</i> %2</p>" #: network/msnsocketbase.cpp:135 #, fuzzy @@ -3477,8 +3464,9 @@ msgstr "%1(内容エラーコード:%2)<br/><i>応答:</i> %3 %4<br/><i>リダイレクト先:</i> %5" #: network/msnsockettcp.cpp:364 +#, fuzzy msgid "Connection time limit exceeded" -msgstr "" +msgstr "接続時間の上限を超えました" #: network/msnsockettcp.cpp:380 msgid "1 ping lost" @@ -3507,7 +3495,6 @@ msgstr "入力したメールアドレス \"%1\" は、Live Messengerのアカウントに属しません!" #: network/soap/addressbookservice.cpp:795 -#, fuzzy #: network/soap/addressbookservice.cpp:818 #: network/soap/httpsoapconnection.cpp:295, kde-format msgctxt "Error message (system-generated description)" @@ -3537,10 +3524,10 @@ msgstr "" #: network/soap/httpsoapconnection.cpp:568 -#, kde-format +#, fuzzy, kde-format msgctxt "Error message with description (system-generated description)" msgid "Invalid web service response %1 (%2)" -msgstr "" +msgstr "無効なウェブサービスの応答 %1 (%2)" #: network/soap/httpsoapconnection.cpp:607 msgctxt "Error message" @@ -3548,15 +3535,15 @@ msgstr "ウェブサービスから応答がありません" #: network/soap/passportloginservice.cpp:208 -#, kde-format +#, fuzzy, kde-format msgctxt "Error message (sytem-generated description)" msgid "Unexpected response from server (%1)" -msgstr "" +msgstr "サーバーから予期しない応答(%1)" #: notification/chatnotification.cpp:172 -#, kde-format +#, fuzzy, kde-format msgid "<html>In <b>%1</b>'s chat:<br/>%2</html>" -msgstr "" +msgstr "<html><b>%1</b> さんのチャット<br/>%2</html>" #: notification/chatnotification.cpp:176 #, kde-format @@ -3568,8 +3555,7 @@ msgid "<html><b>%1</b> has sent you an offline message:<br/>'%2'</html>" msgstr "<html><b>%1</b> さんがあなたにオフラインメッセージを送信しました:<br/>'%2'</html>" -#: notification/chatnotification.cpp:185 -#, fuzzy, kde-format +#: notification/chatnotification.cpp:185, kde-format msgid "<html>%1's chat requests attention!</html>" msgstr "<html>%1 さんがシェイクを送信しました!</html>" @@ -3732,7 +3718,7 @@ #: notification/systemtraywidget.cpp:189 #: notification/systemtraywidget.cpp:199 msgid "Docking in System Tray" -msgstr "" +msgstr "システムトレイにドッキング" #: notification/systemtraywidget.cpp:250 #, kde-format @@ -3953,7 +3939,7 @@ #, kde-format msgctxt "Welcome dialog text, header text for test apps" msgid "Welcome to this testing version of %1." -msgstr "" +msgstr "%1 のテスティングバージョンへようこそ。" #: utils/likeback/likeback.cpp:328, kde-format msgctxt "Welcome dialog text, header text for released apps" @@ -3981,9 +3967,10 @@ msgstr "" #: utils/likeback/likeback.cpp:372 +#, fuzzy msgctxt "Welcome dialog text, usage example" msgid "<b>I like</b> the new artwork. Very refreshing." -msgstr "" +msgstr "新しいアートワークが<b>好き</b>です。とても爽やかです。" #: utils/likeback/likeback.cpp:380 msgctxt "Welcome dialog text, usage example" @@ -4012,9 +3999,10 @@ msgstr[0] "例" #: utils/likeback/likeback.cpp:418 +#, fuzzy msgctxt "Welcome dialog title" msgid "Help Improve the Application" -msgstr "" +msgstr "アプリケーションを進むのを手伝えます" #: utils/likeback/likebackdialog.cpp:28 msgid "Send a Comment to the Developers" @@ -4038,15 +4026,16 @@ msgstr "" #: utils/likeback/likebackdialog.cpp:168 +#, fuzzy msgctxt "Feedback dialog text, text to disallow feature requests" msgid "Please, do not ask for new features: this kind of request will be ignored.<br/>" -msgstr "" +msgstr "新しい機能を尋ねないでください:そのようなリクエストは無視します。<br/>" #: utils/likeback/likebackdialog.cpp:174 -#, kde-format +#, fuzzy, kde-format msgctxt "Feedback dialog text, %1=Application name,%2=message with list of accepted languages for the comment,%3=optional text to remind to balance the likes and dislikes,%4=optional text to disallow feature requests." msgid "<p>You can provide the developers a brief description of your opinions about %1.<br/>%2 %3%4</p>" -msgstr "" +msgstr "<p>開発者に%1について意見を説明できます。<br/>%2 %3%4</p>" #: utils/likeback/likebackdialog.cpp:216 #, kde-format @@ -4188,8 +4177,9 @@ #. i18n: file: dialogs/addcontactdialog.ui:33 #. i18n: ectx: property (title), widget (QGroupBox, groupBox) #: rc.cpp:69 +#, fuzzy msgid "Initial groups" -msgstr "" +msgstr "初期グループ" #. i18n: file: dialogs/addcontactdialog.ui:47 #. i18n: ectx: property (whatsThis), widget (QLabel, label) @@ -4471,7 +4461,6 @@ #. i18n: file: dialogs/networkwindow.ui:60 #. i18n: ectx: property (text), widget (QRadioButton, sendStandardCmdRadio_) #: rc.cpp:232 -#, fuzzy msgid "Standard" msgstr "標準" @@ -4606,7 +4595,7 @@ #. i18n: ectx: property (url), widget (KUrlLabel, newAccountLabel_) #: rc.cpp:312 msgid "https://accountservices.passport.net/reg.srf" -msgstr "" +msgstr "https://accountservices.passport.net/reg.srf" #. i18n: file: initialview.ui:434 #. i18n: ectx: property (tipText), widget (KUrlLabel, newAccountLabel_) @@ -4752,7 +4741,7 @@ #. i18n: ectx: property (text), widget (QCheckBox, rememberCheckbox_) #: rc.cpp:392 msgid "Re&member the settings of this account" -msgstr "" +msgstr "このアカウントの設定を記憶する(&M)" #. i18n: file: settings/accountpage.ui:304 #. i18n: ectx: property (toolTip), widget (QCheckBox, autologinCheckBox_) @@ -4769,15 +4758,15 @@ #. i18n: file: settings/accountpage.ui:319 #. i18n: ectx: property (text), widget (QLabel, textLabel1_) #: rc.cpp:404 -#, fuzzy msgid "Login &as" msgstr "初期状態(&A)" #. i18n: file: settings/accountpage.ui:332 #. i18n: ectx: property (whatsThis), widget (QComboBox, initialStatus_) #: rc.cpp:407 +#, fuzzy msgid "Here you can select which status KMess should set, after logging in." -msgstr "" +msgstr "ここに初期状態を選択できます。" #. i18n: file: settings/accountpage.ui:375 #. i18n: ectx: property (whatsThis), widget (QLabel, verifyLabel_) @@ -4788,7 +4777,6 @@ #. i18n: file: settings/accountpage.ui:378 #. i18n: ectx: property (text), widget (QLabel, verifyLabel_) #: rc.cpp:413 -#, fuzzy msgid "You cannot change your friendly name because your Passport email address is not verified." msgstr "あなたのパスポートのメールアドレスが確認されていませんから、ニックネームを変更できません。" @@ -4814,9 +4802,8 @@ #. i18n: file: settings/accountpage.ui:449 #. i18n: ectx: property (text), widget (QLabel, registerLabel_) #: rc.cpp:425 -#, fuzzy msgid "To connect to the Live Messenger service, you will need to register an email address as Passport account." -msgstr "Live Messengerサービスへ接続するために、パスポートアカウントとしてメールアカウントを登録してください。" +msgstr "Live Messenger サービスに接続するために、パスポートアカウントとしてメールアカウントを登録してください。" #. i18n: file: settings/accountpage.ui:489 #. i18n: ectx: property (text), widget (KUrlLabel, registerButton_) @@ -5487,8 +5474,9 @@ #. i18n: file: settings/miscellaneouspage.ui:33 #. i18n: ectx: property (toolTip), widget (QRadioButton, useKDEBrowserRadio_) #: rc.cpp:813 +#, fuzzy msgid "Choose this option to use the browser used by the rest of KDE." -msgstr "" +msgstr "このオプションを選択して、KDE で使っているウェブブラウザを使います。" #. i18n: file: settings/miscellaneouspage.ui:36 #. i18n: ectx: property (text), widget (QRadioButton, useKDEBrowserRadio_) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fon...@us...> - 2009-08-01 10:53:39
|
Revision: 5225 http://kmess.svn.sourceforge.net/kmess/?rev=5225&view=rev Author: fontknocker Date: 2009-08-01 10:53:30 +0000 (Sat, 01 Aug 2009) Log Message: ----------- Cache the scaled display picture when painting the contact list. Mitigates the performance hit incurred by Qt::SmoothTransformation. Modified Paths: -------------- branches/kmess/kmess-2.0.x/ChangeLog branches/kmess/kmess-2.0.x/src/contact/contact.cpp branches/kmess/kmess-2.0.x/src/contact/contact.h branches/kmess/kmess-2.0.x/src/kmessviewdelegate.cpp Modified: branches/kmess/kmess-2.0.x/ChangeLog =================================================================== --- branches/kmess/kmess-2.0.x/ChangeLog 2009-08-01 10:02:51 UTC (rev 5224) +++ branches/kmess/kmess-2.0.x/ChangeLog 2009-08-01 10:53:30 UTC (rev 5225) @@ -1,3 +1,7 @@ +2009-08-01 (Adam) + * Cache the scaled display picture when painting the contact list. Mitigates + the performance hit incurred by using Qt::SmoothTransformation. + 2009-08-01 (Pano) * Merged an updated Japanese translation by Daniel E. Moctezuma. Modified: branches/kmess/kmess-2.0.x/src/contact/contact.cpp =================================================================== --- branches/kmess/kmess-2.0.x/src/contact/contact.cpp 2009-08-01 10:02:51 UTC (rev 5224) +++ branches/kmess/kmess-2.0.x/src/contact/contact.cpp 2009-08-01 10:53:30 UTC (rev 5225) @@ -141,6 +141,27 @@ +// return the scaled display picture for this contact. +// this is used for display in the contact list. +QPixmap & Contact::getScaledDisplayPicture() +{ + int dpSize = CurrentAccount::instance()->getListPictureSize(); + if ( dpSize == scaledDPSize_ && ! scaledDisplayPicture_.isNull() ) + { + return scaledDisplayPicture_; + } + + // here either the scaling size has changed or we have no cache. + scaledDisplayPicture_.load( getContactPicturePath() ); + scaledDisplayPicture_ = scaledDisplayPicture_.scaled( dpSize, dpSize, Qt::KeepAspectRatio, Qt::SmoothTransformation ); + + scaledDPSize_ = dpSize; + + return scaledDisplayPicture_; +} + + + // Return the current media type const QString & Contact::getCurrentMediaType() const { Modified: branches/kmess/kmess-2.0.x/src/contact/contact.h =================================================================== --- branches/kmess/kmess-2.0.x/src/contact/contact.h 2009-08-01 10:02:51 UTC (rev 5224) +++ branches/kmess/kmess-2.0.x/src/contact/contact.h 2009-08-01 10:53:30 UTC (rev 5225) @@ -84,6 +84,8 @@ virtual ~Contact(); // Add the groupID to the list of current groups void addGroupId(const QString &groupId); + // Return the contact's display picture, scaled to the right size for the contact list. + QPixmap & getScaledDisplayPicture(); // Return the path to the contact's picture const QString getContactPicturePath() const; // Return the current media type @@ -182,6 +184,10 @@ bool reverse_; // The contact's online status Status status_; + // the contact's scaled display picture. + QPixmap scaledDisplayPicture_; + // the scaled size of the dp (used for caching) + int scaledDPSize_; signals: // Public signals // Signal that the contact may have changed list affiliation Modified: branches/kmess/kmess-2.0.x/src/kmessviewdelegate.cpp =================================================================== --- branches/kmess/kmess-2.0.x/src/kmessviewdelegate.cpp 2009-08-01 10:02:51 UTC (rev 5224) +++ branches/kmess/kmess-2.0.x/src/kmessviewdelegate.cpp 2009-08-01 10:53:30 UTC (rev 5225) @@ -24,6 +24,8 @@ #include "model/contactlistmodelitem.h" #include "utils/richtextparser.h" #include "kmessdebug.h" +#include "model/contactlist.h" +#include "contact/contact.h" #include <QApplication> #include <QLabel> @@ -171,7 +173,8 @@ // Only load the picture if it must be shown if( displayPictureSize != 0 ) { - picturePixmap.load( itemData[ "displayPicture" ].toString() ); + picturePixmap = CurrentAccount::instance()->getContactList()->getContactByHandle( itemData[ "handle" ].toString() )->getScaledDisplayPicture(); + /* if ( ! picturePixmap.isNull() ) { // Fast scaled @@ -179,6 +182,7 @@ , displayPictureSize , Qt::KeepAspectRatio, Qt::SmoothTransformation ); } + */ } // Determine which status pixmap to load This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fon...@us...> - 2009-08-01 12:06:21
|
Revision: 5227 http://kmess.svn.sourceforge.net/kmess/?rev=5227&view=rev Author: fontknocker Date: 2009-08-01 12:06:13 +0000 (Sat, 01 Aug 2009) Log Message: ----------- Fix bug where the display picture cache was not cleared when the picture was changed. Backported from trunk. Modified Paths: -------------- branches/kmess/kmess-2.0.x/ChangeLog branches/kmess/kmess-2.0.x/src/contact/contact.cpp branches/kmess/kmess-2.0.x/src/contact/contact.h Modified: branches/kmess/kmess-2.0.x/ChangeLog =================================================================== --- branches/kmess/kmess-2.0.x/ChangeLog 2009-08-01 11:58:41 UTC (rev 5226) +++ branches/kmess/kmess-2.0.x/ChangeLog 2009-08-01 12:06:13 UTC (rev 5227) @@ -1,4 +1,6 @@ 2009-08-01 (Adam) + * Fix bug where the display picture cache was not cleared when the picture + changed. * Cache the scaled display picture when painting the contact list. Mitigates the performance hit incurred by using Qt::SmoothTransformation. Modified: branches/kmess/kmess-2.0.x/src/contact/contact.cpp =================================================================== --- branches/kmess/kmess-2.0.x/src/contact/contact.cpp 2009-08-01 11:58:41 UTC (rev 5226) +++ branches/kmess/kmess-2.0.x/src/contact/contact.cpp 2009-08-01 12:06:13 UTC (rev 5227) @@ -70,7 +70,7 @@ connect ( extension_, SIGNAL( changedFriendlyName() ), this, SIGNAL( changedFriendlyName() ) ); connect ( extension_, SIGNAL( changedPicture() ), - this, SIGNAL( changedPicture() ) ); + this, SLOT ( slotChangedPicture() ) ); } @@ -341,6 +341,15 @@ +// clear contact dp cache. +void Contact::slotChangedPicture() +{ + scaledDisplayPicture_ = QPixmap(); + emit changedPicture(); +} + + + // Load extension settings for a contact void Contact::readProperties( const KConfigGroup &config ) { Modified: branches/kmess/kmess-2.0.x/src/contact/contact.h =================================================================== --- branches/kmess/kmess-2.0.x/src/contact/contact.h 2009-08-01 11:58:41 UTC (rev 5226) +++ branches/kmess/kmess-2.0.x/src/contact/contact.h 2009-08-01 12:06:13 UTC (rev 5227) @@ -189,6 +189,9 @@ // the scaled size of the dp (used for caching) int scaledDPSize_; + private slots: + void slotChangedPicture(); + signals: // Public signals // Signal that the contact may have changed list affiliation void changedList(Contact *contact); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fon...@us...> - 2009-08-10 11:11:53
|
Revision: 5280 http://kmess.svn.sourceforge.net/kmess/?rev=5280&view=rev Author: fontknocker Date: 2009-08-10 11:11:44 +0000 (Mon, 10 Aug 2009) Log Message: ----------- Fix bug where smileys in the contact list and friendly name label were not redrawn when the emoticon theme was changed. This fix is not pretty (due to CurrentAccount copying wierdness) and a much nicer one will be applied to 2.1. -This line, and those below, will be ignored-- M src/kmess.cpp M src/account.cpp M src/contact/contact.h M src/contact/contact.cpp M ChangeLog Modified Paths: -------------- branches/kmess/kmess-2.0.x/ChangeLog branches/kmess/kmess-2.0.x/src/account.cpp branches/kmess/kmess-2.0.x/src/contact/contact.cpp branches/kmess/kmess-2.0.x/src/contact/contact.h branches/kmess/kmess-2.0.x/src/kmess.cpp Modified: branches/kmess/kmess-2.0.x/ChangeLog =================================================================== --- branches/kmess/kmess-2.0.x/ChangeLog 2009-08-10 08:19:06 UTC (rev 5279) +++ branches/kmess/kmess-2.0.x/ChangeLog 2009-08-10 11:11:44 UTC (rev 5280) @@ -1,3 +1,8 @@ +2009-08-10 (Adam) + * Fix bug where the smileys in the contact list and friendly name label + were not redrawn when the emoticon theme was changed: this fix is not + pretty and a much nicer one will be applied for 2.1. + 2009-08-01 (Adam) * Fix bug where the display picture cache was not cleared when the picture changed. Modified: branches/kmess/kmess-2.0.x/src/account.cpp =================================================================== --- branches/kmess/kmess-2.0.x/src/account.cpp 2009-08-10 08:19:06 UTC (rev 5279) +++ branches/kmess/kmess-2.0.x/src/account.cpp 2009-08-10 11:11:44 UTC (rev 5280) @@ -156,7 +156,6 @@ account->getUseListFormatting() ); setEmailInformation ( account->getShowEmail(), account->getShowOtherFolders() ); - setEmoticonStyle ( account->getEmoticonStyle() ); setFontInformation ( account->getFont(), account->getFontColor(), account->getContactFont(), @@ -176,6 +175,7 @@ setStatusOptions ( account->getUseIdleTimer(), account->getIdleTime(), account->getHideNotificationsWhenBusy() ); + setEmoticonStyle ( account->getEmoticonStyle() ); // With direct copying we can quickly duplicate those properties // for which we don't need to send updates @@ -1220,6 +1220,9 @@ emoticonStyle_ = emoticonStyle; emit changedEmoticonSettings(); + // update friendly name. horrible. + friendlyName_.setString( friendlyName_.getOriginal() ); + // Tell the account settings changed and need to be saved dirty_ = true; #ifdef KMESSDEBUG_ACCOUNT_DIRTY Modified: branches/kmess/kmess-2.0.x/src/contact/contact.cpp =================================================================== --- branches/kmess/kmess-2.0.x/src/contact/contact.cpp 2009-08-10 08:19:06 UTC (rev 5279) +++ branches/kmess/kmess-2.0.x/src/contact/contact.cpp 2009-08-10 11:11:44 UTC (rev 5280) @@ -71,6 +71,12 @@ this, SIGNAL( changedFriendlyName() ) ); connect ( extension_, SIGNAL( changedPicture() ), this, SLOT ( slotChangedPicture() ) ); + + // need to know when the emoticon theme changes + // so we can re-parse our friendly name and personal message + // and update the smileys there. + connect ( CurrentAccount::instance(), SIGNAL( changedEmoticonSettings() ), + this, SLOT ( slotEmoticonSettingsChanged() ) ); } @@ -350,6 +356,15 @@ +// re-parse the friendly name and personal message +void Contact::slotEmoticonSettingsChanged() +{ + friendlyName_.setString( friendlyName_.getOriginal() ); + personalMessage_.setString( personalMessage_.getOriginal() ); +} + + + // Load extension settings for a contact void Contact::readProperties( const KConfigGroup &config ) { Modified: branches/kmess/kmess-2.0.x/src/contact/contact.h =================================================================== --- branches/kmess/kmess-2.0.x/src/contact/contact.h 2009-08-10 08:19:06 UTC (rev 5279) +++ branches/kmess/kmess-2.0.x/src/contact/contact.h 2009-08-10 11:11:44 UTC (rev 5280) @@ -191,6 +191,7 @@ private slots: void slotChangedPicture(); + void slotEmoticonSettingsChanged(); signals: // Public signals // Signal that the contact may have changed list affiliation Modified: branches/kmess/kmess-2.0.x/src/kmess.cpp =================================================================== --- branches/kmess/kmess-2.0.x/src/kmess.cpp 2009-08-10 08:19:06 UTC (rev 5279) +++ branches/kmess/kmess-2.0.x/src/kmess.cpp 2009-08-10 11:11:44 UTC (rev 5280) @@ -1870,6 +1870,10 @@ connect( view_, SIGNAL( unblockContact(QString) ), // Unblock the contact msnNotificationConnection_, SLOT ( unblockContact(QString) ) ); + // this is horrible. i'm glad CurrentAccount is gone in 2.1! + Account *realAccount = AccountsManager::instance()->getAccountByHandle( currentAccount_->getHandle() ); + connect( realAccount, SIGNAL( changedEmoticonSettings() ), view_, SLOT( slotUpdateUserStatus() ) ); + // Set it as the application's main widget setCentralWidget( view_ ); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <it_...@us...> - 2009-08-14 12:59:40
|
Revision: 5294 http://kmess.svn.sourceforge.net/kmess/?rev=5294&view=rev Author: it_amroth Date: 2009-08-14 12:59:32 +0000 (Fri, 14 Aug 2009) Log Message: ----------- kmess-2.0.x: Backported fix from trunk: Fixed crash in NetworkWindow when receiving P2P messages shorter than the usual. Modified Paths: -------------- branches/kmess/kmess-2.0.x/ChangeLog branches/kmess/kmess-2.0.x/src/dialogs/networkwindow.cpp Modified: branches/kmess/kmess-2.0.x/ChangeLog =================================================================== --- branches/kmess/kmess-2.0.x/ChangeLog 2009-08-14 12:55:59 UTC (rev 5293) +++ branches/kmess/kmess-2.0.x/ChangeLog 2009-08-14 12:59:32 UTC (rev 5294) @@ -1,12 +1,16 @@ + +2009-08-14 (Valerio) + * Fixed crash in NetworkWindow when receiving P2P messages shorter than the usual. + 2009-08-10 (Adam) - * Fix bug where the smileys in the contact list and friendly name label + * Fix bug where the smileys in the contact list and friendly name label were not redrawn when the emoticon theme was changed: this fix is not pretty and a much nicer one will be applied for 2.1. 2009-08-01 (Adam) * Fix bug where the display picture cache was not cleared when the picture changed. - * Cache the scaled display picture when painting the contact list. Mitigates + * Cache the scaled display picture when painting the contact list. Mitigates the performance hit incurred by using Qt::SmoothTransformation. 2009-08-01 (Pano) Modified: branches/kmess/kmess-2.0.x/src/dialogs/networkwindow.cpp =================================================================== --- branches/kmess/kmess-2.0.x/src/dialogs/networkwindow.cpp 2009-08-14 12:55:59 UTC (rev 5293) +++ branches/kmess/kmess-2.0.x/src/dialogs/networkwindow.cpp 2009-08-14 12:59:32 UTC (rev 5294) @@ -931,7 +931,9 @@ logMessage += formatRawData( incoming, message, slpLength, 1 ); } } - else if( dataSize >= 18 && message[ p2pDataStart ] == '\x80' ) + else if( dataSize >= 18 + && message.size() > p2pDataStart + && message[ p2pDataStart ] == '\x80' ) { // Webcam invitation QString camMessage( QString::fromUtf16( reinterpret_cast<const ushort *>( dataPtr + 10 ), ( safeSize - 10 - 1 ) / 2 ) ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <it_...@us...> - 2009-08-14 18:16:49
|
Revision: 5300 http://kmess.svn.sourceforge.net/kmess/?rev=5300&view=rev Author: it_amroth Date: 2009-08-14 18:16:36 +0000 (Fri, 14 Aug 2009) Log Message: ----------- kmess-2.0.x: Backported Test Server support from trunk. Modified Paths: -------------- branches/kmess/kmess-2.0.x/ChangeLog branches/kmess/kmess-2.0.x/src/kmessapplication.cpp branches/kmess/kmess-2.0.x/src/kmessapplication.h branches/kmess/kmess-2.0.x/src/kmessdebug.h branches/kmess/kmess-2.0.x/src/main.cpp branches/kmess/kmess-2.0.x/src/network/msnsockethttp.cpp branches/kmess/kmess-2.0.x/src/network/msnsockettcp.cpp branches/kmess/kmess-2.0.x/src/network/soap/httpsoapconnection.cpp Modified: branches/kmess/kmess-2.0.x/ChangeLog =================================================================== --- branches/kmess/kmess-2.0.x/ChangeLog 2009-08-14 17:44:42 UTC (rev 5299) +++ branches/kmess/kmess-2.0.x/ChangeLog 2009-08-14 18:16:36 UTC (rev 5300) @@ -1,6 +1,7 @@ 2009-08-14 (Valerio) * Fixed crash in NetworkWindow when receiving P2P messages shorter than the usual. + * Backported Test Server support from trunk. 2009-08-10 (Adam) * Fix bug where the smileys in the contact list and friendly name label Modified: branches/kmess/kmess-2.0.x/src/kmessapplication.cpp =================================================================== --- branches/kmess/kmess-2.0.x/src/kmessapplication.cpp 2009-08-14 17:44:42 UTC (rev 5299) +++ branches/kmess/kmess-2.0.x/src/kmessapplication.cpp 2009-08-14 18:16:36 UTC (rev 5300) @@ -84,7 +84,28 @@ } + /** + * Return the server used in test server mode + */ +const QString &KMessApplication::getTestServer() const +{ + return testServerAddress_; +} + + + +/** + * Return whether to use an alternative server as the Live Service server + */ +bool KMessApplication::getUseTestServer() const +{ + return ( ! testServerAddress_.isEmpty() ); +} + + + +/** * Initialisation of the main window. */ void KMessApplication::initializeMainWindow() @@ -141,6 +162,9 @@ connect( this, SIGNAL(aboutToQuit()), this, SLOT(slotAboutToQuit()) ); #if ( KMESS_DEBUG == 1 ) + // The debug build allows to use an alternative server + testServerAddress_ = args->getOption( "server" ); + // The debug build allows to run tests from the command line. QString testName( args->getOption( "runtest" ) ); if( ! testName.isEmpty() ) Modified: branches/kmess/kmess-2.0.x/src/kmessapplication.h =================================================================== --- branches/kmess/kmess-2.0.x/src/kmessapplication.h 2009-08-14 17:44:42 UTC (rev 5299) +++ branches/kmess/kmess-2.0.x/src/kmessapplication.h 2009-08-14 18:16:36 UTC (rev 5300) @@ -33,7 +33,7 @@ * When it's true, or sessionSaving() returns true, the application is exiting. * For compatibility with KDE 3.1.0, the sessionSaving() is implemented in an <code>\#if</code> block, * so users can still compile KMess at their old systems. - * + * * @author Mike K. Bennett (original work), Diederik van der Boor (new class) * @ingroup Root */ @@ -52,6 +52,10 @@ // Return the contact list window KMess* getContactListWindow() const; + // Return the server used in test server mode + const QString&getTestServer() const; + // Return whether to use an alternative server as the Live Service server + bool getUseTestServer() const; // Return true if quit was selected bool quitSelected() const; // Tell the application that quit was selected @@ -70,6 +74,8 @@ KMess *contactListWindow_; // True when quit was selected bool quitSelected_; + // Address of the testing server, if any + QString testServerAddress_; }; #endif Modified: branches/kmess/kmess-2.0.x/src/kmessdebug.h =================================================================== --- branches/kmess/kmess-2.0.x/src/kmessdebug.h 2009-08-14 17:44:42 UTC (rev 5299) +++ branches/kmess/kmess-2.0.x/src/kmessdebug.h 2009-08-14 18:16:36 UTC (rev 5300) @@ -27,33 +27,6 @@ #if ( KMESS_DEBUG == 1 ) - - /** - * Local mode switch - * - * This switching option must be used with the KMess Test Server application. - * The test server is a standalone Qt-only GUI application (meaning it can be - * also used to test other projects and even WLM itself, with some fiddling) - * which emulates locally all the functions of MSN's servers, to allow fast - * verification of the user interface, quick testing of the protocol code - * behavior, and effective testing in extreme conditions (for example, huge - * contact lists, or sudden network loss). - * The test server code is available in the KMess SVN: - * - * svn checkout https://kmess.svn.sourceforge.net/svnroot/kmess/trunk/kmesstestserver - * - * It is directly executable with (on *nixes): - * <filename>{kmesstestserver build folder}/kmesstestserver</filename> - * and takes no command line arguments (it's a GUI app, after all). - * - * Set this define to 1 to switch KMess to the local connection mode: - * it will connect to the Test Server addresses, which are all on the local - * host. - * Set it to 0 for normal operation. - */ - #define KMESS_ENABLE_LOCAL_MODE 0 - - #define KMESSTEST #define KMESS_NETWORK_WINDOW @@ -142,9 +115,6 @@ #define KMESSDEBUG_CHATNOTIFICATION #define KMESSDEBUG_NEWEMAILNOTIFICATION -#else - // silences a compile time warning if enable-debug-output = 0 in configure - #define KMESS_ENABLE_LOCAL_MODE 0 #endif Modified: branches/kmess/kmess-2.0.x/src/main.cpp =================================================================== --- branches/kmess/kmess-2.0.x/src/main.cpp 2009-08-14 17:44:42 UTC (rev 5299) +++ branches/kmess/kmess-2.0.x/src/main.cpp 2009-08-14 18:16:36 UTC (rev 5300) @@ -200,6 +200,9 @@ // make sure we can run tests fast. #ifdef KMESSTEST options.add( "runtest <test>", ki18n("Run a debug test (developer build only)") ); + options.add( "server <address>", + ki18n("Connect to the specified server instead of the official Live server.\n" + "Use \"localhost\" or \"127.0.0.1\" to connect to a local KMess Test Server.") ); #endif Modified: branches/kmess/kmess-2.0.x/src/network/msnsockethttp.cpp =================================================================== --- branches/kmess/kmess-2.0.x/src/network/msnsockethttp.cpp 2009-08-14 17:44:42 UTC (rev 5299) +++ branches/kmess/kmess-2.0.x/src/network/msnsockethttp.cpp 2009-08-14 18:16:36 UTC (rev 5300) @@ -18,6 +18,7 @@ #include "msnsockethttp.h" #include <config-kmess.h> +#include "../kmessapplication.h" #include "../kmessdebug.h" #include <QNetworkReply> @@ -157,9 +158,12 @@ desiredAddress = server; } -#if KMESS_ENABLE_LOCAL_MODE == 1 - // NOTE Local mode: see src/kmessdebug.h - desiredAddress = "127.0.0.1:8008"; +#ifdef KMESSTEST + // Redirect to a local socket if started with --usetestserver + if( static_cast<KMessApplication*>( kapp )->getUseTestServer() ) + { + desiredAddress = static_cast<KMessApplication*>( kapp )->getTestServer() + ":8008"; + } #endif #ifdef KMESSDEBUG_CONNECTION_SOCKET_HTTP Modified: branches/kmess/kmess-2.0.x/src/network/msnsockettcp.cpp =================================================================== --- branches/kmess/kmess-2.0.x/src/network/msnsockettcp.cpp 2009-08-14 17:44:42 UTC (rev 5299) +++ branches/kmess/kmess-2.0.x/src/network/msnsockettcp.cpp 2009-08-14 18:16:36 UTC (rev 5300) @@ -25,6 +25,7 @@ #include "../utils/kmessshared.h" #include "../currentaccount.h" +#include "../kmessapplication.h" #include "../kmessdebug.h" #ifdef KMESSDEBUG_CONNECTION // Area-specific debug statements @@ -152,10 +153,11 @@ desiredPort = port; } -#if KMESS_ENABLE_LOCAL_MODE == 1 - // NOTE Local mode: see src/kmessdebug.h - desiredServer = "127.0.0.1"; -#endif + // Redirect to another server if started with --server + if( static_cast<KMessApplication*>( kapp )->getUseTestServer() ) + { + desiredServer = static_cast<KMessApplication*>( kapp )->getTestServer(); + } #ifdef KMESSTEST KMESS_ASSERT( desiredPort < 32768 ); Modified: branches/kmess/kmess-2.0.x/src/network/soap/httpsoapconnection.cpp =================================================================== --- branches/kmess/kmess-2.0.x/src/network/soap/httpsoapconnection.cpp 2009-08-14 17:44:42 UTC (rev 5299) +++ branches/kmess/kmess-2.0.x/src/network/soap/httpsoapconnection.cpp 2009-08-14 18:16:36 UTC (rev 5300) @@ -19,6 +19,7 @@ #include "../../utils/kmessshared.h" #include "../../utils/xmlfunctions.h" +#include "../../kmessapplication.h" #include "../../kmessdebug.h" #include "../mimemessage.h" #include "soapmessage.h" @@ -335,11 +336,14 @@ request.setRawHeader( "Connection", "Keep-Alive" ); request.setRawHeader( "Cache-Control", "no-cache" ); -#if KMESS_ENABLE_LOCAL_MODE == 1 - // NOTE Local mode: see src/kmessdebug.h - endpoint.setHost( "127.0.0.1" ); - endpoint.setPort( 4430 ); - request.setUrl( endpoint ); +#ifdef KMESSTEST + // Redirect to another server if started with --server + if( static_cast<KMessApplication*>( kapp )->getUseTestServer() ) + { + endpoint.setHost( static_cast<KMessApplication*>( kapp )->getTestServer() ); + endpoint.setPort( 4430 ); + request.setUrl( endpoint ); + } #endif if( ! soapAction.isNull() ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |