GNOME.org
 

[gnome-menus/wip/muktupavels/gettext: 9/9] use upstream gettext

commit 231630f8bffbd4241cba80f3c3e46c3a68e8f7e6
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Sun Dec 2 15:44:26 2018 +0200

    use upstream gettext
    
    https://gitlab.gnome.org/GNOME/gnome-build-meta/issues/104

 configure.ac                                       |  5 +-
 desktop-directories/AudioVideo.directory.in        |  5 +-
 desktop-directories/Development.directory.in       |  5 +-
 desktop-directories/Education.directory.in         |  3 +-
 desktop-directories/Game.directory.in              |  5 +-
 desktop-directories/Graphics.directory.in          |  5 +-
 desktop-directories/Makefile.am                    |  4 +-
 desktop-directories/Network.directory.in           |  5 +-
 desktop-directories/Office.directory.in            |  5 +-
 desktop-directories/System-Tools.directory.in      |  5 +-
 .../Utility-Accessibility.directory.in             |  5 +-
 desktop-directories/Utility.directory.in           |  5 +-
 .../X-GNOME-Menu-Applications.directory.in         |  5 +-
 desktop-directories/X-GNOME-Other.directory.in     |  5 +-
 desktop-directories/X-GNOME-Sundry.directory.in    |  3 +-
 .../X-GNOME-SystemSettings.directory.in            |  1 +
 desktop-directories/X-GNOME-Utilities.directory.in |  5 +-
 .../X-GNOME-WebApplications.directory.in           |  5 +-
 po/Makevars                                        | 78 ++++++++++++++++++++++
 19 files changed, 127 insertions(+), 32 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b5dfc26..7a74f30 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,9 +27,8 @@ GETTEXT_PACKAGE=gnome-menus-3.0
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Name of default gettext domain])
 AC_SUBST(GETTEXT_PACKAGE)
 
-AM_GLIB_GNU_GETTEXT
-
-IT_PROG_INTLTOOL([0.40.0])
+AM_GNU_GETTEXT_VERSION([0.19.4])
+AM_GNU_GETTEXT([external])
 
 AC_ISC_POSIX
 AC_PROG_CC
diff --git a/desktop-directories/AudioVideo.directory.in b/desktop-directories/AudioVideo.directory.in
index 966fda1..74da792 100644
--- a/desktop-directories/AudioVideo.directory.in
+++ b/desktop-directories/AudioVideo.directory.in
@@ -1,5 +1,6 @@
 [Desktop Entry]
-_Name=Sound & Video
-_Comment=Multimedia menu
+Name=Sound & Video
+Comment=Multimedia menu
+# TRANSLATORS: Don't translate this text (this is icon name)
 Icon=applications-multimedia
 Type=Directory
diff --git a/desktop-directories/Development.directory.in b/desktop-directories/Development.directory.in
index d7e9de9..67e2e5b 100644
--- a/desktop-directories/Development.directory.in
+++ b/desktop-directories/Development.directory.in
@@ -1,5 +1,6 @@
 [Desktop Entry]
-_Name=Programming
-_Comment=Tools for software development
+Name=Programming
+Comment=Tools for software development
+# TRANSLATORS: Don't translate this text (this is icon name)
 Icon=applications-development
 Type=Directory
diff --git a/desktop-directories/Education.directory.in b/desktop-directories/Education.directory.in
index 689168a..fbd8095 100644
--- a/desktop-directories/Education.directory.in
+++ b/desktop-directories/Education.directory.in
@@ -1,4 +1,5 @@
 [Desktop Entry]
-_Name=Education
+Name=Education
+# TRANSLATORS: Don't translate this text (this is icon name)
 Icon=applications-science
 Type=Directory
diff --git a/desktop-directories/Game.directory.in b/desktop-directories/Game.directory.in
index 610bbd8..9639ef9 100644
--- a/desktop-directories/Game.directory.in
+++ b/desktop-directories/Game.directory.in
@@ -1,5 +1,6 @@
 [Desktop Entry]
-_Name=Games
-_Comment=Games and amusements
+Name=Games
+Comment=Games and amusements
+# TRANSLATORS: Don't translate this text (this is icon name)
 Icon=applications-games
 Type=Directory
diff --git a/desktop-directories/Graphics.directory.in b/desktop-directories/Graphics.directory.in
index d2b4bb6..117f026 100644
--- a/desktop-directories/Graphics.directory.in
+++ b/desktop-directories/Graphics.directory.in
@@ -1,5 +1,6 @@
 [Desktop Entry]
-_Name=Graphics
-_Comment=Graphics applications
+Name=Graphics
+Comment=Graphics applications
+# TRANSLATORS: Don't translate this text (this is icon name)
 Icon=applications-graphics
 Type=Directory
diff --git a/desktop-directories/Makefile.am b/desktop-directories/Makefile.am
index cb7e95f..ef26e72 100644
--- a/desktop-directories/Makefile.am
+++ b/desktop-directories/Makefile.am
@@ -20,7 +20,9 @@ directory_in_files =                          \
 
 directory_DATA = $(directory_in_files:.directory.in=.directory)
 
-@INTLTOOL_DIRECTORY_RULE@
+%.directory: %.directory.in
+       $(AM_V_GEN) $(MSGFMT) --desktop --template $< -o $@-t \
+               -d $(top_srcdir)/po && mv $@-t $@
 
 EXTRA_DIST= $(directory_in_files)
 
diff --git a/desktop-directories/Network.directory.in b/desktop-directories/Network.directory.in
index bc88bee..31d8478 100644
--- a/desktop-directories/Network.directory.in
+++ b/desktop-directories/Network.directory.in
@@ -1,5 +1,6 @@
 [Desktop Entry]
-_Name=Internet
-_Comment=Programs for Internet access such as web and email
+Name=Internet
+Comment=Programs for Internet access such as web and email
+# TRANSLATORS: Don't translate this text (this is icon name)
 Icon=applications-internet
 Type=Directory
diff --git a/desktop-directories/Office.directory.in b/desktop-directories/Office.directory.in
index d6c8d9e..c31e7a4 100644
--- a/desktop-directories/Office.directory.in
+++ b/desktop-directories/Office.directory.in
@@ -1,5 +1,6 @@
 [Desktop Entry]
-_Name=Office
-_Comment=Office Applications
+Name=Office
+Comment=Office Applications
+# TRANSLATORS: Don't translate this text (this is icon name)
 Icon=applications-office
 Type=Directory
diff --git a/desktop-directories/System-Tools.directory.in b/desktop-directories/System-Tools.directory.in
index d1d85be..1eabc37 100644
--- a/desktop-directories/System-Tools.directory.in
+++ b/desktop-directories/System-Tools.directory.in
@@ -1,5 +1,6 @@
 [Desktop Entry]
-_Name=System Tools
-_Comment=System configuration and monitoring
+Name=System Tools
+Comment=System configuration and monitoring
+# TRANSLATORS: Don't translate this text (this is icon name)
 Icon=applications-system
 Type=Directory
diff --git a/desktop-directories/Utility-Accessibility.directory.in 
b/desktop-directories/Utility-Accessibility.directory.in
index 358b3a9..6790cc4 100644
--- a/desktop-directories/Utility-Accessibility.directory.in
+++ b/desktop-directories/Utility-Accessibility.directory.in
@@ -1,5 +1,6 @@
 [Desktop Entry]
-_Name=Universal Access
-_Comment=Universal Access Settings
+Name=Universal Access
+Comment=Universal Access Settings
 Type=Directory
+# TRANSLATORS: Don't translate this text (this is icon name)
 Icon=preferences-desktop-accessibility
diff --git a/desktop-directories/Utility.directory.in b/desktop-directories/Utility.directory.in
index 0edeeef..7ab7ce5 100644
--- a/desktop-directories/Utility.directory.in
+++ b/desktop-directories/Utility.directory.in
@@ -1,5 +1,6 @@
 [Desktop Entry]
-_Name=Accessories
-_Comment=Desktop accessories
+Name=Accessories
+Comment=Desktop accessories
+# TRANSLATORS: Don't translate this text (this is icon name)
 Icon=applications-accessories
 Type=Directory
diff --git a/desktop-directories/X-GNOME-Menu-Applications.directory.in 
b/desktop-directories/X-GNOME-Menu-Applications.directory.in
index d4106cb..8a91ddd 100644
--- a/desktop-directories/X-GNOME-Menu-Applications.directory.in
+++ b/desktop-directories/X-GNOME-Menu-Applications.directory.in
@@ -1,5 +1,6 @@
 [Desktop Entry]
-_Name=Applications
-_Comment=Applications
+Name=Applications
+Comment=Applications
+# TRANSLATORS: Don't translate this text (this is icon name)
 Icon=applications-other
 Type=Directory
diff --git a/desktop-directories/X-GNOME-Other.directory.in b/desktop-directories/X-GNOME-Other.directory.in
index 898d406..a126165 100644
--- a/desktop-directories/X-GNOME-Other.directory.in
+++ b/desktop-directories/X-GNOME-Other.directory.in
@@ -1,5 +1,6 @@
 [Desktop Entry]
-_Name=Other
-_Comment=Applications that did not fit in other categories
+Name=Other
+Comment=Applications that did not fit in other categories
+# TRANSLATORS: Don't translate this text (this is icon name)
 Icon=applications-other
 Type=Directory
diff --git a/desktop-directories/X-GNOME-Sundry.directory.in b/desktop-directories/X-GNOME-Sundry.directory.in
index fc03820..379722a 100644
--- a/desktop-directories/X-GNOME-Sundry.directory.in
+++ b/desktop-directories/X-GNOME-Sundry.directory.in
@@ -1,4 +1,5 @@
 [Desktop Entry]
-_Name=Sundry
+Name=Sundry
+# TRANSLATORS: Don't translate this text (this is icon name)
 Icon=applications-other
 Type=Directory
diff --git a/desktop-directories/X-GNOME-SystemSettings.directory.in 
b/desktop-directories/X-GNOME-SystemSettings.directory.in
index acfbffe..76eefc7 100644
--- a/desktop-directories/X-GNOME-SystemSettings.directory.in
+++ b/desktop-directories/X-GNOME-SystemSettings.directory.in
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=System Settings
+# TRANSLATORS: Don't translate this text (this is icon name)
 Icon=gnome-settings
 Type=Directory
 NoDisplay=true
diff --git a/desktop-directories/X-GNOME-Utilities.directory.in 
b/desktop-directories/X-GNOME-Utilities.directory.in
index 00b17cd..7f8792f 100644
--- a/desktop-directories/X-GNOME-Utilities.directory.in
+++ b/desktop-directories/X-GNOME-Utilities.directory.in
@@ -1,5 +1,6 @@
 [Desktop Entry]
-_Name=Utilities
-_Comment=Small but useful GNOME tools
+Name=Utilities
+Comment=Small but useful GNOME tools
+# TRANSLATORS: Don't translate this text (this is icon name)
 Icon=applications-accessories
 Type=Directory
diff --git a/desktop-directories/X-GNOME-WebApplications.directory.in 
b/desktop-directories/X-GNOME-WebApplications.directory.in
index 8c59ce3..b1ba664 100644
--- a/desktop-directories/X-GNOME-WebApplications.directory.in
+++ b/desktop-directories/X-GNOME-WebApplications.directory.in
@@ -1,5 +1,6 @@
 [Desktop Entry]
-_Name=Web Applications
-_Comment=Applications and sites saved from Web
+Name=Web Applications
+Comment=Applications and sites saved from Web
+# TRANSLATORS: Don't translate this text (this is icon name)
 Icon=applications-internet
 Type=Directory
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 0000000..f8c0b1c
--- /dev/null
+++ b/po/Makevars
@@ -0,0 +1,78 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = gnome-menus authors
+
+# This tells whether or not to prepend "GNU " prefix to the package
+# name that gets inserted into the header of the $(DOMAIN).pot file.
+# Possible values are "yes", "no", or empty.  If it is empty, try to
+# detect it automatically by scanning the files in $(top_srcdir) for
+# "GNU packagename" string.
+PACKAGE_GNU = no
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS = https://gitlab.gnome.org/GNOME/gnome-menus/issues
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
+
+# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
+# context.  Possible values are "yes" and "no".  Set this to yes if the
+# package uses functions taking also a message context, like pgettext(), or
+# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
+USE_MSGCTXT = no
+
+# These options get passed to msgmerge.
+# Useful options are in particular:
+#   --previous            to keep previous msgids of translated messages,
+#   --quiet               to reduce the verbosity.
+MSGMERGE_OPTIONS =
+
+# These options get passed to msginit.
+# If you want to disable line wrapping when writing PO files, add
+# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
+# MSGINIT_OPTIONS.
+MSGINIT_OPTIONS =
+
+# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
+# has changed.  Possible values are "yes" and "no".  Set this to no if
+# the POT file is checked in the repository and the version control
+# program ignores timestamps.
+PO_DEPENDS_ON_POT = no
+
+# This tells whether or not to forcibly update $(DOMAIN).pot and
+# regenerate PO files on "make dist".  Possible values are "yes" and
+# "no".  Set this to no if the POT file and PO files are maintained
+# externally.
+DIST_DEPENDS_ON_UPDATE_PO = no
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]