From 4bb20aa0bc8ba6959af4bd103e74dd497874ced7 Mon Sep 17 00:00:00 2001
From: Yuri Chornoivan <yurchor@ukr.net>
Date: Sat, 9 Nov 2013 17:31:09 +0200
Subject: Remove extra file, fix Nvidia spelling

---
 makepot                                  | 3 ---
 po/mageiawelcome.pot                     | 2 +-
 po/uk.po                                 | 2 +-
 usr/share/mageiawelcome/mageiawelcome.py | 2 +-
 4 files changed, 3 insertions(+), 6 deletions(-)
 delete mode 100755 makepot

diff --git a/makepot b/makepot
deleted file mode 100755
index 7639269..0000000
--- a/makepot
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-xgettext --language=Python --keyword=_ --output=mageiawelcome.pot usr/share/mageiawelcome/mageiawelcome.py
diff --git a/po/mageiawelcome.pot b/po/mageiawelcome.pot
index 5ff7c9e..b6bebf1 100644
--- a/po/mageiawelcome.pot
+++ b/po/mageiawelcome.pot
@@ -196,7 +196,7 @@ msgstr ""
 #: ../usr/share/mageiawelcome/mageiawelcome.py:112
 msgid ""
 "<span class='label red'>non-free</span> - some programs which are not free, "
-"or closed source. For example this repository includes nVidia and ATI "
+"or closed source. For example this repository includes Nvidia and ATI "
 "graphics card proprietary drivers, firmware for various WiFi cards, etc"
 msgstr ""
 
diff --git a/po/uk.po b/po/uk.po
index 7172eee..308e3db 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -210,7 +210,7 @@ msgstr ""
 #: ../usr/share/mageiawelcome/mageiawelcome.py:112
 msgid ""
 "<span class='label red'>non-free</span> - some programs which are not free, "
-"or closed source. For example this repository includes nVidia and ATI "
+"or closed source. For example this repository includes Nvidia and ATI "
 "graphics card proprietary drivers, firmware for various WiFi cards, etc"
 msgstr ""
 "<span class='label red'>non-free</span> — деякі програми, які не є вільними "
diff --git a/usr/share/mageiawelcome/mageiawelcome.py b/usr/share/mageiawelcome/mageiawelcome.py
index ff44ea8..2584995 100644
--- a/usr/share/mageiawelcome/mageiawelcome.py
+++ b/usr/share/mageiawelcome/mageiawelcome.py
@@ -109,7 +109,7 @@ def main():
     l['conf_media'] = _("Configure media sources ...")
     l['mag_media'] = _("Mageia official repositories contain:")
     l['core'] = _("<span class='label green'>core</span> - the free-open-source packages, i.e. software licensed under a free-open-source license")
-    l['nonfree'] = _("<span class='label red'>non-free</span> - some programs which are not free, or closed source. For example this repository includes nVidia and ATI graphics card proprietary drivers, firmware for various WiFi cards, etc")
+    l['nonfree'] = _("<span class='label red'>non-free</span> - some programs which are not free, or closed source. For example this repository includes Nvidia and ATI graphics card proprietary drivers, firmware for various WiFi cards, etc")
     l['tainted'] = _("<span class='label red'>tainted</span> - includes packages released under a free license. However, they may infringe on patents and copyright laws in some countries, e.g. multimedia codecs needed to play various audio/video files; packages needed to play commercial video DVD, etc. ")
     l['note'] = _("<strong>Note!</strong> non-free and tainted are not enabled by default.")
     l['editss'] = _("Edit software sources")
-- 
cgit v1.2.1