Merge lp:~elopio/snappy/translator-comment into lp:~snappy-dev/snappy/snappy-moved-to-github

[Leo Arias]

Generate only the translators comments that start with TRANSLATORS:
Fixed the translator comment for hw-unassign.

[Michael Terry (mterry)]

lgtm

review: Approve

=== modified file 'cmd/snappy/cmd_hwassign.go'
--- cmd/snappy/cmd_hwassign.go	2015-07-01 14:56:49 +0000
+++ cmd/snappy/cmd_hwassign.go	2015-07-02 17:16:22 +0000
@@ -55,7 +55,7 @@
 func (x *cmdHWAssign) doHWAssign() error {
 	if err := snappy.AddHWAccess(x.Positional.PackageName, x.Positional.DevicePath); err != nil {
 		if err == snappy.ErrHWAccessAlreadyAdded {
-			// the first %s is a pkgname, the second %s is a path
+			// TRANSLATORS: the first %s is a pkgname, the second %s is a path
 			fmt.Printf(i18n.G("'%s' previously allowed access to '%s'. Skipping\n"), x.Positional.PackageName, x.Positional.DevicePath)
 			return nil
 		}
@@ -63,7 +63,7 @@
 		return err
 	}
 
-	// the first %s is a pkgname, the second %s is a path
+	// TRANSLATORS: the first %s is a pkgname, the second %s is a path
 	fmt.Printf(i18n.G("'%s' is now allowed to access '%s'\n"), x.Positional.PackageName, x.Positional.DevicePath)
 	return nil
 }

=== modified file 'cmd/snappy/cmd_hwunassign.go'
--- cmd/snappy/cmd_hwunassign.go	2015-07-01 14:56:49 +0000
+++ cmd/snappy/cmd_hwunassign.go	2015-07-02 17:16:22 +0000
@@ -57,7 +57,7 @@
 		return err
 	}
 
-	// TRANSLATORS: the %s is a pkgname
+	// TRANSLATORS: the first %s is a pkgname, the second %s is a path
 	fmt.Printf(i18n.G("'%s' is no longer allowed to access '%s'\n"), x.Positional.PackageName, x.Positional.DevicePath)
 	return nil
 }

=== modified file 'cmd/snappy/cmd_list.go'
--- cmd/snappy/cmd_list.go	2015-07-01 14:56:49 +0000
+++ cmd/snappy/cmd_list.go	2015-07-02 17:16:22 +0000
@@ -156,10 +156,10 @@
 
 	if needsReboot {
 		if snappy.VersionCompare(otherVersion, currentVersion) > 0 {
-			// the %s is a pkgname
+			// TRANSLATORS: the %s is a pkgname
 			fmt.Fprintln(o, fmt.Sprintf(i18n.G("Reboot to use the new %s."), otherName))
 		} else {
-			// the first %s is a pkgname the second a version
+			// TRANSLATORS: the first %s is a pkgname the second a version
 			fmt.Fprintln(o, fmt.Sprintf(i18n.G("Reboot to use %s version %s."), otherName, otherVersion))
 		}
 	}

=== modified file 'cmd/snappy/cmd_rollback.go'
--- cmd/snappy/cmd_rollback.go	2015-07-01 14:56:49 +0000
+++ cmd/snappy/cmd_rollback.go	2015-07-02 17:16:22 +0000
@@ -65,7 +65,7 @@
 	if err != nil {
 		return err
 	}
-	// the first %s is a pkgname, the second %s is the new version
+	// TRANSLATORS: the first %s is a pkgname, the second %s is the new version
 	fmt.Printf(i18n.G("Setting %s to version %s\n"), pkg, nowVersion)
 
 	m := snappy.NewMetaRepository()

=== modified file 'po/snappy.pot'
--- po/snappy.pot	2015-07-01 14:56:49 +0000
+++ po/snappy.pot	2015-07-02 17:16:22 +0000
@@ -7,7 +7,7 @@
 msgid   ""
 msgstr  "Project-Id-Version: snappy\n"
         "Report-Msgid-Bugs-To: [e-mail]\n"
-        "POT-Creation-Date: 2015-07-01 16:56+0200\n"
+        "POT-Creation-Date: 2015-07-02 11:15-0600\n"
         "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
         "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
         "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -26,17 +26,17 @@
 msgid   "%s: %s\n"
 msgstr  ""
 
-#. TRANSLATORS: the %s is a pkgname
+#. TRANSLATORS: the first %s is a pkgname, the second %s is a path
 #, c-format
 msgid   "'%s' is no longer allowed to access '%s'\n"
 msgstr  ""
 
-#. the first %s is a pkgname, the second %s is a path
+#. TRANSLATORS: the first %s is a pkgname, the second %s is a path
 #, c-format
 msgid   "'%s' is now allowed to access '%s'\n"
 msgstr  ""
 
-#. the first %s is a pkgname, the second %s is a path
+#. TRANSLATORS: the first %s is a pkgname, the second %s is a path
 #, c-format
 msgid   "'%s' previously allowed access to '%s'. Skipping\n"
 msgstr  ""
@@ -86,20 +86,6 @@
 msgid   "First boot has already run"
 msgstr  ""
 
-#.
-#. Disabling review tools run until the output reflects reality more closely
-#.
-#. _, err = exec.LookPath(clickReview)
-#. if err != nil {
-#. fmt.Fprintf(os.Stderr, "Warning: could not review package (%s not available)\n", clickReview)
-#. }
-#.
-#. cmd := exec.Command(clickReview, snapPackage)
-#. cmd.Stdout = os.Stdout
-#. cmd.Stderr = os.Stderr
-#. // we ignore the error for now
-#. _ = cmd.Run()
-#.
 #. TRANSLATORS: the %s is a pkgname
 #, c-format
 msgid   "Generated '%s' snap\n"
@@ -150,12 +136,12 @@
 msgid   "Query the store for available packages"
 msgstr  ""
 
-#. the first %s is a pkgname the second a version
+#. TRANSLATORS: the first %s is a pkgname the second a version
 #, c-format
 msgid   "Reboot to use %s version %s."
 msgstr  ""
 
-#. the %s is a pkgname
+#. TRANSLATORS: the %s is a pkgname
 #, c-format
 msgid   "Reboot to use the new %s."
 msgstr  ""
@@ -189,7 +175,7 @@
 msgid   "Set properties of system or package"
 msgstr  ""
 
-#. the first %s is a pkgname, the second %s is the new version
+#. TRANSLATORS: the first %s is a pkgname, the second %s is the new version
 #, c-format
 msgid   "Setting %s to version %s\n"
 msgstr  ""

=== modified file 'update-pot'
--- update-pot	2015-07-01 07:48:19 +0000
+++ update-pot	2015-07-02 17:16:22 +0000
@@ -11,7 +11,7 @@
 fi
 
 xgettext -d snappy -o "$OUTPUT" --c++ --from-code=UTF-8 \
-	--indent --add-comments --no-location --sort-output \
+	--indent --add-comments=TRANSLATORS: --no-location --sort-output \
 	--package-name=snappy \
 	--msgid-bugs-address=[e-mail] \
 	--keyword=NG:1,2 --keyword=G \