From 9f1dd0e8481c166b6c16e87548a8adf6b8b28d7c Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Wed, 13 Feb 2013 09:17:53 +0200
Subject: Use consistent terminology

Why "Choose a Computer" but "Add Server"? Let's always call them "computers"
in the UI.

And in fact I think the feature to add a computer manually is kinda pointless;
is it too much to ask people to have their machines discoverable? I doubt
keeping a computer not discoverable through Bluetooth thwarts a determined
attacker from finding it anyway. (I am not saying that just finding it would
mean compromising it.)

Change-Id: Ib8041a8a793d84bee24587adac582c5fad03d1be
(cherry picked from commit 056968fae7fa598e8cb528fb6b45c999de33a102)

Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
---
 android/sdremote/res/values/strings.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'android')

diff --git a/android/sdremote/res/values/strings.xml b/android/sdremote/res/values/strings.xml
index e84b7faa2606..80493f980321 100644
--- a/android/sdremote/res/values/strings.xml
+++ b/android/sdremote/res/values/strings.xml
@@ -25,7 +25,7 @@
     <string name="bluetooth">Bluetooth</string>
     <string name="wifi">WI-FI</string>
     <string name="selector_noservers">Searching for computers…</string>
-    <string name="selector_delete">Remove server</string>
+    <string name="selector_delete">Remove computer</string>
     <string name="selector_choose_a_computer">Choose a Computer</string>
     <string name="selector_dialog_connecting">Attempting to connect to {0}…</string>
     <string name="selector_dialog_connectionfailed">Impress Remote could not connect to {0}.</string>
@@ -42,10 +42,10 @@
     <string name="about_copyright">Copyright © 2012 LibreOffice Contributors and/or their affiliates.</string>
     <string name="about_licence">This app is released under the Mozilla Public License, v. 2.0.</string>
     <string name="about_libraries">This app uses android-coverflow\n\tCopyright © 2011, Polidea\n\tNew BSD License.\n\nThis app uses ActionBarSherlock:\n\tCopyright 2012 Jake Wharton\n\tLicensed under the Apache License, Version 2.0 (the "License")</string>
-    <string name="addserver">Add Server</string>
-    <string name="addserver_entername">Server name:</string>
-    <string name="addserver_enteraddress">Server address as IP or hostname:</string>
-    <string name="addserver_remember">Remember this server next time</string>
+    <string name="addserver">Add Computer Manually</string>
+    <string name="addserver_entername">Computer name:</string>
+    <string name="addserver_enteraddress">Computer IP address or hostname:</string>
+    <string name="addserver_remember">Remember this computer next time</string>
     <string name="addserver_add">Add</string>
     <string name="addserver_cancel">Cancel</string>
     <string name="reconnect_description1">Your connection has been dropped.</string>
-- 
cgit