.viewerclasses needs to depend on .binclasses

3 files changed, 40 insertions, 39 deletions

diff --git a/Makefile b/Makefile
index bae751b..5017293 100644
--- a/Makefile
+++ b/Makefile
@@ -62,7 +62,7 @@ binclasses: .binclasses
 	mkdir -p classes
 	$(JAVAC) -cp classes:${JAVAUNIXJARDIR}/debug-$(DEBUG).jar:${JAVAUNIXJARDIR}/hexdump.jar:$(CLASSPATH) -d classes $(JCFLAGS) $(SRCDIR)/dbus/test/*.java
 	touch .testclasses 
-.viewerclasses: $(SRCDIR)/dbus/viewer/*.java .classes
+.viewerclasses: $(SRCDIR)/dbus/viewer/*.java .classes .binclasses
 	mkdir -p classes
 	$(JAVAC) -cp classes:$(CLASSPATH):${JAVAUNIXJARDIR}/unix.jar:${JAVAUNIXJARDIR}/debug-$(DEBUG).jar:${JAVAUNIXJARDIR}/hexdump.jar -d classes $(JCFLAGS) $(SRCDIR)/dbus/viewer/*.java
 	touch .viewerclasses 
diff --git a/changelog b/changelog
index 117a653..146d82e 100644
--- a/changelog
+++ b/changelog
@@ -12,6 +12,7 @@ Version 2.4:
 	* Add support for localization of strings via gettext.
 	* Throw a nicer error when signals are not declared as part of an
 	  interface.
+	* .viewerclasses needs to depend on .binclasses
 
 Version 2.3.2:
 
diff --git a/translations/en_GB.po b/translations/en_GB.po
index 816ee77..9413715 100644
--- a/translations/en_GB.po
+++ b/translations/en_GB.po
@@ -1,8 +1,6 @@
 #java-format
-msgid " is not a basic type"
-msgstr " is not a basic type"
-msgid " is not an object provided by this process."
-msgstr " is not an object provided by this process."
+msgid "{0} is not between {1} and {2}."
+msgstr "{0} is not between {1} and {2}."
 msgid "Already iterated"
 msgstr "Already iterated"
 msgid "An error occurred while calling "
@@ -17,18 +15,18 @@ msgid "Bus address is blank"
 msgstr "Bus address is blank"
 msgid "Bus address is invalid: "
 msgstr "Bus address is invalid: "
-msgid "Can't wrap Null in a Variant"
-msgstr "Can't wrap Null in a Variant"
-msgid "Can't wrap a multi-valued type in a Variant: "
-msgstr "Can't wrap a multi-valued type in a Variant: "
-msgid "Can't wrap multiple or no types in a Variant: "
-msgstr "Can't wrap multiple or no types in a Variant: "
-msgid "Can't wrap {0} in an unqualified Variant ({1})."
-msgstr "Can't wrap {0} in an unqualified Variant ({1})."
 msgid "Cannot Resolve Session Bus Address"
 msgstr "Cannot Resolve Session Bus Address"
 msgid "Cannot watch for signals based on well known bus name as source, only unique names."
 msgstr "Cannot watch for signals based on well known bus name as source, only unique names."
+msgid "Can't wrap {0} in an unqualified Variant ({1})."
+msgstr "Can't wrap {0} in an unqualified Variant ({1})."
+msgid "Can't wrap a multi-valued type in a Variant: "
+msgstr "Can't wrap a multi-valued type in a Variant: "
+msgid "Can't wrap multiple or no types in a Variant: "
+msgstr "Can't wrap multiple or no types in a Variant: "
+msgid "Can't wrap Null in a Variant"
+msgstr "Can't wrap Null in a Variant"
 msgid "Connection has already sent a Hello message"
 msgstr "Connection has already sent a Hello message"
 msgid "Could not access parent directory for "
@@ -45,6 +43,12 @@ msgid "Disconnected"
 msgstr "Disconnected"
 msgid "ERROR: Could not find introspection file: "
 msgstr "ERROR: Could not find introspection file: "
+msgid "Error deserializing message: number of parameters didn't match receiving signature"
+msgstr "Error deserializing message: number of parameters didn't match receiving signature"
+msgid "Error during parser init: "
+msgstr "Error during parser init: "
+msgid "Error Executing Method {0}.{1}: {2}"
+msgstr "Error Executing Method {0}.{1}: {2}"
 msgid "ERROR: Expected {0}, got {1}, failed."
 msgstr "ERROR: Expected {0}, got {1}, failed."
 msgid "ERROR: Failed to get introspection data"
@@ -57,12 +61,6 @@ msgid "ERROR: Unknown node: "
 msgstr "ERROR: Unknown node: "
 msgid "ERROR: Unknown option: "
 msgstr "ERROR: Unknown option: "
-msgid "Error Executing Method {0}.{1}: {2}"
-msgstr "Error Executing Method {0}.{1}: {2}"
-msgid "Error deserializing message: number of parameters didn't match receiving signature"
-msgstr "Error deserializing message: number of parameters didn't match receiving signature"
-msgid "Error during parser init: "
-msgstr "Error during parser init: "
 msgid "Exporting non-exportable parameterized type "
 msgstr "Exporting non-exportable parameterized type "
 msgid "Exporting non-exportable type "
@@ -95,24 +93,28 @@ msgid "Introspected method name exceeds 255 characters. Cannot export objects wi
 msgstr "Introspected method name exceeds 255 characters. Cannot export objects with method "
 msgid "Introspected signal name exceeds 255 characters. Cannot export objects with signals of type "
 msgstr "Introspected signal name exceeds 255 characters. Cannot export objects with signals of type "
-msgid "Invalid Bus Type: "
-msgstr "Invalid Bus Type: "
-msgid "Invalid Command "
-msgstr "Invalid Command "
-msgid "Invalid Parent Directory"
-msgstr "Invalid Parent Directory"
 msgid "Invalid bus name"
 msgstr "Invalid bus name"
 msgid "Invalid bus name: "
 msgstr "Invalid bus name: "
 msgid "Invalid bus name: null"
 msgstr "Invalid bus name: null"
+msgid "Invalid Bus Type: "
+msgstr "Invalid Bus Type: "
+msgid "Invalid Command "
+msgstr "Invalid Command "
 msgid "Invalid object path: "
 msgstr "Invalid object path: "
 msgid "Invalid object path: null"
 msgstr "Invalid object path: null"
+msgid "Invalid Parent Directory"
+msgstr "Invalid Parent Directory"
 msgid "Invalid type for match rule: "
 msgstr "Invalid type for match rule: "
+msgid " is not a basic type"
+msgstr " is not a basic type"
+msgid " is not an object provided by this process."
+msgstr " is not an object provided by this process."
 msgid "Map must have 2 parameters"
 msgstr "Map must have 2 parameters"
 msgid "Message Failed to Send: "
@@ -131,26 +133,26 @@ msgid "Must specify object path, interface and signal name to Signals."
 msgstr "Must specify object path, interface and signal name to Signals."
 msgid "No reply within specified time"
 msgstr "No reply within specified time"
-msgid "No transport present"
-msgstr "No transport present"
 msgid "Not A DBus Interface"
 msgstr "Not A DBus Interface"
 msgid "Not A DBus Signal"
 msgstr "Not A DBus Signal"
+msgid "Not an array"
+msgstr "Not an array"
 msgid "Not An Expected Convertion type from {0} to {1}"
 msgstr "Not An Expected Convertion type from {0} to {1}"
-msgid "Not Connected"
-msgstr "Not Connected"
+msgid "Not an object exported by this connection and no remote specified"
+msgstr "Not an object exported by this connection and no remote specified"
 msgid "Not a primitive type"
 msgstr "Not a primitive type"
 msgid "Not a wrapper type"
 msgstr "Not a wrapper type"
-msgid "Not an array"
-msgstr "Not an array"
-msgid "Not an object exported by this connection and no remote specified"
-msgstr "Not an object exported by this connection and no remote specified"
+msgid "Not Connected"
+msgstr "Not Connected"
 msgid "Not enough elements to create custom object from serialized data ({0} < {1})."
 msgstr "Not enough elements to create custom object from serialized data ({0} < {1})."
+msgid "No transport present"
+msgstr "No transport present"
 msgid "Object already exported"
 msgstr "Object already exported"
 msgid "Primative array being sent as non-primative array."
@@ -185,12 +187,14 @@ msgid "The name `{0}' does not exist"
 msgstr "The name `{0}' does not exist"
 msgid "This service does not support "
 msgstr "This service does not support "
-msgid "Try saving other files?"
-msgstr "Try saving other files?"
 msgid "Trying to marshall to unconvertable type (from {0} to {1})."
 msgstr "Trying to marshall to unconvertable type (from {0} to {1})."
+msgid "Try saving other files?"
+msgstr "Try saving other files?"
 msgid "Underlying transport returned EOF"
 msgstr "Underlying transport returned EOF"
+msgid "unknown address type "
+msgstr "unknown address type "
 msgid "Waiting for: "
 msgstr "Waiting for: "
 msgid "Wrong return type (failed to de-serialize correct types: {0} )"
@@ -203,7 +207,3 @@ msgid "Wrong return type (not expecting Tuple)"
 msgstr "Wrong return type (not expecting Tuple)"
 msgid "You must send a Hello message"
 msgstr "You must send a Hello message"
-msgid "unknown address type "
-msgstr "unknown address type "
-msgid "{0} is not between {1} and {2}."
-msgstr "{0} is not between {1} and {2}."