Only have one password field in connection-fields

Author: pvanderknyff

tableau-databricks/connection-fields.xml

@@ -63,21 +63,18 @@ limitations under the License. -->
             <condition field="authentication" value="auth-user-pass" />
         </conditions>
     </field>
+
     <field name="password" label="@string/password_prompt/" category="authentication" value-type="string" secure="true">
-        <conditions>
-            <condition field="authentication" value="auth-user-pass" />
-        </conditions>
+     <conditions>
+         <condition field="authentication" value="auth-pass" />
+         <condition field="authentication" value="auth-user-pass" />
+      </conditions>
     </field>
 
-    <field name="password" label="@string/token_prompt/" category="authentication" value-type="string" secure="true">
-        <conditions>
-            <condition field="authentication" value="auth-pass" />
-        </conditions>
-    </field>
     <!-- /Authentication -->
 
     <!-- Proxy -->
-    
+
     <!-- TODO: enable once 'secure="true"' is supported -->
     <!--
     <field name="use-proxy" label="Use Proxy" category="advanced" value-type="boolean">

tableau-databricks/resources-de_DE.xml

@@ -28,7 +28,6 @@ limitations under the License. -->
 
   <string name="username_prompt">Username</string>
   <string name="password_prompt">Password</string>
-  <string name="token_prompt">Personal Access Token</string>
 
   <string name="odbc_extra_config_prompt">Extra ODBC options ('key=value;key2=value2;...')</string>
 

tableau-databricks/resources-en_GB.xml

@@ -28,7 +28,6 @@ limitations under the License. -->
 
   <string name="username_prompt">Username</string>
   <string name="password_prompt">Password</string>
-  <string name="token_prompt">Personal Access Token</string>
 
   <string name="odbc_extra_config_prompt">Extra ODBC options ('key=value;key2=value2;...')</string>
 

tableau-databricks/resources-en_US.xml

@@ -28,7 +28,6 @@ limitations under the License. -->
 
   <string name="username_prompt">Username</string>
   <string name="password_prompt">Password</string>
-  <string name="token_prompt">Personal Access Token</string>
 
   <string name="odbc_extra_config_prompt">Extra ODBC options ('key=value;key2=value2;...')</string>
 

tableau-databricks/resources-es_ES.xml

@@ -28,7 +28,6 @@ limitations under the License. -->
 
   <string name="username_prompt">Username</string>
   <string name="password_prompt">Password</string>
-  <string name="token_prompt">Personal Access Token</string>
 
   <string name="odbc_extra_config_prompt">Extra ODBC options ('key=value;key2=value2;...')</string>
 

tableau-databricks/resources-fr_FR.xml

@@ -28,7 +28,6 @@ limitations under the License. -->
 
   <string name="username_prompt">Username</string>
   <string name="password_prompt">Password</string>
-  <string name="token_prompt">Personal Access Token</string>
 
   <string name="odbc_extra_config_prompt">Extra ODBC options ('key=value;key2=value2;...')</string>
 

tableau-databricks/resources-it_IT.xml

@@ -28,7 +28,6 @@ limitations under the License. -->
 
   <string name="username_prompt">Username</string>
   <string name="password_prompt">Password</string>
-  <string name="token_prompt">Personal Access Token</string>
 
   <string name="odbc_extra_config_prompt">Extra ODBC options ('key=value;key2=value2;...')</string>
 

tableau-databricks/resources-ja_JP.xml

@@ -28,7 +28,6 @@ limitations under the License. -->
 
   <string name="username_prompt">Username</string>
   <string name="password_prompt">Password</string>
-  <string name="token_prompt">Personal Access Token</string>
 
   <string name="odbc_extra_config_prompt">Extra ODBC options ('key=value;key2=value2;...')</string>
 

tableau-databricks/resources-ko_KR.xml

@@ -28,7 +28,6 @@ limitations under the License. -->
 
   <string name="username_prompt">Username</string>
   <string name="password_prompt">Password</string>
-  <string name="token_prompt">Personal Access Token</string>
 
   <string name="odbc_extra_config_prompt">Extra ODBC options ('key=value;key2=value2;...')</string>
 

tableau-databricks/resources-pt_BR.xml

@@ -28,7 +28,6 @@ limitations under the License. -->
 
   <string name="username_prompt">Username</string>
   <string name="password_prompt">Password</string>
-  <string name="token_prompt">Personal Access Token</string>
 
   <string name="odbc_extra_config_prompt">Extra ODBC options ('key=value;key2=value2;...')</string>
 

tableau-databricks/resources-zh_CN.xml

@@ -28,7 +28,6 @@ limitations under the License. -->
 
   <string name="username_prompt">Username</string>
   <string name="password_prompt">Password</string>
-  <string name="token_prompt">Personal Access Token</string>
 
   <string name="odbc_extra_config_prompt">Extra ODBC options ('key=value;key2=value2;...')</string>
 

tableau-databricks/resources-zh_TW.xml

@@ -28,7 +28,6 @@ limitations under the License. -->
 
   <string name="username_prompt">Username</string>
   <string name="password_prompt">Password</string>
-  <string name="token_prompt">Personal Access Token</string>
 
   <string name="odbc_extra_config_prompt">Extra ODBC options ('key=value;key2=value2;...')</string>