commit cd1a9c5bac418ab61a9eacb3376f390ca25d8924
author Shawn Pearce <sop@google.com> Wed Apr 18 07:03:29 2012 -0700
committer gerrit code review <noreply-gerritcodereview@google.com> Wed Apr 18 07:03:30 2012 -0700
tree 7f8a58e84366da684c26a26b1b84c7ee6568dbd2
parent 1cbbc6b405da940ca6c02e336b5e5b7350fa0cd3
parent 17e17dd8b94584b8422706585a20131b20eeb0e4

Merge "Change version in pom.xml to 2.4-SNAPSHOT"

gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritConstants.java

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritConstants.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritConstants.java
index f2a3d3e..ee107d0 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritConstants.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritConstants.java
@@ -81,7 +81,7 @@
   String searchHint();
   String searchButton();
 
-  String rpcStatusLoading();
+  String rpcStatusWorking();
 
   String sectionNavigation();
   String sectionActions();

gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritConstants.properties

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritConstants.properties b/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritConstants.properties
index c5d5e8c..41db3d5 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritConstants.properties
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritConstants.properties
@@ -64,7 +64,7 @@
 searchHint = Change #, SHA-1, tr:id, owner:email or reviewer:email
 searchButton = Search
 
-rpcStatusLoading = Loading ...
+rpcStatusWorking = Working ...
 
 sectionNavigation = Navigation
 sectionActions = Actions

gerrit-gwtui/src/main/java/com/google/gerrit/client/RpcStatus.java

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/RpcStatus.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/RpcStatus.java
index 21c5154..76ce384 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/RpcStatus.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/RpcStatus.java
@@ -47,7 +47,7 @@
     p.add(r);
 
     loading = new InlineLabel();
-    loading.setText(Gerrit.C.rpcStatusLoading());
+    loading.setText(Gerrit.C.rpcStatusWorking());
     loading.setStyleName(Gerrit.RESOURCES.css().rpcStatus());
     loading.addStyleName(Gerrit.RESOURCES.css().rpcStatusLoading());
     loading.setVisible(false);

gerrit-gwtui/src/main/java/com/google/gerrit/client/account/NewAgreementScreen.java

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/NewAgreementScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/NewAgreementScreen.java
index b80c0f9..154e2ce 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/NewAgreementScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/NewAgreementScreen.java
@@ -250,7 +250,7 @@
     String url = cla.getAgreementUrl();
     if (url != null && url.length() > 0) {
       agreementGroup.setVisible(true);
-      agreementHtml.setText(Gerrit.C.rpcStatusLoading());
+      agreementHtml.setText(Gerrit.C.rpcStatusWorking());
       if (!url.startsWith("http:") && !url.startsWith("https:")) {
         url = GWT.getHostPageBaseURL() + url;
       }