Merge branch 'develop' into regular_authentication_in_saml_server

[pub/Android/ownCloud.git] / res / values-te / strings.xml

diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index f439af4..25cec00 100644 (file)
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -1,16 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>

-  <string name="main_password">సంకేతపదం:</string>
-  <string name="main_music">సంగీతం</string>
-  <string name="main_settings">అమరికలు</string>

   <string name="actionbar_settings">అమరికలు</string>
   <string name="actionbar_settings">అమరికలు</string>

+  <string name="actionbar_send_file">పంపించు</string>
+  <string name="prefs_category_more">మరిన్ని</string>
+  <string name="prefs_help">సహాయం</string>

   <string name="auth_username">వాడుకరి పేరు</string>
   <string name="auth_password">సంకేతపదం</string>
   <string name="auth_username">వాడుకరి పేరు</string>
   <string name="auth_password">సంకేతపదం</string>

-  <string name="setup_hint_username">వాడుకరి పేరు</string>
-  <string name="setup_hint_password">సంకేతపదం</string>

   <string name="common_yes">అవును</string>
   <string name="common_no">కాదు</string>
   <string name="common_cancel">రద్దుచేయి</string>
   <string name="common_error">పొరపాటు</string>
   <string name="common_yes">అవును</string>
   <string name="common_no">కాదు</string>
   <string name="common_cancel">రద్దుచేయి</string>
   <string name="common_error">పొరపాటు</string>

-  <!--we need to improve the communication of errors to the user-->
+  <string name="activity_chooser_send_file_title">పంపించు</string>

 </resources>
 </resources>