Merge lp:~markellmtthw/midori/fix-917023 into lp:~vcs-imports/midori/master

[Matthew Markell]

[Cassidy James Blaede (cassidyjames)]

Not sure if it should be "Browse the Web" or "Browse the Internet." My first instinct is "Internet," but I'm not sure and would like feedback. Also, why is private browsing mode still its own .desktop?! It should really be a QuickList action by now IMHO...

review: Needs Information

[Matthew Markell (markellmtthw)]

I used browse the web because Midori is a Web Browser that lets you
Browse the Web. Could be either way though.

Midori does have a Unity quicklist with private browsing. However,
Midori is also used by XFCE and other lightweight environments that
don't support quicklists.

On 01/16/2012 10:25 PM, Cassidy James wrote:
> Review: Needs Information
>
> Not sure if it should be "Browse the Web" or "Browse the Internet." My first instinct is "Internet," but I'm not sure and would like feedback. Also, why is private browsing mode still its own .desktop?! It should really be a QuickList action by now IMHO...

=== modified file 'data/midori-private.desktop.in'
--- data/midori-private.desktop.in	2011-11-15 17:34:19 +0000
+++ data/midori-private.desktop.in	2012-01-16 20:35:32 +0000
@@ -3,7 +3,7 @@
 Type=Application
 _Name=Midori Private Browsing
 _GenericName=Private Browsing
-_Comment=Open a new private browsing window
+_Comment=Browse the Web in private mode
 Categories=GTK;Network;WebBrowser;
 Exec=midori --private %U
 Icon=midori

=== modified file 'data/midori.desktop.in'
--- data/midori.desktop.in	2011-11-24 23:59:48 +0000
+++ data/midori.desktop.in	2012-01-16 20:35:32 +0000
@@ -3,7 +3,7 @@
 Type=Application
 _Name=Midori
 _GenericName=Web Browser
-_Comment=Lightweight web browser
+_Comment=Browse the Web
 _X-GNOME-Keywords=Internet;WWW;Explorer
 _X-AppInstall-Keywords=Internet;WWW;Explorer
 Categories=GTK;Network;WebBrowser;