[debian-edu-commits] debian-edu/ 01/01: Drop Sugar from debian/debian-edu-profile-udeb.templates and debian/po/templates.pot as well.

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository debian-edu-install.

commit 8ed6fbb5a80d52fabf51254782fee5054db65a55
Author: Holger Levsen <holger at layer-acht.org>
Date:   Tue Apr 14 18:23:39 2015 +0200

    Drop Sugar from debian/debian-edu-profile-udeb.templates and debian/po/templates.pot as well.
---
 debian/changelog                         |  2 ++
 debian/debian-edu-profile-udeb.templates |  7 -------
 debian/po/templates.pot                  | 13 ++++++-------
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fc39332..a6f5aac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ debian-edu-install (1.820) UNRELEASED; urgency=high
   [ Holger Levsen ]
   * debian-edu-profile: drop sugar from supported profiles as it has been
     removed from Jessie, see #782504.
+  * Drop Sugar from debian/debian-edu-profile-udeb.templates and
+    debian/po/templates.pot as well.
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Wed, 01 Apr 2015 10:54:46 +0200
 
diff --git a/debian/debian-edu-profile-udeb.templates b/debian/debian-edu-profile-udeb.templates
index 277739c..0751362 100644
--- a/debian/debian-edu-profile-udeb.templates
+++ b/debian/debian-edu-profile-udeb.templates
@@ -5,12 +5,8 @@ _Description: Choose Debian Edu profile
 
 Template: debian-edu-install/profile
 Type: multiselect
-#flag:translate!:7
-#__Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 __Choices: Main Server, Workstation, Roaming Workstation, Thin Client Server, Standalone, Minimal
 Choices-C: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
-#flag:comment:3
-## Translators, do not translate "Sugar"
 _Description: Profile(s) to apply to this machine:
  Profiles determine how the machine can be used out-of-the-box:
  .
@@ -29,9 +25,6 @@ _Description: Profile(s) to apply to this machine:
                  profiles.
   - Minimal:     fully integrated into the Debian Edu network but
                  contains only a basic system without any GUI.
-#  - Sugar:       variant of 'Standalone' that includes the Sugar 
-#                 desktop environment which promotes sharing and 
-#                 collaborative learning for children.
 
 Template: debian-edu-install/standalone_only
 Type: error
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 5d25804..129683b 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -26,42 +26,42 @@ msgstr ""
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Main Server"
 msgstr ""
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Workstation"
 msgstr ""
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Roaming Workstation"
 msgstr ""
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Thin Client Server"
 msgstr ""
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Standalone"
 msgstr ""
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Minimal"
 msgstr ""
@@ -80,7 +80,6 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#. # Translators, do not translate "Sugar"
 #: ../debian-edu-profile-udeb.templates:2002
 msgid ""
 " - Main Server: reserved for the Debian Edu server. It does not\n"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-install.git