Skip to content
Snippets Groups Projects
Commit 2e29ff04 authored by Luis Guzmán's avatar Luis Guzmán
Browse files

Fix mate 1.24 l10n icons

parent 7aa7af6f
No related branches found
No related tags found
No related merge requests found
Showing
with 841 additions and 2 deletions
From 09268d17746f7b956ae0c018f4f5b1f736c8818b Mon Sep 17 00:00:00 2001
From: raveit65 <mate@raveit.de>
Date: Wed, 4 Mar 2020 11:05:54 +0100
Subject: [PATCH] Do not collect the translation for Icon
---
gksu/Makefile.am | 2 +-
image-converter/Makefile.am | 2 +-
open-terminal/Makefile.am | 2 +-
sendto/Makefile.am | 2 +-
share/Makefile.am | 2 +-
wallpaper/Makefile.am | 2 +-
xattr-tags/Makefile.am | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/gksu/Makefile.am b/gksu/Makefile.am
index 93431c8..3cf4ed8 100644
--- a/gksu/Makefile.am
+++ b/gksu/Makefile.am
@@ -31,6 +31,6 @@ extensiondir = $(datadir)/caja/extensions
extension_in_files = libcaja-gksu.caja-extension.desktop.in
extension_DATA = $(extension_in_files:.caja-extension.desktop.in=.caja-extension)
$(extension_DATA): $(extension_in_files)
- $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
CLEANFILES = $(extension_DATA)
diff --git a/image-converter/Makefile.am b/image-converter/Makefile.am
index 0b8154f..df93167 100644
--- a/image-converter/Makefile.am
+++ b/image-converter/Makefile.am
@@ -48,7 +48,7 @@ extensiondir = $(datadir)/caja/extensions
extension_in_files = libcaja-image-converter.caja-extension.desktop.in
extension_DATA = $(extension_in_files:.caja-extension.desktop.in=.caja-extension)
$(extension_DATA): $(extension_in_files)
- $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
EXTRA_DIST = $(builder_DATA)
diff --git a/open-terminal/Makefile.am b/open-terminal/Makefile.am
index f1c77fb..d65fade 100644
--- a/open-terminal/Makefile.am
+++ b/open-terminal/Makefile.am
@@ -40,7 +40,7 @@ extensiondir = $(datadir)/caja/extensions
extension_in_files = libcaja-open-terminal.caja-extension.desktop.in
extension_DATA = $(extension_in_files:.caja-extension.desktop.in=.caja-extension)
$(extension_DATA): $(extension_in_files)
- $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
DISTCLEANFILES = \
org.mate.caja-open-terminal.gschema.xml
diff --git a/sendto/Makefile.am b/sendto/Makefile.am
index e23cde8..d4f056c 100644
--- a/sendto/Makefile.am
+++ b/sendto/Makefile.am
@@ -83,7 +83,7 @@ extensiondir = $(datadir)/caja/extensions
extension_in_files = libcaja-sendto.caja-extension.desktop.in
extension_DATA = $(extension_in_files:.caja-extension.desktop.in=.caja-extension)
$(extension_DATA): $(extension_in_files)
- $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
EXTRA_DIST = \
$(man_MANS) \
diff --git a/share/Makefile.am b/share/Makefile.am
index 8a257f3..6fc1a32 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -41,7 +41,7 @@ extensiondir = $(datadir)/caja/extensions
extension_in_files = libcaja-share.caja-extension.desktop.in
extension_DATA = $(extension_in_files:.caja-extension.desktop.in=.caja-extension)
$(extension_DATA): $(extension_in_files)
- $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
EXTRA_DIST = share-dialog.ui
diff --git a/wallpaper/Makefile.am b/wallpaper/Makefile.am
index 5bb905e..acc6496 100644
--- a/wallpaper/Makefile.am
+++ b/wallpaper/Makefile.am
@@ -33,6 +33,6 @@ extensiondir = $(datadir)/caja/extensions
extension_in_files = libcaja-wallpaper.caja-extension.desktop.in
extension_DATA = $(extension_in_files:.caja-extension.desktop.in=.caja-extension)
$(extension_DATA): $(extension_in_files)
- $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
CLEANFILES = $(extension_DATA)
diff --git a/xattr-tags/Makefile.am b/xattr-tags/Makefile.am
index 27cd567..515d8e1 100644
--- a/xattr-tags/Makefile.am
+++ b/xattr-tags/Makefile.am
@@ -34,6 +34,6 @@ extensiondir = $(datadir)/caja/extensions
extension_in_files = libcaja-xattr-tags.caja-extension.desktop.in
extension_DATA = $(extension_in_files:.caja-extension.desktop.in=.caja-extension)
$(extension_DATA): $(extension_in_files)
- $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
CLEANFILES = $(extension_DATA)
From 0c8d17a76050af39b22f26b33f7b47de949ef379 Mon Sep 17 00:00:00 2001
From: rbuj <robert.buj@gmail.com>
Date: Mon, 2 Mar 2020 13:14:13 +0100
Subject: [PATCH] eom.desktop: Do not collect the translation for Icon
---
data/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/Makefile.am b/data/Makefile.am
index 48c352e0..4842527a 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -6,7 +6,7 @@ DESKTOP_FILES= $(DESKTOP_IN_FILES:.desktop.in.in=.desktop)
desktopdir = $(datadir)/applications
desktop_DATA = $(DESKTOP_FILES)
$(desktop_DATA): $(DESKTOP_IN_FILES)
- $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
appdatadir = $(datadir)/metainfo
appdata_in_files = eom.appdata.xml.in
From 91962719d06ce16d8bc3523872b83fae4d151e10 Mon Sep 17 00:00:00 2001
From: rbuj <robert.buj@gmail.com>
Date: Mon, 2 Mar 2020 08:53:51 +0100
Subject: [PATCH] mate-calc.desktop: Do not collect the translation for Icon
---
data/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/Makefile.am b/data/Makefile.am
index 80db3448..f12b6dac 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -11,7 +11,7 @@ Utilitiesdir = $(datadir)/applications
Utilities_in_files = mate-calc.desktop.in
Utilities_DATA = $(Utilities_in_files:.desktop.in=.desktop)
$(Utilities_DATA): $(Utilities_in_files)
- $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=GenericName --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
man1_MANS = mate-calc.1 mate-calc-cmd.1
From 1438fc157ef1646af33adf7dcf6ca8773d5935f5 Mon Sep 17 00:00:00 2001
From: rbuj <robert.buj@gmail.com>
Date: Mon, 2 Mar 2020 11:34:36 +0100
Subject: [PATCH] Do not collect the translation for Icon
---
capplets/about-me/Makefile.am | 2 +-
capplets/accessibility/at-properties/Makefile.am | 2 +-
capplets/appearance/data/Makefile.am | 2 +-
capplets/default-applications/Makefile.am | 2 +-
capplets/display/Makefile.am | 2 +-
capplets/keybindings/Makefile.am | 2 +-
capplets/keyboard/Makefile.am | 2 +-
capplets/mouse/Makefile.am | 2 +-
capplets/network/Makefile.am | 2 +-
capplets/time-admin/data/Makefile.am | 2 +-
capplets/windows/Makefile.am | 2 +-
font-viewer/Makefile.am | 2 +-
shell/Makefile.am | 2 +-
13 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/capplets/about-me/Makefile.am b/capplets/about-me/Makefile.am
index 4c72622e8..e9a9ebf4d 100644
--- a/capplets/about-me/Makefile.am
+++ b/capplets/about-me/Makefile.am
@@ -35,7 +35,7 @@ mate_about_me_LDFLAGS = -export-dynamic
desktopdir = $(datadir)/applications
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
$(desktop_DATA): $(Desktop_in_files)
- $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
include $(top_srcdir)/gla11y.mk
diff --git a/capplets/accessibility/at-properties/Makefile.am b/capplets/accessibility/at-properties/Makefile.am
index 3475536f2..e81036213 100644
--- a/capplets/accessibility/at-properties/Makefile.am
+++ b/capplets/accessibility/at-properties/Makefile.am
@@ -18,7 +18,7 @@ Desktop_in_files = mate-at-properties.desktop.in
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
$(desktop_DATA): $(Desktop_in_files)
- $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
pixmapdir = $(pkgdatadir)/pixmaps
pixmap_DATA = \
diff --git a/capplets/appearance/data/Makefile.am b/capplets/appearance/data/Makefile.am
index 46fe49315..bbb1919e1 100644
--- a/capplets/appearance/data/Makefile.am
+++ b/capplets/appearance/data/Makefile.am
@@ -23,7 +23,7 @@ desktop_in_files = \
mate-theme-installer.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
%.desktop: %.desktop.in
- $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
xml_in_files = \
mate-theme-package.xml.in
diff --git a/capplets/default-applications/Makefile.am b/capplets/default-applications/Makefile.am
index 4468fc2a5..8aac00ffd 100644
--- a/capplets/default-applications/Makefile.am
+++ b/capplets/default-applications/Makefile.am
@@ -23,7 +23,7 @@ desktopdir = $(datadir)/applications
Desktop_in_files = mate-default-applications-properties.desktop.in
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
$(desktop_DATA): $(Desktop_in_files)
- $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = mate-default-applications.pc
diff --git a/capplets/display/Makefile.am b/capplets/display/Makefile.am
index 24dfa1b73..7ca1180f7 100644
--- a/capplets/display/Makefile.am
+++ b/capplets/display/Makefile.am
@@ -45,7 +45,7 @@ Desktop_in_files = mate-display-properties.desktop.in
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
$(desktop_DATA): $(Desktop_in_files)
- $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
AM_CPPFLAGS = \
$(WARN_CFLAGS) \
diff --git a/capplets/keybindings/Makefile.am b/capplets/keybindings/Makefile.am
index 298105773..f3e500c59 100644
--- a/capplets/keybindings/Makefile.am
+++ b/capplets/keybindings/Makefile.am
@@ -23,7 +23,7 @@ Desktop_in_files = mate-keybinding.desktop.in
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
$(desktop_DATA): $(Desktop_in_files)
- $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
xmldir = $(pkgdatadir)/keybindings
xml_in_files = 00-multimedia-key.xml.in 01-desktop-key.xml.in
diff --git a/capplets/keyboard/Makefile.am b/capplets/keyboard/Makefile.am
index 33a4fea3f..8c54ef8dd 100644
--- a/capplets/keyboard/Makefile.am
+++ b/capplets/keyboard/Makefile.am
@@ -34,7 +34,7 @@ Desktop_in_files = mate-keyboard.desktop.in
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
$(desktop_DATA): $(Desktop_in_files)
- $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
mate-keyboard-properties-resources.h mate-keyboard-properties-resources.c: org.mate.mcc.keyboard.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir $(srcdir) $(srcdir)/org.mate.mcc.keyboard.gresource.xml)
$(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir $(srcdir) --generate --c-name keyboard $<
diff --git a/capplets/mouse/Makefile.am b/capplets/mouse/Makefile.am
index e4e72516a..dfeb69e1e 100644
--- a/capplets/mouse/Makefile.am
+++ b/capplets/mouse/Makefile.am
@@ -21,7 +21,7 @@ Desktop_in_files = mate-settings-mouse.desktop.in
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
$(desktop_DATA): $(Desktop_in_files)
- $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
mate-mouse-properties-resources.h mate-mouse-properties-resources.c: org.mate.mcc.mouse.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir $(srcdir) $(srcdir)/org.mate.mcc.mouse.gresource.xml)
$(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir $(srcdir) --generate --c-name mouse $<
diff --git a/capplets/network/Makefile.am b/capplets/network/Makefile.am
index 09bf2abe7..e36a3ddaa 100644
--- a/capplets/network/Makefile.am
+++ b/capplets/network/Makefile.am
@@ -18,7 +18,7 @@ desktop_in_files = mate-network-properties.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
$(desktop_DATA): $(desktop_in_files)
- $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
mate-network-properties-resources.h mate-network-properties-resources.c: org.mate.mcc.network.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir $(srcdir) $(srcdir)/org.mate.mcc.network.gresource.xml)
$(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir $(srcdir) --generate --c-name network $<
diff --git a/capplets/time-admin/data/Makefile.am b/capplets/time-admin/data/Makefile.am
index f9a035736..f8d5c5249 100644
--- a/capplets/time-admin/data/Makefile.am
+++ b/capplets/time-admin/data/Makefile.am
@@ -28,7 +28,7 @@ desktop_in_files = mate-time-admin.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
$(desktop_DATA): $(desktop_in_files)
- $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
CLEANFILES = $(desktop_DATA)
EXTRA_DIST = \
diff --git a/capplets/windows/Makefile.am b/capplets/windows/Makefile.am
index b6f5e854d..11777e7be 100644
--- a/capplets/windows/Makefile.am
+++ b/capplets/windows/Makefile.am
@@ -20,7 +20,7 @@ mate-window-properties-resources.h mate-window-properties-resources.c: org.mate.
$(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir $(srcdir) --generate --c-name window_properties $<
$(desktop_DATA): $(Desktop_in_files)
- $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
AM_CPPFLAGS = \
$(WARN_CFLAGS) \
diff --git a/font-viewer/Makefile.am b/font-viewer/Makefile.am
index 501c610cb..9dbaee9c0 100644
--- a/font-viewer/Makefile.am
+++ b/font-viewer/Makefile.am
@@ -35,7 +35,7 @@ desktopdir = $(datadir)/applications
desktop_in_files = mate-font-viewer.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
$(desktop_DATA): $(desktop_in_files)
- $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
install-data-local: install-desktop-database
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 154471082..77d1c1ac7 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -21,7 +21,7 @@ sysdir = $(datadir)/applications
sys_in_files = matecc.desktop.in
sys_DATA = $(sys_in_files:.desktop.in=.desktop)
$(sys_DATA): $(sys_in_files)
- $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
directorydir = $(datadir)/desktop-directories
directory_in_files = matecc.directory.desktop.in
From b222081467e85e45dd9451060c369f4fa582c870 Mon Sep 17 00:00:00 2001
From: rbuj <robert.buj@gmail.com>
Date: Mon, 2 Mar 2020 11:20:58 +0100
Subject: [PATCH] mate-about.desktop: Do not collect the translation for Icon
---
mate-about/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mate-about/Makefile.am b/mate-about/Makefile.am
index 67a42935..e557bbe7 100644
--- a/mate-about/Makefile.am
+++ b/mate-about/Makefile.am
@@ -13,7 +13,7 @@ desktopdir = $(datadir)/applications
desktop_in_files = mate-about.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
mate-about.desktop: mate-about.desktop.in
- $(AM_V_GEN)$(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+ $(AM_V_GEN)$(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --template $< -d $(top_srcdir)/po -o $@
versiondir = $(datadir)/mate-about
version_DATA = mate-version.xml
From 39c11887c2fc8098eff2fa77163f85b90df6212a Mon Sep 17 00:00:00 2001
From: rbuj <robert.buj@gmail.com>
Date: Mon, 2 Mar 2020 11:08:07 +0100
Subject: [PATCH] Do not collect the translation for Icon
---
desktop-directories/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/desktop-directories/Makefile.am b/desktop-directories/Makefile.am
index 042899d..4e166bf 100644
--- a/desktop-directories/Makefile.am
+++ b/desktop-directories/Makefile.am
@@ -29,7 +29,7 @@ directory_in_files = \
directory_DATA = $(directory_in_files:.directory.in=.directory)
%.directory: %.directory.in
- $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
EXTRA_DIST= $(directory_in_files)
From 6749f0b63fbbb49f15b2591e37a24e2199897d03 Mon Sep 17 00:00:00 2001
From: rbuj <robert.buj@gmail.com>
Date: Mon, 2 Mar 2020 10:03:36 +0100
Subject: [PATCH] Do not collect the translation for Icon
---
applets/clock/Makefile.am | 2 +-
applets/fish/Makefile.am | 2 +-
applets/notification_area/Makefile.am | 2 +-
applets/wncklet/Makefile.am | 2 +-
mate-panel/Makefile.am | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/applets/clock/Makefile.am b/applets/clock/Makefile.am
index 5247f63ac..55f94e935 100644
--- a/applets/clock/Makefile.am
+++ b/applets/clock/Makefile.am
@@ -136,7 +136,7 @@ $(applet_in_files): $(applet_in_files).in Makefile
$< > $@
$(applet_DATA): $(applet_in_files)
- $(AM_V_GEN) $(MSGFMT) --desktop --keyword Name --keyword Description --template $< -d $(top_srcdir)/po -o $@
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
if !CLOCK_INPROCESS
servicedir = $(datadir)/dbus-1/services
diff --git a/applets/fish/Makefile.am b/applets/fish/Makefile.am
index f5cfbf78e..814d5d8cb 100644
--- a/applets/fish/Makefile.am
+++ b/applets/fish/Makefile.am
@@ -51,7 +51,7 @@ $(applet_in_files): $(applet_in_files).in Makefile
$< > $@
$(applet_DATA): $(applet_in_files)
- $(AM_V_GEN) $(MSGFMT) --desktop --keyword Name --keyword Description --template $< -d $(top_srcdir)/po -o $@
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
if !FISH_INPROCESS
servicedir = $(datadir)/dbus-1/services
diff --git a/applets/notification_area/Makefile.am b/applets/notification_area/Makefile.am
index f7b681103..539db550b 100644
--- a/applets/notification_area/Makefile.am
+++ b/applets/notification_area/Makefile.am
@@ -74,7 +74,7 @@ applet_in_files = org.mate.panel.NotificationAreaApplet.mate-panel-applet.deskto
applet_DATA = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet)
$(applet_DATA): $(applet_in_files)
- $(AM_V_GEN) $(MSGFMT) --desktop --keyword Name --keyword Description --template $< -d $(top_srcdir)/po -o $@
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
$(applet_in_files): $(applet_in_files).in Makefile
$(AM_V_GEN)sed \
diff --git a/applets/wncklet/Makefile.am b/applets/wncklet/Makefile.am
index 199238785..b933f81b9 100644
--- a/applets/wncklet/Makefile.am
+++ b/applets/wncklet/Makefile.am
@@ -60,7 +60,7 @@ $(applet_in_files): $(applet_in_files).in Makefile
$< > $@
$(applet_DATA): $(applet_in_files)
- $(AM_V_GEN) $(MSGFMT) --desktop --keyword Name --keyword Description --template $< -d $(top_srcdir)/po -o $@
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
if !WNCKLET_INPROCESS
servicedir = $(datadir)/dbus-1/services
diff --git a/mate-panel/Makefile.am b/mate-panel/Makefile.am
index 91edecf1d..0c6415837 100644
--- a/mate-panel/Makefile.am
+++ b/mate-panel/Makefile.am
@@ -291,7 +291,7 @@ desktopdir = $(datadir)/applications
desktop_in_files = mate-panel.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
$(desktop_DATA): $(desktop_in_files)
- $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --template $< -d $(top_srcdir)/po -o $@
EXTRA_DIST = \
$(ui_FILES) \
From 51e6322db5717c7baa9a517a19af163fbeed56a5 Mon Sep 17 00:00:00 2001
From: rbuj <robert.buj@gmail.com>
Date: Fri, 15 Jan 2021 18:18:39 +0100
Subject: [PATCH] i18n: Do not collect the translation for Icon
---
src/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index a1c65ed9..f26612be 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -57,7 +57,7 @@ desktopdir = $(sysconfdir)/xdg/autostart
desktop_in_files = mate-screensaver.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
$(desktop_DATA): $(desktop_in_files)
- $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
mate_screensaver_command_SOURCES = \
mate-screensaver-command.c \
From dd0f9279eb831c49ac73b15f565bc9abcf9005ed Mon Sep 17 00:00:00 2001
From: rbuj <robert.buj@gmail.com>
Date: Sun, 31 Jan 2021 20:52:34 +0100
Subject: [PATCH] i18n: Do not collect the translation for Icon (data folder)
---
data/Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/data/Makefile.am b/data/Makefile.am
index e3e0eb9f..b7056353 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -14,7 +14,7 @@ desktop_in_files = mate-screensaver-preferences.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
$(desktop_DATA): $(desktop_in_files)
- $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
directorydir = $(datadir)/desktop-directories
directory_in_files = \
@@ -23,7 +23,7 @@ directory_in_files = \
directory_DATA = $(directory_in_files:.directory.desktop.in=.directory)
$(directory_DATA): $(directory_in_files)
- $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --template $< -d $(top_srcdir)/po -o $@
menudir = $(sysconfdir)/xdg/menus
menu_DATA = \
From d245a2f56302b7a26528194f30c788f5ab80e38f Mon Sep 17 00:00:00 2001
From: rbuj <robert.buj@gmail.com>
Date: Sun, 31 Jan 2021 22:28:37 +0100
Subject: [PATCH] i18n: Do not collect the translation for Icon
---
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
index 95f16ecf..d7e22e71 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,7 +41,7 @@ Applications_in_files = mate-system-monitor.desktop.in
Applications_DATA = $(Applications_in_files:.desktop.in=.desktop)
$(Applications_DATA): $(Applications_in_files)
- $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
distuninstallcheck_listfiles = find . -type f -print
diff -Nru baobab/data/Makefile.am baobab/data/Makefile.am
--- a/baobab/data/Makefile.am 2020-02-09 19:39:11.000000000 -0600
+++ b/baobab/data/Makefile.am 2022-02-16 16:41:58.357104436 -0600
@@ -6,7 +6,7 @@
sed -e "s|\@VERSION\@|@VERSION@|" $< > $@
$(baobabapp_DATA): $(baobabapp_in_files)
- $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
appdatadir = $(datadir)/metainfo
appdata_in_files = mate-disk-usage-analyzer.appdata.xml.in
diff -Nru gsearchtool/data/Makefile.am gsearchtool/data/Makefile.am
--- a/gsearchtool/data/Makefile.am 2020-02-09 19:39:11.000000000 -0600
+++ b/gsearchtool/data/Makefile.am 2022-02-16 16:41:59.341116566 -0600
@@ -18,7 +18,7 @@
Utilities_in_files = mate-search-tool.desktop.in
Utilities_DATA = $(Utilities_in_files:.desktop.in=.desktop)
$(Utilities_DATA): $(Utilities_in_files)
- $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
EXTRA_DIST = \
$(icon_DATA) \
diff -Nru logview/data/Makefile.am logview/data/Makefile.am
--- a/logview/data/Makefile.am 2020-02-09 19:39:11.000000000 -0600
+++ b/logview/data/Makefile.am 2022-02-16 16:41:59.989124555 -0600
@@ -6,7 +6,7 @@
$(desktop_in_files): $(desktop_in_files:.desktop.in=.desktop.in.in)
@sed -e "s|\@VERSION\@|@VERSION@|" $< > $@
$(desktop_DATA): $(desktop_in_files)
- $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
man_MANS = mate-system-log.1
diff -Nru mate-dictionary/data/Makefile.am mate-dictionary/data/Makefile.am
--- a/mate-dictionary/data/Makefile.am 2020-02-09 19:39:11.000000000 -0600
+++ b/mate-dictionary/data/Makefile.am 2022-02-16 16:42:00.853135206 -0600
@@ -9,6 +9,9 @@
$(gdictapp_in_files): $(gdictapp_in_files:.desktop.in=.desktop.in.in)
$(AM_V_GEN)sed -e "s|\@VERSION\@|@VERSION@|" $< > $@
+$(gdictapp_DATA): $(gdictapp_in_files)
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
+
# dictionary sources definitions
dictsourcedir = $(datadir)/mate-dict/sources
dictsource_in_files = \
@@ -17,8 +20,8 @@
$(NULL)
dictsource_DATA = $(dictsource_in_files:.desktop.in=.desktop)
-%.desktop: %.desktop.in
- $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+$(dictsource_DATA): $(dictsource_in_files)
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
builderdir = $(datadir)/mate-dictionary
builder_DATA = \
diff -Nru mate-disk-image-mounter/data/Makefile.am mate-disk-image-mounter/data/Makefile.am
--- a/mate-disk-image-mounter/data/Makefile.am 2020-02-09 19:39:11.000000000 -0600
+++ b/mate-disk-image-mounter/data/Makefile.am 2022-02-16 16:42:02.137151035 -0600
@@ -4,7 +4,7 @@
diskimagemounter_in_files = mate-disk-image-mounter.desktop.in
diskimagemounter_DATA = $(diskimagemounter_in_files:.desktop.in=.desktop)
$(diskimagemounter_DATA): $(diskimagemounter_in_files)
- $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
EXTRA_DIST = \
$(diskimagemounter_in_files) \
diff -Nru mate-screenshot/data/Makefile.am mate-screenshot/data/Makefile.am
--- a/mate-screenshot/data/Makefile.am 2020-02-09 19:39:11.000000000 -0600
+++ b/mate-screenshot/data/Makefile.am 2022-02-16 16:42:02.157151282 -0600
@@ -2,7 +2,7 @@
mate_screenshot_in_files = mate-screenshot.desktop.in
mate_screenshot_DATA = $(mate_screenshot_in_files:.desktop.in=.desktop)
$(mate_screenshot_DATA): $(mate_screenshot_in_files)
- $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
man_MANS = mate-screenshot.1
diff -Nru po/Makevars po/Makevars
--- a/po/Makevars 2020-02-09 19:39:11.000000000 -0600
+++ b/po/Makevars 2022-02-16 16:42:02.233152218 -0600
@@ -8,7 +8,7 @@
top_builddir = ..
# These options get passed to xgettext.
-XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 --keyword=g_dngettext:2,3 --add-comments=Translators:
+XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 --keyword=g_dngettext:2,3 --keyword=Description --add-comments=Translators:
# 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
From 79e576c9d7f8a80ac0bbd60749726a11786809a9 Mon Sep 17 00:00:00 2001
From: rbuj <robert.buj@gmail.com>
Date: Sun, 31 Jan 2021 22:16:42 +0100
Subject: [PATCH] i18n: Do not collect the translation for Icon
---
data/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/Makefile.am b/data/Makefile.am
index ce5f3fb..8a456d6 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -5,7 +5,7 @@ desktop_in_files = mozo.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
$(desktop_DATA): $(desktop_in_files)
- $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
man_MANS = mozo.1
#!/bin/sh
#
# Copyright (C) 2022 Trisquel GNU/Linux developers
# <trisquel-devel@listas.trisquel.info>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
VERSION=0
. ./config
#Fix LP:1891891 Broken icons on localization MATE (only for nabia)
patch -p1 < $DATA/nabia_caja-extensions_fix_based_on_09268d1.patch
changelog "Fix LP:1891891 Broken icons on localization MATE."
compile
#!/bin/sh
#
# Copyright (C) 2022 Trisquel GNU/Linux developers
# <trisquel-devel@listas.trisquel.info>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
VERSION=0
. ./config
#Fix LP:1891891 Broken icons on localization MATE (only for nabia)
patch -p1 < $DATA/nabia_eom_fix_based_on_0c8d17a.patch
changelog "Fix LP:1891891 Broken icons on localization MATE."
compile
#!/bin/sh
#
# Copyright (C) 2022 Trisquel GNU/Linux developers
# <trisquel-devel@listas.trisquel.info>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
VERSION=0
. ./config
#Fix LP:1891891 Broken icons on localization MATE (only for nabia)
patch -p1 < $DATA/nabia_mate-calc_fix_based_on_9196271.patch
changelog "Fix LP:1891891 Broken icons on localization MATE."
compile
#!/bin/sh
#
# Copyright (C) 2022 Trisquel GNU/Linux developers
# <trisquel-devel@listas.trisquel.info>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
VERSION=0
. ./config
#Fix LP:1891891 Broken icons on localization MATE (only for nabia)
patch -p1 < $DATA/nabia_mate-control-center_fix_based_on_1438fc1.patch
changelog "Fix LP:1891891 Broken icons on localization MATE."
compile
#!/bin/sh
#
# Copyright (C) 2022 Trisquel GNU/Linux developers
# <trisquel-devel@listas.trisquel.info>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
VERSION=0
. ./config
#Fix LP:1891891 Broken icons on localization MATE (only for nabia)
patch -p1 < $DATA/nabia_mate-desktop_fix_based_on_b222081.patch
changelog "Fix LP:1891891 Broken icons on localization MATE."
compile
......@@ -17,13 +17,16 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
VERSION=8
VERSION=9
COMPONENT=main
. ./config
cp $DATA/applications.menu layout/mate-applications.menu
#Fix LP:1891891 Broken icons on localization MATE (only for nabia)
patch -p1 < $DATA/nabia_mate-menus_fix_based_on_39c1188.patch
changelog "Default layout adapted for Trisquel"
compile
......
......@@ -18,7 +18,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
VERSION=9
VERSION=10
. ./config
......@@ -121,6 +121,9 @@ debian/mate-panel-layout-update.desktop etc/xdg/autostart
debian/layout-reset usr/share/mate-panel
EOF
#Fix LP:1891891 Broken icons on localization MATE (only for nabia)
patch -p1 < $DATA/nabia_mate-panel_fix_based_on_6749f0b.patch
changelog "Changed default layout"
compile
......
#!/bin/sh
#
# Copyright (C) 2022 Trisquel GNU/Linux developers
# <trisquel-devel@listas.trisquel.info>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
VERSION=0
. ./config
#Fix LP:1891891 Broken icons on localization MATE (only for nabia)
patch -p1 < $DATA/nabia_mate-screensaver_fix_based_on_dd0f927.patch
patch -p1 < $DATA/nabia_mate-screensaver_fix_based_on_51e6322.patch
changelog "Fix LP:1891891 Broken icons on localization MATE."
compile
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment