diff options
| author | Fabian Henneke <FabianHenneke@users.noreply.github.com> | 2020-08-11 18:11:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-11 18:11:39 +0200 |
| commit | 15aa92980239d6d61c3b0febc0407b7f63e152b3 (patch) | |
| tree | 92b25ea3bca41e37fe4727bab82665b04ee8206e /app/src/main/res/values/strings.xml | |
| parent | 8f957ca99454efe1711e2424620d2632bed6cb63 (diff) | |
| download | HardenedPass-15aa92980239d6d61c3b0febc0407b7f63e152b3.tar.gz HardenedPass-15aa92980239d6d61c3b0febc0407b7f63e152b3.zip | |
Switch to URL-based Git config and refactor Git settings (#1008)
* Make Git config URL-based and refactor
* Use Kotlin style null handling for string prefs
* Also show an error if generated URL can't be parsed
* Add some testcases for migration strategy
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
Co-authored-by: Harsh Shandilya <me@msfjarvis.dev>
Diffstat (limited to 'app/src/main/res/values/strings.xml')
| -rw-r--r-- | app/src/main/res/values/strings.xml | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9251d91e..46dfa401 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -83,10 +83,8 @@ <string name="server_name">Server</string> <string name="server_protocol">Protocol</string> - <string name="server_url">Server URL</string> - <string name="server_port_hint">Port</string> - <string name="server_path">Repo path</string> - <string name="server_user">Username</string> + <string name="server_url">Repository URL</string> + <string name="server_branch">Branch</string> <string name="connection_mode">Authentication Mode</string> @@ -326,7 +324,7 @@ <string name="connection_mode_basic_authentication">Password</string> <string name="connection_mode_openkeychain" translatable="false">OpenKeychain</string> <string name="git_server_config_save_success">Successfully saved configuration</string> - <string name="git_server_config_save_error_prefix">Configuration error: %s</string> + <string name="git_server_config_save_error">The provided repository URL is not valid</string> <string name="git_config_error_hostname_empty">empty hostname</string> <string name="git_config_error_generic">please verify your settings and try again</string> <string name="git_config_error_nonnumeric_port">port must be numeric</string> |