From 62b0f044f14569ffcaeb7a068e879a9422fdecbd Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Sun, 7 Apr 2019 21:41:51 +0200
Subject: installer: Internationalize service "names".

* gnu/installer/services.scm (%system-services): Mark networking service
names with 'G_'.
* gnu/installer/newt/services.scm (run-networking-cbt-page): Pass
'system-service-name' through 'G_'.
---
 gnu/installer/newt/services.scm |  4 ++--
 gnu/installer/services.scm      | 14 ++++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'gnu/installer')

diff --git a/gnu/installer/newt/services.scm b/gnu/installer/newt/services.scm
index 76db31d9ab..10c19115ca 100644
--- a/gnu/installer/newt/services.scm
+++ b/gnu/installer/newt/services.scm
@@ -37,7 +37,7 @@ install. If you select multiple desktops environments, you will be able to \
 choose the one to use on the log-in screen.")
    #:title (G_ "Desktop environment")
    #:items (filter desktop-system-service? %system-services)
-   #:item->text system-service-name
+   #:item->text system-service-name               ;no i18n for DE names
    #:checkbox-tree-height 5
    #:exit-button-callback-procedure
    (lambda ()
@@ -59,7 +59,7 @@ system.")
                      (lambda (service)
                        (memq (system-service-type service) types)))
                    %system-services)
-   #:item->text system-service-name
+   #:item->text (compose G_ system-service-name)
    #:checkbox-tree-height 5
    #:exit-button-callback-procedure
    (lambda ()
diff --git a/gnu/installer/services.scm b/gnu/installer/services.scm
index b79c2dfdc9..46ade0f8fa 100644
--- a/gnu/installer/services.scm
+++ b/gnu/installer/services.scm
@@ -44,7 +44,9 @@
                                       ((_ fields ...)
                                        (system-service
                                         (type 'desktop)
-                                        fields ...)))))
+                                        fields ...))))
+               (G_ (syntax-rules ()               ;for xgettext
+                     ((_ str) str))))
     (list
      (desktop-environment
       (name "GNOME")
@@ -63,25 +65,25 @@
 
      ;; Networking.
      (system-service
-      (name "OpenSSH secure shell daemon (sshd)")
+      (name (G_ "OpenSSH secure shell daemon (sshd)"))
       (type 'networking)
       (snippet '(service openssh-service-type)))
      (system-service
-      (name "Tor anonymous network router")
+      (name (G_ "Tor anonymous network router"))
       (type 'networking)
       (snippet '(service tor-service-type)))
 
      ;; Network connectivity management.
      (system-service
-      (name "NetworkManager network connection manager")
+      (name (G_ "NetworkManager network connection manager"))
       (type 'network-management)
       (snippet '(service network-manager-service-type)))
      (system-service
-      (name "Connman network connection manager")
+      (name (G_ "Connman network connection manager"))
       (type 'network-management)
       (snippet '(service connman-service-type)))
      (system-service
-      (name "DHCP client")
+      (name (G_ "DHCP client (dynamic IP address assignment)"))
       (type 'network-management)
       (snippet '(service dhcp-client-service))))))
 
-- 
cgit 1.4.1