Forráskód Böngészése

Merge branch 'master' of https://github.com/unaio/una

AntonLV 9 éve
szülő
commit
fe73f4276f

+ 2 - 2
modules/boonex/notifications/install/langs/en.xml

@@ -15,7 +15,7 @@
     <string name="_bx_ntfs_menu_item_title_notifications"><![CDATA[Notifications]]></string>
     <string name="_bx_ntfs_menu_item_title_notifications"><![CDATA[Notifications]]></string>
 
 
 	<string name="_bx_ntfs_option_events_per_page"><![CDATA[Number of events are displayed on View page]]></string>
 	<string name="_bx_ntfs_option_events_per_page"><![CDATA[Number of events are displayed on View page]]></string>
-	<string name="_bx_ntfs_option_events_hide"><![CDATA[Show events in Notifications]]></string>
+	<string name="_bx_ntfs_option_events_hide"><![CDATA[Show notifications to followers when user performs action]]></string>
 
 
 	<string name="_bx_ntfs_privacy_view"><![CDATA[View event]]></string>
 	<string name="_bx_ntfs_privacy_view"><![CDATA[View event]]></string>
 
 
@@ -32,4 +32,4 @@
 	<string name="_bx_ntfs_txt_object_added"><![CDATA[<a class="bx-ntfs-content-profile" href="{owner_link}">{owner_name}</a> added a new {entry_sample} <a href="{entry_url}">{entry_caption}</a>]]></string>
 	<string name="_bx_ntfs_txt_object_added"><![CDATA[<a class="bx-ntfs-content-profile" href="{owner_link}">{owner_name}</a> added a new {entry_sample} <a href="{entry_url}">{entry_caption}</a>]]></string>
 	<string name="_bx_ntfs_txt_subobject_added_text"><![CDATA[<a class="bx-ntfs-content-profile" href="{owner_link}">{owner_name}</a> added a new {subentry_sample} to <a href="{entry_url}">{entry_caption}</a>]]></string>
 	<string name="_bx_ntfs_txt_subobject_added_text"><![CDATA[<a class="bx-ntfs-content-profile" href="{owner_link}">{owner_name}</a> added a new {subentry_sample} to <a href="{entry_url}">{entry_caption}</a>]]></string>
 	<string name="_bx_ntfs_txt_subobject_added_link"><![CDATA[<a class="bx-ntfs-content-profile" href="{owner_link}">{owner_name}</a> added a new <a href="{subentry_url}">{subentry_sample}</a> to <a href="{entry_url}">{entry_caption}</a>]]></string>
 	<string name="_bx_ntfs_txt_subobject_added_link"><![CDATA[<a class="bx-ntfs-content-profile" href="{owner_link}">{owner_name}</a> added a new <a href="{subentry_url}">{subentry_sample}</a> to <a href="{entry_url}">{entry_caption}</a>]]></string>
-</resources>
+</resources>

+ 1 - 1
modules/boonex/russian/data/langs/bx_notifications/ru.xml

@@ -15,7 +15,7 @@
     <string name="_bx_ntfs_menu_item_title_notifications"><![CDATA[Уведомления]]></string>
     <string name="_bx_ntfs_menu_item_title_notifications"><![CDATA[Уведомления]]></string>
 
 
 	<string name="_bx_ntfs_option_events_per_page"><![CDATA[Количество событий, отображаемых на странице Просмотра]]></string>
 	<string name="_bx_ntfs_option_events_per_page"><![CDATA[Количество событий, отображаемых на странице Просмотра]]></string>
-	<string name="_bx_ntfs_option_events_hide"><![CDATA[Показывать события в Уведомлениях]]></string>
+	<string name="_bx_ntfs_option_events_hide"><![CDATA[Показывать события для последователей, когда пользователь совершает действия]]></string>
 
 
 	<string name="_bx_ntfs_privacy_view"><![CDATA[Просматривать события]]></string>
 	<string name="_bx_ntfs_privacy_view"><![CDATA[Просматривать события]]></string>