- Updated French translation unit (obsolete entries removed)

- GeneralPage.ui : display seconds after the number in the spinbox
- ConnectFriendWizard.ui : correct typoes
- DetailsDialog.ui : add a missing colon
- ChanMsgItem.ui and PopupChatDialog.ui : set "TextLabel" as not to translate
- RSTreeWidget : fix compiler warning by removing useless const in return type


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3815 b45a01b8-16f6-495d-af2f-9b41ad6348cc

retroshare-gui/src/gui/DetailsDialog.ui

@@ -148,7 +148,7 @@
           <item row="4" column="0">
            <widget class="QLabel" name="priority_label">
             <property name="text">
-             <string>Priority</string>
+             <string>Priority:</string>
             </property>
            </widget>
           </item>

retroshare-gui/src/gui/chat/PopupChatDialog.ui

@@ -252,7 +252,7 @@ border-image: url(:/images/avatarstatus_bg.png);
            </font>
           </property>
           <property name="text">
-           <string>TextLabel</string>
+           <string notr="true">TextLabel</string>
           </property>
          </widget>
         </item>
@@ -265,7 +265,7 @@ border-image: url(:/images/avatarstatus_bg.png);
            </font>
           </property>
           <property name="text">
-           <string>TextLabel</string>
+           <string notr="true">TextLabel</string>
           </property>
          </widget>
         </item>

retroshare-gui/src/gui/common/RSTreeWidgetItem.cpp

@@ -30,7 +30,7 @@ void RSTreeWidgetItemCompareRole::addRole(int column, int role)
     insert(column, role);
 }
 
-const int RSTreeWidgetItemCompareRole::findRole(const int column) const
+int RSTreeWidgetItemCompareRole::findRole(const int column) const
 {
     RSTreeWidgetItemCompareRole::const_iterator it = find(column);
     if (it == end()) {

retroshare-gui/src/gui/common/RSTreeWidgetItem.h

@@ -32,7 +32,7 @@ public:
     RSTreeWidgetItemCompareRole();
 
     void addRole(int column, int role);
-    const int findRole(const int column) const;
+    int findRole(const int column) const;
 };
 
 class RSTreeWidgetItem : public QTreeWidgetItem

retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp

@@ -176,7 +176,7 @@ IntroPage::IntroPage(QWidget *parent)
     setTitle( titleStr.arg( tr("Add a new Friend") ) ) ;
              
     setSubTitle(tr("This wizard will help you to connect to your friend(s) "
-                   "to RetroShare network. There are three possible ways "
+                   "to RetroShare network. There are five possible ways "
                    "to do this:")) ;
 
     textRadioButton = new QRadioButton(tr("&Enter the certificate manually"));
@@ -1154,7 +1154,7 @@ int RsidPage::nextId() const {
 EmailPage::EmailPage(QWidget *parent) : QWizardPage(parent) {
     QString titleStr("<span style=\"font-size:16pt; font-weight:500;"
                                "color:white;\">%1</span>");
-    setTitle( titleStr.arg( tr("Invite Friend by Email") ) ) ;
+    setTitle( titleStr.arg( tr("Invite Friends by Email") ) ) ;
 
     setSubTitle(tr("Enter your friends' email addresses (seperate each on with a semicolon)"));
                                       

retroshare-gui/src/gui/feeds/ChanMsgItem.ui

@@ -407,7 +407,7 @@ border-radius: 3px}</string>
         <item row="3" column="1" colspan="6">
          <widget class="QLabel" name="warning_label">
           <property name="text">
-           <string>TextLabel</string>
+           <string notr="true">TextLabel</string>
           </property>
          </widget>
         </item>

retroshare-gui/src/gui/settings/GeneralPage.ui

@@ -594,10 +594,10 @@
       <item>
        <widget class="QSpinBox" name="spinBox">
         <property name="suffix">
-         <string/>
+         <string> seconds</string>
         </property>
         <property name="prefix">
-         <string>seconds </string>
+         <string/>
         </property>
         <property name="maximum">
          <number>1000</number>