Attachment 94401 Details for Bug 104014 – Patch to use intltool

[patch] Patch to use intltool

redhat-config-xfree.patch (text/plain), 7.09 KB, created by Miloslav Trmac on 2003-09-11 00:54:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Miloslav Trmac

Created: 2003-09-11 00:54:58 UTC

Size: 7.09 KB

patch

obsolete

>diff -urN rhl/redhat-config-xfree/Makefile redhat-config-xfree/Makefile
>--- rhl/redhat-config-xfree/Makefile	2003-08-14 23:05:06.000000000 +0200
>+++ redhat-config-xfree/Makefile	2003-09-11 01:11:13.000000000 +0200
>@@ -21,7 +21,7 @@
> subdirs:
> 	for d in $(SUBDIRS); do make -C $$d; [ $$? = 0 ] || exit 1; done
> 
>-install:
>+install: ${PKGNAME}.desktop
> 	mkdir -p $(INSTROOT)/usr/bin
> 	mkdir -p $(INSTROOT)$(PKGDATADIR)
> 	mkdir -p $(INSTROOT)/usr/sbin
>@@ -63,7 +63,11 @@
> 	@rm -rf /tmp/${PKGNAME}-$(VERSION)	
> 	@echo "The archive is in ${PKGNAME}-$(VERSION).tar.bz2"
> 
>+%.desktop: %.desktop.in $(wildcard po/*.po)
>+	intltool-merge po $< $@ -d -u -c po/.intltool-merge-cache
>+
> clean:
> 	@rm -fv *~
> 	@rm -fv *.pyc
>-
>+	@rm -fv ${PKGNAME}.desktop
>+	for d in $(SUBDIRS); do make -C $$d clean; [ $$? = 0 ] || exit 1; done
>diff -urN rhl/redhat-config-xfree/po/Makefile redhat-config-xfree/po/Makefile
>--- rhl/redhat-config-xfree/po/Makefile	2002-12-20 00:03:31.000000000 +0100
>+++ redhat-config-xfree/po/Makefile	2003-09-11 01:16:35.000000000 +0200
>@@ -16,47 +16,46 @@
> INSTALL_NLS_DIR = $(RPM_BUILD_ROOT)/usr/share/locale
> 
> # PO catalog handling
>-MSGMERGE	= msgmerge -v
>-PYGETTEXT	= pygettext.py --default-domain=$(NLSPACKAGE) \
>-		  --verbose --output=$(NLSPACKAGE).po 
>-XGETTEXT	= xgettext --default-domain=$(NLSPACKAGE) \
>-		  --add-comments		  
>+INTLTOOL_UPDATE	= intltool-update --gettext-package=$(NLSPACKAGE)
>+MSGMERGE	= $(INTLTOOL_UPDATE) --dist
>+GENPOT		= $(INTLTOOL_UPDATE) --pot
> MSGFMT		= msgfmt --statistics --verbose
> 
> # What do we need to do
> POFILES		= $(wildcard *.po)
> MOFILES		= $(patsubst %.po,%.mo,$(POFILES))
> PYSRC		= $(wildcard ../src/*.py)
>-SRCFILES	= $(PYSRC) $(NLSPACKAGE).gladestrings
>+SRCFILES	= $(PYSRC) ../src/display.glade \
>+		  ../redhat-config-xfree86.desktop.in
> 
> #default:: clean
> 
> all::  update-po $(MOFILES)
> 
>-$(POTFILE): $(SRCFILES)
>-	$(PYGETTEXT) --keyword=_ --keyword=N_ $(SRCFILES)
>-	@if cmp -s $(NLSPACKAGE).po $(POTFILE); then \
>-	    rm -f $(NLSPACKAGE).po; \
>-	else \
>-	    mv -f $(NLSPACKAGE).po $(POTFILE); \
>-	fi; \
>+POTFILES.in:
>+	for i in $(SRCFILES) ; do \
>+		echo $${i#../} ; \
>+	done > $@
>+
>+$(POTFILE): $(SRCFILES) POTFILES.in
>+	$(GENPOT)
> 
> update-po: Makefile $(POTFILE) refresh-po
> 
> refresh-po: Makefile
> 	for cat in $(POFILES); do \
> 		lang=`basename $$cat .po`; \
>-		if $(MSGMERGE) $$lang.po $(POTFILE) > $$lang.pot ; then \
>-			mv -f $$lang.pot $$lang.po ; \
>+		if $(MSGMERGE) $$lang ; then \
>+			rm -f $$lang.old.po ; \
> 			echo "$(MSGMERGE) of $$lang succeeded" ; \
> 		else \
> 			echo "$(MSGMERGE) of $$lang failed" ; \
>-			rm -f $$lang.pot ; \
>+			mv $$lang.old.po $$lang.po ; \
> 		fi \
> 	done
> 
> clean:
>-	@rm -fv *mo *~ .depend
>+	@rm -fv *mo *~ .depend POTFILES.in
> 
> install: $(MOFILES)
> 	@for n in $(MOFILES); do \
>diff -urN rhl/redhat-config-xfree/po/redhat-config-xfree86.gladestrings redhat-config-xfree/po/redhat-config-xfree86.gladestrings
>--- rhl/redhat-config-xfree/po/redhat-config-xfree86.gladestrings	2003-06-05 23:43:33.000000000 +0200
>+++ redhat-config-xfree/po/redhat-config-xfree86.gladestrings	1970-01-01 01:00:00.000000000 +0100
>@@ -1,42 +0,0 @@
>-/*
>- * Translatable strings file generated by Glade.
>- * Add this file to your project's POTFILES.in.
>- * DO NOT compile it as part of your application.
>- */
>-
>-gchar *s = N_("Display settings");
>-gchar *s = N_("IIyama Vision Master Pro 502 with NVIDIA Rage Mobility");
>-gchar *s = N_("Resolution");
>-gchar *s = N_("256 Colors");
>-gchar *s = N_("Thousands of Colors");
>-gchar *s = N_("Millions of Colors");
>-gchar *s = N_("Color Depth");
>-gchar *s = N_("_Advanced...");
>-gchar *s = N_("_Display");
>-gchar *s = N_("Monitor");
>-gchar *s = N_("_Monitor");
>-gchar *s = N_("Video Card");
>-gchar *s = N_("_Video card");
>-gchar *s = N_("Monitor DPI settings");
>-gchar *s = N_("Monitor _Width:");
>-gchar *s = N_("Monitor _Height:");
>-gchar *s = N_("Inch");
>-gchar *s = N_("Millimeter");
>-gchar *s = N_("_Look up from monitor");
>-gchar *s = N_("Resolution: 72 by 72 pixels per inch");
>-gchar *s = N_("Use a ruler to measure the size of your monitor\n"
>-              "display area and enter below");
>-gchar *s = N_("Advanced Settings");
>-gchar *s = N_("Please select the model of your monitor.");
>-gchar *s = N_("<b>_Horizontal Sync Range:</b>");
>-gchar *s = N_("*");
>-gchar *s = N_("*");
>-gchar *s = N_("<b>Vertical _Refresh Rate:</b>");
>-gchar *s = N_("_Reset to default");
>-gchar *s = N_("_Monitor");
>-gchar *s = N_("Please select the model of your video card.");
>-gchar *s = N_("Custom _memory size");
>-gchar *s = N_("_Reset to default");
>-gchar *s = N_("_Video card");
>-gchar *s = N_("multihead stuff will go here");
>-gchar *s = N_("Multi _Head");
>diff -urN rhl/redhat-config-xfree/redhat-config-xfree86.desktop redhat-config-xfree/redhat-config-xfree86.desktop
>--- rhl/redhat-config-xfree/redhat-config-xfree86.desktop	2003-01-14 17:40:19.000000000 +0100
>+++ redhat-config-xfree/redhat-config-xfree86.desktop	1970-01-01 01:00:00.000000000 +0100
>@@ -1,48 +0,0 @@
>-[Desktop Entry]
>-Name=Display
>-Name[cs]=ZobrazenÃ
>-Name[da]=Display
>-Name[de]=Anzeigen
>-Name[es]=VisualizaciÃ³n 
>-Name[fr]=Affichage
>-Name[is]=SkjÃ¡r
>-Name[it]=Schermo
>-Name[ja]=ãã£ã¹ãã¬ã¤
>-Name[ko]=íì
>-Name[ms]=Paparan
>-Name[nl]=Beeldscherm
>-Name[no]=Skjerm
>-Name[pt]=EcrÃ£
>-Name[ru]=ÐÐ¸ÑÐ¿Ð»ÐµÐ¹
>-Name[sv]=SkÃ¤rm
>-Name[tr]=Ekran
>-Name[zh_CN]=æ¾ç¤º
>-Name[zh_TW]=é¡¯ç¤º
>-Name[foo]=Beeldscherm
>-Comment=Configure resolution and colors
>-Comment[cs]=Nastavit rozliÅ¡enÃ a barvy
>-Comment[da]=KonfigurÃ©r oplÃ¸sning og farver
>-Comment[de]=AuflÃ¶sung und Farben konfigurieren
>-Comment[es]=Configurar la resoluciÃ³n y los colores
>-Comment[fr]=Configuration de la rÃ©solution et des couleurs
>-Comment[is]=Stilla upplausn og litadÃ½pt
>-Comment[it]=Configurazione della risoluzione e dei colori
>-Comment[ja]=è§£ååº¦ã¨è²ãè¨å® 
>-Comment[ko]=í´ìëì ìì ì¤ì 
>-Comment[ms]=Konfigurasikan resolusi dan warna
>-Comment[nl]=Resolutie en kleuren configureren
>-Comment[no]=Konfigurer opplÃ¸sing og farger
>-Comment[pt]=Configurar resoluÃ§Ã£o e cores
>-Comment[ru]=ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° ÑÐ°Ð·ÑÐµÑÐµÐ½Ð¸Ñ Ð¸ ÑÐ²ÐµÑÐ¾Ð²
>-Comment[sv]=Konfigurera upplÃ¶sning och fÃ¤rger
>-Comment[tr]=ÃÃ¶zÃ¼nÃ¼rlÃ¼k ve renkleri yapÄ±landÄ±rÄ±r
>-Comment[zh_CN]=éç½®åè¾¨çåé¢è²
>-Comment[zh_TW]=è¨å®è§£æåº¦èå½©åº¦
>-Comment[foo]=Resolutie en kleuren configureren
>-Categories=System;Application;SystemSetup;GTK;
>-Icon=/usr/share/redhat-config-xfree86/pixmaps/redhat-config-xfree86.png
>-Exec=/usr/bin/redhat-config-xfree86
>-Type=Application
>-Terminal=false
>-StartupNotify=true
>-Encoding=UTF-8
>\ ChybÃ znak konce ÅÃ¡dku na konci souboru
>diff -urN rhl/redhat-config-xfree/redhat-config-xfree86.desktop.in redhat-config-xfree/redhat-config-xfree86.desktop.in
>--- rhl/redhat-config-xfree/redhat-config-xfree86.desktop.in	1970-01-01 01:00:00.000000000 +0100
>+++ redhat-config-xfree/redhat-config-xfree86.desktop.in	2003-09-11 01:09:53.000000000 +0200
>@@ -0,0 +1,10 @@
>+[Desktop Entry]
>+_Name=Display
>+_Comment=Configure resolution and colors
>+Categories=System;Application;SystemSetup;GTK;
>+Icon=/usr/share/redhat-config-xfree86/pixmaps/redhat-config-xfree86.png
>+Exec=/usr/bin/redhat-config-xfree86
>+Type=Application
>+Terminal=false
>+StartupNotify=true
>+Encoding=UTF-8

Actions: View | Diff

Attachments on bug 104014: 94401