[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kphotoalbum] /: String fixes
From:       Miika Turkia <miika.turkia () gmail ! com>
Date:       2012-04-01 11:35:22
Message-ID: 20120401113522.77FA0A60A9 () git ! kde ! org
[Download RAW message or body]

Git commit b20685d653a6effd70abed2a2c451c074ed2be55 by Miika Turkia.
Committed on 01/04/2012 at 12:49.
Pushed by mturkia into branch 'master'.

String fixes

Fixes on HTML tags on the strings and explanations for translators
BUG: 297063

M  +1    -1    HTMLGenerator/HTMLDialog.cpp
M  +7    -7    MainWindow/FeatureDialog.cpp
M  +1    -1    MainWindow/StatisticsDialog.cpp
M  +1    -1    Utilities/Util.cpp

http://commits.kde.org/kphotoalbum/b20685d653a6effd70abed2a2c451c074ed2be55

diff --git a/HTMLGenerator/HTMLDialog.cpp b/HTMLGenerator/HTMLDialog.cpp
index 8471f1c..33b52b9 100644
--- a/HTMLGenerator/HTMLDialog.cpp
+++ b/HTMLGenerator/HTMLDialog.cpp
@@ -489,7 +489,7 @@ void HTMLDialog::populateThemesCombo()
 void HTMLDialog::displayThemeDescription(int themenr)
 {
    // SLOT: update _themeInfo label whenever the _theme QComboBox changes.
-   QString outtxt = i18n( "by " );
+   QString outtxt = i18nc( "This is to show the author of the theme. E.g. copyright \
character (&#169;) by itself will work fine on this context if no proper word is \
available in your language.", "by " );  outtxt.append( _themeAuthors[themenr] );
    outtxt.append( i18n( "\n " ) );
    outtxt.append( _themeDescriptions[themenr] );
diff --git a/MainWindow/FeatureDialog.cpp b/MainWindow/FeatureDialog.cpp
index ec970e9..765ac11 100644
--- a/MainWindow/FeatureDialog.cpp
+++ b/MainWindow/FeatureDialog.cpp
@@ -46,7 +46,7 @@ FeatureDialog::FeatureDialog( QWidget* parent )
 
                   "<p>If you compiled KPhotoAlbum yourself, then please review the \
                sections below to learn what to install "
                   "to get the feature in question. If on the other hand you \
                installed KPhotoAlbum from a binary package, please tell "
-                  "whoever made the package about this defect, eventually including \
the information from the section below.<p>" +                  "whoever made the \
package about this defect, eventually including the information from the section \
below.</p>"  
                   "<p>In case you are missing a feature and you did not compile \
                KPhotoAlbum yourself, please do consider doing so. "
                   "It really isn't that hard. If you need help compiling \
KPhotoAlbum, feel free to ask on the " @@ -61,11 +61,11 @@ \
FeatureDialog::FeatureDialog( QWidget* parent )  text += i18n( "<h1><a \
                name=\"kipi\">Plug-ins Support</a></h1>"
                  "<p>KPhotoAlbum has a plug-in system with lots of extensions. You \
may among other things find plug-ins for:"  "<ul>"
-                  "<li>Writing images to cds or dvd's"
-                  "<li>Adjusting timestamps on your images"
-                  "<li>Making a calendar featuring your images"
-                  "<li>Uploading your images to flickr"
-                  "<li>Upload your images to facebook"
+                  "<li>Writing images to cds or dvd's</li>"
+                  "<li>Adjusting timestamps on your images</li>"
+                  "<li>Making a calendar featuring your images</li>"
+                  "<li>Uploading your images to flickr</li>"
+                  "<li>Upload your images to facebook</li>"
                   "</ul></p>"
 
                   "<p>The plug-in library is called KIPI, and may be downloaded from \
the " @@ -85,7 +85,7 @@ FeatureDialog::FeatureDialog( QWidget* parent )
                   "In addition the qt package for sqlite (e.g.qt-sql-sqlite) must be \
installed.</p>");  
     text += i18n("<h1><a name=\"thumbnails\">Video Thumbnails Support</a></h1>"
-                 "<p>KPhotoAlbum asks the KDE plug-in system for help when it needs \
to generate a thumbnail for videos. " +                 "<p>KPhotoAlbum asks the KDE \
                plug-in system for help when it needs to generate a thumbnail for \
                videos.</p>"
                  "<p>Unfortunately KDE4 does currently not come with any plug-ins \
                for this, you therefore need manually to install "
                  "<a \
href=\"http://www.kde-apps.org/content/show.php?content=41180\">MPlayerThumbs</a>.</p>");
  
diff --git a/MainWindow/StatisticsDialog.cpp b/MainWindow/StatisticsDialog.cpp
index ea81f68..64ca2e1 100644
--- a/MainWindow/StatisticsDialog.cpp
+++ b/MainWindow/StatisticsDialog.cpp
@@ -48,7 +48,7 @@ StatisticsDialog::StatisticsDialog( QWidget* parent )
                        "</table><br/><br/>"
                        "Don't get too attached to this dialog, it has the problem \
                that it counts categories AND subcategories,<br/>"
                        "so if an image has been taken in Las Vegas, Nevada, USA, \
                then 3 tags are counted for that image,<br/>"
-                       "while it should only be one.</br>"
+                       "while it should only be one.<br/>"
                        "I'm not really sure if it is worth fixing that bug (as it is \
pretty hard to fix),<br/>"  "so maybe the dialog will simply go away again");
 
diff --git a/Utilities/Util.cpp b/Utilities/Util.cpp
index 4f92b83..a3d8ca6 100644
--- a/Utilities/Util.cpp
+++ b/Utilities/Util.cpp
@@ -231,7 +231,7 @@ void Utilities::checkForBackupFile( const QString& fileName, \
                const QString& mess
                 "Should the autosave file be used?", backupName, fileName, \
backUpFile.size() >> 10 ),  i18n("Found Autosave File") );
     else if ( backUpFile.size() > 0 )
-        code = KMessageBox::warningYesNo( 0,i18n( "<p>Error: %2</p>"
+        code = KMessageBox::warningYesNo( 0,i18n( "<p>Error: Cannot use current \
                database file '%1':</p><p>%2</p>"
                 "<p>Do you want to use autosave (%3 - size %4 KB) instead of \
                exiting?</p>"
                 "<p><small>(Manually verifying and copying the file might be a good \
idea)</small></p>", fileName, message, backupName, backUpFile.size() >> 10 ),  \
i18n("Recover from Autosave?") );


[prev in list] [next in list] [prev in thread] [next in thread]