Compare commits

...

7 Commits

Author SHA1 Message Date
Federico Mena Quintero
3b5bc58958 Check for libslab with pkgconfig
Signed-off-by: Federico Mena Quintero <federico@novell.com>
2009-05-11 20:41:28 -05:00
Federico Mena Quintero
a0c16ecf0b Comment out invalid translation in uz@cyrillic.po 2009-05-11 19:51:47 -05:00
Federico Mena Quintero
76b4c56b59 Comment out invalid translation in uz.po 2009-05-11 19:39:49 -05:00
Federico Mena Quintero
fe48bc975a Remove executable bit from mai.po 2009-05-11 19:38:11 -05:00
Federico Mena Quintero
eceb504643 Comment out invalid translation in bn.po 2009-05-11 19:37:26 -05:00
Federico Mena Quintero
0c586568a2 Remove executable bit from help/sv/sv.po 2009-05-11 16:28:31 -05:00
Federico Mena Quintero
b5143a4b55 Remove references to the included libslab directory
Signed-off-by: Federico Mena Quintero <federico@novell.com>
2009-05-11 15:14:32 -05:00
10 changed files with 41 additions and 35 deletions

View File

@@ -1,3 +1,13 @@
2009-05-11 Federico Mena Quintero <federico@novell.com>
* configure.in: Depend on libslab; checked with pkgconfig.
2009-05-11 Federico Mena Quintero <federico@novell.com>
* configure.in: Remove references to the included libslab.
* Makefile.am: Remove the libslab directory.
2009-05-07 Christian Persch <chpe@gnome.org>
* font-viewer/ftstream-vfs.c: (vfs_stream_open): Safely printf

View File

@@ -1,4 +1,4 @@
SUBDIRS = po libwindow-settings libslab capplets font-viewer shell help
SUBDIRS = po libwindow-settings capplets font-viewer shell help
if HAVE_TYPING_BREAK
SUBDIRS += typing-break

View File

@@ -87,19 +87,15 @@ dnl ==============================================
dnl Check that we meet the dependencies
dnl ==============================================
ENABLE_DYNAMIC_LIBSLAB=0
AM_CONDITIONAL(ENABLE_DYNAMIC_LIBSLAB, test "x$ENABLE_DYNAMIC_LIBSLAB" = "x1")
COMMON_MODULES="gtk+-2.0 >= 2.13.1 dnl
glib-2.0 >= 2.17.4 dnl
gio-2.0 dnl
gconf-2.0 dnl
libglade-2.0 >= 2.0.0 dnl
gnome-desktop-2.0 >= 2.25.1"
PKG_CHECK_MODULES(LIBSLAB, $COMMON_MODULES libgnomeui-2.0 gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango libgnomeui-2.0)
PKG_CHECK_MODULES(CAPPLET, $COMMON_MODULES)
PKG_CHECK_MODULES(GNOMECC, $COMMON_MODULES libgnome-menu >= 2.10.1)
PKG_CHECK_MODULES(GNOMECC_SHELL, $COMMON_MODULES libgnomeui-2.0 libgnome-menu libpanelapplet-2.0)
PKG_CHECK_MODULES(GNOMECC_SHELL, $COMMON_MODULES libgnomeui-2.0 libgnome-menu libpanelapplet-2.0 libslab)
PKG_CHECK_MODULES(DBUS, dbus-1 dbus-glib-1)
PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-2.0)
PKG_CHECK_MODULES(DEFAULT_APPLICATIONS_CAPPLET, libxml-2.0)
@@ -313,8 +309,6 @@ capplets/windows/window-properties.desktop.in
font-viewer/Makefile
font-viewer/gnome-font-viewer.desktop.in
help/Makefile
libslab/Makefile
libslab/libslab.pc
libwindow-settings/Makefile
libwindow-settings/gnome-window-settings-2.0.pc
po/Makefile.in

0
help/sv/sv.po Executable file → Normal file
View File

View File

@@ -728,22 +728,22 @@ msgstr "ফন্টটি সম্ভবত অত্যধিক বড়"
#: ../capplets/appearance/appearance-font.c:497
#, c-format
msgid ""
"The font selected is %d point large, and may make it difficult to "
"effectively use the computer. It is recommended that you select a size "
"smaller than %d."
msgid_plural ""
"The font selected is %d points large, and may make it difficult to "
"effectively use the computer. It is recommended that you select a size "
"smaller than %d."
msgstr[0] ""
" বর্তমানে ফন্টের বাছাইকৃত আকার %d; কিন্তু এত বড় আকার বাছাই করলে ভালভাবে কম্পিউটার "
"ব্যবহার করাই কঠিন হয়ে যাবে। তাই আপনাকে আরো ছোট আকার বাছাই করার জন্য পরামর্শ "
"দেওয়া যাচ্ছে।"
msgstr[1] ""
" বর্তমানে ফন্টের বাছাইকৃত আকার %d; কিন্তু এত বড় আকার বাছাই করলে ভালভাবে কম্পিউটার "
"ব্যবহার করাই কঠিন হয়ে যাবে। তাই আপনাকে আরো ছোট আকার বাছাই করার জন্য পরামর্শ "
"দেওয়া যাচ্ছে।"
#msgid ""
#"The font selected is %d point large, and may make it difficult to "
#"effectively use the computer. It is recommended that you select a size "
#"smaller than %d."
#msgid_plural ""
#"The font selected is %d points large, and may make it difficult to "
#"effectively use the computer. It is recommended that you select a size "
#"smaller than %d."
#msgstr[0] ""
#" বর্তমানে ফন্টের বাছাইকৃত আকার %d; কিন্তু এত বড় আকার বাছাই করলে ভালভাবে কম্পিউটার "
#"ব্যবহার করাই কঠিন হয়ে যাবে। তাই আপনাকে আরো ছোট আকার বাছাই করার জন্য পরামর্শ "
#"দেওয়া যাচ্ছে।"
#msgstr[1] ""
#" বর্তমানে ফন্টের বাছাইকৃত আকার %d; কিন্তু এত বড় আকার বাছাই করলে ভালভাবে কম্পিউটার "
#"ব্যবহার করাই কঠিন হয়ে যাবে। তাই আপনাকে আরো ছোট আকার বাছাই করার জন্য পরামর্শ "
#"দেওয়া যাচ্ছে।"
#: ../capplets/appearance/appearance-font.c:510
#, c-format

0
po/mai.po Executable file → Normal file
View File

View File

@@ -1234,10 +1234,10 @@ msgstr ""
#: ../capplets/appearance/gnome-wp-item.c:222
#: ../capplets/appearance/gnome-wp-item.c:224
msgid "pixel"
msgid_plural "pixels"
msgstr[0] "piksel"
msgstr[1] "piksel"
#msgid "pixel"
#msgid_plural "pixels"
#msgstr[0] "piksel"
#msgstr[1] "piksel"
#: ../capplets/appearance/theme-installer.c:174
#: ../capplets/appearance/theme-installer.c:224

View File

@@ -1234,10 +1234,10 @@ msgstr ""
#: ../capplets/appearance/gnome-wp-item.c:222
#: ../capplets/appearance/gnome-wp-item.c:224
msgid "pixel"
msgid_plural "pixels"
msgstr[0] "пиксел"
msgstr[1] "пиксел"
#msgid "pixel"
#msgid_plural "pixels"
#msgstr[0] "пиксел"
#msgstr[1] "пиксел"
#: ../capplets/appearance/theme-installer.c:174
#: ../capplets/appearance/theme-installer.c:224

View File

@@ -1,3 +1,7 @@
2009-05-11 Federico Mena Quintero <federico@novell.com>
* Makefile.am: Remove references to the toplevel libslab.
==================== 2.25.90 ====================
==================== 2.25.3 ====================

View File

@@ -1,5 +1,4 @@
INCLUDES = \
-I$(top_srcdir)/libslab \
$(GNOMECC_SHELL_CFLAGS)
bin_PROGRAMS = gnome-control-center
@@ -8,8 +7,7 @@ gnome_control_center_SOURCES = \
control-center.c
gnome_control_center_LDADD = \
$(GNOMECC_SHELL_LIBS) \
$(top_builddir)/libslab/libslab.la
$(GNOMECC_SHELL_LIBS)
AM_CPPFLAGS = \
-DGNOMELOCALEDIR="\"$(datadir)/locale\""