diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml index e19360f6cd..46f76154d8 100644 --- a/android/res/values-ru/strings.xml +++ b/android/res/values-ru/strings.xml @@ -277,8 +277,8 @@ Посмотри на карте MapsWithMe, где я сейчас нахожусь Привет!\n\nЯ сейчас здесь: %1$s. Чтобы увидеть это место на карте MapsWithMe, открой эту ссылку %2$s или эту %3$s \n\nСпасибо. - - Поделиться ... - - Отправить по SMS + + Поделиться + + Отправить сообщением diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml index cc25c531b6..671a207bdf 100644 --- a/android/res/values/strings.xml +++ b/android/res/values/strings.xml @@ -283,10 +283,10 @@ Look at my current location on MapsWithMe map Hi,\n\nI\'m here now: %1$s. Click this link %2$s or this one %3$s to see the place on the map.\n\nThanks. - - Share ... - - Share by SMS - + + Share + + Share by message + E-Mail diff --git a/android/src/com/mapswithme/util/ShareAction.java b/android/src/com/mapswithme/util/ShareAction.java index 8fd5b41d1e..62e6897d3b 100644 --- a/android/src/com/mapswithme/util/ShareAction.java +++ b/android/src/com/mapswithme/util/ShareAction.java @@ -128,7 +128,7 @@ public abstract class ShareAction { protected SmsShareAction() { - super(ID_SMS, R.string.message, new Intent(Intent.ACTION_VIEW).setData(Uri.parse(URI_STRING_SMS))); + super(ID_SMS, R.string.share_by_message, new Intent(Intent.ACTION_VIEW).setData(Uri.parse(URI_STRING_SMS))); } @Override @@ -178,7 +178,7 @@ public abstract class ShareAction { protected AnyShareAction() { - super(ID_ANY, R.string.share, new Intent(Intent.ACTION_SEND).setType(TYPE_TEXT_PLAIN)); + super(ID_ANY, R.string.just_share, new Intent(Intent.ACTION_SEND).setType(TYPE_TEXT_PLAIN)); } @Override @@ -187,7 +187,7 @@ public abstract class ShareAction final Intent intent = getIntent(); intent.putExtra(Intent.EXTRA_TEXT, body) .putExtra(Intent.EXTRA_SUBJECT, subject); - final String header = activity.getString(R.string.share); + final String header = activity.getString(R.string.just_share); activity.startActivity(Intent.createChooser(intent, header)); } } diff --git a/iphone/Maps/en.lproj/Localizable.strings b/iphone/Maps/en.lproj/Localizable.strings index 26bc46ab04..1ba3ef2837 100644 --- a/iphone/Maps/en.lproj/Localizable.strings +++ b/iphone/Maps/en.lproj/Localizable.strings @@ -437,11 +437,11 @@ /* Share my position using EMail, %1$@ is ge0:// and %2$@ is http://ge0.me link WITHOUT NAME */ "my_position_share_email" = "Hi,\n\nI'm here now: %1$@. Click this link %2$@ or this one %3$@ to see the place on the map.\n\nThanks."; -/* Share button text which opens menu with more buttons, like Message, EMail, Facebook etc. */ -"share" = "Share ..."; +/* iOS Share button text which opens menu with more buttons, like Message, EMail, Facebook etc. */ +"share" = "Share with Friends"; -/* Share by Message button text (including SMS) */ -"message" = "Share by SMS"; +/* iOS share by Message button text (including SMS) */ +"message" = "Message"; -/* Share by email button text (including SMS) */ +/* Share by email button text */ "email" = "E-Mail"; diff --git a/iphone/Maps/ru.lproj/Localizable.strings b/iphone/Maps/ru.lproj/Localizable.strings index 1f6a4365f7..e7eef339e4 100644 --- a/iphone/Maps/ru.lproj/Localizable.strings +++ b/iphone/Maps/ru.lproj/Localizable.strings @@ -437,11 +437,11 @@ /* Share my position using EMail, %1$@ is ge0:// and %2$@ is http://ge0.me link WITHOUT NAME */ "my_position_share_email" = "Привет!\n\nЯ сейчас здесь: %1$@. Чтобы увидеть это место на карте MapsWithMe, открой эту ссылку %2$@ или эту %3$@ \n\nСпасибо."; -/* Share button text which opens menu with more buttons, like Message, EMail, Facebook etc. */ -"share" = "Поделиться ..."; +/* iOS Share button text which opens menu with more buttons, like Message, EMail, Facebook etc. */ +"share" = "Отправить другу"; -/* Share by Message button text (including SMS) */ -"message" = "Отправить по SMS"; +/* iOS share by Message button text (including SMS) */ +"message" = "Сообщение"; -/* Share by email button text (including SMS) */ +/* Share by email button text */ "email" = "E-Mail"; diff --git a/strings.txt b/strings.txt index e44d4464fe..121fbaa18b 100644 --- a/strings.txt +++ b/strings.txt @@ -1950,17 +1950,32 @@ fr = Salut,\n\nJe me trouve actuellement là : %1$@. Clique sur ce lien %2$@ ou sur celui-ci %3$@ pour visualiser l'endroit sur la carte.\n\nMerci. cs = Ahoj,\n\nnyní jsem zde: %1$@ . Klikni na jeden z těchto odkazů %2$@, %3$@ a uvidíš toto místo na mapě.\n\nDěkuji. de = Hi,\n\nich bin gerade hier: %1$@ . Klicke auf diesen Link %2$@ oder diesen %3$@, um meinen Standort auf der Karte zu sehen.\n\nVielen Dank. + + [just_share] + en = Share + tags = android + comment = Android Share button text which opens menu with more buttons, like Message, EMail, Facebook etc. + ru = Поделиться + + [share_by_message] + en = Share by message + tags = android + comment = Android share by Message/SMS button text (including SMS) + ru = Отправить сообщением + [share] - en = Share ... - tags = ios, android - comment = Share button text which opens menu with more buttons, like Message, EMail, Facebook etc. - ru = Поделиться ... + en = Share with Friends + tags = ios + comment = iOS Share button text which opens menu with more buttons, like Message, EMail, Facebook etc. + ru = Отправить другу + [message] - en = Share by SMS - tags = ios, android - comment = Share by Message button text (including SMS) - ru = Отправить по SMS + en = Message + tags = ios + comment = iOS share by Message button text (including SMS) + ru = Сообщение + [email] en = E-Mail tags = ios, android - comment = Share by email button text (including SMS) + comment = Share by email button text