Import release 2.0.6.2

Import release 2.0.6.1
2012-03-02 20:51:47 +00:00 · 2011-02-17 09:46:29 +00:00
45 changed files with 2490 additions and 3027 deletions
@@ -115,7 +115,7 @@

  Japanese:

-    Daniel E. Moctezuma <shinsen27@gmail.com>
+    Daniel E. Moctezuma <dmoctezuma@kmess.org>

  Korean:

@@ -149,8 +149,8 @@ INCLUDE_DIRECTORIES( ${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${LIBXM
 #### Define the app version number ####

 # Switch between the following two commands to force using a predefined version number
-# EXECUTE_PROCESS( COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/cmake/get-git-version.sh OUTPUT_VARIABLE KMESS_VERSION )
-SET( KMESS_VERSION "2.0.6" )
+#EXECUTE_PROCESS( COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/cmake/get-git-version.sh OUTPUT_VARIABLE KMESS_VERSION )
+SET( KMESS_VERSION "2.0.6.2" )


 #### Define compiler flags ####
@@ -178,7 +178,7 @@ ENDIF( CMAKE_COMPILER_IS_GNUCXX )
 # - relwithdebinfo  (release with debug info)
 # - minsizerel      (minsize release)
 # Uncomment the next line to always force building in full debug mode
-SET( CMAKE_BUILD_TYPE debugfull )
+# SET( CMAKE_BUILD_TYPE debugfull )

 # Enable the KMess debug output when compiling a debug build
 IF( CMAKE_BUILD_TYPE STREQUAL debugfull OR KMESS_DEBUG_OUTPUT EQUAL 1 )
@@ -187,6 +187,11 @@ ELSE( CMAKE_BUILD_TYPE STREQUAL debugfull OR KMESS_DEBUG_OUTPUT EQUAL 1 )
  SET( KMESS_ENABLE_DEBUG_OUTPUT "0" )
 ENDIF( CMAKE_BUILD_TYPE STREQUAL debugfull OR KMESS_DEBUG_OUTPUT EQUAL 1 )

+IF( CMAKE_BUILD_TYPE STREQUAL debugfull )
+  SET( KMESS_BUILT_DEBUGFULL TRUE )
+ELSE( CMAKE_BUILD_TYPE STREQUAL debugfull )
+  SET( KMESS_BUILT_DEBUGFULL FALSE )
+ENDIF( CMAKE_BUILD_TYPE STREQUAL debugfull )

 # Change symbol visibility, to obtain clearer KDE backtraces
 SET( __KDE_HAVE_GCC_VISIBILITY 0 )
@@ -1,3 +1,35 @@
+--- 2.0.6.2 released ---
+
+2011-11-26 (Dmoctezuma)
+ * Follow Location redirects, MS seems to have moved some accounts
+   to other servers. (patch by Lekensteyn)
+
+2011-04-12 (Sjors)
+ * Apply a patch by Francesco Nwokeka, fixing a part of #480 by moving
+   file transfer settings into its own tab in the settings screen.
+ * Include Phonon headers correctly.
+
+2011-04-10 (Ruben)
+ * Fixed XML for DBus interface
+
+2011-04-03 (Dmoctezuma)
+ * Updated email address.
+
+2011-03-14 (Dmoctezuma)
+ * Updated Japanese translation.
+
+2011-02-27 (Dmoctezuma)
+ * Updated Japanese translation.
+
+2011-02-25 (Adam)
+ * Fix bug where KMess would fail to build on relwithdebinfo builds when
+   --enable-debug-output was set
+
+--- 2.0.6.1 released ---
+
+2011-02-16 (Adam)
+ * Fix yet another login bug caused because our initial profile data no
+   longer includes a language preference.

 --- 2.0.6 released ---

@@ -5,7 +5,7 @@
 #---------------------------------------------------------------------------
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = KMess
-PROJECT_NUMBER         = 2.0.6
+PROJECT_NUMBER         = 2.0.6.2
 OUTPUT_DIRECTORY       = ./apidocs
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English
@@ -1,8 +1,19 @@
-
-Changes between KMess Git and 2.0.6:
+Changes between KMess Git and 2.0.6.2:
 --------------------------------------

- None yet.
+- None yet
+
+Changes between KMess 2.0.6.2 and 2.0.6.1:
+------------------------------------------
+
+- Follow redirects, fixing connection issue. Thanks to Lekensteyn.
+- Moved file transfer settings into own tab.
+- updated Japanese translation by Daniel E. Moctezuma.
+
+Changes between KMess 2.0.6.1 and 2.0.6:
+----------------------------------------
+
+- fix bug where KMess couldn't login due to missing language preference information.

 Changes between KMess 2.0.6 and 2.0.5:
 --------------------------------------
@@ -10,8 +21,7 @@ Changes between KMess 2.0.6 and 2.0.5:
 - fix bug where KMess couldn't login due to badly formed URL commands.
 - fixed crash when taking any action in the Contact Added User dialog.
 - fixed a possible crash when using the Contact Added User dialog.
- Added a fading effect when switching between the initial view
-   and the contact list.
+- Added a fading effect when switching between the initial view and the contact list.
 - fixed retrieval of display pictures from online MSN storage.
 - fixed a problem where roaming service profile data was invalid.
 - fixed "Visit Link" context-menu icon in chat. Thanks to IRC's agostino.
@@ -11,6 +11,9 @@
 /* Define if debug output should be enabled */
 #define KMESS_DEBUG ${KMESS_ENABLE_DEBUG_OUTPUT}

+/* Define what the build type of KMess is */
+#cmakedefine KMESS_BUILT_DEBUGFULL ${KMESS_BUILD_DEBUGFULL}
+
 /* Define the fallback prefix */
 #define KMESS_PREFIX "${CMAKE_INSTALL_PREFIX}"

@@ -24,4 +27,4 @@
 #define KMESS_ENABLE_INK ${HAVE_LIBISFQT}

 /* Define whether we have the new system tray */
-#cmakedefine HAVE_NEW_TRAY
+#cmakedefine HAVE_NEW_TRAY
@@ -0,0 +1,6 @@
+
+# Build files and dirs
+build*
+
+# KDevelop and other IDE-specific project files
+*.kdev*
@@ -2172,7 +2172,7 @@
      <member>Vincenzo Reale            (More Italian)              <email>smart2128@baslug.org</email></member>
      <member>Andrea Decorte            (More Italian)              <email>adecorte@gmail.com</email></member>

-      <member>Daniel E. Moctezuma       (Japanese)                  <email>shinsen27@gmail.com</email></member>
+      <member>Daniel E. Moctezuma       (Japanese)                  <email>dmoctezuma@kmess.org</email></member>

      <member>Park Dong Cheon           (Korean)                    <email>pdc@kaist.ac.kr</email></member>

@@ -1,21 +1,21 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
-# Adrià Arrufat <swiftscythe@gmail.com>, 2009, 2010.
+# Adrià Arrufat <swiftscythe@gmail.com>, 2009, 2010, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ca\n"
 "Report-Msgid-Bugs-To: http://www.kmess.org/board/\n"
 "POT-Creation-Date: 2010-08-04 19:23+0200\n"
-"PO-Revision-Date: 2010-05-20 17:49+0200\n"
-"Last-Translator: \n"
+"PO-Revision-Date: 2011-02-08 00:53+0100\n"
+"Last-Translator: Adrià Arrufat <swiftscythe@gmail.com>\n"
 "Language-Team: American English <kde-i18n-doc@kde.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.0\n"
+"X-Generator: Lokalize 1.2\n"
 "First-Translator: Adrià Arrufat <swiftscythe@gmail.com>\n"

 #: account.cpp:45 account.cpp:755
@@ -115,13 +115,14 @@ msgid "%1 (This message was sent automatically)"
 msgstr "%1 (Aquest missatge ha estat enviat automàticament)"

 #: chat/chat.cpp:821
-#, fuzzy, kde-format
+#, kde-format
 msgid ""
 "<html>KMess could not save the log for the chat with &quot;%1&quot;:<br /"
 ">The chat logs directory, &quot;%2&quot;, does not exist.</html>"
 msgstr ""
-"<html>KMess no ha pogut desar el registre d'aquesta conversa:<br />La "
-"carpeta dels registres ,  &quot;%1&quot;, no existeix.</html>"
+"<html>KMess no ha pogut desar el registre d'aquesta conversa amb &quot;%"
+"1&quot;:<br /> "
+"El directori de registres,  &quot;%2&quot;, no existeix.</html>"

 #: chat/chat.cpp:956
 msgctxt "Message shown in the chat window (when the wink name is unknown)"
@@ -463,7 +464,6 @@ msgstr ""
 "registres de conversa."

 #: chat/chatview.cpp:563
-#, fuzzy
 msgctxt "Chat log saving dialog, file type filter"
 msgid ""
 "*.html *.htm|Web Page (*.html)\n"
@@ -471,7 +471,6 @@ msgid ""
 msgstr ""
 "*.html *.htm|Pàgina web (*.html)\n"
 "*.txt|Document de text pla (*.txt)\n"
-"*.xml|Document XML(*.xml)"

 #: chat/chatview.cpp:581
 #, kde-format
@@ -2040,9 +2039,8 @@ msgid "[%1] %2 goes offline"
 msgstr "[%1] %2 s'ha desconnectat"

 #: kmessview.cpp:440
-#, fuzzy
 msgid "Search in contact list..."
-msgstr "Busca entre els contactes..."
+msgstr "Cerca entre els contactes..."

 #: kmessview.cpp:704
 msgid "Cha&t"
@@ -4107,44 +4105,39 @@ msgstr "<html><b>%1</b><br/>ha anat a menjar</html>"

 #: notification/macnotification.cpp:61
 msgid "Contact changed status"
-msgstr ""
+msgstr "El contacte ha canviat l'estat"

 #: notification/macnotification.cpp:66
-#, fuzzy
 msgid "You received a new e-mail message"
-msgstr "%1 correu electrònic nou"
+msgstr "Heu rebut un nou correu electrònic"

 #: notification/macnotification.cpp:72
 msgid "A contact nudged you!"
-msgstr ""
+msgstr "Un contacte us envia un avís!"

 #: notification/macnotification.cpp:78
 msgid "A contact started a chat with you"
-msgstr ""
+msgstr "Un contacte ha iniciat una conversa"

 #: notification/macnotification.cpp:84
-#, fuzzy
 msgid "A contact messaged you"
-msgstr "Per a contactes d'un mateix grup"
+msgstr "Un contacte us ha enviat un missatge"

 #: notification/macnotification.cpp:90
-#, fuzzy
 msgid "A contact came online"
-msgstr "Aquest contacte no està connectat"
+msgstr "Un contacte s'ha connectat"

 #: notification/macnotification.cpp:96
-#, fuzzy
 msgid "A contact went offline"
-msgstr "Aquest contacte no està connectat"
+msgstr "Un contacte s'ha desconnectat"

 #: notification/macnotification.cpp:102
 msgid "A contact changed status"
-msgstr ""
+msgstr "Un contacte ha canviat l'estat"

 #: notification/macnotification.cpp:107
-#, fuzzy
 msgid "KMess notification"
-msgstr "Icona de KMess"
+msgstr "Notificació de KMess"

 #: notification/newemailnotification.cpp:92
 #, kde-format
@@ -4153,15 +4146,16 @@ msgid "<html><b>New email:</b><br/>'%1'<br/>by '%2'</html>"
 msgstr "<html><b>Nou correu electrònic:</b><br/>'%1'<br/>de '%2'</html>"

 #: notification/newsystemtraywidget.cpp:94
-#, fuzzy
 msgid ""
 "<p>Closing the main window will keep KMess running in the system tray.</"
 "p><p>You can open KMess again by clicking on the bird icon, which is now "
 "flashing.<br/>Use 'Quit' from the 'Connect' menu to quit the application.</p>"
 msgstr ""
-"Tancar la finestra principal de KMess farà que segueixi funcionant a la "
-"safata del sistema. Feu servir 'Abandona' del menú 'Connecta' per sortir de "
-"l'aplicació."
+"<p>Tancar la finestra principal de KMess farà que segueixi funcionant a la "
+"safata del sistema.</p><p>Podeu obrir KMess un altre cop clicant sobre la "
+"icona de l'ocell, que ara fa pampallugues.</br>Feu servir 'Abandona' del menú "
+"'Connecta' per sortir de "
+"l'aplicació.<p>"

 #: notification/newsystemtraywidget.cpp:108
 #: notification/systemtraywidget.cpp:96 notification/systemtraywidget.cpp:195
@@ -4170,32 +4164,30 @@ msgid "Docking in System Tray"
 msgstr "Anclant-se a la safata del sistema"

 #: notification/newsystemtraywidget.cpp:205
-#, fuzzy, kde-format
+#, kde-format
 msgctxt ""
 "Tray icon text tooltip when connected, %1 is the friendly name, %2 is the "
 "status"
 msgid "Connected as %1 (%2)"
-msgstr "Connectant-se a %1, port %2"
+msgstr "Connectat a %1 (%2)"

 #: notification/newsystemtraywidget.cpp:209
-#, fuzzy, kde-format
+#, kde-format
 msgctxt ""
 "Tray icon HTML tooltip when connected, %1 is the friendly name, %2 is the "
 "status"
 msgid "<p>Connected as:<br/><b>%1</b> (%2)</p>"
-msgstr "<br><b>%1</b> (%2)%3"
+msgstr "<p>Connectat com a: <br/><b>%1</b> (%2)</p>"

 #: notification/newsystemtraywidget.cpp:216
-#, fuzzy
 msgctxt "Tray icon text tooltip when not connected"
 msgid "Not connected"
-msgstr "Connectat"
+msgstr "No connectat"

 #: notification/newsystemtraywidget.cpp:219
-#, fuzzy
 msgctxt "Tray icon HTML tooltip when not connected"
 msgid "<p>Not connected</p>"
-msgstr "<p>S'ha perdut la connexió.</p>"
+msgstr "<p>No connectat</p>"

 #: notification/notificationmanager.cpp:120
 msgctxt "Button text for KDE notification boxes"
@@ -4876,9 +4868,8 @@ msgstr "Filtre del registre de converses"
 #. i18n: file: dialogs/chathistorydialog.ui:83
 #. i18n: ectx: property (text), widget (QLabel, label_)
 #: rc.cpp:113
-#, fuzzy
 msgid "Chat date:"
-msgstr "Estil de conversa"
+msgstr "Data de la conversa:"

 #. i18n: file: dialogs/contactaddeduserdialog.ui:52
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox)
@@ -6145,7 +6136,7 @@ msgid ""
 "Contacts may send multiple nudges at once, but KMess only shakes the chat "
 "window with the first nudge.</p></qt>"
 msgstr ""
-"<qt>Quan els vostres contactes vulguin cridar la vostra atenció, upo poden "
+"<qt>Quan els vostres contactes vulguin cridar la vostra atenció, us poden "
 "enviar un avís. Per defecte, la finestra de conversa es mou quan es rep un "
 "avís. Desactiveu aquesta opció si l'efecte de moviment és massa intrusiu.</"
 "p>\n"
@@ -4,14 +4,14 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
-# Daniel E. Moctezuma <democtezuma@gmail.com>, 2009, 2010.
+# Daniel E. Moctezuma <dmoctezuma@kmess.org>, 2009, 2010, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ja\n"
 "Report-Msgid-Bugs-To: http://www.kmess.org/board/\n"
 "POT-Creation-Date: 2010-08-04 19:23+0200\n"
-"PO-Revision-Date: 2010-12-28 00:30-0800\n"
-"Last-Translator: Daniel E. Moctezuma <democtezuma@gmail.com>\n"
+"PO-Revision-Date: 2011-03-13 16:56-0700\n"
+"Last-Translator: Daniel E. Moctezuma <dmoctezuma@kmess.org>\n"
 "Language-Team: Japanese <Kdeveloper@kde.gr.jp>\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
@@ -1970,7 +1970,7 @@ msgstr "オンライン・オフライン"

 #: kmessinterface.cpp:204
 msgid "Mixed"
-msgstr "混ぜる"
+msgstr "混在"

 #: kmessinterface.cpp:294
 msgid "Show &Network Window..."
@@ -2888,7 +2888,7 @@ msgstr "Daniel E. Moctezuma"
 #: main.cpp:198
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your email addresses"
-msgstr "shinsen27@gmail.com"
+msgstr "dmoctezuma@kmess.org"

 #: main.cpp:204
 msgid "Do not show the contact list window initially"
@@ -4424,7 +4424,7 @@ msgid ""
 "tool</a> to translate your message.<br/>"
 msgstr ""
 "メッセージを<b>%1</b>で書いてください、または開発者はあなたのコメントを読むこ"
-"とができません。<br/>（<a href=\"%2\">翻訳機経由</a>でもできます）。<br/>"
+"とができません。<br/>（<a href=\"%2\">オンライン翻訳ツール</a>を使ってもかまいません）。<br/>"

 #: utils/likeback/likebackdialog.cpp:152
 #, kde-format
@@ -4436,8 +4436,7 @@ msgid ""
 "read your comment!<br/>You may want to use an <a href=\"%3\">online "
 "translation tool</a> to translate your message.<br/>"
 msgstr ""
-"メッセージを<b>%1か%2</b>で書いてください（<a href=\"%3\">翻訳機経由</a>でも"
-"できます）。<br/>"
+"メッセージを<b>%1か%2</b>で書いてください（<a href=\"%3\">オンライン翻訳ツール</a>を使ってもかまいません）。<br/>"

 #: utils/likeback/likebackdialog.cpp:168
 msgctxt ""
@@ -4445,9 +4444,7 @@ msgctxt ""
 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 ""
-"このアプリケーションを改善するためにコメントを正負の同量を送信してみてくださ"
-"い。<br/>"
+msgstr "送信するコメントをアプリケーションの改善により反映させるために、なるべく良い点と悪い点の両方を書くようにしてみてください。<br/>"

 #: utils/likeback/likebackdialog.cpp:177
 msgctxt "Feedback dialog text, text to disallow feature requests"
@@ -4465,7 +4462,7 @@ msgctxt ""
 msgid ""
 "<p>You can provide the developers a brief description of your opinions about "
 "%1.<br/>%2 %3%4</p>"
-msgstr "<p>開発者に %1 について意見を説明できます。<br/>%2 %3%4</p>"
+msgstr "<p>開発者に %1 について意見を残すことができます。<br/>%2 %3%4</p>"

 #: utils/likeback/likebackdialog.cpp:225
 #, kde-format
@@ -4504,7 +4501,7 @@ msgstr "コメントの送信エラー"
 #: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
-msgstr "shinsen27@gmail.com"
+msgstr "dmoctezuma@kmess.org"

 #. i18n: file: chat/chatwindow.ui:190
 #. i18n: ectx: property (toolTip), widget (QToolButton, textButton_)
@@ -4706,9 +4703,8 @@ msgstr "チャット履歴のフィルタ"
 #. i18n: file: dialogs/chathistorydialog.ui:83
 #. i18n: ectx: property (text), widget (QLabel, label_)
 #: rc.cpp:113
-#, fuzzy
 msgid "Chat date:"
-msgstr "チャットの日付:"
+msgstr "チャット日付:"

 #. i18n: file: dialogs/contactaddeduserdialog.ui:52
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox)
@@ -4946,7 +4942,6 @@ msgstr "送信"
 #. i18n: file: dialogs/networkwindow.ui:132
 #. i18n: ectx: property (text), widget (QLabel, label_2)
 #: rc.cpp:248
-#, fuzzy
 msgid "Command payload (can be empty):"
 msgstr "コマンドのペイロード（指定しないでもいい）："

@@ -5732,12 +5727,11 @@ msgstr "チャットウィンドウでウインクを表示するのを有効に
 #. i18n: file: settings/chatstylepage.ui:246
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, showWinksCheckBox_)
 #: rc.cpp:648
-#, fuzzy
 msgid ""
 "If enabled, winks you send or receive will be displayed in the chat window. "
 "Please note that in order to use this feature, you need to have a working "
 "Flash-plugin installed."
-msgstr "有効にすると、チャットウィンドウに送信するまたは受信するウインクを表示します（Flash プラグインが必要です）。"
+msgstr "有効にすると、送信するまたは受信するウインクをチャットウィンドウに表示します（Flash プラグインが必要です）。"

 #. i18n: file: settings/chatstylepage.ui:249
 #. i18n: ectx: property (text), widget (QCheckBox, showWinksCheckBox_)
@@ -5848,6 +5842,8 @@ msgid ""
 "<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>\"Messenger Plus!\" のフォーマットを有効します。"
+"例：[b]このテキスト[/b]を<b>このテキスト</b>に置き換えます。</html>"

 #. i18n: file: settings/chatstylepage.ui:558
 #. i18n: ectx: property (text), widget (QCheckBox, enableChatFormattingCheckBox_)
@@ -6101,7 +6097,7 @@ msgstr "カスタムコマンド(&S)："
 #. i18n: file: settings/miscellaneouspage.ui:247
 #. i18n: ectx: property (whatsThis), widget (QLineEdit, customMailClientEdit_)
 #: rc.cpp:842 rc.cpp:877
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Specify the path of a program to use to open links; a '%u' here will be "
 "replaced with the links' URL."
@@ -6195,7 +6191,7 @@ msgstr ""
 #. i18n: ectx: property (toolTip), widget (QToolButton, m_likeButton)
 #: rc.cpp:905
 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)
@@ -6220,13 +6216,13 @@ msgstr ""
 #. i18n: ectx: property (toolTip), widget (QToolButton, m_dislikeButton)
 #: rc.cpp:912
 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:919
 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)
@@ -6234,31 +6230,31 @@ msgstr "ここをクリックして、開発者にアプリケーションの問
 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)
 #: rc.cpp:933
 msgid "Your comment:"
-msgstr "コメント："
+msgstr "あなたのコメント："

 #. i18n: file: utils/likeback/likebackdialog.ui:74
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox)
 #: rc.cpp:936
 msgid "Your comment is about:"
-msgstr "コメントについて："
+msgstr "コメントの対象："

 #. i18n: file: utils/likeback/likebackdialog.ui:86
 #. i18n: ectx: property (text), widget (QRadioButton, likeRadio_)
 #: rc.cpp:939
 msgid "Something you like"
-msgstr "好きなこと"
+msgstr "あなたの好むもの"

 #. i18n: file: utils/likeback/likebackdialog.ui:99
 #. i18n: ectx: property (text), widget (QRadioButton, dislikeRadio_)
 #: rc.cpp:942
 msgid "Something you dislike"
-msgstr "好きではないこと"
+msgstr "あなたの嫌いなもの"

 #. i18n: file: utils/likeback/likebackdialog.ui:112
 #. i18n: ectx: property (text), widget (QRadioButton, bugRadio_)
@@ -6270,13 +6266,13 @@ msgstr "アプリケーションの不適切な挙動"
 #. i18n: ectx: property (text), widget (QRadioButton, featureRadio_)
 #: rc.cpp:948
 msgid "A new feature you desire"
-msgstr "希望する新しい機能"
+msgstr "あなたの望む新しい機能"

 #. i18n: file: utils/likeback/likebackdialog.ui:141
 #. i18n: ectx: property (text), widget (QCheckBox, specifyEmailCheckBox_)
 #: rc.cpp:951
 msgid "Specify an email address to be contacted back:"
-msgstr "連絡するためにメールアドレスを書いてください："
+msgstr "返答用のメールアドレスを指定："

 #. i18n: file: utils/likeback/likebackdialog.ui:188
 #. i18n: ectx: property (text), widget (QLabel, label)
@@ -1,18 +1,18 @@
 # translation of tr.po to Turkish
-# Uğur Çetin <jnmbk@users.sourceforge.net>, 2006, 2007, 2009, 2010.
+# Uğur Çetin <jnmbk@users.sourceforge.net>, 2006, 2007, 2009, 2010, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: http://www.kmess.org/board/\n"
 "POT-Creation-Date: 2010-08-04 19:23+0200\n"
-"PO-Revision-Date: 2010-03-01 06:55+0200\n"
+"PO-Revision-Date: 2011-01-30 10:39+0200\n"
 "Last-Translator: Uğur Çetin <jnmbk@users.sourceforge.net>\n"
 "Language-Team: Turkish <kde-i18n-doc@kde.org>\n"
 "Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
+"X-Generator: Lokalize 1.1\n"
 "Plural-Forms: nplurals=1; plural=0;\n"

 #: account.cpp:45 account.cpp:755
@@ -4114,12 +4114,12 @@ msgid "Connected as %1 (%2)"
 msgstr "Bağlanıyor %1, port %2"

 #: notification/newsystemtraywidget.cpp:209
-#, fuzzy, kde-format
+#, kde-format
 msgctxt ""
 "Tray icon HTML tooltip when connected, %1 is the friendly name, %2 is the "
 "status"
 msgid "<p>Connected as:<br/><b>%1</b> (%2)</p>"
-msgstr "<br><b>%1</b> (%2)"
+msgstr "<p>Bağlı hesap:<br/><b>%1</b> (%2)</p>"

 #: notification/newsystemtraywidget.cpp:216
 #, fuzzy
@@ -4328,9 +4328,8 @@ msgid "Accounts"
 msgstr "Hesaplar"

 #: settings/globalsettingsdialog.cpp:65 settings/globalsettingsdialog.cpp:67
-#, fuzzy
 msgid "Notifications"
-msgstr "E-posta bildirimi"
+msgstr "Bildirimler"

 #: settings/miscellaneouspage.cpp:74
 msgid "No selectable web browsers detected."
@@ -5560,9 +5559,8 @@ msgstr ""
 #. i18n: file: settings/chatloggingpage.ui:39
 #. i18n: ectx: property (title), widget (QGroupBox, saveChatsToFileCheckBox_)
 #: rc.cpp:528
-#, fuzzy
 msgid "Additionally save chat logs to file"
-msgstr "Sohbeti &Dosyaya Kaydet"
+msgstr "Sohbetleri başka dosyaya da kaydet"

 #. i18n: file: settings/chatloggingpage.ui:51
 #. i18n: ectx: property (toolTip), widget (QLabel, label_2)
@@ -5573,9 +5571,8 @@ msgstr ""
 #. i18n: file: settings/chatloggingpage.ui:54
 #. i18n: ectx: property (text), widget (QLabel, label_2)
 #: rc.cpp:534
-#, fuzzy
 msgid "Save chat logs as:"
-msgstr "Sohbeti &Dosyaya Kaydet"
+msgstr "Sohbetleri bu türde kaydet:"

 #. i18n: file: settings/chatloggingpage.ui:86
 #. i18n: ectx: property (whatsThis), widget (QComboBox, fileFormatComboBox_)
@@ -5624,9 +5621,8 @@ msgstr ""
 #. i18n: file: settings/chatloggingpage.ui:140
 #. i18n: ectx: property (text), widget (QLabel, label)
 #: rc.cpp:556
-#, fuzzy
 msgid "Separate logged chats by:"
-msgstr "Sohbeti Kaydet"
+msgstr "Kayıtlı sohbetleri buna göre grupla:"

 #. i18n: file: settings/chatloggingpage.ui:156
 #. i18n: ectx: property (toolTip), widget (QRadioButton, yearRadioButton_)
@@ -5731,7 +5727,7 @@ msgstr ""
 #. i18n: ectx: property (text), widget (QRadioButton, singleDirectoryRadioButton_)
 #: rc.cpp:603
 msgid "Do not organize files"
-msgstr ""
+msgstr "Dosyaları gruplama"

 #. i18n: file: settings/chatloggingpage.ui:273
 #. i18n: ectx: property (toolTip), widget (QToolButton, chatSavePathButton_)
@@ -5756,7 +5752,6 @@ msgstr "Sohbet kayıtlarının duracağı dizini seçin."
 #. i18n: file: settings/chatloggingpage.ui:308
 #. i18n: ectx: property (text), widget (QLabel, chatSavePathLabel_)
 #: rc.cpp:618
-#, fuzzy
 msgid "Save chat logs in the following directory:"
 msgstr "Sohbetleri bu dizine kaydet:"

@@ -5901,9 +5896,8 @@ msgstr ""
 #. i18n: file: settings/chatstylepage.ui:461
 #. i18n: ectx: property (text), widget (QCheckBox, useContactFontCheckBox_)
 #: rc.cpp:690
-#, fuzzy
 msgid "&Force messages from your contacts to use this font:"
-msgstr "Kişinin iletilerinde bu yazı tipinin kullanmasını zorla:"
+msgstr "Gelen iletilerde bu yazı tipinin kullanmasını &zorla:"

 #. i18n: file: settings/chatstylepage.ui:536
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_4)
@@ -5926,10 +5920,10 @@ msgstr ""
 #. i18n: file: settings/chatstylepage.ui:545
 #. i18n: ectx: property (text), widget (QCheckBox, useFontEffectsCheckBox_)
 #: rc.cpp:699
-#, fuzzy
 msgid "Use font &effects in messages, like *bold*, /italic/, and _underline_"
 msgstr ""
-"Mesajlarda &yazıtipi efektleri kullan, ör: *koyu*, /italik/, ve _altı çizili_"
+"İletilerde, *koyu*, /italik/, ve _altı çizili_  gibi &yazıtipi efektleri "
+"kullan"

 #. i18n: file: settings/chatstylepage.ui:555
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, enableChatFormattingCheckBox_)
@@ -6088,7 +6082,7 @@ msgstr "\"Messenger &Plus!\" biçimlendirmesini etkinleştir"
 #. i18n: ectx: property (text), widget (QCheckBox, showContactEmailCheckBox_)
 #: rc.cpp:778
 msgid "Show the &email address of contacts instead of their friendly name"
-msgstr ""
+msgstr "Kişilerimin görünen adlarının yerine &e-posta adreslerini göster"

 #. i18n: file: settings/emoticonspage.ui:24
 #. i18n: ectx: attribute (title), widget (QWidget, tab)
@@ -6099,9 +6093,8 @@ msgstr "İfade &Temaları"
 #. i18n: file: settings/emoticonspage.ui:36
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
 #: rc.cpp:784
-#, fuzzy
 msgid "Available emoticon themes:"
-msgstr "Mümkün olan İfade stilleri:"
+msgstr "Mümkün olan ifade temaları:"

 #. i18n: file: settings/emoticonspage.ui:73
 #. i18n: ectx: attribute (title), widget (QWidget, tab_2)
@@ -6149,9 +6142,8 @@ msgstr "&Sil"
 #. i18n: file: settings/emoticonspage.ui:173
 #. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
 #: rc.cpp:817
-#, fuzzy
 msgid "Available custom emoticons:"
-msgstr "Mümkün olan İfade stilleri:"
+msgstr "Mümkün olan özel ifadeler:"

 #. i18n: file: settings/miscellaneouspage.ui:27
 #. i18n: ectx: attribute (title), widget (QWidget, tab)
@@ -6169,7 +6161,7 @@ msgstr ""
 #. i18n: ectx: property (text), widget (QRadioButton, useKDEBrowserRadio_)
 #: rc.cpp:826
 msgid "&Use the KDE default browser"
-msgstr ""
+msgstr "Ö&ntanımlı KDE tarayıcısını kullan"

 #. i18n: file: settings/miscellaneouspage.ui:43
 #. i18n: ectx: property (toolTip), widget (QRadioButton, useListedBrowserRadio_)
@@ -6183,7 +6175,7 @@ msgstr ""
 #. i18n: ectx: property (text), widget (QRadioButton, useListedBrowserRadio_)
 #: rc.cpp:832
 msgid "&Use an installed browser:"
-msgstr ""
+msgstr "&Kurulu bir tarayıcıyı kullan:"

 #. i18n: file: settings/miscellaneouspage.ui:80
 #. i18n: ectx: property (toolTip), widget (QRadioButton, useCustomBrowserRadio_)
@@ -6198,9 +6190,8 @@ msgstr ""
 #. i18n: file: settings/miscellaneouspage.ui:217
 #. i18n: ectx: property (text), widget (QRadioButton, useCustomMailClientRadio_)
 #: rc.cpp:838 rc.cpp:873
-#, fuzzy
 msgid "&Specify a custom command:"
-msgstr "Uzakta durumu için ileti belirle"
+msgstr "Ö&zel bir komut belirle:"

 #. i18n: file: settings/miscellaneouspage.ui:113
 #. i18n: ectx: property (whatsThis), widget (QLineEdit, customBrowserEdit_)
@@ -6218,7 +6209,7 @@ msgstr ""
 #: rc.cpp:846
 #, no-c-format
 msgid "Use '%u' to insert the URL in the command line."
-msgstr ""
+msgstr "Komut satırına URL'yi eklemek için '%u' kullanın."

 #. i18n: file: settings/miscellaneouspage.ui:151
 #. i18n: ectx: attribute (title), widget (QWidget, tab_2)
@@ -6238,7 +6229,7 @@ msgstr ""
 #. i18n: ectx: property (text), widget (QCheckBox, useLiveMailCheckbox_)
 #: rc.cpp:855
 msgid "Use &Live Mail if the account supports it"
-msgstr ""
+msgstr "Hesap destekliyorsa &Live Mail Kullan"

 #. i18n: file: settings/miscellaneouspage.ui:167
 #. i18n: ectx: property (toolTip), widget (QRadioButton, useKDEMailClientRadio_)
@@ -6250,33 +6241,32 @@ msgstr ""
 #. i18n: ectx: property (text), widget (QRadioButton, useKDEMailClientRadio_)
 #: rc.cpp:861
 msgid "Use the &KDE default email client"
-msgstr ""
+msgstr "Öntanımlı &KDE e-posta istemcisini kullan"

 #. i18n: file: settings/miscellaneouspage.ui:180
 #. i18n: ectx: property (text), widget (QRadioButton, useListedMailClientRadio_)
 #: rc.cpp:867
 msgid "Use an &installed email client:"
-msgstr ""
+msgstr "K&urulu bir e-posta istemcisini kullan:"

 #. i18n: file: settings/miscellaneouspage.ui:260
 #. i18n: ectx: property (text), widget (QLabel, customMailClientInfo_)
 #: rc.cpp:881
 #, no-c-format
 msgid "Use '%u' to insert the email address in the command line."
-msgstr ""
+msgstr "Komut satırına e-posta adresini eklemek için '%u' kullanın."

 #. i18n: file: settings/miscellaneouspage.ui:294
 #. i18n: ectx: property (text), widget (QCheckBox, useReceivedFilesDir_)
 #: rc.cpp:887
-#, fuzzy
 msgid "&Save all received files in one directory:"
-msgstr "Sohbetleri bu dizine kaydet:"
+msgstr "Alınan tüm dosyaları bir dizinde &kaydet:"

 #. i18n: file: settings/miscellaneouspage.ui:343
 #. i18n: ectx: property (text), widget (QLabel, label_2)
 #: rc.cpp:893
 msgid "&Use ports between"
-msgstr ""
+msgstr "Dosya aktarımları için"

 #. i18n: file: settings/miscellaneouspage.ui:369
 #. i18n: ectx: property (text), widget (QLabel, label_3)
@@ -6288,7 +6278,7 @@ msgstr "ve"
 #. i18n: ectx: property (text), widget (QLabel, label_4)
 #: rc.cpp:899
 msgid "for file transfers"
-msgstr "dosya aktarımları için"
+msgstr "aralığındaki portları kullan"

 #. i18n: file: utils/inlineeditlabel.ui:14
 #. i18n: ectx: property (windowTitle), widget (QWidget, InlineEditLabel)
@@ -87,6 +87,7 @@ SET(kmess_SOURCES
   settings/chatloggingpage.cpp
   settings/chatstylepage.cpp
   settings/emoticonspage.cpp
+   settings/filetransfersettingspage.cpp
   settings/globalsettingsdialog.cpp
   settings/miscellaneouspage.cpp
   utils/crashhandler.cpp
@@ -144,6 +145,7 @@ SET(kmess_UI_FILES
   settings/chatloggingpage.ui
   settings/chatstylepage.ui
   settings/emoticonspage.ui
+   settings/filetransfersettingspage.ui
   settings/miscellaneouspage.ui
   utils/inlineeditlabel.ui
 )
@@ -419,6 +419,8 @@ ChatHistoryWriter* ChatHistoryManager::getWriter( const QString& handle )
 /**
 * Add a new chat to the logs, or update an ongoing one.
 *
+ * @param handle
+ *  Handle of the main contact in conversation
 * @param chatLogData
 *  The details of the chat log to be updated
 */
@@ -377,7 +377,7 @@ void ChatHistoryDialog::showLogs( const QDate& day )
 * Set the contact for whom the logs will be initially shown
 *
 * @param handle the account to search logs in
- * @param handle the handle to get contact history for
+ * @param account the handle to get contact history for
 * @returns whether there was history for the given contact
 */
 bool ChatHistoryDialog::setInitialContact( const QString &account, const QString &handle )
@@ -32,6 +32,7 @@
 *
 * @param contactHandle         Reference to the handle of the contact that has added you
 * @param contactFriendlyName   The friendly name of the contact
+ * @param parent                Parent window of this one
 */
 ContactAddedUserDialog::ContactAddedUserDialog( const QString& contactHandle, const QString& contactFriendlyName, QWidget* parent )
  : KDialog(parent)
@@ -63,8 +63,12 @@
  #define KMESSDEBUG_CONTACTBASE
  #define KMESSDEBUG_CONTACTEXTENSION
  #define KMESSDEBUG_CONTACTLIST
+
+#ifdef KMESS_BUILT_DEBUGFULL
  #define KMESSDEBUG_CONTACTLISTMODELTEST
- #define KMESSDEBUG_CONTACTLISTMODEL
+#endif
+
+  #define KMESSDEBUG_CONTACTLISTMODEL
  #define KMESSDEBUG_GROUP


@@ -44,13 +44,13 @@ int main(int argc, char *argv[])
                        KMESS_VERSION,                             // app version from config-kmess.h
                        ki18n("A Live Messenger client for KDE"),  // short description
                        KAboutData::License_GPL,                   // license
-                        ki18n("(c) 2002-2010, Mike K. Bennett\n"   // copyright
-                              "(c) 2005-2010, Diederik van der Boor\n"
-                              "(c) 2007-2010, Valerio Pilo\n"
-                              "(c) 2008-2010, Antonio Nastasi\n"
-                              "(c) 2008-2010, Ruben Vandamme\n"
-                              "(c) 2009-2010, Sjors Gielen\n"
-                              "(c) 2009-2010, Adam Goossens\n"),
+                        ki18n("(c) 2002-2012, Mike K. Bennett\n"   // copyright
+                              "(c) 2005-2012, Diederik van der Boor\n"
+                              "(c) 2007-2012, Valerio Pilo\n"
+                              "(c) 2008-2012, Antonio Nastasi\n"
+                              "(c) 2008-2012, Ruben Vandamme\n"
+                              "(c) 2009-2012, Sjors Gielen\n"
+                              "(c) 2009-2012, Adam Goossens\n"),
                        KLocalizedString(),
                        "http://www.kmess.org/",                   // home page
                        "bugs" "@" "kmess" "." "org"               // address for bugs
@@ -132,7 +132,7 @@ int main(int argc, char *argv[])
  aboutData.addCredit( ki18n("Vincenzo Reale"),            ki18n("More Italian translation"),        "smart2128" "@" "baslug" "." "org");
  aboutData.addCredit( ki18n("Andrea Decorte"),            ki18n("More Italian translation, Group selection in 'contact added user' dialog"), "adecorte" "@" "gmail" "." "com");

-  aboutData.addCredit( ki18n("Daniel E. Moctezuma"),       ki18n("Japanese translation"),            "shinsen27" "@" "gmail" "." "com");
+  aboutData.addCredit( ki18n("Daniel E. Moctezuma"),       ki18n("Japanese translation"),            "dmoctezuma" "@" "kmess" "." "org");
  aboutData.addCredit( ki18n("Park Dong Cheon"),           ki18n("Korean translation"),              "pdc" "@" "kaist" "." "ac.kr");
  aboutData.addCredit( ki18n("Øyvind Sæther"),             ki18n("Norsk Bokmål translation"),         "oyvind" "@" "sather" "." "tk");

@@ -1033,7 +1033,9 @@ void MsnNotificationConnection::goOnline()
    hash.insert( QString::number(ack), "COMPOSE" );

    // Ask the personal profile URL
-    ack = sendCommand("URL", "PROFILE 0x" + QString::number( CurrentAccount::instance()->getLanguageCode().toInt(), 8 ) );
+    // default to US English if no preference
+    quint32 langcode = CurrentAccount::instance()->getLanguageCode().toInt();
+    ack = sendCommand("URL", "PROFILE 0x" + QString::number( ( langcode == 0 ? 1033 : langcode ), 8 ) );
    hash.insert( QString::number(ack), "PROFILE" );
  }

@@ -456,6 +456,7 @@ void HttpSoapConnection::slotRequestFinished( QNetworkReply *reply )
  const QByteArray& replyContents = reply->readAll();
  const int         statusCode    = reply->attribute( QNetworkRequest::HttpStatusCodeAttribute   ).toInt();
  const QString     error         ( reply->attribute( QNetworkRequest::HttpReasonPhraseAttribute ).toString() );
+  QUrl              redirectUrl   = reply->attribute( QNetworkRequest::RedirectionTargetAttribute ).toUrl();

 #ifdef KMESSDEBUG_HTTPSOAPCONNECTION_GENERAL
  bool requestSuccess = false;
@@ -490,13 +491,16 @@ void HttpSoapConnection::slotRequestFinished( QNetworkReply *reply )
 #endif

    // Parse the message contents
-    if( currentResponse->isFaultMessage() )
+    if( ! redirectUrl.isEmpty() || currentResponse->isFaultMessage() )
    {
-      // Verify if the server is redirecting us to another server
      if( currentResponse->getFaultCode() == "psf:Redirect" )
+      {
+        redirectUrl = XmlFunctions::getNodeValue( currentResponse->getFault(), "redirectUrl" );
+      }
+      // Verify if the server is redirecting us to another server
+      if( ! redirectUrl.isEmpty() )
      {
        const QUrl& originalUrl = currentResponse->getEndPoint();
-        const QUrl redirectUrl( XmlFunctions::getNodeValue( currentResponse->getFault(), "redirectUrl" ) );
        const QString originalHost( originalUrl.host() );
        const QString redirectHost( redirectUrl.host() );

@@ -20,9 +20,9 @@
 #include <QtXml/QDomDocument>
 #include <QtCore/QDebug>

-#include <phonon/Phonon/MediaObject>
-#include <phonon/Phonon/MediaSource>
-#include <phonon/Phonon/AudioOutput>
+#include <Phonon/MediaObject>
+#include <Phonon/MediaSource>
+#include <Phonon/AudioOutput>

 #include <KLocale>

@@ -0,0 +1,83 @@
+#include "filetransfersettingspage.h"
+
+#include <KFileDialog>
+#include <KMessageBox>
+#include <KUrlCompletion>
+#include <QDir>
+
+FileTransferSettingsPage::FileTransferSettingsPage( QWidget* parent )
+  : QWidget( parent )
+{
+  // setup ui
+  setupUi( this );
+
+  connect( lowestTransferPort_, SIGNAL( valueChanged( int ) ), this, SLOT( checkPortsInterval() ) );
+  connect( highestTransferPort_, SIGNAL( valueChanged( int ) ), this, SLOT( checkPortsInterval() ) );
+
+  // Prepare and connect the directory selection button
+  chooseDirButton_->setIcon( KIcon( "folder-open" ) );
+  connect( chooseDirButton_, SIGNAL( clicked() ), this, SLOT( slotChooseDirectory() ) );
+
+  // Make the directory selection friendlier
+  KUrlCompletion *dirCompletion = new KUrlCompletion( KUrlCompletion::DirCompletion );
+  dirCompletion->setParent( this );
+  receivedFilesDirEdit_->setCompletionObject( dirCompletion );
+  receivedFilesDirEdit_->setClearButtonShown( true );
+}
+
+
+
+void FileTransferSettingsPage::loadSettings( const KConfigGroup& group )
+{
+  receivedFilesDirEdit_->setText( group.readEntry( "receivedFilesDir", QDir::homePath() ) );
+  useReceivedFilesDir_->setChecked( group.readEntry( "useReceivedFilesDir", false ) );
+  lowestTransferPort_->setValue( group.readEntry( "lowestTransferPort", 6891 ) );
+  highestTransferPort_->setValue( group.readEntry( "highestTransferPort", 6900 ) );
+}
+
+
+
+bool FileTransferSettingsPage::saveSettings( KConfigGroup& group )
+{
+  // Make sure there's a selected directory if the Save files in a directory option is set
+  if( useReceivedFilesDir_->isChecked() && receivedFilesDirEdit_->text().isEmpty() ) {
+    KMessageBox::error( 0, i18n( "You have to select a directory for the received files!" ) );
+    return false;
+  }
+
+  // Start saving settings
+  group.writeEntry( "receivedFilesDir", receivedFilesDirEdit_->text() );
+  group.writeEntry( "useReceivedFilesDir", useReceivedFilesDir_ ->isChecked() );
+  group.writeEntry( "lowestTransferPort", lowestTransferPort_  ->value() );
+  group.writeEntry( "highestTransferPort", highestTransferPort_ ->value() );
+
+  return true;
+}
+
+
+
+void FileTransferSettingsPage::checkPortsInterval()
+{
+  int lowerPortValue = lowestTransferPort_->value();
+
+  // Allow a minimum of two ports in the interval
+  if( lowerPortValue >= highestTransferPort_->value() )
+  {
+    highestTransferPort_->setValue( lowerPortValue + 1 );
+  }
+}
+
+
+
+void FileTransferSettingsPage::slotChooseDirectory()
+{
+  const KUrl url( KFileDialog::getExistingDirectoryUrl(
+                    receivedFilesDirEdit_->text(),
+                    this, i18n( "Select Directory" ) )
+                );
+
+  if( ! url.isEmpty() )
+  {
+    receivedFilesDirEdit_->setText( url.path() );
+  }
+}
@@ -0,0 +1,30 @@
+#ifndef FILETRANSFERSETTINGSPAGE_H
+#define FILETRANSFERSETTINGSPAGE_H
+
+/**
+ * @brief Allows to modify the file transfer settings
+ *
+ * @author Francesco Nwokeka
+ * @ingroup Settings
+ */
+
+#include "ui_filetransfersettingspage.h"
+
+#include <QWidget>
+
+class FileTransferSettingsPage : public QWidget, private Ui::FileTransferSettingsPage
+{
+    Q_OBJECT
+
+public:
+    FileTransferSettingsPage( QWidget *parent = 0 );
+    void loadSettings( const KConfigGroup &group );     /** Load users settings */
+    bool saveSettings( KConfigGroup &group );           /** Save users settings */
+
+private slots:
+    void checkPortsInterval();                          /** Ensure that the specified ports interval is valid */
+    void slotChooseDirectory();                         /** Allow the user to navigate the filesystem and choose a directory */
+};
+
+
+#endif  //FILETRANSFERSETTINGSPAGE
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>FileTransferSettingsPage</class>
+ <widget class="QWidget" name="FileTransferSettingsPage">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>490</width>
+    <height>241</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <item>
+    <layout class="QVBoxLayout" name="verticalLayout">
+     <item>
+      <widget class="QCheckBox" name="useReceivedFilesDir_">
+       <property name="enabled">
+        <bool>true</bool>
+       </property>
+       <property name="text">
+        <string>&amp;Save all received files in one directory:</string>
+       </property>
+       <property name="checked">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout_11">
+       <item>
+        <widget class="KLineEdit" name="receivedFilesDirEdit_">
+         <property name="enabled">
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QToolButton" name="chooseDirButton_">
+         <property name="enabled">
+          <bool>false</bool>
+         </property>
+         <property name="text">
+          <string>...</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <spacer name="verticalSpacer_3">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>16</width>
+         <height>16</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout_9">
+       <item>
+        <widget class="QLabel" name="label_2">
+         <property name="text">
+          <string>&amp;Use ports between</string>
+         </property>
+         <property name="buddy">
+          <cstring>lowestTransferPort_</cstring>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QSpinBox" name="lowestTransferPort_">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="accelerated">
+          <bool>true</bool>
+         </property>
+         <property name="maximum">
+          <number>65534</number>
+         </property>
+         <property name="value">
+          <number>6891</number>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="label_3">
+         <property name="text">
+          <string>and</string>
+         </property>
+         <property name="buddy">
+          <cstring>highestTransferPort_</cstring>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QSpinBox" name="highestTransferPort_">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="accelerated">
+          <bool>true</bool>
+         </property>
+         <property name="minimum">
+          <number>1</number>
+         </property>
+         <property name="maximum">
+          <number>65535</number>
+         </property>
+         <property name="value">
+          <number>6900</number>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="label_4">
+         <property name="text">
+          <string>for file transfers</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer_3">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <spacer name="verticalSpacer_4">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>40</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>KLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header>klineedit.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>useReceivedFilesDir_</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>receivedFilesDirEdit_</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>244</x>
+     <y>15</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>227</x>
+     <y>42</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>useReceivedFilesDir_</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>chooseDirButton_</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>244</x>
+     <y>15</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>468</x>
+     <y>42</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
@@ -20,6 +20,7 @@
 #include "../utils/kmessconfig.h"
 #include "../kmessdebug.h"
 #include "accountsmanagerpage.h"
+#include "filetransfersettingspage.h"
 #include "miscellaneouspage.h"

 #include <QCloseEvent>
@@ -49,6 +50,7 @@ GlobalSettingsDialog::GlobalSettingsDialog( QWidget *parent )

  // Create the widgets that belong in the pages
  accountsManagerPage_ = new AccountsManagerPage();
+  fileTransferSettingsPage_ = new FileTransferSettingsPage();
  miscellaneousPage_ = new MiscellaneousPage();
  notificationPage_ = new KNotifyConfigWidget( this );
  notificationPage_->setApplication( "kmess" );
@@ -70,6 +72,10 @@ GlobalSettingsDialog::GlobalSettingsDialog( QWidget *parent )
  page->setHeader( i18n( "Settings" ) );
  page->setIcon( KIcon( "configure" ) );

+  page = addPage( fileTransferSettingsPage_, i18n( "FileTransfers" ) );
+  page->setIcon( KIcon( "folder-remote" ) );
+  page->setHeader( i18n( "Transfer Settings" ) );
+
  // Let all the tabs load their settings
  loadSettings();
 }
@@ -120,6 +126,7 @@ void GlobalSettingsDialog::loadSettings()
  const KConfigGroup group( KMessConfig::instance()->getGlobalConfig( "General" ) );

  miscellaneousPage_->loadSettings( group );
+  fileTransferSettingsPage_->loadSettings( group );
 }


@@ -134,6 +141,11 @@ bool GlobalSettingsDialog::saveSettings()
    return false;
  }

+  if( !fileTransferSettingsPage_->saveSettings( group ) )
+  {
+      return false;
+  }
+
  notificationPage_ ->save();

  // Force the saving to be sure the KMessShared Class gets the correct options
@@ -24,6 +24,7 @@

 // Forward declarations
 class AccountsManagerPage;
+class FileTransferSettingsPage;
 class MiscellaneousPage;

 class KConfigGroup;
@@ -61,6 +62,8 @@ class GlobalSettingsDialog : public KPageDialog
    KConfigGroup                 config_;
    // The page where to manage the saved MSN accounts
    AccountsManagerPage         *accountsManagerPage_;
+    // The page where to manage file transfer settings
+    FileTransferSettingsPage    *fileTransferSettingsPage_;
    // The page where to manage the miscellaneous settings
    MiscellaneousPage           *miscellaneousPage_;
    // The page where to manage the notification settings
@@ -45,8 +45,6 @@ MiscellaneousPage::MiscellaneousPage( QWidget *parent )
  connect( useListedMailClientRadio_, SIGNAL(     toggled(bool) ), mailClientsCombo_,     SLOT(         setEnabled(bool) ) );
  connect( useCustomMailClientRadio_, SIGNAL(     toggled(bool) ), customMailClientEdit_, SLOT(         setEnabled(bool) ) );
  connect( useCustomMailClientRadio_, SIGNAL(     toggled(bool) ), customMailClientInfo_, SLOT(         setEnabled(bool) ) );
-  connect( lowestTransferPort_,       SIGNAL( valueChanged(int) ), this,                  SLOT( checkPortsInterval()     ) );
-  connect( highestTransferPort_,      SIGNAL( valueChanged(int) ), this,                  SLOT( checkPortsInterval()     ) );

  // Prepare and browse the list of available browsers
  const KService::List browserServices = KMimeTypeTrader::self()->query( "text/html", "Application" );
@@ -101,16 +99,6 @@ MiscellaneousPage::MiscellaneousPage( QWidget *parent )
    mailClientsCombo_->addItem( i18n("No selectable email clients detected.") );
    mailClientsCombo_->setEnabled( false );
  }
-
-  // Prepare and connect the directory selection button
-  chooseDirButton_->setIcon( KIcon( "folder-open" ) );
-  connect( chooseDirButton_, SIGNAL( clicked() ), this, SLOT( slotChooseDirectory() ) );
-
-  // Make the directory selection friendlier
-  KUrlCompletion *dirCompletion = new KUrlCompletion( KUrlCompletion::DirCompletion );
-  dirCompletion->setParent( this );
-  receivedFilesDirEdit_->setCompletionObject( dirCompletion );
-  receivedFilesDirEdit_->setClearButtonShown( true );
 }


@@ -124,22 +112,6 @@ MiscellaneousPage::~MiscellaneousPage()



-/**
- * @brief Ensure that the specified P2P ports interval is valid
- */
-void MiscellaneousPage::checkPortsInterval()
-{
-  int lowerPortValue = lowestTransferPort_->value();
-
-  // Allow a minimum of two ports in the interval
-  if( lowerPortValue >= highestTransferPort_->value() )
-  {
-    highestTransferPort_->setValue( lowerPortValue + 1 );
-  }
-}
-
-
-
 /**
 * @brief Load the widget state
 */
@@ -148,11 +120,8 @@ void MiscellaneousPage::loadSettings( const KConfigGroup &group )
  // Read the settings into the widgets
  customBrowserEdit_   ->setText   ( group.readEntry( "customBrowser",       QString()        ) );
  customMailClientEdit_->setText   ( group.readEntry( "customMailClient",    QString()        ) );
-  receivedFilesDirEdit_->setText   ( group.readEntry( "receivedFilesDir",    QDir::homePath() ) );
  useLiveMailCheckbox_ ->setChecked( group.readEntry( "useLiveMail",         true             ) );
-  useReceivedFilesDir_ ->setChecked( group.readEntry( "useReceivedFilesDir", false            ) );
-  lowestTransferPort_  ->setValue  ( group.readEntry( "lowestTransferPort",  6891             ) );
-  highestTransferPort_ ->setValue  ( group.readEntry( "highestTransferPort", 6900             ) );
+

  int pos;
  QString userChoice;
@@ -338,13 +307,6 @@ bool MiscellaneousPage::saveSettings( KConfigGroup &group )
    }
  }

-  // Make sure there's a selected directory if the Save files in a directory option is set
-  if( useReceivedFilesDir_->isChecked() && receivedFilesDirEdit_->text().isEmpty() )
-  {
-    KMessageBox::error( 0, i18n( "You have to select a directory for the received files!" ) );
-    return false;
-  }
-
  QString userChoice;

  // Save the checked browser option
@@ -380,11 +342,7 @@ bool MiscellaneousPage::saveSettings( KConfigGroup &group )
  // Save the state of the other widgets
  group.writeEntry( "customBrowser",       customBrowserEdit_   ->text()      );
  group.writeEntry( "customMailClient",    customMailClientEdit_->text()      );
-  group.writeEntry( "receivedFilesDir",    receivedFilesDirEdit_->text()      );
-  group.writeEntry( "useReceivedFilesDir", useReceivedFilesDir_ ->isChecked() );
  group.writeEntry( "useLiveMail",         useLiveMailCheckbox_ ->isChecked() );
-  group.writeEntry( "lowestTransferPort",  lowestTransferPort_  ->value()     );
-  group.writeEntry( "highestTransferPort", highestTransferPort_ ->value()     );

  int index = browsersCombo_->currentIndex();
  group.writeEntry( "listedBrowser",    browsersCombo_   ->itemData( index ) );
@@ -395,22 +353,4 @@ bool MiscellaneousPage::saveSettings( KConfigGroup &group )
 }


-
-/**
- * Allow the user to navigate the filesystem and choose a directory
- */
-void MiscellaneousPage::slotChooseDirectory()
-{
-  const KUrl url( KFileDialog::getExistingDirectoryUrl( receivedFilesDirEdit_->text(),
-                                                        this,
-                                                        i18n( "Select Directory") ) );
-
-  if( ! url.isEmpty() )
-  {
-    receivedFilesDirEdit_->setText( url.path() );
-  }
-}
-
-
-
 #include "miscellaneouspage.moc"
@@ -46,13 +46,6 @@ class MiscellaneousPage : public QWidget, private Ui::MiscellaneousPage
    // Save account information from the misc options widget
    bool                saveSettings( KConfigGroup &group );

-
-  private slots:
-    // Ensure that the specified ports interval is valid
-    void                checkPortsInterval();
-    // Allow the user to navigate the filesystem and choose a directory
-    void                slotChooseDirectory();
-
  private: // Private properties

    // A list of browser executables, mapped by browser name
@@ -280,202 +280,13 @@
       </item>
      </layout>
     </widget>
-     <widget class="QWidget" name="tab_3">
-      <attribute name="title">
-       <string>File Transfers</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_10">
-       <item>
-        <widget class="QCheckBox" name="useReceivedFilesDir_">
-         <property name="enabled">
-          <bool>true</bool>
-         </property>
-         <property name="text">
-          <string>&amp;Save all received files in one directory:</string>
-         </property>
-         <property name="checked">
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <layout class="QHBoxLayout" name="horizontalLayout_10">
-         <item>
-          <widget class="KLineEdit" name="receivedFilesDirEdit_">
-           <property name="enabled">
-            <bool>false</bool>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QToolButton" name="chooseDirButton_">
-           <property name="enabled">
-            <bool>false</bool>
-           </property>
-           <property name="text">
-            <string>...</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <spacer name="verticalSpacer_3">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeType">
-          <enum>QSizePolicy::Fixed</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>16</width>
-           <height>16</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
-        <layout class="QHBoxLayout" name="horizontalLayout_9">
-         <item>
-          <widget class="QLabel" name="label_2">
-           <property name="text">
-            <string>&amp;Use ports between</string>
-           </property>
-           <property name="buddy">
-            <cstring>lowestTransferPort_</cstring>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QSpinBox" name="lowestTransferPort_">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="accelerated">
-            <bool>true</bool>
-           </property>
-           <property name="maximum">
-            <number>65534</number>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="label_3">
-           <property name="text">
-            <string>and</string>
-           </property>
-           <property name="buddy">
-            <cstring>highestTransferPort_</cstring>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QSpinBox" name="highestTransferPort_">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="accelerated">
-            <bool>true</bool>
-           </property>
-           <property name="minimum">
-            <number>1</number>
-           </property>
-           <property name="maximum">
-            <number>65535</number>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="label_4">
-           <property name="text">
-            <string>for file transfers</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <spacer name="horizontalSpacer_3">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>40</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <spacer name="verticalSpacer_4">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </widget>
    </widget>
   </item>
  </layout>
 </widget>
- <customwidgets>
-  <customwidget>
-   <class>KLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>klineedit.h</header>
-  </customwidget>
- </customwidgets>
 <tabstops>
  <tabstop>browsersCombo_</tabstop>
 </tabstops>
 <resources/>
- <connections>
-  <connection>
-   <sender>useReceivedFilesDir_</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>receivedFilesDirEdit_</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>73</x>
-     <y>58</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>78</x>
-     <y>89</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>useReceivedFilesDir_</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>chooseDirButton_</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>192</x>
-     <y>52</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>426</x>
-     <y>88</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
+ <connections/>
 </ui>
@@ -20,16 +20,20 @@
    <method name="getPersonalMessage">
      <arg name="message" type="s" direction="out"/>
    </method>
-    <method name="getFriendlyName" >
+    <method name="getFriendlyName">
      <arg direction="in" type="i" name="formattingMode" />
      <arg direction="out" type="s" name="friendlyName" />
    </method>
-    <method name="getFriendlyName" >
+    <method name="getFriendlyName">
      <arg direction="out" type="s" name="friendlyName" />
    </method>
    <method name="getList">
      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="DBusContactList"/>
-      <arg name="list" type="a(ssi)" direction="out"/>
+      <arg type="a(ssi)" direction="out" name="list" />
+    </method>
+    <method name="startFileTransfer">
+      <arg direction="in" type="s" name="handle" />
+      <arg direction="in" type="s" name="filename" />
    </method>
  </interface>
 </node>
@@ -58,7 +58,7 @@
 * and thus natural sorting keeps them in the right temporal order.
 *
 * @param name1 First filename
- * @param name1 Second filename
+ * @param name2 Second filename
 * @return bool whether the first is lesser than the second
 */
 bool KMessShared::compareFileNames( const QString& name1, const QString& name2 )
@@ -142,7 +142,7 @@ QString KMessShared::createRequestFile( const QString &mailto, const QString &fo
  // this will have our (urlencoded) dodgy email address we used to satisfy URL COMPOSE
  // at the initial login. replace it where we actually want it to go.
  QString command( folder );
-  
+
  command = command.replace( "some.invalid%40kmess.email", mailto );

  // Use the method into passport to compute the token
@@ -739,7 +739,7 @@ bool KMessShared::selectNextFile( const QString &directory, const QString &baseN
 *
 * etc.
 *
- * @param baseDir The full path to the base directory.
+ * @param baseDirPath The full path to the base directory.
 * @param baseFileName The base file name, minus the extension or numbering.
 * @param extension The extension of the file.
 * @param lastFile [out] Set to the full path of the last existing file in the sequence, or an empty string if none exists.
Author	SHA1	Message	Date
Mario Fetka	91626a9c87	Import release 2.0.6.2	2012-03-02 20:51:47 +00:00
Mario Fetka	858a70fe82	Import release 2.0.6.1	2011-02-17 09:46:29 +00:00