Attached Files |
phrases_fixes_510_core.patch [^] (14,202 bytes) 2010-06-12 09:00
[Show Content]
Index: admin_templates/categories/cache_updater.tpl
===================================================================
--- admin_templates/categories/cache_updater.tpl (revision 13756)
+++ admin_templates/categories/cache_updater.tpl (working copy)
@@ -15,13 +15,13 @@
</tr>
<tr>
<td align="right" width="50%">
- <input type="button" name="yes_btn" value="<inp2:m_phrase name="lu_yes"/>" onclick="goto_url('<inp2:m_t continue="1"/>');" class="button" />
+ <input type="button" name="yes_btn" value="<inp2:m_phrase name='la_yes'/>" onclick="goto_url('<inp2:m_t continue="1"/>');" class="button" />
</td>
<td>
<img src="img/spacer.gif" width="10" />
</td>
<td align="left" width="50%">
- <input type="button" name="yes_btn" value="<inp2:m_phrase name="lu_no"/>" onclick="javascript:window_close();" class="button" />
+ <input type="button" name="yes_btn" value="<inp2:m_phrase name='la_no'/>" onclick="javascript:window_close();" class="button" />
</td>
</tr>
</table>
Index: install.php
===================================================================
--- install.php (revision 13756)
+++ install.php (working copy)
@@ -930,7 +930,7 @@
if ($this->currentStep == -1) {
// step after last step -> redirect to admin
- $this->Application->Redirect('index', null, '', 'index.php');
+ $this->Application->Redirect('index', Array (), '', 'index.php');
}
}
Index: install/english.lang
===================================================================
--- install/english.lang (revision 13756)
+++ install/english.lang (working copy)
@@ -463,6 +463,7 @@
<PHRASE Label="la_fld_FromEmail" Module="Core" Type="1">RnJvbSBFbWFpbA==</PHRASE>
<PHRASE Label="la_fld_FrontEndOnly" Module="Core" Type="1">RnJvbnQtRW5kIE9ubHk=</PHRASE>
<PHRASE Label="la_fld_FrontRegistration" Module="Core" Type="1">QWxsb3cgUmVnaXN0cmF0aW9uIG9uIEZyb250LWVuZA==</PHRASE>
+ <PHRASE Label="la_fld_Group" Module="Core" Type="1">VXNlciBHcm91cA==</PHRASE>
<PHRASE Label="la_fld_GroupId" Module="Core" Type="1">SUQ=</PHRASE>
<PHRASE Label="la_fld_GroupName" Module="Core" Type="1">R3JvdXAgTmFtZQ==</PHRASE>
<PHRASE Label="la_fld_Height" Module="Core" Type="1">SGVpZ2h0</PHRASE>
@@ -730,6 +731,7 @@
<PHRASE Label="la_nextcategory" Module="Core" Type="1">TmV4dCBzZWN0aW9u</PHRASE>
<PHRASE Label="la_No" Module="Core" Type="1">Tm8=</PHRASE>
<PHRASE Label="la_none" Module="Core" Type="1">Tm9uZQ==</PHRASE>
+ <PHRASE Label="la_no_permissions" Module="Core" Type="1">Tm8gUGVybWlzc2lvbnM=</PHRASE>
<PHRASE Label="la_of" Module="Core" Type="1">b2Y=</PHRASE>
<PHRASE Label="la_Off" Module="Core" Type="1">T2Zm</PHRASE>
<PHRASE Label="la_On" Module="Core" Type="1">T24=</PHRASE>
@@ -841,6 +843,19 @@
<PHRASE Label="la_permission_in-portal:user_groups.advanced:send_email" Module="Core" Type="1">U2VuZCBFLW1haWwgdG8gR3JvdXBzIGluIEFkbWlu</PHRASE>
<PHRASE Label="la_permission_in-portal:user_list.advanced:ban" Module="Core" Type="1">QmFuIFVzZXJz</PHRASE>
<PHRASE Label="la_permission_in-portal:user_list.advanced:send_email" Module="Core" Type="1">U2VuZCBFLW1haWwgdG8gVXNlcnMgaW4gQWRtaW4=</PHRASE>
+ <PHRASE Label="la_PermName_Admin_desc" Module="Core" Type="1">QWRtaW4gTG9naW4=</PHRASE>
+ <PHRASE Label="la_PermName_Category.AddPending_desc" Module="Core" Type="1">QWRkIFBlbmRpbmcgQ2F0ZWdvcnk=</PHRASE>
+ <PHRASE Label="la_PermName_Category.Add_desc" Module="Core" Type="1">QWRkIENhdGVnb3J5</PHRASE>
+ <PHRASE Label="la_PermName_Category.Delete_desc" Module="Core" Type="1">RGVsZXRlIENhdGVnb3J5</PHRASE>
+ <PHRASE Label="la_PermName_Category.Modify_desc" Module="Core" Type="1">TW9kaWZ5IENhdGVnb3J5</PHRASE>
+ <PHRASE Label="la_PermName_Category.View_desc" Module="Core" Type="1">VmlldyBDYXRlZ29yeQ==</PHRASE>
+ <PHRASE Label="la_PermName_Debug.Info_desc" Module="Core" Type="1">QXBwZW5kIHBocGluZm8gdG8gYWxsIHBhZ2VzIChEZWJ1Zyk=</PHRASE>
+ <PHRASE Label="la_PermName_Debug.Item_desc" Module="Core" Type="1">RGlzcGxheSBJdGVtIFF1ZXJpZXMgKERlYnVnKQ==</PHRASE>
+ <PHRASE Label="la_PermName_Debug.List_desc" Module="Core" Type="1">RGlzcGxheSBJdGVtIExpc3QgUXVlcmllcyAoRGVidWcp</PHRASE>
+ <PHRASE Label="la_PermName_favorites_desc" Module="Core" Type="1">QWxsb3cgZmF2b3JpdGVz</PHRASE>
+ <PHRASE Label="la_PermName_Login_desc" Module="Core" Type="1">QWxsb3cgTG9naW4=</PHRASE>
+ <PHRASE Label="la_PermName_Profile.Modify_desc" Module="Core" Type="1">Q2hhbmdlIFVzZXIgUHJvZmlsZXM=</PHRASE>
+ <PHRASE Label="la_PermName_ShowLang_desc" Module="Core" Type="1">U2hvdyBMYW5ndWFnZSBUYWdz</PHRASE>
<PHRASE Label="la_PermName_SystemAccess.ReadOnly_desc" Module="Core" Type="1">UmVhZC1Pbmx5IEFjY2VzcyBUbyBEYXRhYmFzZQ==</PHRASE>
<PHRASE Label="la_PhraseNotTranslated" Module="Core" Type="1">Tm90IFRyYW5zbGF0ZWQ=</PHRASE>
<PHRASE Label="la_PhraseTranslated" Module="Core" Type="1">VHJhbnNsYXRlZA==</PHRASE>
@@ -989,6 +1004,7 @@
<PHRASE Label="la_section_Image" Module="Core" Type="1">SW1hZ2U=</PHRASE>
<PHRASE Label="la_section_ImageSettings" Module="Core" Type="1">SW1hZ2UgU2V0dGluZ3M=</PHRASE>
<PHRASE Label="la_section_Items" Module="Core" Type="1">VXNlciBJdGVtcw==</PHRASE>
+ <PHRASE Label="la_section_MemoryCache" Module="Core" Type="1">TWVtb3J5IENhY2hl</PHRASE>
<PHRASE Label="la_section_Message" Module="Core" Type="1">TWVzc2FnZQ==</PHRASE>
<PHRASE Label="la_section_overview" Module="Core" Type="1">U2VjdGlvbiBPdmVydmlldw==</PHRASE>
<PHRASE Label="la_section_Page" Module="Core" Type="1">U2VjdGlvbiBQcm9wZXJ0aWVz</PHRASE>
@@ -1453,9 +1469,6 @@
<PHRASE Label="la_Windows" Module="Core" Type="1">V2luZG93cw==</PHRASE>
<PHRASE Label="la_year" Module="Core" Type="1">eWVhcg==</PHRASE>
<PHRASE Label="la_Yes" Module="Core" Type="1">WWVz</PHRASE>
- <PHRASE Label="lu_ferror_forgotpw_nodata" Module="Core" Type="1">WW91IG11c3QgZW50ZXIgYSBVc2VybmFtZSBvciBFbWFpbCBBZGRyZXNzIHRvIHJldHJpdmUgeW91ciBhY2NvdW50IGluZm9ybWF0aW9u</PHRASE>
- <PHRASE Label="lu_ferror_unknown_email" Module="Core" Type="1">VXNlciBhY2NvdW50IHdpdGggZ2l2ZW4gRS1tYWlsIG5vdCBmb3VuZA==</PHRASE>
- <PHRASE Label="lu_ferror_unknown_username" Module="Core" Type="1">VXNlciBhY2NvdW50IHdpdGggZ2l2ZW4gVXNlcm5hbWUgbm90IGZvdW5k</PHRASE>
<PHRASE Label="lu_field_CachedDescendantCatsQty" Module="Core" Type="1">U3ViLXNlY3Rpb25zIFF1YW50aXR5</PHRASE>
<PHRASE Label="lu_field_CachedNavBar" Module="Core" Type="1">TmF2aWdhdGlvbiBCYXI=</PHRASE>
<PHRASE Label="lu_field_cachedrating" Module="Core" Type="2">UmF0aW5n</PHRASE>
@@ -1492,19 +1505,6 @@
<PHRASE Label="lu_opt_AutoDetect" Module="Core" Type="1">QXV0by1EZXRlY3Q=</PHRASE>
<PHRASE Label="lu_opt_Cookies" Module="Core" Type="1">Q29va2llcw==</PHRASE>
<PHRASE Label="lu_opt_QueryString" Module="Core" Type="1">UXVlcnkgU3RyaW5nIChTSUQp</PHRASE>
- <PHRASE Label="lu_PermName_Admin_desc" Module="Core" Type="1">QWRtaW4gTG9naW4=</PHRASE>
- <PHRASE Label="lu_PermName_Category.AddPending_desc" Module="Core" Type="2">QWRkIFBlbmRpbmcgQ2F0ZWdvcnk=</PHRASE>
- <PHRASE Label="lu_PermName_Category.Add_desc" Module="Core" Type="2">QWRkIENhdGVnb3J5</PHRASE>
- <PHRASE Label="lu_PermName_Category.Delete_desc" Module="Core" Type="2">RGVsZXRlIENhdGVnb3J5</PHRASE>
- <PHRASE Label="lu_PermName_Category.Modify_desc" Module="Core" Type="2">TW9kaWZ5IENhdGVnb3J5</PHRASE>
- <PHRASE Label="lu_PermName_Category.View_desc" Module="Core" Type="2">VmlldyBDYXRlZ29yeQ==</PHRASE>
- <PHRASE Label="lu_PermName_Debug.Info_desc" Module="Core" Type="1">QXBwZW5kIHBocGluZm8gdG8gYWxsIHBhZ2VzIChEZWJ1Zyk=</PHRASE>
- <PHRASE Label="lu_PermName_Debug.Item_desc" Module="Core" Type="1">RGlzcGxheSBJdGVtIFF1ZXJpZXMgKERlYnVnKQ==</PHRASE>
- <PHRASE Label="lu_PermName_Debug.List_desc" Module="Core" Type="1">RGlzcGxheSBJdGVtIExpc3QgUXVlcmllcyAoRGVidWcp</PHRASE>
- <PHRASE Label="lu_PermName_favorites_desc" Module="Core" Type="2">QWxsb3cgZmF2b3JpdGVz</PHRASE>
- <PHRASE Label="lu_PermName_Login_desc" Module="Core" Type="1">QWxsb3cgTG9naW4=</PHRASE>
- <PHRASE Label="lu_PermName_Profile.Modify_desc" Module="Core" Type="1">Q2hhbmdlIFVzZXIgUHJvZmlsZXM=</PHRASE>
- <PHRASE Label="lu_PermName_ShowLang_desc" Module="Core" Type="1">U2hvdyBMYW5ndWFnZSBUYWdz</PHRASE>
</PHRASES>
<EVENTS>
<EVENT MessageType="html" Event="CATEGORY.ADD" Type="0">U3ViamVjdDogTmV3IENhdGVnb3J5ICI8aW5wMjpjX0ZpZWxkIG5hbWU9Ik5hbWUiLz4iIC0gQWRkZWQKCllvdXIgc3VnZ2VzdGVkIGNhdGVnb3J5ICI8aW5wMjpjX0ZpZWxkIG5hbWU9Ik5hbWUiLz4iIGhhcyBiZWVuIGFkZGVkLg==</EVENT>
Index: install/install_data.sql
===================================================================
--- install/install_data.sql (revision 13756)
+++ install/install_data.sql (working copy)
@@ -483,19 +483,19 @@
(307, 2, 225, 'AK', NULL),
(306, 2, 225, 'AL', NULL);
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'CATEGORY.VIEW', 'lu_PermName_Category.View_desc', 'lu_PermName_Category.View_error', 'In-Portal');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'CATEGORY.ADD', 'lu_PermName_Category.Add_desc', 'lu_PermName_Category.Add_error', 'In-Portal');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'CATEGORY.DELETE', 'lu_PermName_Category.Delete_desc', 'lu_PermName_Category.Delete_error', 'In-Portal');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'CATEGORY.ADD.PENDING', 'lu_PermName_Category.AddPending_desc', 'lu_PermName_Category.AddPending_error', 'In-Portal');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'CATEGORY.MODIFY', 'lu_PermName_Category.Modify_desc', 'lu_PermName_Category.Modify_error', 'In-Portal');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'ADMIN', 'lu_PermName_Admin_desc', 'lu_PermName_Admin_error', 'Admin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'LOGIN', 'lu_PermName_Login_desc', 'lu_PermName_Admin_error', 'Front');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'DEBUG.ITEM', 'lu_PermName_Debug.Item_desc', '', 'Admin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'DEBUG.LIST', 'lu_PermName_Debug.List_desc', '', 'Admin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'DEBUG.INFO', 'lu_PermName_Debug.Info_desc', '', 'Admin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'PROFILE.MODIFY', 'lu_PermName_Profile.Modify_desc', '', 'Admin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'SHOWLANG', 'lu_PermName_ShowLang_desc', '', 'Admin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'FAVORITES', 'lu_PermName_favorites_desc', 'lu_PermName_favorites_error', 'In-Portal');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'CATEGORY.VIEW', 'la_PermName_Category.View_desc', 'la_PermName_Category.View_error', 'In-Portal');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'CATEGORY.ADD', 'la_PermName_Category.Add_desc', 'la_PermName_Category.Add_error', 'In-Portal');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'CATEGORY.DELETE', 'la_PermName_Category.Delete_desc', 'la_PermName_Category.Delete_error', 'In-Portal');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'CATEGORY.ADD.PENDING', 'la_PermName_Category.AddPending_desc', 'la_PermName_Category.AddPending_error', 'In-Portal');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'CATEGORY.MODIFY', 'la_PermName_Category.Modify_desc', 'la_PermName_Category.Modify_error', 'In-Portal');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'ADMIN', 'la_PermName_Admin_desc', 'la_PermName_Admin_error', 'Admin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'LOGIN', 'la_PermName_Login_desc', 'la_PermName_Admin_error', 'Front');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'DEBUG.ITEM', 'la_PermName_Debug.Item_desc', '', 'Admin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'DEBUG.LIST', 'la_PermName_Debug.List_desc', '', 'Admin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'DEBUG.INFO', 'la_PermName_Debug.Info_desc', '', 'Admin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'PROFILE.MODIFY', 'la_PermName_Profile.Modify_desc', '', 'Admin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'SHOWLANG', 'la_PermName_ShowLang_desc', '', 'Admin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'FAVORITES', 'la_PermName_favorites_desc', 'la_PermName_favorites_error', 'In-Portal');
INSERT INTO PermissionConfig VALUES (DEFAULT, 'SYSTEM_ACCESS.READONLY', 'la_PermName_SystemAccess.ReadOnly_desc', 'la_PermName_SystemAccess.ReadOnly_error', 'Admin');
INSERT INTO PermCache VALUES (DEFAULT, 0, 1, '11,12,13,14,15');
Index: install/upgrades.sql
===================================================================
--- install/upgrades.sql (revision 13756)
+++ install/upgrades.sql (working copy)
@@ -1899,4 +1899,32 @@
DELETE FROM Permissions WHERE Permission LIKE 'in-portal:user_email%';
DELETE FROM Phrase WHERE Phrase IN ('la_fld_FromToUser', 'la_col_FromToUser');
-# ===== v 5.1.0-B2 =====
\ No newline at end of file
+# ===== v 5.1.0-B2 =====
+
+# ===== v 5.1.0-RC1 =====
+UPDATE Phrase SET Module = 'Core' WHERE Phrase = 'la_fld_Group';
+
+UPDATE PermissionConfig
+SET
+ Description = REPLACE(Description, 'lu_PermName_', 'la_PermName_'),
+ ErrorMessage = REPLACE(ErrorMessage, 'lu_PermName_', 'la_PermName_');
+
+UPDATE Phrase
+SET
+ Phrase = REPLACE(Phrase, 'lu_PermName_', 'la_PermName_'),
+ PhraseKey = REPLACE(PhraseKey, 'LU_PERMNAME_', 'LA_PERMNAME_'),
+ PhraseType = 1
+WHERE PhraseKey LIKE 'LU_PERMNAME_%';
+
+UPDATE Phrase
+SET
+ Phrase = 'la_no_permissions',
+ PhraseKey = 'LA_NO_PERMISSIONS',
+ PhraseType = 1
+WHERE PhraseKey = 'LU_NO_PERMISSIONS';
+
+UPDATE Phrase
+SET PhraseType = 0
+WHERE PhraseKey IN (
+ 'LU_FERROR_FORGOTPW_NODATA', 'LU_FERROR_UNKNOWN_USERNAME', 'LU_FERROR_UNKNOWN_EMAIL'
+);
\ No newline at end of file
Index: units/users/users_event_handler.php
===================================================================
--- units/users/users_event_handler.php (revision 13756)
+++ units/users/users_event_handler.php (working copy)
@@ -223,7 +223,7 @@
$object =& $user_helper->getUserObject();
if ($result == LOGIN_RESULT_NO_PERMISSION) {
- $object->SetError('ValidateLogin', 'no_permission', 'lu_no_permissions');
+ $object->SetError('ValidateLogin', 'no_permission', 'la_no_permissions');
}
else {
$object->SetID(USER_GUEST);
phrases_fixes_510_modules.patch [^] (39,650 bytes) 2010-06-12 09:00
[Show Content]
Index: in-bulletin/install/english.lang
===================================================================
--- in-bulletin/install/english.lang (revision 13756)
+++ in-bulletin/install/english.lang (working copy)
@@ -1,5 +1,5 @@
-<LANGUAGES>
- <LANGUAGE PackName="English" Encoding="base64"><DATEFORMAT>m/d/Y</DATEFORMAT><TIMEFORMAT>g:i A</TIMEFORMAT><INPUTDATEFORMAT>m/d/Y</INPUTDATEFORMAT><INPUTTIMEFORMAT>g:i:s A</INPUTTIMEFORMAT><DECIMAL>.</DECIMAL><THOUSANDS>,</THOUSANDS><CHARSET>utf-8</CHARSET><DOCS_URL>http://docs.in-portal.org/eng/index.php</DOCS_URL><UNITSYSTEM>2</UNITSYSTEM>
+<LANGUAGES Version="3">
+ <LANGUAGE Encoding="base64" PackName="English" LocalName="English" DateFormat="m/d/Y" TimeFormat="g:i A" InputDateFormat="m/d/Y" InputTimeFormat="g:i:s A" DecimalPoint="." ThousandSep="," Charset="utf-8" UnitSystem="2" Locale="en-US" UserDocsUrl="http://docs.in-portal.org/eng/index.php">
<PHRASES>
<PHRASE Label="la_col_BadWord" Module="In-Bulletin" Type="1">Q2Vuc29yZWQgV29yZA==</PHRASE>
<PHRASE Label="la_col_CommentedByUser" Module="In-Bulletin" Type="1">VXNlcg==</PHRASE>
@@ -39,6 +39,24 @@
<PHRASE Label="la_opt_NumberOfPosts" Module="In-Bulletin" Type="1">TnVtYmVyIG9mIFBvc3Rz</PHRASE>
<PHRASE Label="la_opt_TopicText" Module="In-Bulletin" Type="1">VG9waWMgVGV4dA==</PHRASE>
<PHRASE Label="la_opt_TopicViews" Module="In-Bulletin" Type="1">VG9waWMgVmlld3M=</PHRASE>
+ <PHRASE Label="la_PermName_Topic.Add.Pending_desc" Module="In-Bulletin" Type="1">QWRkIFBlbmRpbmcgVG9waWM=</PHRASE>
+ <PHRASE Label="la_PermName_Topic.Add_desc" Module="In-Bulletin" Type="1">QWRkIFRvcGlj</PHRASE>
+ <PHRASE Label="la_PermName_Topic.Delete_desc" Module="In-Bulletin" Type="1">RGVsZXRlIFRvcGlj</PHRASE>
+ <PHRASE Label="la_PermName_Topic.Lock_desc" Module="In-Bulletin" Type="1">TG9jay9VbmxvY2sgVG9waWNz</PHRASE>
+ <PHRASE Label="la_PermName_Topic.Modify.Pending_desc" Module="In-Bulletin" Type="1">TW9kaWZ5IFRvcGljIFBlbmRpbmc=</PHRASE>
+ <PHRASE Label="la_PermName_Topic.Modify_desc" Module="In-Bulletin" Type="1">TW9kaWZ5IFRvcGlj</PHRASE>
+ <PHRASE Label="la_PermName_Topic.Owner.Delete_desc" Module="In-Bulletin" Type="1">VG9waWMgT3duZXIgRGVsZXRl</PHRASE>
+ <PHRASE Label="la_PermName_Topic.Owner.Modify.Pending_desc" Module="In-Bulletin" Type="1">T3duZXIgTW9kaWZ5IFRvcGljIFBlbmRpbmc=</PHRASE>
+ <PHRASE Label="la_PermName_Topic.Owner.Modify_desc" Module="In-Bulletin" Type="1">VG9waWMgT3duZXIgTW9kaWZ5</PHRASE>
+ <PHRASE Label="la_PermName_Topic.Rate_desc" Module="In-Bulletin" Type="1">UmF0ZSBUb3BpYw==</PHRASE>
+ <PHRASE Label="la_PermName_Topic.Reply.Add_desc" Module="In-Bulletin" Type="1">QWRkIFRvcGljIFJlcGx5</PHRASE>
+ <PHRASE Label="la_PermName_Topic.Reply.Delete_desc" Module="In-Bulletin" Type="1">RGVsZXRlIFRvcGlj</PHRASE>
+ <PHRASE Label="la_PermName_Topic.Reply.Modify_desc" Module="In-Bulletin" Type="1">UmVwbHkgVG9waWMgTW9kaWZ5</PHRASE>
+ <PHRASE Label="la_PermName_Topic.Reply.Owner.Delete_desc" Module="In-Bulletin" Type="1">UG9zdCBPd25lciBEZWxldGU=</PHRASE>
+ <PHRASE Label="la_PermName_Topic.Reply.Owner.Modify_desc" Module="In-Bulletin" Type="1">UG9zdCBPd25lciBNb2RpZnk=</PHRASE>
+ <PHRASE Label="la_PermName_Topic.Reply.View_desc" Module="In-Bulletin" Type="1">VmlldyBUb3BpYyBSZXBseQ==</PHRASE>
+ <PHRASE Label="la_PermName_Topic.Review_desc" Module="In-Bulletin" Type="1">Q29tbWVudCBUb3BpYw==</PHRASE>
+ <PHRASE Label="la_PermName_Topic.View_desc" Module="In-Bulletin" Type="1">VmlldyBUb3BpYw==</PHRASE>
<PHRASE Label="la_posts_newdays_prompt" Module="In-Bulletin" Type="1">TmV3IHBvc3RzIChkYXlzKQ==</PHRASE>
<PHRASE Label="la_posts_perpage_prompt" Module="In-Bulletin" Type="1">TnVtYmVyIG9mIHBvc3RzIHBlciBwYWdl</PHRASE>
<PHRASE Label="la_posts_subheading" Module="In-Bulletin" Type="1">UG9zdHM=</PHRASE>
@@ -110,14 +128,6 @@
<PHRASE Label="lu_field_postedby" Module="In-Bulletin" Type="2">UG9zdGVkIEJ5</PHRASE>
<PHRASE Label="lu_field_topicid" Module="In-Bulletin" Type="2">VG9waWMgSUQ=</PHRASE>
<PHRASE Label="lu_field_topictext" Module="In-Bulletin" Type="2">VG9waWMgVGV4dA==</PHRASE>
- <PHRASE Label="lu_PermName_Topic.Lock_desc" Module="In-Bulletin" Type="1">TG9jay9VbmxvY2sgVG9waWNz</PHRASE>
- <PHRASE Label="lu_PermName_Topic.Modify.Pending_desc" Module="In-Bulletin" Type="1">TW9kaWZ5IFRvcGljIFBlbmRpbmc=</PHRASE>
- <PHRASE Label="lu_PermName_Topic.Owner.Delete_desc" Module="In-Bulletin" Type="1">VG9waWMgT3duZXIgRGVsZXRl</PHRASE>
- <PHRASE Label="lu_PermName_Topic.Owner.Modify.Pending_desc" Module="In-Bulletin" Type="1">T3duZXIgTW9kaWZ5IFRvcGljIFBlbmRpbmc=</PHRASE>
- <PHRASE Label="lu_PermName_Topic.Owner.Modify_desc" Module="In-Bulletin" Type="1">VG9waWMgT3duZXIgTW9kaWZ5</PHRASE>
- <PHRASE Label="lu_PermName_Topic.Reply.Owner.Delete_desc" Module="In-Bulletin" Type="1">UG9zdCBPd25lciBEZWxldGU=</PHRASE>
- <PHRASE Label="lu_PermName_Topic.Reply.Owner.Modify_desc" Module="In-Bulletin" Type="1">UG9zdCBPd25lciBNb2RpZnk=</PHRASE>
- <PHRASE Label="lu_PermName_Topic.Review_desc" Module="In-Bulletin" Type="1">Q29tbWVudCBUb3BpYw==</PHRASE>
</PHRASES>
<EVENTS>
<EVENT MessageType="html" Event="PM.ADD" Type="0">U3ViamVjdDogTmV3IFByaXZhdGUgTWVzc2FnZQoKWW91IGhhdmUgYSBuZXcgcHJpdmF0ZSBtZXNzYWdlIGhhcyBhcnJpdmVkLg==</EVENT>
Index: in-bulletin/install/install_data.sql
===================================================================
--- in-bulletin/install/install_data.sql (revision 13756)
+++ in-bulletin/install/install_data.sql (working copy)
@@ -83,24 +83,24 @@
INSERT INTO ItemTypes VALUES (3, 'In-Bulletin', 'bb', 'Topic', 'TopicText', 'OwnerId', 'Views', 'CachedRating', 'la_ItemTab_Topics', 1, '', 'clsTopic', 'Topic');
INSERT INTO ItemTypes VALUES (30, 'In-Bulletin', 'posting', 'Posting', 'Subject', 'CreatedById', NULL, NULL, 'la_ItemTab_Posts', 0, '', '', 'Post');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.VIEW', 'lu_PermName_Topic.View_desc', 'lu_PermName_Topic.View_error', 'In-Bulletin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.ADD', 'lu_PermName_Topic.Add_desc', 'lu_PermName_Topic.Add_error', 'In-Bulletin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.ADD.PENDING', 'lu_PermName_Topic.Add.Pending_desc', 'lu_PermName_Topic.Add.Pending_error', 'In-Bulletin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.DELETE', 'lu_PermName_Topic.Delete_desc', 'lu_PermName_Topic.Delete_error', 'In-Bulletin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.MODIFY', 'lu_PermName_Topic.Modify_desc', 'lu_PermName_Topic.Modify_error', 'In-Bulletin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REPLY.DELETE', 'lu_PermName_Topic.Reply.Delete_desc', 'lu_PermName_Topic.Reply.Delete_desc', 'In-Bulletin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REPLY.VIEW', 'lu_PermName_Topic.Reply.View_desc', 'lu_PermName_Topic.Reply.View_error', 'In-Bulletin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REPLY.ADD', 'lu_PermName_Topic.Reply.Add_desc', 'lu_PermName_Topic.Reply.Add_error', 'In-Bulletin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REPLY.MODIFY', 'lu_PermName_Topic.Reply.Modify_desc', 'lu_PermName_Topic.Reply.Modify_error', 'In-Bulletin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.RATE', 'lu_PermName_Topic.Rate_desc', 'lu_PermName_Topic.Rate_desc', 'In-Bulletin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REVIEW', 'lu_PermName_Topic.Review_desc', 'lu_PermName_Topic.Review_desc', 'In-Bulletin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REPLY.OWNER.MODIFY', 'lu_PermName_Topic.Reply.Owner.Modify_desc', 'lu_PermName_Topic.Reply.Owner.Modify_error', 'In-Bulletin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REPLY.OWNER.DELETE', 'lu_PermName_Topic.Reply.Owner.Delete_desc', 'lu_PermName_Topic.Reply.Owner.Delete_error', 'In-Bulletin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.OWNER.DELETE', 'lu_PermName_Topic.Owner.Delete_desc', 'lu_PermName_Topic.Owner.Delete_error', 'In-Bulletin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.MODIFY.PENDING', 'lu_PermName_Topic.Modify.Pending_desc', 'lu_PermName_Topic.Modify.Pending_error', 'In-Bulletin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.OWNER.MODIFY.PENDING', 'lu_PermName_Topic.Owner.Modify.Pending_desc', 'lu_PermName_Topic.Owner.Modify.Pending_error', 'In-Bulletin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.OWNER.MODIFY', 'lu_PermName_Topic.Owner.Modify_desc', 'lu_PermName_Topic.Owner.Modify_error', 'In-Bulletin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.LOCK', 'lu_PermName_Topic.Lock_desc', 'lu_PermName_Topic.Lock_error', 'In-Bulletin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.VIEW', 'la_PermName_Topic.View_desc', 'la_PermName_Topic.View_error', 'In-Bulletin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.ADD', 'la_PermName_Topic.Add_desc', 'la_PermName_Topic.Add_error', 'In-Bulletin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.ADD.PENDING', 'la_PermName_Topic.Add.Pending_desc', 'la_PermName_Topic.Add.Pending_error', 'In-Bulletin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.DELETE', 'la_PermName_Topic.Delete_desc', 'la_PermName_Topic.Delete_error', 'In-Bulletin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.MODIFY', 'la_PermName_Topic.Modify_desc', 'la_PermName_Topic.Modify_error', 'In-Bulletin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REPLY.DELETE', 'la_PermName_Topic.Reply.Delete_desc', 'la_PermName_Topic.Reply.Delete_desc', 'In-Bulletin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REPLY.VIEW', 'la_PermName_Topic.Reply.View_desc', 'la_PermName_Topic.Reply.View_error', 'In-Bulletin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REPLY.ADD', 'la_PermName_Topic.Reply.Add_desc', 'la_PermName_Topic.Reply.Add_error', 'In-Bulletin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REPLY.MODIFY', 'la_PermName_Topic.Reply.Modify_desc', 'la_PermName_Topic.Reply.Modify_error', 'In-Bulletin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.RATE', 'la_PermName_Topic.Rate_desc', 'la_PermName_Topic.Rate_desc', 'In-Bulletin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REVIEW', 'la_PermName_Topic.Review_desc', 'la_PermName_Topic.Review_desc', 'In-Bulletin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REPLY.OWNER.MODIFY', 'la_PermName_Topic.Reply.Owner.Modify_desc', 'la_PermName_Topic.Reply.Owner.Modify_error', 'In-Bulletin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REPLY.OWNER.DELETE', 'la_PermName_Topic.Reply.Owner.Delete_desc', 'la_PermName_Topic.Reply.Owner.Delete_error', 'In-Bulletin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.OWNER.DELETE', 'la_PermName_Topic.Owner.Delete_desc', 'la_PermName_Topic.Owner.Delete_error', 'In-Bulletin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.MODIFY.PENDING', 'la_PermName_Topic.Modify.Pending_desc', 'la_PermName_Topic.Modify.Pending_error', 'In-Bulletin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.OWNER.MODIFY.PENDING', 'la_PermName_Topic.Owner.Modify.Pending_desc', 'la_PermName_Topic.Owner.Modify.Pending_error', 'In-Bulletin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.OWNER.MODIFY', 'la_PermName_Topic.Owner.Modify_desc', 'la_PermName_Topic.Owner.Modify_error', 'In-Bulletin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.LOCK', 'la_PermName_Topic.Lock_desc', 'la_PermName_Topic.Lock_error', 'In-Bulletin');
INSERT INTO StatItem VALUES (DEFAULT, 'In-Bulletin', 'SELECT count(*) FROM <%prefix%>Topic WHERE Status=1', NULL, 'la_prompt_ActiveTopics', 0, 1);
INSERT INTO StatItem VALUES (DEFAULT, 'In-Bulletin', 'SELECT COUNT(*) AS TotalTopics FROM <%prefix%>Topic', NULL, 'la_prompt_TopicsTotal', 0, 2);
Index: in-commerce/install/english.lang
===================================================================
--- in-commerce/install/english.lang (revision 13756)
+++ in-commerce/install/english.lang (working copy)
@@ -164,6 +164,8 @@
<PHRASE Label="la_col_ProductType" Module="In-Commerce" Type="1">VHlwZQ==</PHRASE>
<PHRASE Label="la_col_ProductWeight" Module="In-Commerce" Type="1">V2VpZ2h0</PHRASE>
<PHRASE Label="la_col_Profit" Module="In-Commerce" Type="1">UHJvZml0</PHRASE>
+ <PHRASE Label="la_col_Qty" Module="In-Commerce" Type="1">UXR5</PHRASE>
+ <PHRASE Label="la_col_QtyBackordered" Module="In-Commerce" Type="1">QmFja29yZGVyZWQ=</PHRASE>
<PHRASE Label="la_col_QtyInStock" Module="In-Commerce" Type="1">UXR5IEluIFN0b2Nr</PHRASE>
<PHRASE Label="la_col_QtyInStockMin" Module="In-Commerce" Type="1">UXR5SW5TdG9ja01pbg==</PHRASE>
<PHRASE Label="la_col_QtyOnOrder" Module="In-Commerce" Type="1">UXR5IE9uIE9yZGVy</PHRASE>
@@ -334,7 +336,6 @@
<PHRASE Label="la_fld_FromDateTime" Module="In-Commerce" Type="1">RnJvbSBkYXRlL3RpbWU=</PHRASE>
<PHRASE Label="la_fld_Gateway" Module="In-Commerce" Type="1">R2F0ZXdheQ==</PHRASE>
<PHRASE Label="la_fld_GroundDelivery" Module="In-Commerce" Type="1">R3JvdW5kIERlbGl2ZXJ5</PHRASE>
- <PHRASE Label="la_fld_Group" Module="In-Commerce" Type="1">VXNlciBHcm91cA==</PHRASE>
<PHRASE Label="la_fld_Groups" Module="In-Commerce" Type="1">VXNlciBHcm91cHMgU2VsZWN0aW9u</PHRASE>
<PHRASE Label="la_fld_Instructions" Module="In-Commerce" Type="1">SW5zdHJ1Y3Rpb25z</PHRASE>
<PHRASE Label="la_fld_InsuranceFee" Module="In-Commerce" Type="1">SW5zdXJhbmNlIENvc3Q=</PHRASE>
@@ -491,6 +492,7 @@
<PHRASE Label="la_IRR" Module="In-Commerce" Type="1">SXJhbmlhbiBSaWFs</PHRASE>
<PHRASE Label="la_ISK" Module="In-Commerce" Type="1">SWNlbGFuZCBLcm9uYQ==</PHRASE>
<PHRASE Label="la_ISOUsedIfBlank" Module="In-Commerce" Type="1">SVNPIENvZGUgd2lsbCBiZSB1c2VkIGlmIGxlZnQgYmxhbms=</PHRASE>
+ <PHRASE Label="la_ItemBackordered" Module="In-Commerce" Type="1">YmFja29yZGVyZWQ=</PHRASE>
<PHRASE Label="la_ItemTab_Products" Module="In-Commerce" Type="1">UHJvZHVjdHM=</PHRASE>
<PHRASE Label="la_JMD" Module="In-Commerce" Type="1">SmFtYWljYW4gRG9sbGFy</PHRASE>
<PHRASE Label="la_JOD" Module="In-Commerce" Type="1">Sm9yZGFuaWFuIERpbmFy</PHRASE>
@@ -602,6 +604,13 @@
<PHRASE Label="la_permission_in-commerce:shipping.advanced:decline" Module="In-Commerce" Type="1">RGlzYWJsZSBTaGlwcGluZyBUeXBl</PHRASE>
<PHRASE Label="la_permission_in-commerce:shipping_quote_engines.advanced:approve" Module="In-Commerce" Type="1">RW5hYmxlIFNoaXBwaW5nIFF1b3RpbmcgRW5naW5lcw==</PHRASE>
<PHRASE Label="la_permission_in-commerce:shipping_quote_engines.advanced:decline" Module="In-Commerce" Type="1">RGlzYWJsZSBTaGlwcGluZyBRdW90aW5nIEVuZ2luZXM=</PHRASE>
+ <PHRASE Label="la_PermName_Product.Add_desc" Module="In-Commerce" Type="1">QWRkIFByb2R1Y3Q=</PHRASE>
+ <PHRASE Label="la_PermName_Product.Delete_desc" Module="In-Commerce" Type="1">RGVsZXRlIFByb2R1Y3Q=</PHRASE>
+ <PHRASE Label="la_PermName_Product.Modify_desc" Module="In-Commerce" Type="1">TW9kaWZ5IFByb2R1Y3Q=</PHRASE>
+ <PHRASE Label="la_PermName_Product.Rate_desc" Module="In-Commerce" Type="1">UmF0ZSBQcm9kdWN0</PHRASE>
+ <PHRASE Label="la_PermName_Product.Review_desc" Module="In-Commerce" Type="1">Q29tbWVudCBQcm9kdWN0</PHRASE>
+ <PHRASE Label="la_PermName_Product.Review_Pending_desc" Module="In-Commerce" Type="1">Q29tbWVudCBQcm9kdWN0IFBlbmRpbmc=</PHRASE>
+ <PHRASE Label="la_PermName_Product.View_desc" Module="In-Commerce" Type="1">VmlldyBQcm9kdWN0</PHRASE>
<PHRASE Label="la_Perpage_Manufacturers" Module="In-Commerce" Type="1">TWFudWZhY3R1cmVycyBwZXIgcGFnZQ==</PHRASE>
<PHRASE Label="la_Perpage_Manufacturers_Short" Module="In-Commerce" Type="1">TWFudWZhY3R1cmVycyBwZXIgcGFnZSBvbiBhIHNob3J0IGxpc3Rpbmc=</PHRASE>
<PHRASE Label="la_Perpage_Products" Module="In-Commerce" Type="1">TnVtYmVyIG9mIHByb2R1Y3RzIHBlciBwYWdl</PHRASE>
@@ -909,6 +918,8 @@
<PHRASE Label="la_ToolTip_NewTaxZone" Module="In-Commerce" Type="1">TmV3IFRheCBab25l</PHRASE>
<PHRASE Label="la_ToolTip_New_Affiliate" Module="In-Commerce" Type="1">TmV3IEFmZmlsaWF0ZQ==</PHRASE>
<PHRASE Label="la_ToolTip_New_Affiliate_Plan" Module="In-Commerce" Type="1">TmV3IEFmZmlsaWF0ZSBQbGFu</PHRASE>
+ <PHRASE Label="la_tooltip_New_Coupon" Module="In-Commerce" Type="1">TmV3IENvdXBvbg==</PHRASE>
+ <PHRASE Label="la_tooltip_New_Discount" Module="In-Commerce" Type="1">TmV3IERpc2NvdW50</PHRASE>
<PHRASE Label="la_ToolTip_New_Order" Module="In-Commerce" Type="1">TmV3IE9yZGVy</PHRASE>
<PHRASE Label="la_ToolTip_New_PricingLimit" Module="In-Commerce" Type="1">TmV3IFByaWNpbmcgTGltaXQ=</PHRASE>
<PHRASE Label="la_tooltip_new_products" Module="In-Commerce" Type="1">QWRkIG5ldyBwcm9kdWN0cw==</PHRASE>
@@ -980,13 +991,6 @@
<PHRASE Label="lu_comm_LastQuater" Module="In-Commerce" Type="1">TGFzdCBRdWF0ZXI=</PHRASE>
<PHRASE Label="lu_comm_ProfileAddressWarning" Module="In-Commerce" Type="1">VGhpcyBpcyB5b3VyIHByb2ZpbGUgYWRkcmVzcy4gSXQgd2lsbCBiZSB1cGRhdGVkIGlmIHlvdSBlZGl0IHRoZSBhZGRyZXNzIGJlbG93Lg==</PHRASE>
<PHRASE Label="lu_field_manufacturer" Module="In-Commerce" Type="2">TWFudWZhY3R1cmVy</PHRASE>
- <PHRASE Label="lu_PermName_Product.Add_desc" Module="In-Commerce" Type="1">QWRkIFByb2R1Y3Q=</PHRASE>
- <PHRASE Label="lu_PermName_Product.Delete_desc" Module="In-Commerce" Type="1">RGVsZXRlIFByb2R1Y3Q=</PHRASE>
- <PHRASE Label="lu_PermName_Product.Modify_desc" Module="In-Commerce" Type="1">TW9kaWZ5IFByb2R1Y3Q=</PHRASE>
- <PHRASE Label="lu_PermName_Product.Rate_desc" Module="In-Commerce" Type="1">UmF0ZSBQcm9kdWN0</PHRASE>
- <PHRASE Label="lu_PermName_Product.Review_desc" Module="In-Commerce" Type="1">Q29tbWVudCBQcm9kdWN0</PHRASE>
- <PHRASE Label="lu_PermName_Product.Review_Pending_desc" Module="In-Commerce" Type="1">Q29tbWVudCBQcm9kdWN0IFBlbmRpbmc=</PHRASE>
- <PHRASE Label="lu_PermName_Product.View_desc" Module="In-Commerce" Type="1">VmlldyBQcm9kdWN0</PHRASE>
<PHRASE Label="lu_ship_Shipment" Module="In-Commerce" Type="1">U2hpcG1lbnQ=</PHRASE>
<PHRASE Label="lu_ship_ShippingType" Module="In-Commerce" Type="1">U2hpcHBpbmcgVHlwZQ==</PHRASE>
<PHRASE Label="lu_title_ReviewProduct" Module="In-Commerce" Type="1">Q29tbWVudCB0aGlzIFByb2R1Y3Q=</PHRASE>
Index: in-commerce/install/install_data.sql
===================================================================
--- in-commerce/install/install_data.sql (revision 13756)
+++ in-commerce/install/install_data.sql (working copy)
@@ -321,13 +321,13 @@
INSERT INTO PaymentTypeCurrencies VALUES (DEFAULT, 3, 131);
INSERT INTO PaymentTypeCurrencies VALUES (DEFAULT, 1, 131);
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.RATE', 'lu_PermName_Product.Rate_desc', 'lu_PermName_Product.Rate_error', 'In-Commerce');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.REVIEW', 'lu_PermName_Product.Review_desc', 'lu_PermName_Product.Review_error', 'In-Commerce');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.REVIEW.PENDING', 'lu_PermName_Product.Review_Pending_desc', ' lu_PermName_Product.Review_Pending_error', 'In-Commerce');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.ADD', 'lu_PermName_Product.Add_desc', 'lu_PermName_Product.Add_error', 'In-Commerce');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.DELETE', 'lu_PermName_Product.Delete_desc', 'lu_PermName_Product.Delete_error', 'In-Commerce');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.MODIFY', 'lu_PermName_Product.Modify_desc', 'lu_PermName_Product.Modify_desc', 'In-Commerce');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.VIEW', 'lu_PermName_Product.View_desc', 'lu_PermName_Product.View_error', 'In-Commerce');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.RATE', 'la_PermName_Product.Rate_desc', 'la_PermName_Product.Rate_error', 'In-Commerce');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.REVIEW', 'la_PermName_Product.Review_desc', 'la_PermName_Product.Review_error', 'In-Commerce');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.REVIEW.PENDING', 'la_PermName_Product.Review_Pending_desc', ' la_PermName_Product.Review_Pending_error', 'In-Commerce');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.ADD', 'la_PermName_Product.Add_desc', 'la_PermName_Product.Add_error', 'In-Commerce');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.DELETE', 'la_PermName_Product.Delete_desc', 'la_PermName_Product.Delete_error', 'In-Commerce');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.MODIFY', 'la_PermName_Product.Modify_desc', 'la_PermName_Product.Modify_desc', 'In-Commerce');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.VIEW', 'la_PermName_Product.View_desc', 'la_PermName_Product.View_error', 'In-Commerce');
INSERT INTO Permissions VALUES (DEFAULT, 'PRODUCT.VIEW', 14, 1, 0, {ProductCatId});
INSERT INTO Permissions VALUES (DEFAULT, 'PRODUCT.RATE', 13, 1, 0, {ProductCatId});
Index: in-commerce/install/upgrades.sql
===================================================================
--- in-commerce/install/upgrades.sql (revision 13756)
+++ in-commerce/install/upgrades.sql (working copy)
@@ -165,4 +165,15 @@
UPDATE Phrase SET Module = 'Core' WHERE Phrase IN ('la_btn_Add', 'la_fld_RecipientName', 'la_fld_SenderName');
DELETE FROM Permissions WHERE Permission LIKE 'in-commerce:incommerce_configemail%';
-# ===== v 5.1.0-B2 =====
\ No newline at end of file
+# ===== v 5.1.0-B2 =====
+
+# ===== v 5.1.0-RC1 =====
+UPDATE Phrase
+SET PhraseType = 1
+WHERE Phrase IN (
+ 'la_col_Qty', 'la_col_QtyBackordered', 'la_ItemBackordered', 'la_ship_all_together',
+ 'la_ship_backorders_upon_avail', 'la_ship_backorder_separately', 'la_tooltip_New_Coupon',
+ 'la_tooltip_New_Discount'
+);
+
+DELETE FROM Phrase WHERE Phrase = 'la_comm_ProductsByManuf';
\ No newline at end of file
Index: in-link/install/english.lang
===================================================================
--- in-link/install/english.lang (revision 13756)
+++ in-link/install/english.lang (working copy)
@@ -62,6 +62,18 @@
<PHRASE Label="la_permission_in-link:link_validation.advanced:validate" Module="In-Link" Type="1">TGluayBWYWxpZGF0aW9uIGZvciBJbmRpdmlkdWFsIExpc3Rpbmdz</PHRASE>
<PHRASE Label="la_permission_in-link:paid_listings.advanced:approve" Module="In-Link" Type="1">QXBwcm92ZSBQYWlkIExpc3Rpbmdz</PHRASE>
<PHRASE Label="la_permission_in-link:paid_listings.advanced:decline" Module="In-Link" Type="1">RGVjbGluZSBQYWlkIExpc3Rpbmdz</PHRASE>
+ <PHRASE Label="la_PermName_Link.Add.Pending_desc" Module="In-Link" Type="1">UGVuZGluZyBMaW5r</PHRASE>
+ <PHRASE Label="la_PermName_Link.Add_desc" Module="In-Link" Type="1">QWRkIExpbms=</PHRASE>
+ <PHRASE Label="la_PermName_Link.Delete_desc" Module="In-Link" Type="1">RGVsZXRlIExpbms=</PHRASE>
+ <PHRASE Label="la_PermName_Link.Modify.Pending_desc" Module="In-Link" Type="1">TW9kaWZ5IExpbmsgUGVuZGluZw==</PHRASE>
+ <PHRASE Label="la_PermName_Link.Modify_desc" Module="In-Link" Type="1">TW9kaWZ5IExpbms=</PHRASE>
+ <PHRASE Label="la_PermName_Link.Owner.Delete_desc" Module="In-Link" Type="1">TGluayBEZWxldGUgYnkgT3duZXI=</PHRASE>
+ <PHRASE Label="la_PermName_Link.Owner.Modify.Pending_desc" Module="In-Link" Type="1">TGluayBNb2RpZnkgUGVuZGluZyBieSBPd25lcg==</PHRASE>
+ <PHRASE Label="la_PermName_Link.Owner.Modify_desc" Module="In-Link" Type="1">TGluayBNb2RpZnkgYnkgT3duZXI=</PHRASE>
+ <PHRASE Label="la_PermName_Link.Rate_desc" Module="In-Link" Type="1">UmF0ZSBMaW5r</PHRASE>
+ <PHRASE Label="la_PermName_Link.Review_desc" Module="In-Link" Type="1">Q29tbWVudCBMaW5r</PHRASE>
+ <PHRASE Label="la_PermName_Link.Review_Pending_desc" Module="In-Link" Type="1">UmV2aWV3IExpbmsgUGVuZGluZw==</PHRASE>
+ <PHRASE Label="la_PermName_Link.View_desc" Module="In-Link" Type="1">VmlldyBMaW5r</PHRASE>
<PHRASE Label="la_prompt_ActiveLinks" Module="In-Link" Type="1">QWN0aXZlIExpbmtz</PHRASE>
<PHRASE Label="la_prompt_DisabledLinks" Module="In-Link" Type="1">RGlzYWJsZWQgTGlua3M=</PHRASE>
<PHRASE Label="la_prompt_EditorsPickLinks" Module="In-Link" Type="1">RWRpdG9yJ3MgUGljayBMaW5rcw==</PHRASE>
@@ -115,18 +127,6 @@
<PHRASE Label="la_ToolTip_NewValidation" Module="In-Link" Type="1">U3RhcnQgTmV3IFZhbGlkYXRpb24=</PHRASE>
<PHRASE Label="la_ToolTip_ResetValidationStatus" Module="In-Link" Type="1">UmVzZXQgVmFsaWRhdGlvbiBTdGF0dXM=</PHRASE>
<PHRASE Label="la_UseGridToApproveDecline" Module="In-Link" Type="1">VXNlIGdyaWQgdG8gQXBwcm92ZSAvIERlY2xpbmU=</PHRASE>
- <PHRASE Label="lu_PermName_Link.Add.Pending_desc" Module="In-Link" Type="2">UGVuZGluZyBMaW5r</PHRASE>
- <PHRASE Label="lu_PermName_Link.Add_desc" Module="In-Link" Type="2">QWRkIExpbms=</PHRASE>
- <PHRASE Label="lu_PermName_Link.Delete_desc" Module="In-Link" Type="2">RGVsZXRlIExpbms=</PHRASE>
- <PHRASE Label="lu_PermName_Link.Modify.Pending_desc" Module="In-Link" Type="2">TW9kaWZ5IExpbmsgUGVuZGluZw==</PHRASE>
- <PHRASE Label="lu_PermName_Link.Modify_desc" Module="In-Link" Type="2">TW9kaWZ5IExpbms=</PHRASE>
- <PHRASE Label="lu_PermName_Link.Owner.Delete_desc" Module="In-Link" Type="2">TGluayBEZWxldGUgYnkgT3duZXI=</PHRASE>
- <PHRASE Label="lu_PermName_Link.Owner.Modify.Pending_desc" Module="In-Link" Type="2">TGluayBNb2RpZnkgUGVuZGluZyBieSBPd25lcg==</PHRASE>
- <PHRASE Label="lu_PermName_Link.Owner.Modify_desc" Module="In-Link" Type="2">TGluayBNb2RpZnkgYnkgT3duZXI=</PHRASE>
- <PHRASE Label="lu_PermName_Link.Rate_desc" Module="In-Link" Type="2">UmF0ZSBMaW5r</PHRASE>
- <PHRASE Label="lu_PermName_Link.Review_desc" Module="In-Link" Type="2">Q29tbWVudCBMaW5r</PHRASE>
- <PHRASE Label="lu_PermName_Link.Review_Pending_desc" Module="In-Link" Type="2">UmV2aWV3IExpbmsgUGVuZGluZw==</PHRASE>
- <PHRASE Label="lu_PermName_Link.View_desc" Module="In-Link" Type="2">VmlldyBMaW5r</PHRASE>
</PHRASES>
<EVENTS>
<EVENT MessageType="html" Event="LINK.ADD" Type="0">U3ViamVjdDogTmV3IExpbmsgIjxpbnAyOmxfRmllbGQgbmFtZT0iTmFtZSIvPiIgLSBBZGRlZAoKVGhhbmsgeW91IGZvciBzdWJtaXR0aW5nIHlvdXIgbGluayB0byBvdXIgd2Vic2l0ZSE8YnIgLz4NCjxiciAvPg0KTGluayBkZXRhaWwgYXJlIGxpc3RlZCBiZWxvdzo8YnIgLz4NCjxiciAvPg0KTGluayBOYW1lOiA8aW5wMjpsX0ZpZWxkIG5hbWU9Ik5hbWUiLz4gPGJyIC8+DQo8aW5wMjptX2lmIGNoZWNrPSJsX0ZpZWxkIiBuYW1lPSJVcmwiPiBMaW5rIFdlYnNpdGU6IDxpbnAyOmxfRmllbGQgbmFtZT0iVXJsIi8+PGJyIC8+DQo8L2lucDI6bV9pZj4gPGlucDI6bV9pZiBjaGVjaz0ibF9GaWVsZCIgbmFtZT0iRGVzY3JpcHRpb24iPiBEZXNjcmlwdGlvbjogPGlucDI6bF9GaWVsZCBuYW1lPSJEZXNjcmlwdGlvbiIvPjxiciAvPg0KPC9pbnAyOm1faWY+IDxiciAvPg0KPGJyIC8+DQpZb3UgY2FuIHZpZXcgeW91ciBsaW5rIGhlcmUgPGEgaHJlZj0iPGlucDI6bF9MaW5rTGluayB0ZW1wbGF0ZT0iX19kZWZhdWx0X18iLz4iPjxpbnAyOmxfRmllbGQgbmFtZT0iTmFtZSIvPjwvYT4=</EVENT>
Index: in-link/install/install_data.sql
===================================================================
--- in-link/install/install_data.sql (revision 13756)
+++ in-link/install/install_data.sql (working copy)
@@ -113,18 +113,18 @@
INSERT INTO ItemTypes VALUES (4, 'In-Link', 'l', 'Link', 'Name', 'CreatedById', 'Hits', 'CachedRating', 'la_ItemTab_Links', 1, 'in-link/admin/addlink.php', 'clsLink', 'Link');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.ADD', 'lu_PermName_Link.Add_desc', 'lu_PermName_Link.Add_error', 'In-Link');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.VIEW', 'lu_PermName_Link.View_desc', 'lu_PermName_Link.View_error', 'In-Link');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.ADD.PENDING', 'lu_PermName_Link.Add.Pending_desc', 'lu_PermName_Link.Add.Pending_error', 'In-Link');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.MODIFY', 'lu_PermName_Link.Modify_desc', 'lu_PermName_Link.Modify_desc', 'In-Link');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.DELETE', 'lu_PermName_Link.Delete_desc', 'lu_PermName_Link.Delete_error', 'In-Link');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.RATE', 'lu_PermName_Link.Rate_desc', 'lu_PermName_Link.Rate_error', 'In-Link');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.REVIEW', 'lu_PermName_Link.Review_desc', 'lu_PermName_Link.Review_error', 'In-Link');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.REVIEW.PENDING', 'lu_PermName_Link.Review_Pending_desc', ' lu_PermName_Link.Review_Pending_error', 'In-Link');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.MODIFY.PENDING', 'lu_PermName_Link.Modify.Pending_desc', 'lu_PermName_Link.Modify.Pending_desc', 'In-Link');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.OWNER.MODIFY', 'lu_PermName_Link.Owner.Modify_desc', 'lu_PermName_Link.Owner.Modify_error', 'In-Link');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.OWNER.MODIFY.PENDING', 'lu_PermName_Link.Owner.Modify.Pending_desc', 'lu_PermName_Link.Owner.Modify.Pending_error', 'In-Link');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.OWNER.DELETE', 'lu_PermName_Link.Owner.Delete_desc', 'lu_PermName_Link.Owner.Delete_error', 'In-Link');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.ADD', 'la_PermName_Link.Add_desc', 'la_PermName_Link.Add_error', 'In-Link');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.VIEW', 'la_PermName_Link.View_desc', 'la_PermName_Link.View_error', 'In-Link');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.ADD.PENDING', 'la_PermName_Link.Add.Pending_desc', 'la_PermName_Link.Add.Pending_error', 'In-Link');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.MODIFY', 'la_PermName_Link.Modify_desc', 'la_PermName_Link.Modify_desc', 'In-Link');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.DELETE', 'la_PermName_Link.Delete_desc', 'la_PermName_Link.Delete_error', 'In-Link');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.RATE', 'la_PermName_Link.Rate_desc', 'la_PermName_Link.Rate_error', 'In-Link');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.REVIEW', 'la_PermName_Link.Review_desc', 'la_PermName_Link.Review_error', 'In-Link');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.REVIEW.PENDING', 'la_PermName_Link.Review_Pending_desc', ' la_PermName_Link.Review_Pending_error', 'In-Link');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.MODIFY.PENDING', 'la_PermName_Link.Modify.Pending_desc', 'la_PermName_Link.Modify.Pending_desc', 'In-Link');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.OWNER.MODIFY', 'la_PermName_Link.Owner.Modify_desc', 'la_PermName_Link.Owner.Modify_error', 'In-Link');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.OWNER.MODIFY.PENDING', 'la_PermName_Link.Owner.Modify.Pending_desc', 'la_PermName_Link.Owner.Modify.Pending_error', 'In-Link');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.OWNER.DELETE', 'la_PermName_Link.Owner.Delete_desc', 'la_PermName_Link.Owner.Delete_error', 'In-Link');
INSERT INTO SearchConfig VALUES ('Link', 'OrgId', 0, 0, 'lu_fielddesc_link_orgid', 'lu_field_orgid', 'In-Link', 'la_text_link', 19, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT INTO SearchConfig VALUES ('Link', 'NewItem', 0, 1, 'lu_fielddesc_link_newitem', 'lu_field_newitem', 'In-Link', 'la_text_link', 18, DEFAULT, 0, 'boolean', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
Index: in-news/install/english.lang
===================================================================
--- in-news/install/english.lang (revision 13756)
+++ in-news/install/english.lang (working copy)
@@ -1,5 +1,5 @@
-<LANGUAGES>
- <LANGUAGE PackName="English" Encoding="base64"><DATEFORMAT>m/d/Y</DATEFORMAT><TIMEFORMAT>g:i A</TIMEFORMAT><INPUTDATEFORMAT>m/d/Y</INPUTDATEFORMAT><INPUTTIMEFORMAT>g:i:s A</INPUTTIMEFORMAT><DECIMAL>.</DECIMAL><THOUSANDS>,</THOUSANDS><CHARSET>utf-8</CHARSET><DOCS_URL>http://docs.in-portal.org/eng/index.php</DOCS_URL><UNITSYSTEM>2</UNITSYSTEM>
+<LANGUAGES Version="3">
+ <LANGUAGE Encoding="base64" PackName="English" LocalName="English" DateFormat="m/d/Y" TimeFormat="g:i A" InputDateFormat="m/d/Y" InputTimeFormat="g:i:s A" DecimalPoint="." ThousandSep="," Charset="utf-8" UnitSystem="2" Locale="en-US" UserDocsUrl="http://docs.in-portal.org/eng/index.php">
<PHRASES>
<PHRASE Label="la_Article_Author" Module="In-News" Type="1">QXV0aG9y</PHRASE>
<PHRASE Label="la_Article_Date" Module="In-News" Type="1">RGF0ZQ==</PHRASE>
@@ -46,6 +46,18 @@
<PHRASE Label="la_news_sortfield_pompt" Module="In-News" Type="1">T3JkZXIgYXJ0aWNsZXMgYnk=</PHRASE>
<PHRASE Label="la_news_sortreviews2_prompt" Module="In-News" Type="1">QW5kIHRoZW4gYnk=</PHRASE>
<PHRASE Label="la_news_sortreviews_prompt" Module="In-News" Type="1">U29ydCBDb21tZW50cyBieQ==</PHRASE>
+ <PHRASE Label="la_PermName_News.Add.Pending_desc" Module="In-News" Type="1">QWRkIFBlbmRpbmcgTmV3cw==</PHRASE>
+ <PHRASE Label="la_PermName_News.Add_desc" Module="In-News" Type="1">QWRkIE5ld3M=</PHRASE>
+ <PHRASE Label="la_PermName_News.Delete_desc" Module="In-News" Type="1">RGVsZXRlIE5ld3M=</PHRASE>
+ <PHRASE Label="la_PermName_News.Modify.Pending_desc" Module="In-News" Type="1">TW9kaWZ5IEFydGljbGUgUGVuZGluZw==</PHRASE>
+ <PHRASE Label="la_PermName_News.Modify_desc" Module="In-News" Type="1">TW9kaWZ5IE5ld3M=</PHRASE>
+ <PHRASE Label="la_PermName_News.Owner.Delete_desc" Module="In-News" Type="1">QXJ0aWNsZSBEZWxldGUgYnkgT3duZXI=</PHRASE>
+ <PHRASE Label="la_PermName_News.Owner.Modify.Pending_desc" Module="In-News" Type="1">QXJ0aWNsZSBNb2RpZnkgUGVuZGluZyBieSBPd25lcg==</PHRASE>
+ <PHRASE Label="la_PermName_News.Owner.Modify_desc" Module="In-News" Type="1">QXJ0aWNsZSBNb2RpZnkgYnkgT3duZXI=</PHRASE>
+ <PHRASE Label="la_PermName_News.Rate_desc" Module="In-News" Type="1">UmF0ZSBOZXdz</PHRASE>
+ <PHRASE Label="la_PermName_News.Review.Pending_desc" Module="In-News" Type="1">UmV2aWV3IE5ld3MgUGVuZGluZw==</PHRASE>
+ <PHRASE Label="la_PermName_News.Review_desc" Module="In-News" Type="1">Q29tbWVudCBBcnRpY2xl</PHRASE>
+ <PHRASE Label="la_PermName_News.View_desc" Module="In-News" Type="1">VmlldyBOZXdz</PHRASE>
<PHRASE Label="la_prompt_ActiveArticles" Module="In-News" Type="1">QWN0aXZlIEFydGljbGVz</PHRASE>
<PHRASE Label="la_prompt_ArticleAverageRating" Module="In-News" Type="1">QXZlcmFnZSBSYXRpbmcgb2YgQXJ0aWNsZXM=</PHRASE>
<PHRASE Label="la_prompt_ArticleReviews" Module="In-News" Type="1">VG90YWwgQXJ0aWNsZSBDb21tZW50cw==</PHRASE>
@@ -77,8 +89,6 @@
<PHRASE Label="la_title_In-News" Module="In-News" Type="1">TmV3cw==</PHRASE>
<PHRASE Label="la_title_NewArticle" Module="In-News" Type="1">TmV3IEFydGljbGU=</PHRASE>
<PHRASE Label="la_ToolTip_NewArticle" Module="In-News" Type="1">TmV3IEFydGljbGU=</PHRASE>
- <PHRASE Label="lu_PermName_News.Review.Pending_desc" Module="In-News" Type="2">UmV2aWV3IE5ld3MgUGVuZGluZw==</PHRASE>
- <PHRASE Label="lu_PermName_News.Review_desc" Module="In-News" Type="1">Q29tbWVudCBBcnRpY2xl</PHRASE>
</PHRASES>
<EVENTS>
<EVENT MessageType="html" Event="NEWS.ADD" Type="0">U3ViamVjdDogWW91ciBOZXcgQXJ0aWNsZSAiPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIvPiIgLSBBZGRlZAoKVGhhbmsgeW91IGZvciBzdWJtaXR0aW5nIHlvdXIgQXJ0aWNsZSB0byBvdXIgd2Vic2l0ZSE8YnIvPjxici8+DQ1BcnRpY2xlIGRldGFpbHMgYXJlIGxpc3RlZCBiZWxvdzo8YnIvPjxici8+DQ1BcnRpY2xlIFRpdGxlOiA8aW5wMjpuX0ZpZWxkIG5hbWU9IlRpdGxlIi8+PGJyLz4NPGlucDI6bV9pZiBjaGVjaz0ibl9GaWVsZCIgbmFtZT0iQm9keSI+DUJvZHk6IDxpbnAyOm5fRmllbGQgbmFtZT0iQm9keSIvPjxici8+DTwvaW5wMjptX2lmPg08YnIvPjxici8+DQ1Zb3UgY2FuIHZpZXcgeW91ciBhcnRpY2xlIGhlcmUgPGEgaHJlZj0iPGlucDI6bl9BcnRpY2xlTGluayB0ZW1wbGF0ZT0iX19kZWZhdWx0X18iLz4iPjxpbnAyOm5fRmllbGQgbmFtZT0iVGl0bGUiLz48L2E+</EVENT>
Index: in-news/install/install_data.sql
===================================================================
--- in-news/install/install_data.sql (revision 13756)
+++ in-news/install/install_data.sql (working copy)
@@ -60,18 +60,18 @@
INSERT INTO ItemTypes VALUES (2, 'In-News', 'n', 'News', 'Title', 'CreatedById', 'Hits', 'CachedRating', 'la_ItemTab_News', 1, 'in-news/admin/addarticle.php', 'clsNews', 'Article');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.ADD', 'lu_PermName_News.Add_desc', 'lu_PermName_News.Add_desc', 'In-News');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.VIEW', 'lu_PermName_News.View_desc', 'lu_PermName_News.View_desc', 'In-News');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.ADD.PENDING', 'lu_PermName_News.Add.Pending_desc', 'lu_PermName_News.Add.Pending_error', 'In-News');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.MODIFY', 'lu_PermName_News.Modify_desc', 'lu_PermName_News.Modify_error', 'In-News');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.DELETE', 'lu_PermName_News.Delete_desc', 'lu_PermName_News.Delete_error', 'In-News');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.RATE', 'lu_PermName_News.Rate_desc', 'lu_PermName_News.Rate_error', 'In-News');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.REVIEW', 'lu_PermName_News.Review_desc', 'lu_PermName_News.Review_error', 'In-News');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.REVIEW.PENDING', 'lu_PermName_News.Review.Pending_desc', 'lu_PermName_News.Review.Pending_error', 'In-News');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.MODIFY.PENDING', 'lu_PermName_News.Modify.Pending_desc', 'lu_PermName_News.Modify.Pending_desc', 'In-News');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.OWNER.MODIFY', 'lu_PermName_News.Owner.Modify_desc', 'lu_PermName_News.Owner.Modify_error', 'In-News');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.OWNER.MODIFY.PENDING', 'lu_PermName_News.Owner.Modify.Pending_desc', 'lu_PermName_News.Owner.Modify.Pending_error', 'In-News');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.OWNER.DELETE', 'lu_PermName_News.Owner.Delete_desc', 'lu_PermName_News.Owner.Delete_error', 'In-News');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.ADD', 'la_PermName_News.Add_desc', 'la_PermName_News.Add_desc', 'In-News');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.VIEW', 'la_PermName_News.View_desc', 'la_PermName_News.View_desc', 'In-News');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.ADD.PENDING', 'la_PermName_News.Add.Pending_desc', 'la_PermName_News.Add.Pending_error', 'In-News');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.MODIFY', 'la_PermName_News.Modify_desc', 'la_PermName_News.Modify_error', 'In-News');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.DELETE', 'la_PermName_News.Delete_desc', 'la_PermName_News.Delete_error', 'In-News');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.RATE', 'la_PermName_News.Rate_desc', 'la_PermName_News.Rate_error', 'In-News');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.REVIEW', 'la_PermName_News.Review_desc', 'la_PermName_News.Review_error', 'In-News');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.REVIEW.PENDING', 'la_PermName_News.Review.Pending_desc', 'la_PermName_News.Review.Pending_error', 'In-News');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.MODIFY.PENDING', 'la_PermName_News.Modify.Pending_desc', 'la_PermName_News.Modify.Pending_desc', 'In-News');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.OWNER.MODIFY', 'la_PermName_News.Owner.Modify_desc', 'la_PermName_News.Owner.Modify_error', 'In-News');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.OWNER.MODIFY.PENDING', 'la_PermName_News.Owner.Modify.Pending_desc', 'la_PermName_News.Owner.Modify.Pending_error', 'In-News');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.OWNER.DELETE', 'la_PermName_News.Owner.Delete_desc', 'la_PermName_News.Owner.Delete_error', 'In-News');
INSERT INTO SearchConfig VALUES ('News', 'Title', 1, 1, 'lu_fielddesc_news_title', 'lu_field_title', 'In-News', 'la_text_article', 2, DEFAULT, 2, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT INTO SearchConfig VALUES ('News', 'Excerpt', 1, 1, 'lu_fielddesc_news_excerpt', 'lu_field_excerpt', 'In-News', 'la_text_article', 3, DEFAULT, 1, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
phrases_fixes_510_themes.patch [^] (11,306 bytes) 2010-06-12 09:00
[Show Content]
Index: advanced/_install/english.lang
===================================================================
--- advanced/_install/english.lang (revision 13756)
+++ advanced/_install/english.lang (working copy)
@@ -111,7 +111,10 @@
<PHRASE Label="lu_error_Required" Module="Core" Type="0">UmVxdWlyZWQ=</PHRASE>
<PHRASE Label="lu_error_UserNotFound" Module="Core" Type="0">VXNlciBOb3QgRm91bmQ=</PHRASE>
<PHRASE Label="lu_favorite" Module="Core" Type="0">RmF2b3JpdGU=</PHRASE>
+ <PHRASE Label="lu_ferror_forgotpw_nodata" Module="Core" Type="0">WW91IG11c3QgZW50ZXIgYSBVc2VybmFtZSBvciBFbWFpbCBBZGRyZXNzIHRvIHJldHJpdmUgeW91ciBhY2NvdW50IGluZm9ybWF0aW9u</PHRASE>
<PHRASE Label="lu_ferror_reset_denied" Module="Core" Type="0">Tm90IHJlc2V0</PHRASE>
+ <PHRASE Label="lu_ferror_unknown_email" Module="Core" Type="0">VXNlciBhY2NvdW50IHdpdGggZ2l2ZW4gRS1tYWlsIG5vdCBmb3VuZA==</PHRASE>
+ <PHRASE Label="lu_ferror_unknown_username" Module="Core" Type="0">VXNlciBhY2NvdW50IHdpdGggZ2l2ZW4gVXNlcm5hbWUgbm90IGZvdW5k</PHRASE>
<PHRASE Label="lu_field_archived" Module="Core" Type="0">QXJjaGl2ZSBEYXRl</PHRASE>
<PHRASE Label="lu_field_author" Module="Core" Type="0">QXJ0aWNsZSBBdXRob3I=</PHRASE>
<PHRASE Label="lu_field_body" Module="Core" Type="0">QXJ0aWNsZSBCb2R5</PHRASE>
@@ -230,7 +233,6 @@
<PHRASE Label="lu_none" Module="Core" Type="0">Tm9uZQ==</PHRASE>
<PHRASE Label="lu_NoReviews" Module="Core" Type="0">QmUgdGhlIGZpcnN0IHRvIGNvbW1lbnQ=</PHRASE>
<PHRASE Label="lu_NotLoggedIn" Module="Core" Type="0">bm90IGxvZ2dlZCBpbg==</PHRASE>
- <PHRASE Label="lu_no_permissions" Module="Core" Type="0">Tm8gUGVybWlzc2lvbnM=</PHRASE>
<PHRASE Label="lu_OldToRecent" Module="Core" Type="0">T2xkIHRvIFJlY2VudA==</PHRASE>
<PHRASE Label="LU_Opt_SelectCategory" Module="Core" Type="0">U2VsZWN0IENhdGVnb3J5</PHRASE>
<PHRASE Label="lu_or" Module="Core" Type="0">b3I=</PHRASE>
Index: advanced/in-bulletin/_install/english.lang
===================================================================
--- advanced/in-bulletin/_install/english.lang (revision 13756)
+++ advanced/in-bulletin/_install/english.lang (working copy)
@@ -64,16 +64,6 @@
<PHRASE Label="lu_opt_MessageSent" Module="In-Bulletin" Type="0">U2VudA==</PHRASE>
<PHRASE Label="lu_opt_MessageUnread" Module="In-Bulletin" Type="0">VW5yZWFk</PHRASE>
<PHRASE Label="lu_opt_MessageViewed" Module="In-Bulletin" Type="0">Vmlld2Vk</PHRASE>
- <PHRASE Label="lu_PermName_Topic.Add.Pending_desc" Module="In-Bulletin" Type="0">QWRkIFBlbmRpbmcgVG9waWM=</PHRASE>
- <PHRASE Label="lu_PermName_Topic.Add_desc" Module="In-Bulletin" Type="0">QWRkIFRvcGlj</PHRASE>
- <PHRASE Label="lu_PermName_Topic.Delete_desc" Module="In-Bulletin" Type="0">RGVsZXRlIFRvcGlj</PHRASE>
- <PHRASE Label="lu_PermName_Topic.Modify_desc" Module="In-Bulletin" Type="0">TW9kaWZ5IFRvcGlj</PHRASE>
- <PHRASE Label="lu_PermName_Topic.Rate_desc" Module="In-Bulletin" Type="0">UmF0ZSBUb3BpYw==</PHRASE>
- <PHRASE Label="lu_PermName_Topic.Reply.Add_desc" Module="In-Bulletin" Type="0">QWRkIFRvcGljIFJlcGx5</PHRASE>
- <PHRASE Label="lu_PermName_Topic.Reply.Delete_desc" Module="In-Bulletin" Type="0">RGVsZXRlIFRvcGlj</PHRASE>
- <PHRASE Label="lu_PermName_Topic.Reply.Modify_desc" Module="In-Bulletin" Type="0">UmVwbHkgVG9waWMgTW9kaWZ5</PHRASE>
- <PHRASE Label="lu_PermName_Topic.Reply.View_desc" Module="In-Bulletin" Type="0">VmlldyBUb3BpYyBSZXBseQ==</PHRASE>
- <PHRASE Label="lu_PermName_Topic.View_desc" Module="In-Bulletin" Type="0">VmlldyBUb3BpYw==</PHRASE>
<PHRASE Label="lu_posted" Module="In-Bulletin" Type="0">UG9zdGVk</PHRASE>
<PHRASE Label="lu_posts" Module="In-Bulletin" Type="0">cG9zdHM=</PHRASE>
<PHRASE Label="lu_PrivateMessages" Module="In-Bulletin" Type="0">UHJpdmF0ZSBNZXNzYWdlcw==</PHRASE>
Index: advanced/in-commerce/_install/english.lang
===================================================================
--- advanced/in-commerce/_install/english.lang (revision 13756)
+++ advanced/in-commerce/_install/english.lang (working copy)
@@ -1,15 +1,6 @@
-<LANGUAGES>
- <LANGUAGE PackName="English" Encoding="base64"><DATEFORMAT>m/d/Y</DATEFORMAT><TIMEFORMAT>g:i A</TIMEFORMAT><INPUTDATEFORMAT>m/d/Y</INPUTDATEFORMAT><INPUTTIMEFORMAT>g:i:s A</INPUTTIMEFORMAT><DECIMAL>.</DECIMAL><THOUSANDS>,</THOUSANDS><CHARSET>utf-8</CHARSET><DOCS_URL>http://docs.in-portal.org/eng/index.php</DOCS_URL><UNITSYSTEM>2</UNITSYSTEM>
+<LANGUAGES Version="3">
+ <LANGUAGE Encoding="base64" PackName="English" LocalName="English" DateFormat="m/d/Y" TimeFormat="g:i A" InputDateFormat="m/d/Y" InputTimeFormat="g:i:s A" DecimalPoint="." ThousandSep="," Charset="utf-8" UnitSystem="2" Locale="en-US" UserDocsUrl="http://docs.in-portal.org/eng/index.php">
<PHRASES>
- <PHRASE Label="la_col_Qty" Module="In-Commerce" Type="0">UXR5</PHRASE>
- <PHRASE Label="la_col_QtyBackordered" Module="In-Commerce" Type="0">QmFja29yZGVyZWQ=</PHRASE>
- <PHRASE Label="la_comm_ProductsByManuf" Module="In-Commerce" Type="0">UHJvZHVjdHMgYnkgbWFudWZhY3R1cmVy</PHRASE>
- <PHRASE Label="la_ItemBackordered" Module="In-Commerce" Type="0">YmFja29yZGVyZWQ=</PHRASE>
- <PHRASE Label="la_ship_all_together" Module="In-Commerce" Type="0">U2hpcCBhbGwgaXRlbXMgdG9nZXRoZXI=</PHRASE>
- <PHRASE Label="la_ship_backorders_upon_avail" Module="In-Commerce" Type="0">U2hpcCBiYWNrb3JkZXJzIHVwb24gYXZhaWxhYmxl</PHRASE>
- <PHRASE Label="la_ship_backorder_separately" Module="In-Commerce" Type="0">U2hpcCBiYWNrb3JkZXJlZCBpdGVtcyBzZXBhcmF0ZWx5</PHRASE>
- <PHRASE Label="la_tooltip_New_Coupon" Module="In-Commerce" Type="0">TmV3IENvdXBvbg==</PHRASE>
- <PHRASE Label="la_tooltip_New_Discount" Module="In-Commerce" Type="0">TmV3IERpc2NvdW50</PHRASE>
<PHRASE Label="lu_AdditionalInfo" Module="In-Commerce" Type="0">QWRkaXRpb25hbCBJbmZv</PHRASE>
<PHRASE Label="lu_addressmodificationblocked" Module="In-Commerce" Type="0">QWRkcmVzcyBpcyBsb2NrZWQgZm9yIG1vZGlmaWNhdGlvbnM=</PHRASE>
<PHRASE Label="lu_AddressUsedAs" Module="In-Commerce" Type="0">QWRkcmVzcyBVc2VkIEFz</PHRASE>
@@ -452,8 +443,6 @@
<PHRASE Label="lu_ship_all_backordered" Module="In-Commerce" Type="0">QWxsIGJhY2tvcmRlcmVkIGl0ZW1z</PHRASE>
<PHRASE Label="lu_ship_backordered" Module="In-Commerce" Type="0">QmFja29yZGVyZWQ=</PHRASE>
<PHRASE Label="lu_ship_ItemsNumber" Module="In-Commerce" Type="0">TnVtYmVyIG9mIEl0ZW1z</PHRASE>
- <PHRASE Label="lu_ship_Shipment" Module="In-Commerce" Type="0">U2hpcG1lbnQ=</PHRASE>
- <PHRASE Label="lu_ship_ShippingType" Module="In-Commerce" Type="0">U2hpcHBpbmcgVHlwZQ==</PHRASE>
<PHRASE Label="lu_ship_ShippingWeight" Module="In-Commerce" Type="0">U2hpcHBpbmcgV2VpZ2h0</PHRASE>
<PHRASE Label="lu_ShoppingCart" Module="In-Commerce" Type="0">U2hvcHBpbmcgQ2FydA==</PHRASE>
<PHRASE Label="lu_SortProductsBy" Module="In-Commerce" Type="0">U29ydCBQcm9kdWN0cyBCeQ==</PHRASE>
Index: advanced/in-news/_install/english.lang
===================================================================
--- advanced/in-news/_install/english.lang (revision 13756)
+++ advanced/in-news/_install/english.lang (working copy)
@@ -15,16 +15,6 @@
<PHRASE Label="lu_fld_RssOriginalURL" Module="In-News" Type="0">RmVlZCBPcmlnaW5hbCBVUkw=</PHRASE>
<PHRASE Label="lu_MyArticles" Module="In-News" Type="0">TXkgQXJ0aWNsZXM=</PHRASE>
<PHRASE Label="lu_NoArticles" Module="In-News" Type="0">Tm8gQXJ0aWNsZXM=</PHRASE>
- <PHRASE Label="lu_PermName_News.Add.Pending_desc" Module="In-News" Type="0">QWRkIFBlbmRpbmcgTmV3cw==</PHRASE>
- <PHRASE Label="lu_PermName_News.Add_desc" Module="In-News" Type="0">QWRkIE5ld3M=</PHRASE>
- <PHRASE Label="lu_PermName_News.Delete_desc" Module="In-News" Type="0">RGVsZXRlIE5ld3M=</PHRASE>
- <PHRASE Label="lu_PermName_News.Modify.Pending_desc" Module="In-News" Type="0">TW9kaWZ5IEFydGljbGUgUGVuZGluZw==</PHRASE>
- <PHRASE Label="lu_PermName_News.Modify_desc" Module="In-News" Type="0">TW9kaWZ5IE5ld3M=</PHRASE>
- <PHRASE Label="lu_PermName_News.Owner.Delete_desc" Module="In-News" Type="0">QXJ0aWNsZSBEZWxldGUgYnkgT3duZXI=</PHRASE>
- <PHRASE Label="lu_PermName_News.Owner.Modify.Pending_desc" Module="In-News" Type="0">QXJ0aWNsZSBNb2RpZnkgUGVuZGluZyBieSBPd25lcg==</PHRASE>
- <PHRASE Label="lu_PermName_News.Owner.Modify_desc" Module="In-News" Type="0">QXJ0aWNsZSBNb2RpZnkgYnkgT3duZXI=</PHRASE>
- <PHRASE Label="lu_PermName_News.Rate_desc" Module="In-News" Type="0">UmF0ZSBOZXdz</PHRASE>
- <PHRASE Label="lu_PermName_News.View_desc" Module="In-News" Type="0">VmlldyBOZXdz</PHRASE>
<PHRASE Label="lu_rss_feed" Module="In-News" Type="0">UlNTIEZlZWQ=</PHRASE>
<PHRASE Label="lu_section_ArticleDetails" Module="In-News" Type="0">QXJ0aWNsZSBEZXRhaWxz</PHRASE>
<PHRASE Label="lu_SiteLeadStory" Module="In-News" Type="0">c2l0ZSBsZWFkIHN0b3J5</PHRASE>
Index: simple/_install/english.lang
===================================================================
--- simple/_install/english.lang (revision 13756)
+++ simple/_install/english.lang (working copy)
@@ -230,7 +230,6 @@
<PHRASE Label="lu_none" Module="Core" Type="0">Tm9uZQ==</PHRASE>
<PHRASE Label="lu_NoReviews" Module="Core" Type="0">QmUgdGhlIGZpcnN0IHRvIGNvbW1lbnQ=</PHRASE>
<PHRASE Label="lu_NotLoggedIn" Module="Core" Type="0">bm90IGxvZ2dlZCBpbg==</PHRASE>
- <PHRASE Label="lu_no_permissions" Module="Core" Type="0">Tm8gUGVybWlzc2lvbnM=</PHRASE>
<PHRASE Label="lu_OldToRecent" Module="Core" Type="0">T2xkIHRvIFJlY2VudA==</PHRASE>
<PHRASE Label="LU_Opt_SelectCategory" Module="Core" Type="0">U2VsZWN0IENhdGVnb3J5</PHRASE>
<PHRASE Label="lu_or" Module="Core" Type="0">b3I=</PHRASE>
@@ -238,17 +237,6 @@
<PHRASE Label="lu_passwords_do_not_match" Module="Core" Type="0">UGFzc3dvcmRzIGRvIG5vdCBtYXRjaA==</PHRASE>
<PHRASE Label="lu_passwords_too_short" Module="Core" Type="0">UGFzc3dvcmQgaXMgdG9vIHNob3J0LCBwbGVhc2UgZW50ZXIgYXQgbGVhc3QgJXMgY2hhcmFjdGVycw==</PHRASE>
<PHRASE Label="lu_PendingItem" Module="Core" Type="0">cGVuZGluZyBpdGVt</PHRASE>
- <PHRASE Label="lu_PermName_Category.AddPending_desc" Module="Core" Type="0">QWRkIFBlbmRpbmcgQ2F0ZWdvcnk=</PHRASE>
- <PHRASE Label="lu_PermName_Category.Add_desc" Module="Core" Type="0">QWRkIENhdGVnb3J5</PHRASE>
- <PHRASE Label="lu_PermName_Category.Delete_desc" Module="Core" Type="0">RGVsZXRlIENhdGVnb3J5</PHRASE>
- <PHRASE Label="lu_PermName_Category.Modify_desc" Module="Core" Type="0">TW9kaWZ5IENhdGVnb3J5</PHRASE>
- <PHRASE Label="lu_PermName_Category.View_desc" Module="Core" Type="0">VmlldyBDYXRlZ29yeQ==</PHRASE>
- <PHRASE Label="lu_PermName_Link.Add.Pending_desc" Module="Core" Type="0">UGVuZGluZyBMaW5r</PHRASE>
- <PHRASE Label="lu_PermName_Link.Add_desc" Module="Core" Type="0">QWRkIExpbms=</PHRASE>
- <PHRASE Label="lu_PermName_Link.Delete_desc" Module="Core" Type="0">RGVsZXRlIExpbms=</PHRASE>
- <PHRASE Label="lu_PermName_Link.Modify_desc" Module="Core" Type="0">TW9kaWZ5IExpbms=</PHRASE>
- <PHRASE Label="lu_PermName_Link.Rate_desc" Module="Core" Type="0">UmF0ZSBMaW5r</PHRASE>
- <PHRASE Label="lu_PermName_Link.View_desc" Module="Core" Type="0">VmlldyBMaW5r</PHRASE>
<PHRASE Label="lu_phone" Module="Core" Type="0">UGhvbmU=</PHRASE>
<PHRASE Label="lu_pick" Module="Core" Type="0">UGljaw==</PHRASE>
<PHRASE Label="lu_PleaseRegister" Module="Core" Type="0">UGxlYXNlIFJlZ2lzdGVy</PHRASE>
|