some translation string fixes and german translation update

jef-n · jef-n · commit 00b14dcabe99 · 2013-06-14T14:34:49.000+02:00
diff --git a/doc/TRANSLATORS b/doc/TRANSLATORS
diff --git a/i18n/qgis_de.ts b/i18n/qgis_de.ts
diff --git a/resources/context_help/QgsPluginManager-en_US b/resources/context_help/QgsPluginManager-en_US
@@ -17,7 +17,7 @@ Manage and install plugins.
 </a>
 <p>
 This tab shows you the list of currently installed plugins on your system. Both
-python and cpp plugins are listed. 
+python and C++ plugins are listed. 
 </p>
 <p>
 You can enable or disable them by clicking the checkbox in front of the name.<br/>
diff --git a/src/app/pluginmanager/qgspluginmanager_texts.cpp b/src/app/pluginmanager/qgspluginmanager_texts.cpp
@@ -64,7 +64,7 @@ then click the 'Install plugin' button.\
   mTabDescriptions.insert( "new_plugins", tr( "<h3>New plugins</h3>\
 \
 <p>\
-Here you see hot <b>new</b> plugins which can be installed.\
+Here you see brand <b>new</b> plugins which can be installed.\
 </p>\
 \
 \
@@ -83,7 +83,7 @@ Click on an individual plugin; if possible QGIS shows you more information.\
 </p>\
 \
 <p>\
-The main reasons to have invalid plugins is either that this plugin is not build \
+The main reasons to have invalid plugins is that this plugin is not build \
 for this version of QGIS. Maybe you can download an other version from <a href=\"http://plugins.qgis.org\">plugins.qgis.org</a>.\
 </p>\
 \
diff --git a/src/app/qgslabelinggui.cpp b/src/app/qgslabelinggui.cpp
@@ -1007,7 +1007,7 @@ void QgsLabelingGui::populateDataDefinedButtons( QgsPalLayerSettings& s )
 
   // rendering
   QString ddScaleVisInfo = tr( "Value &lt; 0 represents a scale closer than 1:1, e.g. -10 = 10:1<br>"
-                               "Value of 0 toggles off specific limit" );
+                               "Value of 0 disables the specific limit." );
   mScaleBasedVisibilityDDBtn->init( mLayer, s.dataDefinedProperty( QgsPalLayerSettings::ScaleVisibility ),
                                     QgsDataDefinedButton::AnyType, QgsDataDefinedButton::boolDesc() );
   mScaleBasedVisibilityDDBtn->registerCheckedWidget( mScaleBasedVisibilityChkBx );
diff --git a/src/ui/qgslabelingguibase.ui b/src/ui/qgslabelingguibase.ui
@@ -5031,7 +5031,7 @@ font-style: italic;</string>
                                  </sizepolicy>
                                 </property>
                                 <property name="toolTip">
-                                 <string>Value &amp;lt; 0 represents a scale closer than 1:1, e.g. -10 = 10:1.&lt;br&gt;Value of 0 toggles off specific limit.</string>
+                                 <string>Value &amp;lt; 0 represents a scale closer than 1:1, e.g. -10 = 10:1.&lt;br&gt;Value of 0 disables the specific limit.</string>
                                 </property>
                                 <property name="prefix">
                                  <string>Minimum </string>
@@ -5060,7 +5060,7 @@ font-style: italic;</string>
                                  </sizepolicy>
                                 </property>
                                 <property name="toolTip">
-                                 <string>Value &amp;lt; 0 represents a scale closer than 1:1, e.g. -10 = 10:1.&lt;br&gt;Value of 0 toggles off specific limit.</string>
+                                 <string>Value &amp;lt; 0 represents a scale closer than 1:1, e.g. -10 = 10:1.&lt;br&gt;Value of 0 disables the specific limit.</string>
                                 </property>
                                 <property name="prefix">
                                  <string>Maximum </string>

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ then click the 'Install plugin' button.\`
`64`	`64`	`mTabDescriptions.insert( "new_plugins", tr( "<h3>New plugins</h3>\`
`65`	`65`	`\`
`66`	`66`	`<p>\`
`67`		`-Here you see hot <b>new</b> plugins which can be installed.\`
	`67`	`+Here you see brand <b>new</b> plugins which can be installed.\`
`68`	`68`	`</p>\`
`69`	`69`	`\`
`70`	`70`	`\`
`@@ -83,7 +83,7 @@ Click on an individual plugin; if possible QGIS shows you more information.\`
`83`	`83`	`</p>\`
`84`	`84`	`\`
`85`	`85`	`<p>\`
`86`		`-The main reasons to have invalid plugins is either that this plugin is not build \`
	`86`	`+The main reasons to have invalid plugins is that this plugin is not build \`
`87`	`87`	`for this version of QGIS. Maybe you can download an other version from <a href=\"http://plugins.qgis.org\">plugins.qgis.org</a>.\`
`88`	`88`	`</p>\`
`89`	`89`	`\`