Granite

Merge lp:~leonardolemos/granite/fix-1517662 into lp:~elementary-pantheon/granite/granite

  1. fix-1517662
  2. Merge into granite
Proposed by Leonardo Lemos
Status: Merged
Approved by: Corentin Noël
Approved revision: 902
Merged at revision: 903
Proposed branch: lp:~leonardolemos/granite/fix-1517662
Merge into: lp:~elementary-pantheon/granite/granite
Diff against target: 50 lines (+8/-9)
1 file modified
lib/GtkPatch/AboutDialog.vala (+8/-9)
To merge this branch: bzr merge lp:~leonardolemos/granite/fix-1517662
Reviewer Review Type Date Requested Status
elementary Pantheon team Pending
Review via email: mp+278338@code.launchpad.net

Commit message

Use Human readable licences name.

Description of the change

Changed strings as the lp:1517662 says.

To post a comment you must log in.
lp:~leonardolemos/granite/fix-1517662 updated
902. By Leonardo Lemos <email address hidden>

Replaced hyphens with spaces

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/GtkPatch/AboutDialog.vala'
2--- lib/GtkPatch/AboutDialog.vala 2015-11-18 21:37:51 +0000
3+++ lib/GtkPatch/AboutDialog.vala 2015-11-25 15:54:20 +0000
4@@ -10,7 +10,7 @@
5 but WITHOUT ANY WARRANTY; without even the implied warranty of
6 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
7 Lesser General Public License for more details.
8-
9+
10 You should have received a copy of the GNU Lesser General
11 Public License along with this library; if not, write to the
12 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
13@@ -424,25 +424,25 @@
14 {
15 switch (license_type) {
16 case License.GPL_2_0:
17- set_generic_license("http://www.gnu.org/licenses/old-licenses/gpl-2.0.html", "gpl-2.0");
18+ set_generic_license("http://www.gnu.org/licenses/old-licenses/gpl-2.0.html", "GPL 2.0");
19 break;
20 case License.GPL_3_0:
21- set_generic_license("http://www.gnu.org/licenses/gpl.html", "gpl");
22+ set_generic_license("http://www.gnu.org/licenses/gpl.html", "GPL");
23 break;
24 case License.LGPL_2_1:
25- set_generic_license("http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html", "lgpl-2.1");
26+ set_generic_license("http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html", "LGPL 2.1");
27 break;
28 case License.LGPL_3_0:
29- set_generic_license("http://www.gnu.org/licenses/lgpl.html", "lgpl");
30+ set_generic_license("http://www.gnu.org/licenses/lgpl.html", "LGPL");
31 break;
32 case License.BSD:
33- set_generic_license("http://opensource.org/licenses/bsd-license.php", "bsd");
34+ set_generic_license("http://opensource.org/licenses/bsd-license.php", "BSD");
35 break;
36 case License.MIT_X11:
37- set_generic_license("http://opensource.org/licenses/mit-license.php", "mit");
38+ set_generic_license("http://opensource.org/licenses/mit-license.php", "MIT");
39 break;
40 case License.ARTISTIC:
41- set_generic_license("http://opensource.org/licenses/artistic-license-2.0.php", "artistic");
42+ set_generic_license("http://opensource.org/licenses/artistic-license-2.0.php", "Artistic");
43 break;
44 default:
45 if (license != null && license != "") {
46@@ -490,4 +490,3 @@
47 website_url_label.hide ();
48 }
49 }
50-

Subscribers

People subscribed via source and target branches