diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-06-01 20:35:51 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-06-01 20:35:51 +0200 |
| commit | 05100b0a4de85edc6c49c15cdc050ed7ece2b3d0 (patch) | |
| tree | f702f2a42f7d09a0d2ff20ca7f9f8b65f64643eb /src/main/res/values | |
| parent | c41e6004909c10d4d24c7030d584f8e9fdf52d7c (diff) | |
| parent | 20ba1add1eaeb43a522189a85471ac3c4e1a3933 (diff) | |
Merge remote-tracking branch 'refs/remotes/siacs/master'
Diffstat (limited to 'src/main/res/values')
| -rw-r--r-- | src/main/res/values/strings.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index aec0e3a43..b465b4b92 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -627,10 +627,10 @@ <string name="presence_dnd">Busy</string> <string name="secure_password_generated">A secure password has been generated</string> <string name="device_does_not_support_battery_op">Your device does not support opting out of battery optimization</string> - <string name="share">Share</string> + <string name="share">Share</string> <string name="share_location">Share location</string> - <string name="location_sharing_disabled">Location sharing is disabled in settings</string> - <string name="locating">Locating…</string> + <string name="location_sharing_disabled">Location sharing is disabled in settings</string> + <string name="locating">Locating…</string> <string name="uninstall_plugins">We have integrated the VoiceRecorder and ShareLocation plugin directly into the messenger. You should uninstall the plugins.</string> <string name="uninstall">Uninstall</string> <string name="action_end_conversation_muc">Leave conference</string> @@ -646,5 +646,5 @@ <string name="import_database">Import backup</string> <string name="uninstall_app_text">There is an old version of Pix-Art Messenger or Conversations installed. If you have an old Pix-Art Messenger installed, you should uninstall this version. After uninstalled the old versoin, you should choose \'import backup\' again and we will import your data to the new version.</string> <string name="you">You</string> - + <string name="invite_again">Invite again</string> </resources> |