diff --git a/debian/changelog b/debian/changelog index d982e94..d26069e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,32 @@ +mintmenu (5.7.5) serena; urgency=medium + + * Favorites: Add rhythmbox + + -- Clement Lefebvre Wed, 23 Nov 2016 22:49:47 +0000 + +mintmenu (5.7.4) serena; urgency=medium + + [ JKAbrams ] + * Added setting to disable internet searching + * Revert "Added setting to disable internet searching" + * Making internet searching from the start menu optional + + [ Clement Lefebvre ] + * Search engines: Replace Google CSE with DDG + * Search engines: Re-enable search engines by default. + * Search engines: Fix community links when Internet search is disabled + * l10n: Capitalize "Internet" + * Search engines: Point to local version of Wikipedia + * l10n: Update POT file + + -- Clement Lefebvre Wed, 23 Nov 2016 15:37:46 +0000 + +mintmenu (5.7.3) serena; urgency=medium + + * Fixed launching some Wine applications + + -- Clement Lefebvre Wed, 02 Nov 2016 14:03:20 +0000 + mintmenu (5.7.2) sarah; urgency=medium * Menu icon: Scale svg files to 22px to prevent them from getting too big diff --git a/mintmenu.pot b/mintmenu.pot index 042086a..89b8d9a 100644 --- a/mintmenu.pot +++ b/mintmenu.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-11-27 15:05+0300\n" +"POT-Creation-Date: 2016-11-23 15:36+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,31 +21,31 @@ msgstr "" msgid "Menu" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenu.py:256 +#: usr/lib/linuxmint/mintMenu/mintMenu.py:247 msgid "Couldn't load plugin:" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenu.py:328 +#: usr/lib/linuxmint/mintMenu/mintMenu.py:319 msgid "Couldn't initialize plugin" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenu.py:731 +#: usr/lib/linuxmint/mintMenu/mintMenu.py:727 msgid "Advanced MATE Menu" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenu.py:818 +#: usr/lib/linuxmint/mintMenu/mintMenu.py:815 msgid "Preferences" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenu.py:821 +#: usr/lib/linuxmint/mintMenu/mintMenu.py:818 msgid "Edit menu" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenu.py:824 +#: usr/lib/linuxmint/mintMenu/mintMenu.py:821 msgid "Reload plugins" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenu.py:827 +#: usr/lib/linuxmint/mintMenu/mintMenu.py:824 msgid "About" msgstr "" @@ -62,286 +62,286 @@ msgid "Show button icon" msgstr "" #: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:47 -msgid "Use custom colors" +msgid "Enable Internet search" msgstr "" #: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:48 -msgid "Show recent documents plugin" +msgid "Use custom colors" msgstr "" #: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:49 -msgid "Show applications plugin" +msgid "Show recent documents plugin" msgstr "" #: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:50 -msgid "Show system plugin" +msgid "Show applications plugin" msgstr "" #: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:51 +msgid "Show system plugin" +msgstr "" + +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:52 msgid "Show places plugin" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:53 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:54 msgid "Show application comments" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:54 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:55 msgid "Show category icons" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:55 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:56 msgid "Hover" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:56 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:57 msgid "Remember the last category or search" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:57 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:58 msgid "Search for packages to install" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:58 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:59 msgid "Swap name and generic name" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:60 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:61 msgid "Border width:" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:61 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:62 msgid "pixels" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:63 -msgid "Opacity:" -msgstr "" - -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:66 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:64 msgid "Button text:" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:67 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:65 msgid "Options" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:68 -#: usr/lib/linuxmint/mintMenu/plugins/applications.py:251 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:66 +#: usr/lib/linuxmint/mintMenu/plugins/applications.py:203 msgid "Applications" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:70 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:68 msgid "Theme" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:71 -#: usr/lib/linuxmint/mintMenu/plugins/applications.py:248 -#: usr/lib/linuxmint/mintMenu/plugins/applications.py:249 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:69 +#: usr/lib/linuxmint/mintMenu/plugins/applications.py:200 +#: usr/lib/linuxmint/mintMenu/plugins/applications.py:201 msgid "Favorites" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:72 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:70 msgid "Main button" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:73 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:71 msgid "Plugins" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:75 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:73 msgid "Background:" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:76 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:74 msgid "Headings:" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:77 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:75 msgid "Borders:" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:78 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:76 msgid "Theme:" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:82 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:80 msgid "Number of columns:" msgstr "" +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:81 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:82 #: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:83 #: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:84 -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:85 -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:86 msgid "Icon size:" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:87 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:85 msgid "Hover delay (ms):" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:88 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:86 msgid "Button icon:" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:89 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:87 msgid "Search command:" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:91 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:89 #: usr/lib/linuxmint/mintMenu/plugins/places.py:44 msgid "Places" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:92 -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:104 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:90 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:102 msgid "Allow Scrollbar" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:93 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:91 msgid "Show GTK Bookmarks" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:94 -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:105 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:92 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:103 msgid "Height:" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:95 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:93 msgid "Toggle Default Places:" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:96 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:94 #: usr/lib/linuxmint/mintMenu/plugins/places.py:141 msgid "Computer" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:97 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:95 #: usr/lib/linuxmint/mintMenu/plugins/places.py:151 msgid "Home Folder" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:98 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:96 #: usr/lib/linuxmint/mintMenu/plugins/places.py:164 #: usr/lib/linuxmint/mintMenu/plugins/places.py:166 msgid "Network" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:99 -#: usr/lib/linuxmint/mintMenu/plugins/places.py:189 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:97 +#: usr/lib/linuxmint/mintMenu/plugins/places.py:188 msgid "Desktop" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:100 -#: usr/lib/linuxmint/mintMenu/plugins/places.py:199 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:98 +#: usr/lib/linuxmint/mintMenu/plugins/places.py:198 msgid "Trash" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:101 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:99 msgid "Custom Places:" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:103 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:101 #: usr/lib/linuxmint/mintMenu/plugins/system_management.py:40 msgid "System" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:106 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:104 msgid "Toggle Default Items:" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:107 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:105 #: usr/lib/linuxmint/mintMenu/plugins/system_management.py:136 msgid "Software Manager" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:108 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:106 #: usr/lib/linuxmint/mintMenu/plugins/system_management.py:143 msgid "Package Manager" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:109 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:107 #: usr/lib/linuxmint/mintMenu/plugins/system_management.py:150 msgid "Control Center" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:110 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:108 #: usr/lib/linuxmint/mintMenu/plugins/system_management.py:160 msgid "Terminal" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:111 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:109 #: usr/lib/linuxmint/mintMenu/plugins/system_management.py:177 msgid "Lock Screen" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:112 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:110 msgid "Log Out" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:113 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:111 #: usr/lib/linuxmint/mintMenu/plugins/system_management.py:194 msgid "Quit" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:115 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:113 msgid "Edit Place" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:116 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:114 msgid "New Place" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:117 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:115 msgid "Select a folder" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:147 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:145 msgid "Keyboard shortcut:" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:153 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:151 msgid "Images" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:271 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:269 msgid "Name" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:272 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:270 msgid "Path" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:287 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:285 msgid "Desktop theme" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:426 -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:457 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:434 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:465 msgid "Name:" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:427 -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:458 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:435 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:466 msgid "Path:" msgstr "" -#: usr/lib/linuxmint/mintMenu/keybinding.py:197 +#: usr/lib/linuxmint/mintMenu/keybinding.py:199 msgid "Click to set a new accelerator key for opening and closing the menu. " msgstr "" -#: usr/lib/linuxmint/mintMenu/keybinding.py:198 +#: usr/lib/linuxmint/mintMenu/keybinding.py:200 msgid "Press Escape or click again to cancel the operation. " msgstr "" -#: usr/lib/linuxmint/mintMenu/keybinding.py:199 +#: usr/lib/linuxmint/mintMenu/keybinding.py:201 msgid "Press Backspace to clear the existing keybinding." msgstr "" -#: usr/lib/linuxmint/mintMenu/keybinding.py:212 +#: usr/lib/linuxmint/mintMenu/keybinding.py:214 msgid "Pick an accelerator" msgstr "" -#: usr/lib/linuxmint/mintMenu/keybinding.py:265 +#: usr/lib/linuxmint/mintMenu/keybinding.py:267 msgid "" msgstr "" @@ -349,142 +349,142 @@ msgstr "" msgid "Recent documents" msgstr "" -#: usr/lib/linuxmint/mintMenu/plugins/applications.py:246 +#: usr/lib/linuxmint/mintMenu/plugins/applications.py:198 msgid "Search:" msgstr "" -#: usr/lib/linuxmint/mintMenu/plugins/applications.py:250 +#: usr/lib/linuxmint/mintMenu/plugins/applications.py:202 msgid "All applications" msgstr "" -#: usr/lib/linuxmint/mintMenu/plugins/applications.py:634 +#: usr/lib/linuxmint/mintMenu/plugins/applications.py:595 #, python-format -msgid "Search Google for %s" +msgid "Search DuckDuckGo for %s" msgstr "" -#: usr/lib/linuxmint/mintMenu/plugins/applications.py:641 +#: usr/lib/linuxmint/mintMenu/plugins/applications.py:602 #, python-format msgid "Search Wikipedia for %s" msgstr "" -#: usr/lib/linuxmint/mintMenu/plugins/applications.py:657 +#: usr/lib/linuxmint/mintMenu/plugins/applications.py:618 #, python-format msgid "Lookup %s in Dictionary" msgstr "" -#: usr/lib/linuxmint/mintMenu/plugins/applications.py:664 +#: usr/lib/linuxmint/mintMenu/plugins/applications.py:625 #, python-format msgid "Search Computer for %s" msgstr "" -#: usr/lib/linuxmint/mintMenu/plugins/applications.py:742 -#: usr/lib/linuxmint/mintMenu/plugins/applications.py:795 +#: usr/lib/linuxmint/mintMenu/plugins/applications.py:703 +#: usr/lib/linuxmint/mintMenu/plugins/applications.py:756 #, python-format msgid "Install package '%s'" msgstr "" -#: usr/lib/linuxmint/mintMenu/plugins/applications.py:918 -#: usr/lib/linuxmint/mintMenu/plugins/applications.py:986 +#: usr/lib/linuxmint/mintMenu/plugins/applications.py:890 +#: usr/lib/linuxmint/mintMenu/plugins/applications.py:960 msgid "Add to desktop" msgstr "" -#: usr/lib/linuxmint/mintMenu/plugins/applications.py:919 -#: usr/lib/linuxmint/mintMenu/plugins/applications.py:987 +#: usr/lib/linuxmint/mintMenu/plugins/applications.py:891 +#: usr/lib/linuxmint/mintMenu/plugins/applications.py:961 msgid "Add to panel" msgstr "" -#: usr/lib/linuxmint/mintMenu/plugins/applications.py:921 -#: usr/lib/linuxmint/mintMenu/plugins/applications.py:969 +#: usr/lib/linuxmint/mintMenu/plugins/applications.py:893 +#: usr/lib/linuxmint/mintMenu/plugins/applications.py:942 msgid "Insert space" msgstr "" -#: usr/lib/linuxmint/mintMenu/plugins/applications.py:922 -#: usr/lib/linuxmint/mintMenu/plugins/applications.py:970 +#: usr/lib/linuxmint/mintMenu/plugins/applications.py:894 +#: usr/lib/linuxmint/mintMenu/plugins/applications.py:943 msgid "Insert separator" msgstr "" -#: usr/lib/linuxmint/mintMenu/plugins/applications.py:924 -#: usr/lib/linuxmint/mintMenu/plugins/applications.py:990 +#: usr/lib/linuxmint/mintMenu/plugins/applications.py:896 +#: usr/lib/linuxmint/mintMenu/plugins/applications.py:964 msgid "Launch when I log in" msgstr "" -#: usr/lib/linuxmint/mintMenu/plugins/applications.py:926 -#: usr/lib/linuxmint/mintMenu/plugins/applications.py:992 +#: usr/lib/linuxmint/mintMenu/plugins/applications.py:898 +#: usr/lib/linuxmint/mintMenu/plugins/applications.py:966 msgid "Launch" msgstr "" -#: usr/lib/linuxmint/mintMenu/plugins/applications.py:927 +#: usr/lib/linuxmint/mintMenu/plugins/applications.py:899 msgid "Remove from favorites" msgstr "" -#: usr/lib/linuxmint/mintMenu/plugins/applications.py:929 -#: usr/lib/linuxmint/mintMenu/plugins/applications.py:996 +#: usr/lib/linuxmint/mintMenu/plugins/applications.py:901 +#: usr/lib/linuxmint/mintMenu/plugins/applications.py:970 msgid "Edit properties" msgstr "" -#: usr/lib/linuxmint/mintMenu/plugins/applications.py:968 +#: usr/lib/linuxmint/mintMenu/plugins/applications.py:941 msgid "Remove" msgstr "" -#: usr/lib/linuxmint/mintMenu/plugins/applications.py:989 +#: usr/lib/linuxmint/mintMenu/plugins/applications.py:963 msgid "Show in my favorites" msgstr "" -#: usr/lib/linuxmint/mintMenu/plugins/applications.py:993 +#: usr/lib/linuxmint/mintMenu/plugins/applications.py:967 msgid "Uninstall" msgstr "" -#: usr/lib/linuxmint/mintMenu/plugins/applications.py:994 +#: usr/lib/linuxmint/mintMenu/plugins/applications.py:968 msgid "Delete from menu" msgstr "" -#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1048 -msgid "Search Google" +#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1025 +msgid "Search DuckDuckGo" msgstr "" -#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1055 +#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1032 msgid "Search Wikipedia" msgstr "" -#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1065 +#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1042 msgid "Lookup Dictionary" msgstr "" -#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1072 +#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1049 msgid "Search Computer" msgstr "" -#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1082 +#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1059 msgid "Find Software" msgstr "" -#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1089 +#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1066 msgid "Find Tutorials" msgstr "" -#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1096 +#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1073 msgid "Find Hardware" msgstr "" -#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1103 +#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1080 msgid "Find Ideas" msgstr "" -#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1110 +#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1087 msgid "Find Users" msgstr "" -#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1577 +#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1547 msgid "" "Couldn't save favorites. Check if you have write access to ~/.linuxmint/" "mintMenu" msgstr "" -#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1778 +#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1758 msgid "All" msgstr "" -#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1778 +#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1758 msgid "Show all applications" msgstr "" @@ -535,14 +535,14 @@ msgstr "" msgid "Browse bookmarked and local network locations" msgstr "" -#: usr/lib/linuxmint/mintMenu/plugins/places.py:196 +#: usr/lib/linuxmint/mintMenu/plugins/places.py:195 msgid "Browse items placed on the desktop" msgstr "" -#: usr/lib/linuxmint/mintMenu/plugins/places.py:210 +#: usr/lib/linuxmint/mintMenu/plugins/places.py:209 msgid "Browse deleted files" msgstr "" -#: usr/lib/linuxmint/mintMenu/plugins/places.py:262 +#: usr/lib/linuxmint/mintMenu/plugins/places.py:261 msgid "Empty trash" msgstr "" diff --git a/usr/lib/linuxmint/mintMenu/applications.list b/usr/lib/linuxmint/mintMenu/applications.list index 6ad2cf8..e779c50 100644 --- a/usr/lib/linuxmint/mintMenu/applications.list +++ b/usr/lib/linuxmint/mintMenu/applications.list @@ -2,6 +2,7 @@ location:/usr/share/applications/firefox.desktop location:/usr/share/applications/thunderbird.desktop location:/usr/share/applications/pidgin.desktop location:/usr/share/applications/banshee.desktop +location:/usr/share/applications/rhythmbox.desktop separator location:/usr/share/applications/gnome-calculator.desktop location:/usr/share/applications/gcalctool.desktop diff --git a/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade b/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade index 2a67b5d..17a9b2c 100644 --- a/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade +++ b/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade @@ -1,4 +1,5 @@ + @@ -310,10 +311,10 @@ True False - 10 - 10 - 10 - 10 + 5 + 5 + 5 + 5 0 none @@ -333,6 +334,7 @@ False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK start + 5 True @@ -347,6 +349,7 @@ False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK start + 5 Button text: @@ -373,6 +376,7 @@ True False start + 5 Button icon: @@ -439,10 +443,10 @@ True False - 10 - 10 - 10 - 10 + 5 + 5 + 5 + 5 0 none @@ -657,17 +661,21 @@ True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 10 - 10 - 10 - 10 - 0 + 5 + 5 + 5 + 4 + 0.5 none True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 7 + 7 + 21 + 7 vertical @@ -829,17 +837,22 @@ True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 10 - 10 - 10 - 10 + 5 + 5 + 5 + 5 0 none True False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 7 + 7 + 7 5 + 2 Show application comments @@ -847,7 +860,7 @@ True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 10 + 11 True @@ -980,16 +993,12 @@ True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False True - 2 + 0 6 - 7 - GTK_FILL - - 5 + 2 @@ -1008,10 +1017,19 @@ - - - - + + Enable Internet search + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + 0 + 8 + 2 + @@ -1037,10 +1055,10 @@ True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 10 - 10 - 10 - 10 + 7 + 7 + 21 + 7 0 none @@ -1146,10 +1164,10 @@ True False - 10 - 10 - 10 - 10 + 7 + 7 + 2 + 7 0 none @@ -1570,10 +1588,10 @@ True False - 10 - 10 - 10 - 10 + 7 + 7 + 7 + 7 0 none @@ -1587,6 +1605,7 @@ True True False + 10 10 True @@ -1607,6 +1626,7 @@ True False + 10 Height: True @@ -1653,6 +1673,7 @@ False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK start + 10 Icon size: @@ -1703,6 +1724,7 @@ True True False + 10 True @@ -1717,6 +1739,7 @@ True True False + 10 True @@ -1731,6 +1754,7 @@ True True False + 10 True @@ -1745,6 +1769,7 @@ True True False + 10 none True @@ -1760,6 +1785,7 @@ True True False + 10 True @@ -1774,6 +1800,7 @@ True True False + 10 True @@ -1788,6 +1815,7 @@ True True False + 10 True diff --git a/usr/lib/linuxmint/mintMenu/mintMenuConfig.py b/usr/lib/linuxmint/mintMenu/mintMenuConfig.py index 40837e4..96914b9 100755 --- a/usr/lib/linuxmint/mintMenu/mintMenuConfig.py +++ b/usr/lib/linuxmint/mintMenu/mintMenuConfig.py @@ -44,6 +44,7 @@ class mintMenuConfig( object ): self.builder.get_object("startWithFavorites").set_label(_("Always start with favorites pane")) self.builder.get_object("showButtonIcon").set_label(_("Show button icon")) + self.builder.get_object("enableInternetSearch").set_label(_("Enable Internet search")) self.builder.get_object("useCustomColors").set_label(_("Use custom colors")) self.builder.get_object("showRecentPlugin").set_label(_("Show recent documents plugin")) self.builder.get_object("showApplicationsPlugin").set_label(_("Show applications plugin")) @@ -139,6 +140,7 @@ class mintMenuConfig( object ): self.borderColorLabel = self.builder.get_object( "borderColorLabel" ) self.headingColorLabel = self.builder.get_object( "headingColorLabel" ) self.showButtonIcon = self.builder.get_object( "showButtonIcon" ) + self.enableInternetSearch = self.builder.get_object( "enableInternetSearch" ) self.buttonText = self.builder.get_object( "buttonText" ) self.hotkeyWidget = keybinding.KeybindingWidget(_("Keyboard shortcut:") ) grid = self.builder.get_object( "main_grid" ) @@ -208,6 +210,7 @@ class mintMenuConfig( object ): self.bindGSettingsValueToWidget( self.settingsApplications, "int", "favicon-size", self.favIconSize, "value-changed", self.favIconSize.set_value, self.favIconSize.get_value ) self.bindGSettingsValueToWidget( self.settingsApplications, "int", "fav-cols", self.favCols, "value-changed", self.favCols.set_value, self.favCols.get_value ) self.bindGSettingsValueToWidget( self.settingsApplications, "bool", "remember-filter", self.rememberFilter, "toggled", self.rememberFilter.set_active, self.rememberFilter.get_active) + self.bindGSettingsValueToWidget( self.settingsApplications, "bool", "enable-internet-search", self.enableInternetSearch, "toggled", self.enableInternetSearch.set_active, self.enableInternetSearch.get_active) self.bindGSettingsValueToWidget( self.settingsPlaces, "int", "icon-size", self.placesIconSize, "value-changed", self.placesIconSize.set_value, self.placesIconSize.get_value ) self.bindGSettingsValueToWidget( self.settingsSystem, "int", "icon-size", self.systemIconSize, "value-changed", self.systemIconSize.set_value, self.systemIconSize.get_value ) diff --git a/usr/lib/linuxmint/mintMenu/plugins/applications.py b/usr/lib/linuxmint/mintMenu/plugins/applications.py index 9c55932..2d6da86 100755 --- a/usr/lib/linuxmint/mintMenu/plugins/applications.py +++ b/usr/lib/linuxmint/mintMenu/plugins/applications.py @@ -170,6 +170,12 @@ class pluginclass( object ): self.toggleButton = toggleButton self.de = de + # Detect the locale (this is used for the Wikipedia search) + self.lang = "en" + lang = os.getenv('LANG') + if lang is not None and lang != "": + self.lang = lang.split("_")[0] + self.builder = Gtk.Builder() # The Glade file for the plugin self.builder.add_from_file (os.path.join( os.path.dirname( __file__ ), "applications.glade" )) @@ -237,9 +243,11 @@ class pluginclass( object ): self.settings.notifyAdd( "use-apt", self.switchAPTUsage) self.settings.notifyAdd( "fav-cols", self.changeFavCols ) self.settings.notifyAdd( "remember-filter", self.changeRememberFilter) + self.settings.notifyAdd( "enable-internet-search", self.changeEnableInternetSearch) self.settings.bindGSettingsEntryToVar( "int", "category-hover-delay", self, "categoryhoverdelay" ) self.settings.bindGSettingsEntryToVar( "bool", "do-not-filter", self, "donotfilterapps" ) + self.settings.bindGSettingsEntryToVar( "bool", "enable-internet-search", self, "enableInternetSearch" ) self.settings.bindGSettingsEntryToVar( "string", "search-command", self, "searchtool" ) self.settings.bindGSettingsEntryToVar( "int", "default-tab", self, "defaultTab" ) except Exception, detail: @@ -382,6 +390,9 @@ class pluginclass( object ): def changeRememberFilter( self, settings, key, args): self.rememberFilter = settings.get_boolean(key) + def changeEnableInternetSearch( self, settings, key, args): + self.enableInternetSearch = settings.get_boolean(key) + def changeShowApplicationComments( self, settings, key, args ): self.showapplicationcomments = settings.get_boolean(key) for child in self.applicationsBox: @@ -446,6 +457,7 @@ class pluginclass( object ): self.showapplicationcomments = self.settings.get( "bool", "show-application-comments") self.useAPT = self.settings.get( "bool", "use-apt") self.rememberFilter = self.settings.get( "bool", "remember-filter") + self.enableInternetSearch = self.settings.get( "bool", "enable-internet-search") self.lastActiveTab = self.settings.get( "int", "last-active-tab") self.defaultTab = self.settings.get( "int", "default-tab") @@ -571,28 +583,29 @@ class pluginclass( object ): text = "%s" % text - suggestionButton = SuggestionButton("list-add", self.iconSize, "") - suggestionButton.connect("clicked", self.search_google) - suggestionButton.set_text(_("Search Google for %s") % text) - suggestionButton.set_image("/usr/lib/linuxmint/mintMenu/search_engines/google.ico") - self.applicationsBox.add(suggestionButton) - self.suggestions.append(suggestionButton) + if self.enableInternetSearch: + suggestionButton = SuggestionButton("list-add", self.iconSize, "") + suggestionButton.connect("clicked", self.search_ddg) + suggestionButton.set_text(_("Search DuckDuckGo for %s") % text) + suggestionButton.set_image("/usr/lib/linuxmint/mintMenu/search_engines/ddg.png") + self.applicationsBox.add(suggestionButton) + self.suggestions.append(suggestionButton) - suggestionButton = SuggestionButton("list-add", self.iconSize, "") - suggestionButton.connect("clicked", self.search_wikipedia) - suggestionButton.set_text(_("Search Wikipedia for %s") % text) - suggestionButton.set_image("/usr/lib/linuxmint/mintMenu/search_engines/wikipedia.ico") - self.applicationsBox.add(suggestionButton) - self.suggestions.append(suggestionButton) + suggestionButton = SuggestionButton("list-add", self.iconSize, "") + suggestionButton.connect("clicked", self.search_wikipedia) + suggestionButton.set_text(_("Search Wikipedia for %s") % text) + suggestionButton.set_image("/usr/lib/linuxmint/mintMenu/search_engines/wikipedia.ico") + self.applicationsBox.add(suggestionButton) + self.suggestions.append(suggestionButton) - separator = Gtk.EventBox() - separator.add(Gtk.Separator( orientation=Gtk.Orientation.HORIZONTAL )) - separator.set_visible_window(False) - separator.set_size_request(-1, 20) - separator.type = "separator" - separator.show_all() - self.applicationsBox.add(separator) - self.suggestions.append(separator) + separator = Gtk.EventBox() + separator.add(Gtk.Separator( orientation=Gtk.Orientation.HORIZONTAL )) + separator.set_visible_window(False) + separator.set_size_request(-1, 20) + separator.type = "separator" + separator.show_all() + self.applicationsBox.add(separator) + self.suggestions.append(separator) suggestionButton = SuggestionButton("list-add", self.iconSize, "") suggestionButton.connect("clicked", self.search_dictionary) @@ -997,22 +1010,24 @@ class pluginclass( object ): def searchPopup( self, widget=None, event=None ): menu = Gtk.Menu() - menuItem = Gtk.ImageMenuItem(_("Search Google")) - img = Gtk.Image() - img.set_from_file('/usr/lib/linuxmint/mintMenu/search_engines/google.ico') - menuItem.set_image(img) - menuItem.connect("activate", self.search_google) - menu.append(menuItem) + if self.enableInternetSearch: - menuItem = Gtk.ImageMenuItem(_("Search Wikipedia")) - img = Gtk.Image() - img.set_from_file('/usr/lib/linuxmint/mintMenu/search_engines/wikipedia.ico') - menuItem.set_image(img) - menuItem.connect("activate", self.search_wikipedia) - menu.append(menuItem) + menuItem = Gtk.ImageMenuItem(_("Search DuckDuckGo")) + img = Gtk.Image() + img.set_from_file('/usr/lib/linuxmint/mintMenu/search_engines/ddg.png') + menuItem.set_image(img) + menuItem.connect("activate", self.search_ddg) + menu.append(menuItem) - menuItem = Gtk.SeparatorMenuItem() - menu.append(menuItem) + menuItem = Gtk.ImageMenuItem(_("Search Wikipedia")) + img = Gtk.Image() + img.set_from_file('/usr/lib/linuxmint/mintMenu/search_engines/wikipedia.ico') + menuItem.set_image(img) + menuItem.connect("activate", self.search_wikipedia) + menu.append(menuItem) + + menuItem = Gtk.SeparatorMenuItem() + menu.append(menuItem) menuItem = Gtk.ImageMenuItem(_("Lookup Dictionary")) img = Gtk.Image() @@ -1085,16 +1100,16 @@ class pluginclass( object ): y = rect.y + rect.height return (x, y, False) - def search_google(self, widget): + def search_ddg(self, widget): text = self.searchEntry.get_text() text = text.replace(" ", "+") - os.system("xdg-open \"http://www.google.com/cse?cx=002683415331144861350%3Atsq8didf9x0&ie=utf-8&sa=Search&q=" + text + "\" &") + os.system("xdg-open \"https://duckduckgo.com/?q=%s&t=lm&ia=web\" &" % text) self.mintMenuWin.hide() def search_wikipedia(self, widget): text = self.searchEntry.get_text() text = text.replace(" ", "+") - os.system("xdg-open \"http://en.wikipedia.org/wiki/Special:Search?search=" + text + "\" &") + os.system("xdg-open \"http://%s.wikipedia.org/wiki/Special:Search?search=%s\" &" % (self.lang, text)) self.mintMenuWin.hide() def search_dictionary(self, widget): diff --git a/usr/lib/linuxmint/mintMenu/plugins/easybuttons.py b/usr/lib/linuxmint/mintMenu/plugins/easybuttons.py index bb01dc2..19941d7 100755 --- a/usr/lib/linuxmint/mintMenu/plugins/easybuttons.py +++ b/usr/lib/linuxmint/mintMenu/plugins/easybuttons.py @@ -289,7 +289,7 @@ class ApplicationLauncher( easyButton ): self.appName = self.strip_accents(desktopItem.getName()) self.appGenericName = self.strip_accents(desktopItem.getGenericName()) self.appComment = self.strip_accents(desktopItem.getComment()) - self.appExec = self.strip_accents(desktopItem.getExec()) + self.appExec = self.strip_accents(desktopItem.getExec().replace('\\\\', '\\')) self.appIconName = desktopItem.getIcon() self.appCategories = desktopItem.getCategories() self.appMateDocPath = desktopItem.get( "X-MATE-DocPath" ) or "" diff --git a/usr/lib/linuxmint/mintMenu/search_engines/ddg.png b/usr/lib/linuxmint/mintMenu/search_engines/ddg.png new file mode 100644 index 0000000..7cdf03d Binary files /dev/null and b/usr/lib/linuxmint/mintMenu/search_engines/ddg.png differ diff --git a/usr/lib/linuxmint/mintMenu/search_engines/google.ico b/usr/lib/linuxmint/mintMenu/search_engines/google.ico deleted file mode 100644 index ee7c943..0000000 Binary files a/usr/lib/linuxmint/mintMenu/search_engines/google.ico and /dev/null differ diff --git a/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml b/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml index 22d4c84..5bffba8 100644 --- a/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml +++ b/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml @@ -313,6 +313,12 @@ + + + true + + +