From d007e4b1afe9e6bd65c40aa982c37497c709257e Mon Sep 17 00:00:00 2001 From: Nicolas Maia Date: Tue, 1 Dec 2015 09:54:54 -0200 Subject: Removed mentions of open source and Apple --- libre-testing/cnchi/libre+rebranding.patch | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'libre-testing/cnchi/libre+rebranding.patch') diff --git a/libre-testing/cnchi/libre+rebranding.patch b/libre-testing/cnchi/libre+rebranding.patch index 5874e893f..33963a123 100644 --- a/libre-testing/cnchi/libre+rebranding.patch +++ b/libre-testing/cnchi/libre+rebranding.patch @@ -602,7 +602,8 @@ diff -Nur Cnchi-0.12.0.orig/cnchi/features_info.py Cnchi-0.12.0/cnchi/features_i - 'games': _("Installs Steam and Playonlinux for gamming enthusiasts."), 'lamp': _("Apache (or Nginx) + Mariadb + PHP installation and setup."), 'cups': _("Installation of printer drivers and management tools."), - 'office': _("Open source office suite. Supports editing MS Office files."), +- 'office': _("Open source office suite. Supports editing MS Office files."), ++ 'office': _("Free software office suite. Supports editing MS Office files."), 'visual': _("Enable transparency, shadows, and other desktop effects."), 'firewall': _("Control the incoming and outgoing network traffic."), 'lts': _("Long term support (LTS) Linux kernel and modules."), @@ -624,9 +625,10 @@ diff -Nur Cnchi-0.12.0.orig/cnchi/features_info.py Cnchi-0.12.0/cnchi/features_i - "other electronic devices. In Linux, the canonical\n" + "other electronic devices. In GNU/Linux, the canonical\n" "implementation of the Bluetooth protocol stack is BlueZ."), - 'cups': _("CUPS is the standards-based, open source printing\n" - "system developed by Apple Inc. for OS® X and other\n" - "UNIX®-like operating systems."), +- 'cups': _("CUPS is the standards-based, open source printing\n" ++ 'cups': _("CUPS is a standards-based, free software printing system."), +- "system developed by Apple Inc. for OS® X and other\n" +- "UNIX®-like operating systems."), - 'firefox': _("Mozilla Firefox (known simply as Firefox) is a free and\n" - "open-source web browser developed for Windows, OS X, and Linux,\n" - "with a mobile version for Android, by the Mozilla Foundation and\n" @@ -1276,7 +1278,8 @@ diff -Nur Cnchi-0.12.0.orig/cnchi/installation/lamp.py Cnchi-0.12.0/cnchi/instal +++ Cnchi-0.12.0/cnchi/installation/lamp.py 2015-11-29 11:58:16.060633159 -0300 @@ -30,7 +30,7 @@ """ - LAMP stack is a group of open source software to get web servers up +-LAMP stack is a group of open source software to get web servers up ++LAMP stack is a group of free software to get web servers up and running. The acronym stands for Linux, Apache, MySQL, and PHP. -Since the server is already running Antergos, the linux +Since the server is already running Parabola, the GNU/Linux @@ -1288,7 +1291,8 @@ diff -Nur Cnchi-0.12.0.orig/cnchi/installation/lemp.py Cnchi-0.12.0/cnchi/instal +++ Cnchi-0.12.0/cnchi/installation/lemp.py 2015-11-29 11:54:30.171905352 -0300 @@ -30,7 +30,7 @@ """ - LEMP stack is a group of open source software to get web servers up +-LEMP stack is a group of open source software to get web servers up ++LEMP stack is a group of free software to get web servers up and running. The acronym stands for Linux, nginx (pronounced Engine x), -MySQL, and PHP. Since the server is already running Antergos, the linux +MySQL, and PHP. Since the server is already running Parabola, the GNU/Linux -- cgit v1.2.3