libmbca r8 - in trunk: . data po src
- From: kaijanma svn gnome org
- To: svn-commits-list gnome org
- Subject: libmbca r8 - in trunk: . data po src
- Date: Tue, 5 Aug 2008 09:17:52 +0000 (UTC)
Author: kaijanma
Date: Tue Aug 5 09:17:52 2008
New Revision: 8
URL: http://svn.gnome.org/viewvc/libmbca?rev=8&view=rev
Log:
* all source strings should now be ready for translation
* UI Definition is now 'fixed' by hand
Added:
trunk/data/glade.README
Modified:
trunk/README
trunk/data/Makefile.am
trunk/data/mbca.glade
trunk/po/fetch_po.sh
trunk/src/Makefile.am
trunk/src/mbca_assistant.c
trunk/src/method_page.c
trunk/src/provider_page.c
Modified: trunk/README
==============================================================================
--- trunk/README (original)
+++ trunk/README Tue Aug 5 09:17:52 2008
@@ -53,26 +53,3 @@
binaries, it can be a pain when trying to debug a program. For that
reason, compilation of shared libraries can be turned off by
specifying the â--disable-sharedâ option to âconfigureâ.
-
-
-Known problems
-==============
-
-if gtk gives you an error:
- ' ** ERROR **: could not load the UI: Unprocessed tag: "requires" '
-
-this means that your version of gtk has a bug. Ubuntu hardy users can enable
-my Personal Packet Archive and have an update:
-
- https://launchpad.net/~kaijanmaki/+archive
-
-If you can't or won't update your gtk you can work around the bug by editing
-the UI definition file
-
- nano -w data/mbca.glade
-
-and remove the following line:
-
- <requires lib="gtk+" version="2.12"/>
-
-remember to 'make install' after you have edited the file.
Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am (original)
+++ trunk/data/Makefile.am Tue Aug 5 09:17:52 2008
@@ -1,3 +1,4 @@
## Process this file with automake to produce Makefile.in
dist_pkgdata_DATA = mbca.glade
+EXTRA_DIST = glade.README
Added: trunk/data/glade.README
==============================================================================
--- (empty file)
+++ trunk/data/glade.README Tue Aug 5 09:17:52 2008
@@ -0,0 +1,7 @@
+mbca.glade was originally constructed using Glade, but Glade is lacking many
+GtkBuilder features or they are buggy or just plain wrong. Unfortunately
+there's no time to fix the whole Glade so the UI definition is fixed by hand.
+Therefore:
+
+
+ DO NOT EDIT mbca.glade WITH GLADE BEFORE IT'S FIXED
Modified: trunk/data/mbca.glade
==============================================================================
--- trunk/data/mbca.glade (original)
+++ trunk/data/mbca.glade Tue Aug 5 09:17:52 2008
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<interface>
- <requires lib="gtk+" version="2.12"/>
+<interface domain="libmbca">
<object class="GtkAssistant" id="mbca_assistant">
<property name="extension_events">GDK_EXTENSION_EVENTS_ALL</property>
<property name="title" translatable="yes">New Mobile Broadband Connection</property>
@@ -17,7 +16,7 @@
<object class="GtkLabel" id="label1">
<property name="width_request">460</property>
<property name="visible">True</property>
- <property name="label" translatable="yes">This assistant will guide you through setting up a new mobile broadband connection. The connection can be established using a mobile phone or dedicated data modem.</property>
+ <property name="label" translatable="yes">This assistant will guide you through setting up a new mobile broadband connection. The connection can be established using a mobile phone or a dedicated data modem.</property>
<property name="use_markup">True</property>
<property name="wrap">True</property>
</object>
@@ -114,7 +113,6 @@
<child>
<object class="GtkRadioButton" id="method_none_radiobutton">
<property name="can_focus">True</property>
- <property name="response_id">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -125,7 +123,6 @@
<property name="can_focus">True</property>
<property name="label" translatable="yes">_USB</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
<property name="group">method_none_radiobutton</property>
</object>
@@ -139,7 +136,6 @@
<property name="can_focus">True</property>
<property name="label" translatable="yes">B_luetooth</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
<property name="group">method_none_radiobutton</property>
</object>
@@ -151,9 +147,8 @@
<object class="GtkRadioButton" id="pcmcia_radiobutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_PC Card, PCMCIA or ExpressCard</property>
+ <property name="label" translatable="yes">_PC Card, PCMCIA, or ExpressCard</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property name="group">method_none_radiobutton</property>
@@ -168,7 +163,6 @@
<property name="can_focus">True</property>
<property name="label" translatable="yes">_Serial cable</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
<property name="group">method_none_radiobutton</property>
</object>
@@ -182,7 +176,6 @@
<property name="can_focus">True</property>
<property name="label" translatable="yes">Built-_in</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property name="group">method_none_radiobutton</property>
@@ -262,7 +255,7 @@
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><small>Make sure your computer and mobile phone have Bluetooth enabled and your mobile phone is discoverable by other Bluetooth devices. Consult your mobile phones instruction manual if necessary</small></property>
+ <property name="label" translatable="yes"><small>Make sure your computer and mobile phone have Bluetooth enabled and your mobile phone is discoverable by other Bluetooth devices. Consult your mobile phone's instruction manual if necessary</small></property>
<property name="use_markup">True</property>
<property name="wrap">True</property>
</object>
@@ -317,7 +310,7 @@
<object class="GtkHBox" id="bluetooth_manual_hbox">
<property name="visible">True</property>
<property name="sensitive">False</property>
- <property name="tooltip" translatable="yes">Bluetooth address in form 01:23:45:67:89:AB</property>
+ <property name="tooltip-text" translatable="yes">Bluetooth address in form 01:23:45:67:89:AB</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label9">
@@ -351,7 +344,6 @@
<property name="can_focus">True</property>
<property name="label" translatable="yes">_Specify Manually:</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
</object>
</child>
@@ -427,9 +419,9 @@
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><small>Leftmost column tells the subsystem in which the port belongs to. <i>pnp</i> usually means serial ports that are in the side of the computer, <i>usb</i> and <i>pci</i> are mobile phones, data modems or serial port adapters.
+ <property name="label" translatable="yes"><small>The leftmost column indicates which subsystem the port belongs to. <i>pnp</i> usually means serial ports that are in the side of the computer, <i>usb</i> and <i>pci</i> are mobile phones, data modems, or serial port adapters.
-You must make sure that the actual device is always found from the port you select here in order to use the configuration you are now creating</small></property>
+You must make sure that the device is always found from the port you select here in order to use the configuration you are now creating</small></property>
<property name="use_markup">True</property>
<property name="wrap">True</property>
</object>
@@ -582,7 +574,6 @@
<property name="can_focus">True</property>
<property name="label" translatable="yes">_Specify Manually:</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
</object>
</child>
@@ -804,7 +795,7 @@
<object class="GtkExpander" id="country_expander">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Click to show or hide a list of countries</property>
+ <property name="tooltip-text" translatable="yes">Click to show or hide a list of countries</property>
<property name="use_underline">True</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow1">
@@ -925,7 +916,7 @@
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><small>If necessary go back and change the details .When you are done give the configuration a name which will be easy to identify later</small></property>
+ <property name="label" translatable="yes"><small>If necessary go back and change the details. When you are done give the configuration a name which will be easy to identify later</small></property>
<property name="use_markup">True</property>
<property name="wrap">True</property>
</object>
@@ -959,55 +950,65 @@
<property name="column_spacing">6</property>
<property name="homogeneous">True</property>
<child>
- <object class="GtkEntry" id="summary_name_entry">
+ <object class="GtkLabel" id="summary_method_caption_label">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="width_chars">12</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes"><b>Connection method:</b></property>
+ <property name="use_markup">True</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
<property name="y_options">GTK_EXPAND</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="summary_country_label">
+ <object class="GtkLabel" id="label17">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes"><b>Device:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_options">GTK_EXPAND</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label18">
+ <property name="visible">True</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes"><b>Country:</b></property>
+ <property name="use_markup">True</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="y_options">GTK_EXPAND</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="summary_provider_label">
+ <object class="GtkLabel" id="label19">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes"><b>Service Provider:</b></property>
+ <property name="use_markup">True</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="y_options">GTK_EXPAND</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="summary_device_label">
+ <object class="GtkLabel" id="label20">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes"><b>Name:</b></property>
+ <property name="use_markup">True</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
<property name="y_options">GTK_EXPAND</property>
</packing>
</child>
@@ -1023,65 +1024,55 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label20">
+ <object class="GtkLabel" id="summary_device_label">
<property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes"><b>Name:</b></property>
- <property name="use_markup">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="y_options">GTK_EXPAND</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label19">
+ <object class="GtkLabel" id="summary_provider_label">
<property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes"><b>Service Provider:</b></property>
- <property name="use_markup">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="y_options">GTK_EXPAND</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label18">
+ <object class="GtkLabel" id="summary_country_label">
<property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes"><b>Country:</b></property>
- <property name="use_markup">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="y_options">GTK_EXPAND</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label17">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes"><b>Device:</b></property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options">GTK_EXPAND</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="summary_method_caption_label">
+ <object class="GtkEntry" id="summary_name_entry">
<property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes"><b>Connection method:</b></property>
- <property name="use_markup">True</property>
+ <property name="can_focus">True</property>
+ <property name="width_chars">12</property>
</object>
<packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
<property name="y_options">GTK_EXPAND</property>
</packing>
</child>
Modified: trunk/po/fetch_po.sh
==============================================================================
--- trunk/po/fetch_po.sh (original)
+++ trunk/po/fetch_po.sh Tue Aug 5 09:17:52 2008
@@ -16,3 +16,4 @@
done
echo "translations fetched"
+rm -f stamp-po *.gmo
\ No newline at end of file
Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Tue Aug 5 09:17:52 2008
@@ -12,7 +12,7 @@
gnome-panel/README
AM_CPPFLAGS = \
- -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+ -DPACKAGE_LOCALE_DIR=\""$(datadir)/locale"\" \
-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
$(LIBMBCA_CFLAGS)
Modified: trunk/src/mbca_assistant.c
==============================================================================
--- trunk/src/mbca_assistant.c (original)
+++ trunk/src/mbca_assistant.c Tue Aug 5 09:17:52 2008
@@ -1040,8 +1040,6 @@
priv->builder = gtk_builder_new ();
- gtk_builder_set_translation_domain (priv->builder,
- GETTEXT_PACKAGE);
ret = gtk_builder_add_from_file (priv->builder,
MBCA_UI_DEFINITION,
&error);
Modified: trunk/src/method_page.c
==============================================================================
--- trunk/src/method_page.c (original)
+++ trunk/src/method_page.c Tue Aug 5 09:17:52 2008
@@ -121,7 +121,7 @@
gpointer user_data)
{
set_hal_device (_("Built-in"),
- _("Select the Built-in device from the list"),
+ _("Select the built-in device from the list"),
_("<small>Make sure the device is not disabled by a "
"manual switch or button on the side of the computer"
".</small>"),
@@ -132,7 +132,7 @@
mbca_pcmcia_radiobutton_clicked_cb (GtkButton* button,
gpointer user_data)
{
- set_hal_device (_("PC Card, PCMCIA or ExpressCard"),
+ set_hal_device (_("PC Card, PCMCIA, or ExpressCard"),
_("Select the correct device from the list"),
_("<small>Make sure the SIM card is in place</small>"),
user_data);
@@ -162,8 +162,8 @@
{
set_hal_device (_("USB"),
_("Select the USB device from the list"),
- _("<small>Device must be plugged in and must be switched on."
- " Make sure that mobile phone has no security lock acti"
+ _("<small>The device must be plugged in and must be switched on."
+ " Make sure that the mobile phone has no security lock acti"
"ve. Make sure the SIM card is in place</small>"),
user_data);
}
Modified: trunk/src/provider_page.c
==============================================================================
--- trunk/src/provider_page.c (original)
+++ trunk/src/provider_page.c Tue Aug 5 09:17:52 2008
@@ -166,8 +166,8 @@
NULL,
NULL);
- gtk_tooltip_set_text (tooltip, _("You can search the list by typing "
- "with keyboard"));
+ gtk_tooltip_set_text (tooltip, _("You can search the list by entering "
+ "text on your keyboard"));
if (column)
{
columns = gtk_tree_view_get_columns (country_list);
@@ -185,8 +185,8 @@
if (column_id == COUNTRY_CODE_COLUMN)
{
- gtk_tooltip_set_text (tooltip, _("Code of the country as defined by "
- "ISO 3166 standard"));
+ gtk_tooltip_set_text (tooltip, _("The country code as defined "
+ "by ISO 3166 standard"));
}
gtk_tree_view_set_tooltip_cell (GTK_TREE_VIEW (country_list),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
