Resolve merge conflicts

Author: georgweiss

app/alarm/ui/src/main/resources/org/phoebus/applications/alarm/ui/messages_fr.properties

@@ -2,8 +2,12 @@ error=Erreur
 acknowledgeFailed=\u00C9chec de l\u0027acquittement de(s) (\u0027)alarme(s)
 addComponentFailed=\u00C9chec de l\u0027ajout du composant
 disableAlarmFailed=\u00C9chec de la d\u00E9sactivation de l\u0027alarme
+disabled=D\u00E9sactiv\u00E9
+disabledUntil=D\u00E9sactiv\u00E9 jusqu\u0027\u00E0
 enableAlarmFailed=\u00C9chec de l\u0027activation de l\u0027alarme
 moveItemFailed=\u00C9chec du d\u00E9placement de l\u0027\u00E9l\u00E9ment
+partlyDisabled=Partiellement d\u00E9sactiv\u00E9
 removeComponentFailed=\u00C9chec de la suppression du composant
 renameItemFailed=\u00C9chec du renommage de l\u0027\u00E9l\u00E9ment
+timer=Minuteur
 unacknowledgeFailed=\u00C9chec de la d\u00E9sacquittement de(s) (l\u0027)alarme(s)

app/credentials-management/doc/images/CredentialsManagement.png

@@ -8,18 +8,25 @@ Further, Phoebus may be configured to store the credentials entered by the user
 In order to also support an explicit logout capability, the Credentials Management application offers means to
 remove stored credentials.
 
-In some cases an explicit login procedure can be useful, e.g. login to service for the purpose of storing
-user credentials and thereby support automated creation of logbook entries.
-
 The application is launched using the dedicated button in the (bottom) status bar.
 
-The below screen shot shows an example where credentials have been stored for the "logbook" scope,
-plus an option to login to the "<remote service>" scope. User may also choose to "logout" from all scopes,
+The below screen shot shows an example where credentials have been stored for the "Logbook" scope,
+plus an option to login to the "<remote service>" scope. User may also choose to "Logout from all" services,
 i.e. to remove all stored credentials.
 
 .. image:: images/CredentialsManagement.png
 
-If no credentials are stored in the credentials store, and if no services supporting authentication have been configured,
+If no credentials are stored in the credentials store, and if no services supporting authentication are available,
 the Credentials Management UI will show a static message:
 
-.. image:: images/CredentialsManagement_Empty.png
+.. image:: images/CredentialsManagement_empty.png
+
+The "Login To All" button can be used to login to all services as a single action.
+In this case credentials entered in the text fields of toolbar at the top are used for all services, irrespective of
+the credentials (if any) entered in other input fields.
+
+If login to a service fails (service off-line or invalid credentials), this is indicated in the "Login Result" column.
+
+.. image:: images/CredentialsManagement_one_failed.png
+
+If on the other hand login succeeds to a single or all services, the dialog is closed automatically.

app/credentials-management/doc/images/CredentialsManagement_Empty.png

@@ -61,7 +61,6 @@ public CredentialsManagementStage(List<ServiceAuthenticationProvider> authentica
         try {
             fxmlLoader.load();
             Scene scene = new Scene(fxmlLoader.getRoot());
-            scene.getStylesheets().add(getClass().getResource("/css/credentials-management-style.css").toExternalForm());
             setTitle(Messages.Title);
             setScene(scene);
         } catch (Exception exception) {

app/credentials-management/doc/images/CredentialsManagement_empty.png

@@ -30,6 +30,9 @@ public class Messages {
     public static String SecureStoreErrorTitle;
     public static String SecureStoreErrorBody;
     public static String Title;
+    public static String ServiceConnectionFailure;
+    public static String UnknownError;
+    public static String UserNotAuthenticated;
 
     static
     {

app/credentials-management/doc/images/CredentialsManagement_one_failed.png

@@ -1,20 +1,27 @@
 .text-field-styling{
      -fx-padding: 5px 3px 3px 3px;
-     -fx-border-insets: 5px 3px 3px 3px;
+     -fx-border-insets: 5px 3px 3px 2px;
      -fx-background-insets: 5px 3px 3px 3px;
      -fx-border-color: #cdcdcd;
      -fx-border-radius: 3px;
 }
 
 .table-view .table-column{
-    -fx-alignment:center;
+    -fx-alignment:CENTER;
 }
 
-.table-view .table-cell{
-    -fx-font-weight: bold;
+.table-view .column-header > .label{
+    -fx-alignment: CENTER-LEFT;
     -fx-font-size: 14px;
+    -fx-padding: 5px 3px 3px 3px;
 }
 
 .button-style{
     -fx-pref-width: 100px;
 }
+
+.error{
+    -fx-text-fill: red;
+}
+
+