ФЗ-94: Практические рекомендации эксперта. Переход на ФКС

branches/stable/l10n-kde4/tr/messages/calligra

SVN commit 1296266 by scripty:

check_po_files

 M  +1 -2      braindump.po  

--- branches/stable/l10n-kde4/tr/messages/calligra/braindump.po #1296265:1296266
@@ -15,8 +15,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Lokalize 1.4\n"

 #: rc.cpp:1

www/areas/l10n/teams/fr/apps (silent)

SVN commit 1296265 by renard:

SVN_SILENT automatic update

 M  +58 -34    pofiles.php  
 M  +21 -21    stats.php  
 M  +19 -17    translators.csv  
 M  +865 -842  translators.php  

http://websvn.kde.org/?view=rev&revision=1296265

[konversation] src/irc: Reset the char format to KColorScheme::NormalText explicity.

Git commit aec546b5a5c70187acfc076c7b509c15c4467024 by Eike Hein.
Committed on 23/05/2012 at 02:03.
Pushed by hein into branch 'master'.

Reset the char format to KColorScheme::NormalText explicity.

Rather relying on the format of the document start to be what we need.
Fixes a corner case bug where the user deletes everything before the
TOPICLEN threshold in one swoop, putting the NegativeText-colored text
at the document start.

M  +10   -1    src/irc/channeloptionsdialog.cpp

http://commits.kde.org/konversation/aec546b5a5c70187acfc076c7b509c15c4467024

diff --git a/src/irc/channeloptionsdialog.cpp b/src/irc/channeloptionsdialog.cpp
index 693ff58..ca5c468 100644
--- a/src/irc/channeloptionsdialog.cpp
+++ b/src/irc/channeloptionsdialog.cpp
@@ -175,6 +175,8 @@ namespace Konversation

     void ChannelOptionsDialog::topicEditContentsChange(int position, int charsRemoved, int charsAdded)
     {
+        Q_UNUSED(position);
+
         if (!m_editingTopic) return;
         if (charsRemoved == 0 && charsAdded == 0) return;

@@ -187,7 +189,11 @@ namespace Konversation
             m_previousEditPastTopicLength = true;

             QTextCursor cursor(m_ui.topicEdit->document());
+
+            KColorScheme colors(QPalette::Active);
+
             QTextCharFormat format = cursor.charFormat();
+            format.setForeground(colors.foreground(KColorScheme::NormalText));

             cursor.joinPreviousEditBlock();

@@ -197,7 +203,6 @@ namespace Konversation
             cursor.setPosition(topicLength, QTextCursor::MoveAnchor);
             cursor.movePosition(QTextCursor::End, QTextCursor::KeepAnchor);

-            KColorScheme colors(QPalette::Active);
             format.setForeground(colors.foreground(KColorScheme::NegativeText));
             cursor.setCharFormat(format);

@@ -208,7 +213,11 @@ namespace Konversation
             m_previousEditPastTopicLength = false;

             QTextCursor cursor(m_ui.topicEdit->document());
+
+            KColorScheme colors(QPalette::Active);
+
             QTextCharFormat format = cursor.charFormat();
+            format.setForeground(colors.foreground(KColorScheme::NormalText));

             cursor.joinPreviousEditBlock();

[konversation] /: Color text past TOPICLEN in KColorScheme::NegativeText.

Git commit f1eb0fb703fd22cd0f6ffcbd71a0a3f3bce93135 by Eike Hein.
Committed on 23/05/2012 at 01:55.
Pushed by hein into branch 'master'.

Color text past TOPICLEN in KColorScheme::NegativeText.

M  +3    -0    ChangeLog
M  +50   -0    src/irc/channeloptionsdialog.cpp
M  +2    -0    src/irc/channeloptionsdialog.h

http://commits.kde.org/konversation/f1eb0fb703fd22cd0f6ffcbd71a0a3f3bce93135

diff --git a/ChangeLog b/ChangeLog
index 0d9c38b..c29e280 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -101,6 +101,9 @@ Changes not in the 1.4 branch:
   Buttons that operate on nicknames will be shown alongside other nickname-
   related actions in context menus throughout Konversation. Essentially, this
   allows for placing custom actions in nickname context menus.
+* When editing the topic in the Channel Options dialog, any text entered past the
+  server's maximum allowed topic length will now be drawn in the color scheme's
+  negative text color (i.e. usually red).

 
 Changes since 1.4:
diff --git a/src/irc/channeloptionsdialog.cpp b/src/irc/channeloptionsdialog.cpp
index bc46d79..693ff58 100644
--- a/src/irc/channeloptionsdialog.cpp
+++ b/src/irc/channeloptionsdialog.cpp
@@ -15,6 +15,8 @@
 #include "application.h"
 #include "channel.h"

+#include <KColorScheme>
+
 #include <QCheckBox>
 #include <QHeaderView>
 #include <QPushButton>
@@ -52,11 +54,13 @@ namespace Konversation

         m_channel = channel;
         m_editingTopic = false;
+        m_previousEditPastTopicLength = false;

         connect(m_ui.topicHistoryView->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)),
                 this, SLOT(topicHistoryItemClicked(QItemSelection)));
         connect(m_ui.toggleAdvancedModes, SIGNAL(clicked()), this, SLOT(toggleAdvancedModes()));
         connect(m_ui.topicEdit, SIGNAL(undoAvailable(bool)), this, SLOT(topicBeingEdited(bool)));
+        connect(m_ui.topicEdit->document(), SIGNAL(contentsChange(int,int,int)), this, SLOT(topicEditContentsChange(int,int,int)));
         connect(this, SIGNAL(finished()), m_ui.topicEdit, SLOT(clear()));

         connect(m_channel, SIGNAL(topicHistoryChanged()), this, SLOT(refreshTopicHistory()));
@@ -169,6 +173,52 @@ namespace Konversation
         m_editingTopic = edited;
     }

+    void ChannelOptionsDialog::topicEditContentsChange(int position, int charsRemoved, int charsAdded)
+    {
+        if (!m_editingTopic) return;
+        if (charsRemoved == 0 && charsAdded == 0) return;
+
+        int topicLength = m_channel->getServer()->topicLength();
+
+        if (topicLength == -1) return;
+
+        if (m_ui.topicEdit->document()->characterCount() > topicLength)
+        {
+            m_previousEditPastTopicLength = true;
+
+            QTextCursor cursor(m_ui.topicEdit->document());
+            QTextCharFormat format = cursor.charFormat();
+
+            cursor.joinPreviousEditBlock();
+
+            cursor.setPosition(topicLength, QTextCursor::KeepAnchor);
+            cursor.setCharFormat(format);
+
+            cursor.setPosition(topicLength, QTextCursor::MoveAnchor);
+            cursor.movePosition(QTextCursor::End, QTextCursor::KeepAnchor);
+
+            KColorScheme colors(QPalette::Active);
+            format.setForeground(colors.foreground(KColorScheme::NegativeText));
+            cursor.setCharFormat(format);
+
+            cursor.endEditBlock();
+        }
+        else if (m_previousEditPastTopicLength)
+        {
+            m_previousEditPastTopicLength = false;
+
+            QTextCursor cursor(m_ui.topicEdit->document());
+            QTextCharFormat format = cursor.charFormat();
+
+            cursor.joinPreviousEditBlock();
+
+            cursor.movePosition(QTextCursor::End, QTextCursor::KeepAnchor);
+            cursor.setCharFormat(format);
+
+            cursor.endEditBlock();
+        }
+    }
+
     QString ChannelOptionsDialog::topic()
     {
         return m_ui.topicEdit->toPlainText().replace('\n',' ');
diff --git a/src/irc/channeloptionsdialog.h b/src/irc/channeloptionsdialog.h
index 8dde675..42a0191 100644
--- a/src/irc/channeloptionsdialog.h
+++ b/src/irc/channeloptionsdialog.h
@@ -64,9 +64,11 @@ namespace Konversation
         protected slots:
             void topicHistoryItemClicked(const QItemSelection& selection);
             void topicBeingEdited(bool edited);
+            void topicEditContentsChange(int position, int charsRemoved, int charsAdded);

         protected:
             bool m_editingTopic;
+            bool m_previousEditPastTopicLength;
             bool m_isAnyTypeOfOp;

         private:

[konversation] src/irc: Add TOPICLEN support.

Git commit f740930eb0b14f5a3a499fc214456a836ed436ed by Eike Hein.
Committed on 23/05/2012 at 00:31.
Pushed by hein into branch 'master'.

Add TOPICLEN support.

M  +11   -0    src/irc/inputfilter.cpp
M  +1    -0    src/irc/server.cpp
M  +5    -0    src/irc/server.h

http://commits.kde.org/konversation/f740930eb0b14f5a3a499fc214456a836ed436ed

diff --git a/src/irc/inputfilter.cpp b/src/irc/inputfilter.cpp
index b6d6217..9253d40 100644
--- a/src/irc/inputfilter.cpp
+++ b/src/irc/inputfilter.cpp
@@ -948,6 +948,17 @@ void InputFilter::parseServerCommand(const QString &prefix, const QString &comma
                                 m_server->setAllowedChannelModes(newModes);
                             }
                         }
+                        else if (property == "TOPICLEN")
+                        {
+                            if (!value.isEmpty())
+                            {
+                                bool ok =  false;
+                                int topicLength = value.toInt(&ok);
+
+                                if (ok)
+                                    m_server->setTopicLength(topicLength);
+                            }
+                        }
                         else
                         {
                             //kDebug() << "Ignored server-capability: " << property << " with value '" << value << "'";
diff --git a/src/irc/server.cpp b/src/irc/server.cpp
index 834c2ef..cee03a7 100644
--- a/src/irc/server.cpp
+++ b/src/irc/server.cpp
@@ -107,6 +107,7 @@ Server::Server(QObject* parent, ConnectionSettings& settings) : QObject(parent)
     m_channelPrefixes = "#&";
     m_modesCount = 3;
     m_sslErrorLock = false;
+    m_topicLength = -1;

     setObjectName(QString::fromLatin1("server_") + m_connectionSettings.name());

diff --git a/src/irc/server.h b/src/irc/server.h
index 43a1119..d387500 100644
--- a/src/irc/server.h
+++ b/src/irc/server.h
@@ -364,6 +364,9 @@ class Server : public QObject
         void setAllowedChannelModes(const QString& modes) { m_allowedChannelModes = modes; }
         QString allowedChannelModes() const { return m_allowedChannelModes; }

+        void setTopicLength(int topicLength) { m_topicLength = topicLength; }
+        int topicLength() const { return m_topicLength; }
+
         void registerWithServices();

         // Blowfish stuff
@@ -812,6 +815,8 @@ class Server : public QObject

         QString m_allowedChannelModes;

+        int m_topicLength;
+
         // Blowfish key map
         QHash<QString, QByteArray> m_keyHash;

www/apps/kdesrc-build/releases

SVN commit 1296264 by mpyne:

Now fix the missing .1 in the link.

 M  +2 -2      kdesrc-build-1.15.1.php  

--- trunk/www/apps/kdesrc-build/releases/kdesrc-build-1.15.1.php #1296263:1296264
@@ -11,9 +11,9 @@
 <p>Released: <b>2012-May-21</b></p>

 <p>Download it:
-<a
href="http://download.kde.org/stable/kdesrc-build/1.15.1/src/kdesrc-build-1.15.tar.xz"><?php
echo $release_file; ?></a>
+<a
href="http://download.kde.org/stable/kdesrc-build/1.15.1/src/kdesrc-build-1.15.1.tar.xz"><?php
echo $release_file; ?></a>
 -
-<a
href="http://download.kde.org/stable/kdesrc-build/1.15.1/src/kdesrc-build-1.15.tar.xz.mirrorlist">Details
(incl. PGP signature)</a>
+<a
href="http://download.kde.org/stable/kdesrc-build/1.15.1/src/kdesrc-build-1.15.1.tar.xz.mirrorlist">Details
(incl. PGP signature)</a>
 </p>

 <p><?php echo $release_title; ?> had 6 commits from 1 author from the prior

www/apps/kdesrc-build/releases

SVN commit 1296263 by mpyne:

Fix PHP link to release tarball.

 M  +1 -1      kdesrc-build-1.15.1.php  

--- trunk/www/apps/kdesrc-build/releases/kdesrc-build-1.15.1.php #1296262:1296263
@@ -1,7 +1,7 @@
 <?php
   $release_version = '1.15.1';
   $release_title = "kdesrc-build $release_version";
-  $release_file = "kdesrc-build-$release_version.tar.bz2";
+  $release_file = "kdesrc-build-$release_version.tar.xz";
   $page_title = "kdesrc-build release $release_version";
   $site_root = "../";

[apper] Desktop: Refresh desktop-file

Git commit 4cb12099ec0a5156f7c85354b85460a7b7157c16 by Matthias Klumpp.
Committed on 23/05/2012 at 01:07.
Pushed by matthiask into branch 'master'.

Refresh desktop-file

M  +2    -2    Desktop/apper_appsetup.desktop

http://commits.kde.org/apper/4cb12099ec0a5156f7c85354b85460a7b7157c16

diff --git a/Desktop/apper_appsetup.desktop b/Desktop/apper_appsetup.desktop
index 22ae0a4..342b903 100755
--- a/Desktop/apper_appsetup.desktop
+++ b/Desktop/apper_appsetup.desktop
@@ -4,8 +4,8 @@ Icon=applications-other
 Exec=apper-appsetup %F

 Name=Listaller Package Installer
-GenericName=3rd-Party Software Installer
-Comment=Application to install new 3rd-party software
+GenericName=3rd-party software installer
+Comment=Tool to install new 3rd-party software

 Categories=Qt;KDE;System;Settings;PackageManager;
 MimeType=application/x-installation;

[apper] AppSetup: AppSetup: Load Apper translation catalog

Git commit 3935215fced3b99241b48aca430143a14965dbe8 by Matthias Klumpp.
Committed on 23/05/2012 at 01:05.
Pushed by matthiask into branch 'master'.

AppSetup: Load Apper translation catalog

M  +2    -0    AppSetup/main.cpp

http://commits.kde.org/apper/3935215fced3b99241b48aca430143a14965dbe8

diff --git a/AppSetup/main.cpp b/AppSetup/main.cpp
index 4874b3f..a990306 100644
--- a/AppSetup/main.cpp
+++ b/AppSetup/main.cpp
@@ -41,6 +41,8 @@ int main(int argc, char** argv)
                         "matthias <at> tenstral.net");
     aboutData.setProductName("apper/listaller");

+    KGlobal::insertCatalog(QLatin1String("apper"));
+
     KCmdLineArgs::init(argc, argv, &aboutData);
     // Add --verbose as commandline option
     KCmdLineOptions options;

[okular] core: Fix wrong text

Git commit 04935266d21a4b1563cb3ca7aa78c6218b121650 by Fabio D'Urso.
Committed on 23/05/2012 at 00:45.
Pushed by fabiod into branch 'master'.

Fix wrong text

M  +1    -1    core/document.cpp

http://commits.kde.org/okular/04935266d21a4b1563cb3ca7aa78c6218b121650

diff --git a/core/document.cpp b/core/document.cpp
index b06fb36..e27b790 100644
--- a/core/document.cpp
+++ b/core/document.cpp
@@ -781,7 +781,7 @@ void DocumentPrivate::warnLimitedAnnotSupport()
     {
         // Show only if there are external annotations (we follow the usual XML path otherwise)
         if ( m_containsExternalAnnotations )
-            KMessageBox::sorry( m_parent->widget(), i18n("Your changes will not be saved automatically. Use
File -> Save As... or your changes will be lost") );
+            KMessageBox::sorry( m_parent->widget(), i18n("Your annotation changes will not be saved
automatically. Use File -> Save As...\nor your changes will be lost once the document is closed") );
     }
     else
     {