remove obsolete string constants

This commit is contained in:
sonora 2015-11-29 11:55:24 +01:00
parent 008ba4873e
commit 4b514bf089
2 changed files with 14 additions and 12 deletions

View file

@ -138,6 +138,8 @@
<string name="rendering_value_blue_name">Blue</string>
<string name="rendering_value_translucent_blue_name">Translucent blue</string>
<string name="rendering_value_purple_name">Purple</string>
<string name="rendering_value_pink_name">Pink</string>
<string name="rendering_value_brown_name">Brown</string>
<string name="rendering_value_translucent_purple_name">Translucent purple</string>
<string name="restart_is_required">In order to fully apply the changes, a manual application restart is required.</string>
<string name="light_theme">Light</string>
@ -637,7 +639,7 @@
<string name="osmo_use_server_name">Registered name</string>
<string name="osmo_connect_to_my_nickname">My nickname</string>
<string name="osmo_user_name">User</string>
<string name="color_red">Red</string>
<!-- string name="color_red">Red</string>
<string name="color_orange">Orange</string>
<string name="color_yellow">Yellow</string>
<string name="color_lightgreen">Light green</string>
@ -646,7 +648,7 @@
<string name="color_blue">Blue</string>
<string name="color_purple">Purple</string>
<string name="color_pink">Pink</string>
<string name="color_brown">Brown</string>
<string name="color_brown">Brown</string -->
<string name="osmo_edit_device">Change user properties</string>
<string name="osmo_edit_color">Display color</string>

View file

@ -28,16 +28,16 @@ import static android.util.TypedValue.COMPLEX_UNIT_DIP;
public class ColorDialogs {
public static int[] paletteColors = new int[] {
R.string.color_red,
R.string.color_orange,
R.string.color_yellow,
R.string.color_lightgreen,
R.string.color_green,
R.string.color_lightblue,
R.string.color_blue,
R.string.color_purple,
R.string.color_pink,
R.string.color_brown
R.string.rendering_value_red_name,
R.string.rendering_value_orange_name,
R.string.rendering_value_yellow_name,
R.string.rendering_value_lightgreen_name,
R.string.rendering_value_green_name,
R.string.rendering_value_lightblue_name,
R.string.rendering_value_blue_name,
R.string.rendering_value_purple_name,
R.string.rendering_value_pink_name,
R.string.rendering_value_brown_name
};
public static int[] pallette = new int[] {