AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Switch gettext domain from gtk30 to gtk40

Browse Source
This commit is contained in:
Matthias Clasen 2016-10-07 09:13:59 -04:00
parent ecd384eeb7
commit 74f3d7f6d3
24 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -104,6 +104,6 @@ AM_DISTCHECK_CONFIGURE_FLAGS = \
--enable-installed-tests --enable-installed-tests
GITIGNORE_TRANSLATION_DIRS = po-properties GITIGNORE_TRANSLATION_DIRS = po-properties
GITIGNOREFILES = po-properties/gtk30-properties.pot GITIGNOREFILES = po-properties/gtk40-properties.pot
-include $(top_srcdir)/git.mk -include $(top_srcdir)/git.mk

2
configure.ac
View File

@ -168,7 +168,7 @@ AC_USE_SYSTEM_EXTENSIONS
AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT([external])
AM_GNU_GETTEXT_VERSION([0.19.7]) AM_GNU_GETTEXT_VERSION([0.19.7])
GETTEXT_PACKAGE=gtk30 GETTEXT_PACKAGE=gtk40
AC_SUBST(GETTEXT_PACKAGE) AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
[The prefix for our gettext translation domains.]) [The prefix for our gettext translation domains.])

2
demos/gtk-demo/listbox.ui
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<interface domain="gtk30"> <interface domain="gtk40">
<!-- interface-requires gtk+ 3.10 --> <!-- interface-requires gtk+ 3.10 -->
<!-- interface-requires gtkdemo 3.10 --> <!-- interface-requires gtkdemo 3.10 -->
<object class="GtkMenu" id="menu1"> <object class="GtkMenu" id="menu1">

4
docs/RELEASE-HOWTO
View File

@ -28,8 +28,8 @@ Make sure that gtk-doc is the latest released version.
3) Update the pot files and commit the changes: 3) Update the pot files and commit the changes:
make -C po gtk30.pot make -C po gtk40.pot
make -C po-properties gtk30-properties.pot make -C po-properties gtk40-properties.pot
4) In particular, if this is a major, stable, release, verify that 4) In particular, if this is a major, stable, release, verify that
README.in contains the relevant release notes and that the README.in contains the relevant release notes and that the

2
gtk/inspector/actions.ui
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<interface domain="gtk30"> <interface domain="gtk40">
<object class="GtkListStore" id="model"> <object class="GtkListStore" id="model">
<columns> <columns>
<column type="gchararray"/> <column type="gchararray"/>

2
gtk/inspector/css-editor.ui
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<interface domain="gtk30"> <interface domain="gtk40">
<object class="GtkTextTagTable" id="tags"> <object class="GtkTextTagTable" id="tags">
<child type="tag"> <child type="tag">
<object class="GtkTextTag"> <object class="GtkTextTag">

2
gtk/inspector/css-node-tree.ui
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<interface domain="gtk30"> <interface domain="gtk40">
<object class="GtkListStore" id="prop_model"> <object class="GtkListStore" id="prop_model">
<columns> <columns>
<column type="gchararray"/> <column type="gchararray"/>

2
gtk/inspector/data-list.ui
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<interface domain="gtk30"> <interface domain="gtk40">
<template class="GtkInspectorDataList" parent="GtkBox"> <template class="GtkInspectorDataList" parent="GtkBox">
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>

2
gtk/inspector/general.ui
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<interface domain="gtk30"> <interface domain="gtk40">
<template class="GtkInspectorGeneral" parent="GtkScrolledWindow"> <template class="GtkInspectorGeneral" parent="GtkScrolledWindow">
<property name="hscrollbar-policy">never</property> <property name="hscrollbar-policy">never</property>
<property name="vscrollbar-policy">automatic</property> <property name="vscrollbar-policy">automatic</property>

2
gtk/inspector/magnifier.ui
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<interface domain="gtk30"> <interface domain="gtk40">
<template class="GtkInspectorMagnifier" parent="GtkBox"> <template class="GtkInspectorMagnifier" parent="GtkBox">
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>

2
gtk/inspector/menu.ui
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<interface domain="gtk30"> <interface domain="gtk40">
<object class="GtkTreeStore" id="model"> <object class="GtkTreeStore" id="model">
<columns> <columns>
<column type="gchararray"/> <!-- type --> <column type="gchararray"/> <!-- type -->

2
gtk/inspector/misc-info.ui
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<interface domain="gtk30"> <interface domain="gtk40">
<template class="GtkInspectorMiscInfo" parent="GtkScrolledWindow"> <template class="GtkInspectorMiscInfo" parent="GtkScrolledWindow">
<child> <child>
<object class="GtkBox"> <object class="GtkBox">

2
gtk/inspector/object-hierarchy.ui
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<interface domain="gtk30"> <interface domain="gtk40">
<object class="GtkTreeStore" id="model"> <object class="GtkTreeStore" id="model">
<columns> <columns>
<column type="gchararray"/> <column type="gchararray"/>

2
gtk/inspector/object-tree.ui
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<interface domain="gtk30"> <interface domain="gtk40">
<object class="GtkTreeStore" id="model"> <object class="GtkTreeStore" id="model">
<columns> <columns>
<column type="gpointer"/> <column type="gpointer"/>

2
gtk/inspector/prop-list.ui
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<interface domain="gtk30"> <interface domain="gtk40">
<object class="GtkListStore" id="model"> <object class="GtkListStore" id="model">
<columns> <columns>
<column type="gchararray"/> <column type="gchararray"/>

2
gtk/inspector/resource-list.ui
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<interface domain="gtk30"> <interface domain="gtk40">
<object class="GtkTreeStore" id="model"> <object class="GtkTreeStore" id="model">
<columns> <columns>
<column type="gchararray"/> <column type="gchararray"/>

2
gtk/inspector/selector.ui
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<interface domain="gtk30"> <interface domain="gtk40">
<object class="GtkTreeStore" id="model"> <object class="GtkTreeStore" id="model">
<columns> <columns>
<column type="gchararray"/> <column type="gchararray"/>

2
gtk/inspector/signals-list.ui
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<interface domain="gtk30"> <interface domain="gtk40">
<object class="GtkListStore" id="model"> <object class="GtkListStore" id="model">
<columns> <columns>
<column type="gchararray"/> <column type="gchararray"/>

2
gtk/inspector/statistics.ui
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<interface domain="gtk30"> <interface domain="gtk40">
<object class="GtkListStore" id="model"> <object class="GtkListStore" id="model">
<columns> <columns>
<column type="GType"/> <column type="GType"/>

2
gtk/inspector/visual.ui
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<interface domain="gtk30"> <interface domain="gtk40">
<object class="GtkAdjustment" id="scale_adjustment"> <object class="GtkAdjustment" id="scale_adjustment">
<property name="lower">1</property> <property name="lower">1</property>
<property name="upper">2</property> <property name="upper">2</property>

2
gtk/inspector/window.ui
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<interface domain="gtk30"> <interface domain="gtk40">
<object class="GtkAdjustment" id="magnification_adjustment"> <object class="GtkAdjustment" id="magnification_adjustment">
<property name="lower">1.0</property> <property name="lower">1.0</property>
<property name="upper">5.0</property> <property name="upper">5.0</property>

10
make-pot
View File

@ -9,11 +9,11 @@
# #
# ./make-pot # ./make-pot
# #
# to generate po/gtk30.pot, and like this: # to generate po/gtk40.pot, and like this:
# #
# ./make-pot properties # ./make-pot properties
# #
# to generate po-properties/gtk30-properties.pot. # to generate po-properties/gtk40-properties.pot.
# #
# Various things can be passed in by environment variables, which # Various things can be passed in by environment variables, which
# are heavily inspired by the variables used in po/Makefile.in.in: # are heavily inspired by the variables used in po/Makefile.in.in:
@ -23,7 +23,7 @@
# srcdir - the directory where POTFILES.in is located (defaults to # srcdir - the directory where POTFILES.in is located (defaults to
# $top_srcdir/po or $top_srcdir/po-properties) # $top_srcdir/po or $top_srcdir/po-properties)
# GETTEXT_PACKAGE - the gettext domain, used for naming the resulting # GETTEXT_PACKAGE - the gettext domain, used for naming the resulting
# .pot file (defaults to gtk30 or gtk30-properties) # .pot file (defaults to gtk40 or gtk40-properties)
# XGETTEXT_KEYWORDS - --keyword arguments to pass to xgettext # XGETTEXT_KEYWORDS - --keyword arguments to pass to xgettext
@ -32,11 +32,11 @@ top_srcdir="${top_srcdir:-.}"
if test "$1" = "properties"; then if test "$1" = "properties"; then
srcdir="${srcdir:-$top_srcdir/po-properties}" srcdir="${srcdir:-$top_srcdir/po-properties}"
GETTEXT_PACKAGE="${GETTEXT_PACKAGE:-gtk30-properties}" GETTEXT_PACKAGE="${GETTEXT_PACKAGE:-gtk40-properties}"
XGETTEXT_KEYWORDS="${XGETTEXT_KEYWORDS:- --keyword --keyword=P_ }" XGETTEXT_KEYWORDS="${XGETTEXT_KEYWORDS:- --keyword --keyword=P_ }"
else else
srcdir="${srcdir:-$top_srcdir/po}" srcdir="${srcdir:-$top_srcdir/po}"
GETTEXT_PACKAGE="${GETTEXT_PACKAGE:-gtk30}" GETTEXT_PACKAGE="${GETTEXT_PACKAGE:-gtk40}"
XGETTEXT_KEYWORDS="${XGETTEXT_KEYWORDS:- --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 --keyword=g_dngettext:2,3 }" XGETTEXT_KEYWORDS="${XGETTEXT_KEYWORDS:- --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 --keyword=g_dngettext:2,3 }"
fi fi

2
po-properties/Makevars
View File

@ -1,7 +1,7 @@
# Makefile variables for PO directory in any package using GNU gettext. # Makefile variables for PO directory in any package using GNU gettext.
# Usually the message domain is the same as the package name. # Usually the message domain is the same as the package name.
DOMAIN = gtk30-properties DOMAIN = gtk40-properties
# These two variables depend on the location of this directory. # These two variables depend on the location of this directory.
subdir = po subdir = po

2
po/Makevars
View File

@ -1,7 +1,7 @@
# Makefile variables for PO directory in any package using GNU gettext. # Makefile variables for PO directory in any package using GNU gettext.
# Usually the message domain is the same as the package name. # Usually the message domain is the same as the package name.
DOMAIN = gtk30 DOMAIN = gtk40
# These two variables depend on the location of this directory. # These two variables depend on the location of this directory.
subdir = po subdir = po