From 6294de0acf38507697258c295785c213b4de08fd Mon Sep 17 00:00:00 2001 From: Wu Xiaotian Date: Mon, 2 Sep 2019 10:38:45 +0800 Subject: migrate from intltool to gettext --- desktop-themes/BlackMATE-border/Makefile.am | 4 ++-- desktop-themes/BlackMATE/Makefile.am | 5 +++-- desktop-themes/BlackMATE/index.theme.in | 2 +- desktop-themes/Blue-Submarine-border/Makefile.am | 5 +++-- desktop-themes/Blue-Submarine/Makefile.am | 5 +++-- desktop-themes/Blue-Submarine/index.theme.in | 2 +- desktop-themes/BlueMenta-border/Makefile.am | 5 +++-- desktop-themes/BlueMenta-border/index.theme.in | 2 +- desktop-themes/BlueMenta/Makefile.am | 5 +++-- desktop-themes/BlueMenta/index.theme.in | 2 +- desktop-themes/ContrastHigh/Makefile.am | 5 +++-- desktop-themes/ContrastHigh/index.theme.in | 2 +- desktop-themes/Green-Submarine-border/Makefile.am | 5 +++-- desktop-themes/Green-Submarine-border/index.theme.in | 2 +- desktop-themes/Green-Submarine/Makefile.am | 5 +++-- desktop-themes/Green-Submarine/index.theme.in | 2 +- desktop-themes/GreenLaguna-border/Makefile.am | 5 +++-- desktop-themes/GreenLaguna/Makefile.am | 5 +++-- desktop-themes/GreenLaguna/index.theme.in | 2 +- desktop-themes/HighContrastInverse/Makefile.am | 5 +++-- desktop-themes/HighContrastInverse/index.theme.in | 4 ++-- desktop-themes/Menta-border/Makefile.am | 5 +++-- desktop-themes/Menta/Makefile.am | 5 +++-- desktop-themes/Menta/index.theme.in | 2 +- desktop-themes/TraditionalGreen/Makefile.am | 5 +++-- desktop-themes/TraditionalGreen/index.theme.in | 2 +- desktop-themes/TraditionalOk/Makefile.am | 5 +++-- desktop-themes/TraditionalOk/index.theme.in | 2 +- 28 files changed, 60 insertions(+), 45 deletions(-) (limited to 'desktop-themes') diff --git a/desktop-themes/BlackMATE-border/Makefile.am b/desktop-themes/BlackMATE-border/Makefile.am index e4d247c1..60b3a1fa 100644 --- a/desktop-themes/BlackMATE-border/Makefile.am +++ b/desktop-themes/BlackMATE-border/Makefile.am @@ -1,11 +1,11 @@ THEME_NAME=BlackMATE-border THEME_IN_FILES=index.theme.in -@INTLTOOL_THEME_RULE@ - themedir = $(datadir)/themes/$(THEME_NAME) theme_DATA = index.theme +$(theme_DATA): $(THEME_IN_FILES) + $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ SUBDIRS = \ metacity-1 diff --git a/desktop-themes/BlackMATE/Makefile.am b/desktop-themes/BlackMATE/Makefile.am index 85822b8f..00ee5d67 100644 --- a/desktop-themes/BlackMATE/Makefile.am +++ b/desktop-themes/BlackMATE/Makefile.am @@ -1,8 +1,6 @@ THEME_NAME= BlackMATE THEME_IN_FILES=index.theme.in -@INTLTOOL_THEME_RULE@ - themedir = $(datadir)/themes/$(THEME_NAME) theme_DATA = \ @@ -10,6 +8,9 @@ theme_DATA = \ index.theme \ README +%.theme: %.theme.in + $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + SUBDIRS = \ gtk-2.0 \ gtk-3.0 \ diff --git a/desktop-themes/BlackMATE/index.theme.in b/desktop-themes/BlackMATE/index.theme.in index 786c28ad..55a43c20 100644 --- a/desktop-themes/BlackMATE/index.theme.in +++ b/desktop-themes/BlackMATE/index.theme.in @@ -1,7 +1,7 @@ [Desktop Entry] Type=X-GNOME-Metatheme Name=BlackMATE -_Comment=A clean dark theme +Comment=A clean dark theme Encoding=UTF-8 [X-GNOME-Metatheme] diff --git a/desktop-themes/Blue-Submarine-border/Makefile.am b/desktop-themes/Blue-Submarine-border/Makefile.am index b0e9f3c2..cc932e0e 100644 --- a/desktop-themes/Blue-Submarine-border/Makefile.am +++ b/desktop-themes/Blue-Submarine-border/Makefile.am @@ -1,12 +1,13 @@ THEME_NAME=Blue-Submarine-border THEME_IN_FILES=index.theme.in -@INTLTOOL_THEME_RULE@ - themedir = $(datadir)/themes/$(THEME_NAME) theme_DATA = index.theme +$(theme_DATA): $(THEME_IN_FILES) + $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + SUBDIRS = \ metacity-1 diff --git a/desktop-themes/Blue-Submarine/Makefile.am b/desktop-themes/Blue-Submarine/Makefile.am index 0b74e802..e70fee01 100644 --- a/desktop-themes/Blue-Submarine/Makefile.am +++ b/desktop-themes/Blue-Submarine/Makefile.am @@ -1,12 +1,13 @@ THEME_NAME=Blue-Submarine THEME_IN_FILES=index.theme.in -@INTLTOOL_THEME_RULE@ - themedir = $(datadir)/themes/$(THEME_NAME) theme_DATA = index.theme +$(theme_DATA): $(THEME_IN_FILES) + $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + SUBDIRS = \ cinnamon \ emerald \ diff --git a/desktop-themes/Blue-Submarine/index.theme.in b/desktop-themes/Blue-Submarine/index.theme.in index e0d2048c..957b40b6 100644 --- a/desktop-themes/Blue-Submarine/index.theme.in +++ b/desktop-themes/Blue-Submarine/index.theme.in @@ -1,7 +1,7 @@ [Desktop Entry] Type=X-GNOME-Metatheme Name=Blue-Submarine -_Comment=A medium blue theme with dark menus and panel +Comment=A medium blue theme with dark menus and panel Encoding=UTF-8 [X-GNOME-Metatheme] diff --git a/desktop-themes/BlueMenta-border/Makefile.am b/desktop-themes/BlueMenta-border/Makefile.am index 4163d10c..54d4d179 100644 --- a/desktop-themes/BlueMenta-border/Makefile.am +++ b/desktop-themes/BlueMenta-border/Makefile.am @@ -1,8 +1,6 @@ THEME_NAME=BlueMenta-border THEME_IN_FILES=index.theme.in -@INTLTOOL_THEME_RULE@ - themedir = $(datadir)/themes/$(THEME_NAME) theme_DATA = \ @@ -10,6 +8,9 @@ theme_DATA = \ index.theme \ README +%.theme: %.theme.in + $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + SUBDIRS = \ metacity-1 diff --git a/desktop-themes/BlueMenta-border/index.theme.in b/desktop-themes/BlueMenta-border/index.theme.in index aad8124b..6b65506c 100644 --- a/desktop-themes/BlueMenta-border/index.theme.in +++ b/desktop-themes/BlueMenta-border/index.theme.in @@ -1,7 +1,7 @@ [Desktop Entry] Type=X-GNOME-Metatheme Name=BlueMenta-border -_Comment=A clean light theme with blue elements with huge borders for using without compositor +Comment=A clean light theme with blue elements with huge borders for using without compositor Encoding=UTF-8 [X-GNOME-Metatheme] diff --git a/desktop-themes/BlueMenta/Makefile.am b/desktop-themes/BlueMenta/Makefile.am index 198d6eda..ad296ffe 100644 --- a/desktop-themes/BlueMenta/Makefile.am +++ b/desktop-themes/BlueMenta/Makefile.am @@ -1,8 +1,6 @@ THEME_NAME=BlueMenta THEME_IN_FILES=index.theme.in -@INTLTOOL_THEME_RULE@ - themedir = $(datadir)/themes/$(THEME_NAME) theme_DATA = \ @@ -10,6 +8,9 @@ theme_DATA = \ index.theme \ README +%.theme: %.theme.in + $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + SUBDIRS = \ cinnamon \ emerald \ diff --git a/desktop-themes/BlueMenta/index.theme.in b/desktop-themes/BlueMenta/index.theme.in index 4399c17f..d1577053 100644 --- a/desktop-themes/BlueMenta/index.theme.in +++ b/desktop-themes/BlueMenta/index.theme.in @@ -1,7 +1,7 @@ [Desktop Entry] Type=X-GNOME-Metatheme Name=BlueMenta -_Comment=A clean light theme with blue elements +Comment=A clean light theme with blue elements Encoding=UTF-8 [X-GNOME-Metatheme] diff --git a/desktop-themes/ContrastHigh/Makefile.am b/desktop-themes/ContrastHigh/Makefile.am index e8d5b861..250686b4 100644 --- a/desktop-themes/ContrastHigh/Makefile.am +++ b/desktop-themes/ContrastHigh/Makefile.am @@ -1,11 +1,12 @@ THEME_NAME=ContrastHigh THEME_IN_FILES=index.theme.in -@INTLTOOL_THEME_RULE@ - themedir = $(datadir)/themes/$(THEME_NAME) theme_DATA = index.theme +$(theme_DATA): $(THEME_IN_FILES) + $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + DISTCLEANFILES = index.theme EXTRA_DIST = index.theme.in diff --git a/desktop-themes/ContrastHigh/index.theme.in b/desktop-themes/ContrastHigh/index.theme.in index 13a54b79..091bf98a 100644 --- a/desktop-themes/ContrastHigh/index.theme.in +++ b/desktop-themes/ContrastHigh/index.theme.in @@ -1,7 +1,7 @@ [Desktop Entry] Type=X-GNOME-Metatheme Name=High Contrast -_Comment=High contrast theme +Comment=High contrast theme Encoding=UTF-8 [X-GNOME-Metatheme] diff --git a/desktop-themes/Green-Submarine-border/Makefile.am b/desktop-themes/Green-Submarine-border/Makefile.am index 5cdef7f1..3cb8964b 100644 --- a/desktop-themes/Green-Submarine-border/Makefile.am +++ b/desktop-themes/Green-Submarine-border/Makefile.am @@ -1,12 +1,13 @@ THEME_NAME=Green-Submarine-border THEME_IN_FILES=index.theme.in -@INTLTOOL_THEME_RULE@ - themedir = $(datadir)/themes/$(THEME_NAME) theme_DATA = index.theme +$(theme_DATA): $(THEME_IN_FILES) + $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + SUBDIRS = \ metacity-1 diff --git a/desktop-themes/Green-Submarine-border/index.theme.in b/desktop-themes/Green-Submarine-border/index.theme.in index 637aadcb..2679e4f6 100644 --- a/desktop-themes/Green-Submarine-border/index.theme.in +++ b/desktop-themes/Green-Submarine-border/index.theme.in @@ -1,7 +1,7 @@ [Desktop Entry] Type=X-GNOME-Metatheme Name=Green-Submarine-border -_Comment=A medium green theme with dark menus and panel with huge borders for using without compositor +Comment=A medium green theme with dark menus and panel with huge borders for using without compositor Encoding=UTF-8 [X-GNOME-Metatheme] diff --git a/desktop-themes/Green-Submarine/Makefile.am b/desktop-themes/Green-Submarine/Makefile.am index 966bd5c6..0cb9e35f 100644 --- a/desktop-themes/Green-Submarine/Makefile.am +++ b/desktop-themes/Green-Submarine/Makefile.am @@ -1,12 +1,13 @@ THEME_NAME=Green-Submarine THEME_IN_FILES=index.theme.in -@INTLTOOL_THEME_RULE@ - themedir = $(datadir)/themes/$(THEME_NAME) theme_DATA = index.theme +$(theme_DATA): $(THEME_IN_FILES) + $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + SUBDIRS = \ cinnamon \ emerald \ diff --git a/desktop-themes/Green-Submarine/index.theme.in b/desktop-themes/Green-Submarine/index.theme.in index ce2dd987..a477a695 100644 --- a/desktop-themes/Green-Submarine/index.theme.in +++ b/desktop-themes/Green-Submarine/index.theme.in @@ -1,7 +1,7 @@ [Desktop Entry] Type=X-GNOME-Metatheme Name=Green-Submarine -_Comment=A medium green theme with dark menus and panel +Comment=A medium green theme with dark menus and panel Encoding=UTF-8 [X-GNOME-Metatheme] diff --git a/desktop-themes/GreenLaguna-border/Makefile.am b/desktop-themes/GreenLaguna-border/Makefile.am index a670afb4..afae535b 100644 --- a/desktop-themes/GreenLaguna-border/Makefile.am +++ b/desktop-themes/GreenLaguna-border/Makefile.am @@ -1,14 +1,15 @@ THEME_NAME=GreenLaguna-border THEME_IN_FILES=index.theme.in -@INTLTOOL_THEME_RULE@ - themedir = $(datadir)/themes/$(THEME_NAME) theme_DATA = \ COPYING \ index.theme +%.theme: %.theme.in + $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + SUBDIRS = \ metacity-1 diff --git a/desktop-themes/GreenLaguna/Makefile.am b/desktop-themes/GreenLaguna/Makefile.am index f8b74faf..049fbad8 100644 --- a/desktop-themes/GreenLaguna/Makefile.am +++ b/desktop-themes/GreenLaguna/Makefile.am @@ -1,8 +1,6 @@ THEME_NAME=GreenLaguna THEME_IN_FILES=index.theme.in -@INTLTOOL_THEME_RULE@ - themedir = $(datadir)/themes/$(THEME_NAME) theme_DATA = \ @@ -10,6 +8,9 @@ theme_DATA = \ index.theme \ README +%.theme: %.theme.in + $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + SUBDIRS = \ gtk-2.0 \ gtk-3.0 \ diff --git a/desktop-themes/GreenLaguna/index.theme.in b/desktop-themes/GreenLaguna/index.theme.in index c8f4d5aa..accafcfa 100644 --- a/desktop-themes/GreenLaguna/index.theme.in +++ b/desktop-themes/GreenLaguna/index.theme.in @@ -1,7 +1,7 @@ [Desktop Entry] Type=X-GNOME-Metatheme Name=GreenLaguna -_Comment=A clean light green theme +Comment=A clean light green theme Encoding=UTF-8 [X-GNOME-Metatheme] diff --git a/desktop-themes/HighContrastInverse/Makefile.am b/desktop-themes/HighContrastInverse/Makefile.am index 3cce48c2..5fcd8883 100644 --- a/desktop-themes/HighContrastInverse/Makefile.am +++ b/desktop-themes/HighContrastInverse/Makefile.am @@ -1,12 +1,13 @@ THEME_NAME=HighContrastInverse THEME_IN_FILES=index.theme.in -@INTLTOOL_THEME_RULE@ - themedir = $(datadir)/themes/$(THEME_NAME) theme_DATA = index.theme +$(theme_DATA): $(THEME_IN_FILES) + $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + SUBDIRS = \ gtk-2.0 \ metacity-1 \ diff --git a/desktop-themes/HighContrastInverse/index.theme.in b/desktop-themes/HighContrastInverse/index.theme.in index e53d34fe..55574a0f 100644 --- a/desktop-themes/HighContrastInverse/index.theme.in +++ b/desktop-themes/HighContrastInverse/index.theme.in @@ -1,7 +1,7 @@ [Desktop Entry] Type=X-GNOME-Metatheme -_Name=High Contrast Inverse -_Comment=White-on-black text and icons +Name=High Contrast Inverse +Comment=White-on-black text and icons Encoding=UTF-8 [X-GNOME-Metatheme] diff --git a/desktop-themes/Menta-border/Makefile.am b/desktop-themes/Menta-border/Makefile.am index e573bdf9..3133f43e 100644 --- a/desktop-themes/Menta-border/Makefile.am +++ b/desktop-themes/Menta-border/Makefile.am @@ -1,8 +1,6 @@ THEME_NAME=Menta-border THEME_IN_FILES=index.theme.in -@INTLTOOL_THEME_RULE@ - themedir = $(datadir)/themes/$(THEME_NAME) theme_DATA = \ @@ -10,6 +8,9 @@ theme_DATA = \ index.theme \ README +%.theme: %.theme.in + $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + SUBDIRS = \ metacity-1 diff --git a/desktop-themes/Menta/Makefile.am b/desktop-themes/Menta/Makefile.am index fccf2850..ca84f46b 100644 --- a/desktop-themes/Menta/Makefile.am +++ b/desktop-themes/Menta/Makefile.am @@ -1,8 +1,6 @@ THEME_NAME=Menta THEME_IN_FILES=index.theme.in -@INTLTOOL_THEME_RULE@ - themedir = $(datadir)/themes/$(THEME_NAME) theme_DATA = \ @@ -10,6 +8,9 @@ theme_DATA = \ index.theme \ README +%.theme: %.theme.in + $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + SUBDIRS = \ cinnamon \ emerald \ diff --git a/desktop-themes/Menta/index.theme.in b/desktop-themes/Menta/index.theme.in index 26c76770..ee815021 100644 --- a/desktop-themes/Menta/index.theme.in +++ b/desktop-themes/Menta/index.theme.in @@ -1,7 +1,7 @@ [Desktop Entry] Type=X-GNOME-Metatheme Name=Menta -_Comment=A clean light theme with green elements +Comment=A clean light theme with green elements Encoding=UTF-8 [X-GNOME-Metatheme] diff --git a/desktop-themes/TraditionalGreen/Makefile.am b/desktop-themes/TraditionalGreen/Makefile.am index ab134294..42638043 100644 --- a/desktop-themes/TraditionalGreen/Makefile.am +++ b/desktop-themes/TraditionalGreen/Makefile.am @@ -1,14 +1,15 @@ THEME_NAME=TraditionalGreen THEME_IN_FILES=index.theme.in -@INTLTOOL_THEME_RULE@ - themedir = $(datadir)/themes/$(THEME_NAME) theme_DATA = \ COPYING \ index.theme +%.theme: %.theme.in + $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + SUBDIRS = \ gtk-2.0 \ gtk-3.0 \ diff --git a/desktop-themes/TraditionalGreen/index.theme.in b/desktop-themes/TraditionalGreen/index.theme.in index e339528b..b19ff52c 100644 --- a/desktop-themes/TraditionalGreen/index.theme.in +++ b/desktop-themes/TraditionalGreen/index.theme.in @@ -1,7 +1,7 @@ [Desktop Entry] Type=X-GNOME-Metatheme Name=TraditionalGreen -_Comment=Green port of Clearlooks-Phenix +Comment=Green port of Clearlooks-Phenix Encoding=UTF-8 [X-GNOME-Metatheme] diff --git a/desktop-themes/TraditionalOk/Makefile.am b/desktop-themes/TraditionalOk/Makefile.am index 97df9f09..8956a277 100644 --- a/desktop-themes/TraditionalOk/Makefile.am +++ b/desktop-themes/TraditionalOk/Makefile.am @@ -1,14 +1,15 @@ THEME_NAME=TraditionalOk THEME_IN_FILES=index.theme.in -@INTLTOOL_THEME_RULE@ - themedir = $(datadir)/themes/$(THEME_NAME) theme_DATA = \ COPYING \ index.theme +%.theme: %.theme.in + $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + SUBDIRS = \ gtk-2.0 \ gtk-3.0 \ diff --git a/desktop-themes/TraditionalOk/index.theme.in b/desktop-themes/TraditionalOk/index.theme.in index 683217b5..64041ca0 100644 --- a/desktop-themes/TraditionalOk/index.theme.in +++ b/desktop-themes/TraditionalOk/index.theme.in @@ -1,7 +1,7 @@ [Desktop Entry] Type=X-GNOME-Metatheme Name=TraditionalOk -_Comment=Port of Clearlooks-Phenix +Comment=Port of Clearlooks-Phenix Encoding=UTF-8 [X-GNOME-Metatheme] -- cgit v1.2.1