Re: Review Request 129571: remove obsolete entities help.menu.documentation + install.intro.documentation

2017-03-05 Thread Luigi Toscano

---
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/129571/#review102716
---


Ship it!




Let's go for this.

- Luigi Toscano


On Nov. 27, 2016, 10:26 p.m., Burkhard Lück wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/129571/
> ---
> 
> (Updated Nov. 27, 2016, 10:26 p.m.)
> 
> 
> Review request for Documentation and Marble.
> 
> 
> Repository: marble
> 
> 
> Description
> ---
> 
> see description
> these entities will be removed in kf6
> 
> 
> Diffs
> -
> 
>   doc/index.docbook 895e446 
> 
> Diff: https://git.reviewboard.kde.org/r/129571/diff/
> 
> 
> Testing
> ---
> 
> passes checkXML5
> 
> 
> Thanks,
> 
> Burkhard Lück
> 
>



Re: [smb4k] doc: Updated handbook with a patch send by Burkhard Lück.

2017-03-05 Thread Luigi Toscano
Alexander Reinholdt ha scritto:
> Git commit e36ce88a93dcea792d328b29e524edef4faef19a by Alexander Reinholdt.
> Committed on 05/03/2017 at 11:02.
> Pushed by areinholdt into branch 'master'.
> 
> Updated handbook with a patch send by Burkhard Lück.

Hi!

A general note about committing patches from other authors: you can apply the
patch using the --author parameter of git, as luckily git distinguish between
the author and the committer:
https://kevin.deldycke.com/2010/05/how-to-fix-bad-commit-authorship-git/

Ciao
-- 
Luigi



[smb4k] doc: Updated handbook with a patch send by Burkhard Lück.

2017-03-05 Thread Alexander Reinholdt
Git commit e36ce88a93dcea792d328b29e524edef4faef19a by Alexander Reinholdt.
Committed on 05/03/2017 at 11:02.
Pushed by areinholdt into branch 'master'.

Updated handbook with a patch send by Burkhard Lück.

M  +18   -20   doc/index.docbook

https://commits.kde.org/smb4k/e36ce88a93dcea792d328b29e524edef4faef19a

diff --git a/doc/index.docbook b/doc/index.docbook
index 45eea17..958f05d 100644
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -27,8 +27,8 @@
 Alexander Reinholdt
   
   
-  2017-02-04
-   2.0.0
+  2017-03-03
+   2.0.0
   
  is an advanced network neighborhood browser and Samba share 
mounting utility.
   
@@ -72,12 +72,10 @@
 Ability to define custom options for individual servers 
and shares
 Laptop support through the Solid hardware device 
framework
 Wake-On-LAN capabilities
-
+ for desktop integration
 Profiles for different network neighborhood 
setups
   
 
-  The plasmoid has not been ported to  and QtQuick 2 yet. 
Thus, it has been disabled in this release. We are currently working on 
bringing this functionality back.  
-
   If you encounter problems while using , please visit our https://sourceforge.net/p/smb4k/wiki/Home/;>wiki first. If you 
cannot find your problem described there, please post a help request to our 
https://sourceforge.net/p/smb4k/discussion/help/;>Help 
forum. In case you find a bug, please report it to our https://bugs.kde.org/enter_bug.cgi?format=guidedproduct=smb4k;>bug 
tracker.
   For discussions about -related topics there is the https://sourceforge.net/p/smb4k/discussion/general/;>General 
Discussion forum and we invite every user to participate.
 
@@ -98,7 +96,7 @@
 
 After the installation, you can run  either from the K menu 
or from the command prompt by typing $ 
smb4k
  does not take any arguments, except those that are known to 
all  applications.
-
+ also comes with a  
for better desktop integration. It can be added as widget to the desktop or the 
panel.
 If your system is missing some of the programs  needs to 
operate properly, it notifies the user:
 
 
@@ -1062,7 +1060,7 @@
   Using Smb4K : The Plasmoid 
 -->
 
-
+  
 
 
 
-
+  
 
 
 
-
+  
 
 
 
-
+  
 
 
 
-
+
 
  and 
the shares view. In the dock widgets of the main 
window, this is done by selecting one or multiple shares and clicking the 
Add Bookmark action.  A dialog will then pop up where you can add a label and/or assign a 
group to the bookmark.
+  You can add bookmarks to your favorite shares from within the 
network neighborhood 
browser and 
the shares view and the . In the dock widgets of the main window, 
this is done by selecting one or multiple shares and clicking the 
Add Bookmark action. In the 
, you click the respective bookmark action next to the item's name. A 
dialog will then pop up where you can add a label and/or assign a group to the 
bookmark.
 
   
 Screenshot of the bookmarks addition dialog
@@ -1245,7 +1243,7 @@
 
   All other entries are either group submenus or shares that do not 
belong to a group. All entries are listed alphabetically and the bookmarks may 
either appear with their UNC address or descriptive label. By clicking a 
bookmark, the respective share is mounted. If a bookmarked share is mounted on 
the system, the bookmark entry is disabled.
   For each group there is a submenu. It contains all bookmarks 
belonging to the group and a Mount All Bookmarks 
menu item. The latter one can be used to mount all bookmarks in that submenu at 
once.
-  In the system tray widget, there is an identical 
Bookmarks submenu 
except that the Add Bookmark entry is missing.  The bookmark groups and the bookmarks 
are listed in the view. Bookmarked shares can be mounted by clicking the 
respective entry. In the tool bar two actions are present: 
Back and Edit. By 
clicking Back you can get back to the top level if 
you entered a group folder. The Edit action will 
open the bookmark editor.
+  In the system tray widget, there is an identical 
Bookmarks submenu 
except that the Add Bookmark entry is missing. The 
plasmoid provides a Bookmarks tab where all bookmarks are arranged in a 
similar way as in the bookmark menu. The bookmark groups and the bookmarks are 
listed in the view. Bookmarked shares can be mounted by clicking the respective 
entry. In the tool bar two actions are present: Back 
and Edit. By clicking 
Back you can get back to the top level if you 
entered a group folder. The Edit action will open 
the bookmark editor.
 
 
 
   
 
   


[kdesvn] src/settings: Fix typo: recoursive => recursive

2017-03-05 Thread Steve Allewell
Git commit 38895739c5b829f5d39616f62dc1f4399096ccd7 by Steve Allewell.
Committed on 05/03/2017 at 10:46.
Pushed by sallewell into branch 'master'.

Fix typo: recoursive => recursive

GUI: recoursive => recursive

M  +1-1src/settings/diffmergesettings.ui

https://commits.kde.org/kdesvn/38895739c5b829f5d39616f62dc1f4399096ccd7

diff --git a/src/settings/diffmergesettings.ui 
b/src/settings/diffmergesettings.ui
index 10958d69..7506f903 100644
--- a/src/settings/diffmergesettings.ui
+++ b/src/settings/diffmergesettings.ui
@@ -187,7 +187,7 @@ or
 If one between the first or the second form is used, svn itself generates the 
diff. %f will be replaced with a temporary filename. If %f is not given,
 the diff-display should be able to read data from stdin.
 br
-When %s1 and %s2 are given, kdesvn lets this display make the diff. For that 
it makes a temporary export or get (if needed) and fills out the parameters 
with the right values. %s1 will be filled with the content of the initial 
revision, %s2 with the final revision. On large recoursive diffs this may get 
really slow.
+When %s1 and %s2 are given, kdesvn lets this display make the diff. For that 
it makes a temporary export or get (if needed) and fills out the parameters 
with the right values. %s1 will be filled with the content of the initial 
revision, %s2 with the final revision. On large recursive diffs this may get 
really slow.
 /p

   


[tellico] /: Fix minor issues

2017-03-05 Thread Yuri Chornoivan
Git commit 5871bdfb5c5f0015003138b03639a9bffd250435 by Yuri Chornoivan.
Committed on 05/03/2017 at 08:55.
Pushed by yurchor into branch 'master'.

Fix minor issues

M  +1-1doc/configuration.docbook
M  +1-1icons/README.quesnay
M  +1-1src/entryiconview.cpp

https://commits.kde.org/tellico/5871bdfb5c5f0015003138b03639a9bffd250435

diff --git a/doc/configuration.docbook b/doc/configuration.docbook
index 31cb32a9..3e133924 100644
--- a/doc/configuration.docbook
+++ b/doc/configuration.docbook
@@ -348,7 +348,7 @@ The http://www.imdb.com;>Internet Movie 
Database provides in
 
 OMDBAPI.com
 
-http://omdbapi.com;>The Open Movie Databaseis a free web 
service to obtain movie information.
+http://omdbapi.com;>The Open Movie Database is a free web 
service to obtain movie information.
 
 
 
diff --git a/icons/README.quesnay b/icons/README.quesnay
index 571daab7..7c96427e 100644
--- a/icons/README.quesnay
+++ b/icons/README.quesnay
@@ -20,7 +20,7 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public
-License along with this library (see the the license.txt file); if not, write 
to the Free Software Foundation, Inc., 51 Franklin Street, Fifh Floor, Boston, 
MA  02110-1301  USA
+License along with this library (see the license.txt file); if not, write to 
the Free Software Foundation, Inc., 51 Franklin Street, Fifh Floor, Boston, MA  
02110-1301  USA
 ### NOTE THIS ADD-ON ###
 The GNU Lesser General Public License or LGPL is written for software libraries
 in the first place. The LGPL has to be considered valid for this artwork
diff --git a/src/entryiconview.cpp b/src/entryiconview.cpp
index 5983ed0a..8ba044d1 100644
--- a/src/entryiconview.cpp
+++ b/src/entryiconview.cpp
@@ -140,7 +140,7 @@ void EntryIconView::slotSortMenuActivated(QAction* action_) 
{
 return;
   }
   // could have just put the index of the field in the list as the action data
-  // but instead, we need to to iterate over the current fields and find the 
index since EntryTitleModel
+  // but instead, we need to iterate over the current fields and find the 
index since EntryTitleModel
   // uses the field list index as the column value
   Data::FieldList fields = Data::Document::self()->collection()->fields();
   for(int i = 0; i < fields.count(); ++i) {