diff options
| author | Kenny Root <kenny@the-b.org> | 2015-03-27 11:52:01 +0000 |
|---|---|---|
| committer | Kenny Root <kenny@the-b.org> | 2015-03-27 11:52:01 +0000 |
| commit | 48e9c2f37ca757c3dfbd882417670ed67192725f (patch) | |
| tree | 7e4f348052736b5132609fe26376d1922c22fa1b /app/src/main/res/values/strings.xml | |
| parent | 8c2e8642127e0c6068a17e9ed82a46668cbd11c4 (diff) | |
| parent | ada9571134b5d061206c4b7fa7d76a770ec9d419 (diff) | |
| download | connectbot-48e9c2f37ca757c3dfbd882417670ed67192725f.tar.gz connectbot-48e9c2f37ca757c3dfbd882417670ed67192725f.tar.bz2 connectbot-48e9c2f37ca757c3dfbd882417670ed67192725f.zip | |
Merge branch 'master' into gradle-conversion
Conflicts:
app/src/main/java/org/connectbot/util/UberColorPickerDialog.java
Diffstat (limited to 'app/src/main/res/values/strings.xml')
| -rw-r--r-- | app/src/main/res/values/strings.xml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 552cd05..87206cf 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -37,6 +37,8 @@ <string name="title_help">"Help"</string> <!-- Window title for color list editing screen --> <string name="title_colors">"Colors"</string> + <!-- Dialog title for color picker dialog --> + <string name="title_color_picker">"Pick a color"</string> <string name="resolve_connect">"Connect"</string> <!-- Menu selection where user must move finger randomly over an area to gather entropy (collect random bits) --> @@ -481,11 +483,11 @@ <string name="color_blue">"blue"</string> <string name="color_gray">"gray"</string> - <!-- Very short label indicating the thing next to it is "foreground color." --> - <string name="colors_fg">"FG":</string> + <!-- Very short label indicating the number next to it is "foreground color" number. --> + <string name="colors_fg_label">"FG: %1$d"</string> - <!-- Very short label indicating the thing next to it is "background color." --> - <string name="color_bg">"BG:"</string> + <!-- Very short label indicating the number next to it is "background color" number. --> + <string name="color_bg_label">"BG: %1$d"</string> <!-- Describes the image of the "connected to host" icon for accessibility purposes. --> <string name="image_description_connected">"Connected."</string> |