Merge remote-tracking branch 'upstream/120131_as_small_bugs' into 4.0

13 years ago · 64952ca9bb
parent 8f0da20d09 dd02f318d5
commit 64952ca9bb
1 changed files with 3 additions and 0 deletions
--- a/astrid/res/values/strings-actfm.xml
+++ b/astrid/res/values/strings-actfm.xml
@ -227,6 +227,9 @@
  <!-- share login: Google Auth title -->
  <string name="actfm_GAA_title">Select the Google account you want to use:</string>

+  <!-- share login: OAUTH Login Prompt -->
+  <string name="actfm_OLA_prompt">Please connect to Google:</string>
+  
  <!-- ================================================ Synchronization == -->
      
  <!-- Preferences Title: Act.fm -->