Changeset 128 for smplayer/trunk/src/about.cpp

Timestamp:

Mar 29, 2012, 4:53:15 PM (13 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: trunk update to latest svn

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/about.cpp (modified) (7 diffs)

smplayer/trunk/src/about.cpp

@@ -27 +27 @@
 #include <QFile>
 #include <QDesktopServices>
-
-//#define TRANS_ORIG
-#define TRANS_LIST
-//#define TRANS_TABLE
 
 using namespace Global;
@@ -60 +56 @@
 #if PORTABLE_APP
                 " (" + tr("Portable Edition") + ")" +
+#endif
+#ifdef EXPERIMENTAL
+        "<br>Experimental branch<br>"
 #endif
         "<br>" +
@@ -141 +140 @@
         return QString(
                  tr("The following people have contributed with translations:") +
-#ifndef TRANS_TABLE
-         "<ul>" +
-#else
-         "<table>" +
-#endif
+                "<p>" + 
+         trad(tr("Spanish"), "Ricardo Villalba <rvm@users.sourceforge.net>") +
          trad(tr("German"), "Panagiotis Papadopoulos <pano_90@gmx.net>") +
                  trad(tr("Slovak"), "Sweto <peter.mendel@gmail.com>") +
@@ -192 +188 @@
                 trad(tr("Korean"), "Heesu Yoon <imsu30@gmail.com>") +
                 trad(tr("Macedonian"), "Marko Doda <mark0d0da@gmail.com>") +
-                trad(tr("Basque"), "Piarres Beobide <pi@beobide.net>") +
+                trad(tr("Basque"), QStringList() 
+                        << "Piarres Beobide <pi@beobide.net>" 
+                        << "Xabier Aramendi <azpidatziak@gmail.com>") +
                 trad(tr("Catalan"), QString::fromUtf8("Roger Calvó <rcalvoi@yahoo.com>")) +
                 trad(tr("Slovenian"), "Janez Troha <janez.troha@gmail.com>") +
@@ -200 +198 @@
                 trad(tr("Vietnamese"), QString::fromUtf8("Lê Xuân Thảo <thaolx@gmail.com>")) +
                 trad(tr("Estonian"), QString::fromUtf8("Olav MÀgi <olav.magi@hotmail.com>")) +
-        trad(tr("Lithuanian"), "Freemail <ricka_g@freemail.lt>") +
+        trad(tr("Lithuanian"), QStringList() 
+                        << "Freemail <ricka_g@freemail.lt>"
+                        << QString::fromUtf8("Algimantas Margevičius <margevicius.algimantas@gmail.com>") ) +
         trad(tr("Danish"), "Martin Schlander <mschlander@opensuse.org>") +
         trad(tr("Croatian"), QString::fromUtf8("Josip KujundÅŸija <marshsmello@gmail.com>")) +
-#ifndef TRANS_TABLE
-        "</ul>");
-#else
-        "</table>");
-#endif
+                "");
 }
 
@@ -215 +211 @@
 
 QString About::trad(const QString & lang, const QStringList & authors) {
-#ifdef TRANS_ORIG
-        QString s;
-
-        switch (authors.count()) {
-                case 2: s = tr("%1 and %2"); break;
-                case 3: s = tr("%1, %2 and %3"); break;
-                case 4: s = tr("%1, %2, %3 and %4"); break;
-                case 5: s = tr("%1, %2, %3, %4 and %5"); break;
-                default: s = "%1";
-        }
-
-        for (int n = 0; n < authors.count(); n++) {
-                QString author = authors[n];
-                s = s.arg(author.replace("<", "&lt;").replace(">", "&gt;"));
-        }
-
-        return "<li>"+ tr("<b>%1</b>: %2").arg(lang).arg(s) + "</li>";
-#endif
-
-#ifdef TRANS_LIST
-        QString s = "<ul>";;
-        for (int n = 0; n < authors.count(); n++) {
-                QString author = authors[n];
-                s += "<li>"+ author.replace("<", "&lt;").replace(">", "&gt;") + "</li>";
-        }
-        s+= "</ul>";
-
-        return "<li>"+ tr("<b>%1</b>: %2").arg(lang).arg(s) + "</li>";
-#endif
-
-#ifdef TRANS_TABLE
         QString s;
         for (int n = 0; n < authors.count(); n++) {
@@ -252 +217 @@
                 if (n < (authors.count()-1)) s += "<br>";
         }
-
-        return QString("<tr><td align=right><b>%1</b></td><td>%2</td></tr>").arg(lang).arg(s);
-#endif
+        return QString("<h3>%1:</h3><h4>%2</h4><hr>").arg(lang).arg(s);
 }