GNOME.org
 

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

commit 83a90425e0371222026dccb888c4f7f087d3fd70
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 +-
 .../AudioVideo.directory.desktop.in                |  6 ++
 desktop-directories/AudioVideo.directory.in        |  5 --
 .../Development.directory.desktop.in               |  6 ++
 desktop-directories/Development.directory.in       |  5 --
 desktop-directories/Education.directory.desktop.in |  5 ++
 desktop-directories/Education.directory.in         |  4 --
 desktop-directories/Game.directory.desktop.in      |  6 ++
 desktop-directories/Game.directory.in              |  5 --
 desktop-directories/Graphics.directory.desktop.in  |  6 ++
 desktop-directories/Graphics.directory.in          |  5 --
 desktop-directories/Makefile.am                    | 38 ++++++-----
 desktop-directories/Network.directory.desktop.in   |  6 ++
 desktop-directories/Network.directory.in           |  5 --
 desktop-directories/Office.directory.desktop.in    |  6 ++
 desktop-directories/Office.directory.in            |  5 --
 .../System-Tools.directory.desktop.in              |  6 ++
 desktop-directories/System-Tools.directory.in      |  5 --
 .../Utility-Accessibility.directory.desktop.in     |  6 ++
 .../Utility-Accessibility.directory.in             |  5 --
 desktop-directories/Utility.directory.desktop.in   |  6 ++
 desktop-directories/Utility.directory.in           |  5 --
 .../X-GNOME-Menu-Applications.directory.desktop.in |  6 ++
 .../X-GNOME-Menu-Applications.directory.in         |  5 --
 .../X-GNOME-Other.directory.desktop.in             |  6 ++
 desktop-directories/X-GNOME-Other.directory.in     |  5 --
 .../X-GNOME-Sundry.directory.desktop.in            |  5 ++
 desktop-directories/X-GNOME-Sundry.directory.in    |  4 --
 ...=> X-GNOME-SystemSettings.directory.desktop.in} |  0
 .../X-GNOME-Utilities.directory.desktop.in         |  6 ++
 desktop-directories/X-GNOME-Utilities.directory.in |  5 --
 .../X-GNOME-WebApplications.directory.desktop.in   |  6 ++
 .../X-GNOME-WebApplications.directory.in           |  5 --
 po/Makevars                                        | 78 ++++++++++++++++++++++
 po/POTFILES.in                                     | 30 ++++-----
 35 files changed, 203 insertions(+), 109 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index cd67084..5e3beec 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.desktop.in 
b/desktop-directories/AudioVideo.directory.desktop.in
new file mode 100644
index 0000000..74da792
--- /dev/null
+++ b/desktop-directories/AudioVideo.directory.desktop.in
@@ -0,0 +1,6 @@
+[Desktop Entry]
+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.desktop.in 
b/desktop-directories/Development.directory.desktop.in
new file mode 100644
index 0000000..67e2e5b
--- /dev/null
+++ b/desktop-directories/Development.directory.desktop.in
@@ -0,0 +1,6 @@
+[Desktop Entry]
+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.desktop.in 
b/desktop-directories/Education.directory.desktop.in
new file mode 100644
index 0000000..fbd8095
--- /dev/null
+++ b/desktop-directories/Education.directory.desktop.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Name=Education
+# TRANSLATORS: Don't translate this text (this is icon name)
+Icon=applications-science
+Type=Directory
diff --git a/desktop-directories/Game.directory.desktop.in b/desktop-directories/Game.directory.desktop.in
new file mode 100644
index 0000000..9639ef9
--- /dev/null
+++ b/desktop-directories/Game.directory.desktop.in
@@ -0,0 +1,6 @@
+[Desktop Entry]
+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.desktop.in 
b/desktop-directories/Graphics.directory.desktop.in
new file mode 100644
index 0000000..117f026
--- /dev/null
+++ b/desktop-directories/Graphics.directory.desktop.in
@@ -0,0 +1,6 @@
+[Desktop Entry]
+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..c447ec0 100644
--- a/desktop-directories/Makefile.am
+++ b/desktop-directories/Makefile.am
@@ -1,26 +1,28 @@
 directorydir = $(datadir)/desktop-directories
 
 directory_in_files =                           \
-       AudioVideo.directory.in                 \
-       Development.directory.in                \
-       Education.directory.in                  \
-       Game.directory.in                       \
-       Graphics.directory.in                   \
-       Network.directory.in                    \
-       Office.directory.in                     \
-       System-Tools.directory.in               \
-       Utility.directory.in                    \
-       Utility-Accessibility.directory.in      \
-       X-GNOME-Other.directory.in              \
-       X-GNOME-Menu-Applications.directory.in  \
-       X-GNOME-Sundry.directory.in             \
-       X-GNOME-Utilities.directory.in          \
-       X-GNOME-WebApplications.directory.in    \
-       X-GNOME-SystemSettings.directory.in
+       AudioVideo.directory.desktop.in                 \
+       Development.directory.desktop.in                \
+       Education.directory.desktop.in                  \
+       Game.directory.desktop.in                       \
+       Graphics.directory.desktop.in                   \
+       Network.directory.desktop.in                    \
+       Office.directory.desktop.in                     \
+       System-Tools.directory.desktop.in               \
+       Utility.directory.desktop.in                    \
+       Utility-Accessibility.directory.desktop.in      \
+       X-GNOME-Other.directory.desktop.in              \
+       X-GNOME-Menu-Applications.directory.desktop.in  \
+       X-GNOME-Sundry.directory.desktop.in             \
+       X-GNOME-Utilities.directory.desktop.in          \
+       X-GNOME-WebApplications.directory.desktop.in    \
+       X-GNOME-SystemSettings.directory.desktop.in
 
-directory_DATA = $(directory_in_files:.directory.in=.directory)
+directory_DATA = $(directory_in_files:.directory.desktop.in=.directory)
 
-@INTLTOOL_DIRECTORY_RULE@
+%.directory: %.directory.desktop.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.desktop.in 
b/desktop-directories/Network.directory.desktop.in
new file mode 100644
index 0000000..31d8478
--- /dev/null
+++ b/desktop-directories/Network.directory.desktop.in
@@ -0,0 +1,6 @@
+[Desktop Entry]
+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.desktop.in b/desktop-directories/Office.directory.desktop.in
new file mode 100644
index 0000000..c31e7a4
--- /dev/null
+++ b/desktop-directories/Office.directory.desktop.in
@@ -0,0 +1,6 @@
+[Desktop Entry]
+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.desktop.in 
b/desktop-directories/System-Tools.directory.desktop.in
new file mode 100644
index 0000000..1eabc37
--- /dev/null
+++ b/desktop-directories/System-Tools.directory.desktop.in
@@ -0,0 +1,6 @@
+[Desktop Entry]
+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.desktop.in 
b/desktop-directories/Utility-Accessibility.directory.desktop.in
new file mode 100644
index 0000000..6790cc4
--- /dev/null
+++ b/desktop-directories/Utility-Accessibility.directory.desktop.in
@@ -0,0 +1,6 @@
+[Desktop Entry]
+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.desktop.in 
b/desktop-directories/Utility.directory.desktop.in
new file mode 100644
index 0000000..7ab7ce5
--- /dev/null
+++ b/desktop-directories/Utility.directory.desktop.in
@@ -0,0 +1,6 @@
+[Desktop Entry]
+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.desktop.in 
b/desktop-directories/X-GNOME-Menu-Applications.directory.desktop.in
new file mode 100644
index 0000000..8a91ddd
--- /dev/null
+++ b/desktop-directories/X-GNOME-Menu-Applications.directory.desktop.in
@@ -0,0 +1,6 @@
+[Desktop Entry]
+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.desktop.in 
b/desktop-directories/X-GNOME-Other.directory.desktop.in
new file mode 100644
index 0000000..a126165
--- /dev/null
+++ b/desktop-directories/X-GNOME-Other.directory.desktop.in
@@ -0,0 +1,6 @@
+[Desktop Entry]
+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.desktop.in 
b/desktop-directories/X-GNOME-Sundry.directory.desktop.in
new file mode 100644
index 0000000..379722a
--- /dev/null
+++ b/desktop-directories/X-GNOME-Sundry.directory.desktop.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+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.desktop.in
similarity index 100%
rename from desktop-directories/X-GNOME-SystemSettings.directory.in
rename to desktop-directories/X-GNOME-SystemSettings.directory.desktop.in
diff --git a/desktop-directories/X-GNOME-Utilities.directory.desktop.in 
b/desktop-directories/X-GNOME-Utilities.directory.desktop.in
new file mode 100644
index 0000000..7f8792f
--- /dev/null
+++ b/desktop-directories/X-GNOME-Utilities.directory.desktop.in
@@ -0,0 +1,6 @@
+[Desktop Entry]
+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.desktop.in 
b/desktop-directories/X-GNOME-WebApplications.directory.desktop.in
new file mode 100644
index 0000000..b1ba664
--- /dev/null
+++ b/desktop-directories/X-GNOME-WebApplications.directory.desktop.in
@@ -0,0 +1,6 @@
+[Desktop Entry]
+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
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a95faa1..3515fce 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,17 +1,17 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-desktop-directories/AudioVideo.directory.in
-desktop-directories/Development.directory.in
-desktop-directories/Education.directory.in
-desktop-directories/Game.directory.in
-desktop-directories/Graphics.directory.in
-desktop-directories/Network.directory.in
-desktop-directories/Office.directory.in
-desktop-directories/System-Tools.directory.in
-desktop-directories/Utility-Accessibility.directory.in
-desktop-directories/Utility.directory.in
-desktop-directories/X-GNOME-Menu-Applications.directory.in
-desktop-directories/X-GNOME-Other.directory.in
-desktop-directories/X-GNOME-Sundry.directory.in
-desktop-directories/X-GNOME-Utilities.directory.in
-desktop-directories/X-GNOME-WebApplications.directory.in
+desktop-directories/AudioVideo.directory.desktop.in
+desktop-directories/Development.directory.desktop.in
+desktop-directories/Education.directory.desktop.in
+desktop-directories/Game.directory.desktop.in
+desktop-directories/Graphics.directory.desktop.in
+desktop-directories/Network.directory.desktop.in
+desktop-directories/Office.directory.desktop.in
+desktop-directories/System-Tools.directory.desktop.in
+desktop-directories/Utility-Accessibility.directory.desktop.in
+desktop-directories/Utility.directory.desktop.in
+desktop-directories/X-GNOME-Menu-Applications.directory.desktop.in
+desktop-directories/X-GNOME-Other.directory.desktop.in
+desktop-directories/X-GNOME-Sundry.directory.desktop.in
+desktop-directories/X-GNOME-Utilities.directory.desktop.in
+desktop-directories/X-GNOME-WebApplications.directory.desktop.in
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]