-
Notifications
You must be signed in to change notification settings - Fork 3
/
1359.diff
1411 lines (1363 loc) · 75.9 KB
/
1359.diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute.php
index 6697084389..f8853cfb4e 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute.php
@@ -24,7 +24,7 @@ class Mage_Adminhtml_Block_Catalog_Product_Attribute extends Mage_Adminhtml_Bloc
public function __construct()
{
$this->_controller = 'catalog_product_attribute';
- $this->_headerText = Mage::helper('catalog')->__('Manage Attributes');
+ $this->_headerText = Mage::helper('catalog')->__('Attributes');
$this->_addButtonLabel = Mage::helper('catalog')->__('Add New Attribute');
parent::__construct();
}
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tabs.php
index e156dfe08f..6773c9c544 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tabs.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tabs.php
@@ -41,8 +41,8 @@ class Mage_Adminhtml_Block_Catalog_Product_Attribute_Edit_Tabs extends Mage_Admi
$model = Mage::registry('entity_attribute');
$this->addTab('labels', [
- 'label' => Mage::helper('catalog')->__('Manage Label / Options'),
- 'title' => Mage::helper('catalog')->__('Manage Label / Options'),
+ 'label' => Mage::helper('catalog')->__('Label / Options'),
+ 'title' => Mage::helper('catalog')->__('Label / Options'),
'content' => $this->getLayout()->createBlock('adminhtml/catalog_product_attribute_edit_tab_options')->toHtml(),
]);
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main.php
index 075c543dd5..68f8caf094 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main.php
@@ -57,7 +57,7 @@ class Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Toolbar_Main extends Ma
*/
protected function _getHeader()
{
- return Mage::helper('catalog')->__('Manage Attribute Sets');
+ return Mage::helper('catalog')->__('Attribute Sets');
}
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement.php b/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement.php
index 7263449b91..ca47b9378d 100644
--- a/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement.php
+++ b/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement.php
@@ -24,7 +24,7 @@ class Mage_Adminhtml_Block_Checkout_Agreement extends Mage_Adminhtml_Block_Widge
public function __construct()
{
$this->_controller = 'checkout_agreement';
- $this->_headerText = Mage::helper('checkout')->__('Manage Terms and Conditions');
+ $this->_headerText = Mage::helper('checkout')->__('Terms and Conditions');
$this->_addButtonLabel = Mage::helper('checkout')->__('Add New Condition');
parent::__construct();
}
diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page.php
index fa74a0c56e..246d99e317 100644
--- a/app/code/core/Mage/Adminhtml/Block/Cms/Page.php
+++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page.php
@@ -24,7 +24,7 @@ class Mage_Adminhtml_Block_Cms_Page extends Mage_Adminhtml_Block_Widget_Grid_Con
public function __construct()
{
$this->_controller = 'cms_page';
- $this->_headerText = Mage::helper('cms')->__('Manage Pages');
+ $this->_headerText = Mage::helper('cms')->__('Pages');
parent::__construct();
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer.php b/app/code/core/Mage/Adminhtml/Block/Customer.php
index d1137b9992..ff4805f6ca 100644
--- a/app/code/core/Mage/Adminhtml/Block/Customer.php
+++ b/app/code/core/Mage/Adminhtml/Block/Customer.php
@@ -24,7 +24,7 @@ class Mage_Adminhtml_Block_Customer extends Mage_Adminhtml_Block_Widget_Grid_Con
public function __construct()
{
$this->_controller = 'customer';
- $this->_headerText = Mage::helper('customer')->__('Manage Customers');
+ $this->_headerText = Mage::helper('customer')->__('Customers');
$this->_addButtonLabel = Mage::helper('customer')->__('Add New Customer');
parent::__construct();
}
diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons.php
index 55b830994f..11697ab6ae 100644
--- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons.php
+++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons.php
@@ -28,7 +28,7 @@ class Mage_Adminhtml_Block_Promo_Quote_Edit_Tab_Coupons extends Mage_Adminhtml_B
*/
public function getTabLabel()
{
- return Mage::helper('salesrule')->__('Manage Coupon Codes');
+ return Mage::helper('salesrule')->__('Coupon Codes');
}
/**
@@ -38,7 +38,7 @@ class Mage_Adminhtml_Block_Promo_Quote_Edit_Tab_Coupons extends Mage_Adminhtml_B
*/
public function getTabTitle()
{
- return Mage::helper('salesrule')->__('Manage Coupon Codes');
+ return Mage::helper('salesrule')->__('Coupon Codes');
}
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Rating/Rating.php b/app/code/core/Mage/Adminhtml/Block/Rating/Rating.php
index 79356ef8f9..201e58d35c 100644
--- a/app/code/core/Mage/Adminhtml/Block/Rating/Rating.php
+++ b/app/code/core/Mage/Adminhtml/Block/Rating/Rating.php
@@ -24,7 +24,7 @@ class Mage_Adminhtml_Block_Rating_Rating extends Mage_Adminhtml_Block_Widget_Gri
public function __construct()
{
$this->_controller = 'rating';
- $this->_headerText = Mage::helper('rating')->__('Manage Ratings');
+ $this->_headerText = Mage::helper('rating')->__('Ratings');
$this->_addButtonLabel = Mage::helper('rating')->__('Add New Rating');
parent::__construct();
}
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Currency.php b/app/code/core/Mage/Adminhtml/Block/System/Currency.php
index 3f89f8377a..581f78892e 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Currency.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Currency.php
@@ -73,7 +73,7 @@ class Mage_Adminhtml_Block_System_Currency extends Mage_Adminhtml_Block_Template
protected function getHeader()
{
- return Mage::helper('adminhtml')->__('Manage Currency Rates');
+ return Mage::helper('adminhtml')->__('Currency Rates');
}
protected function getSaveButtonHtml()
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Store.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Store.php
index 32d664111d..2d6f5bb9ee 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Store/Store.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Store.php
@@ -25,7 +25,7 @@ class Mage_Adminhtml_Block_System_Store_Store extends Mage_Adminhtml_Block_Widge
public function __construct()
{
$this->_controller = 'system_store';
- $this->_headerText = Mage::helper('adminhtml')->__('Manage Stores');
+ $this->_headerText = Mage::helper('adminhtml')->__('Stores');
$this->setTemplate('system/store/container.phtml');
parent::__construct();
}
diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Tag.php b/app/code/core/Mage/Adminhtml/Block/Tag/Tag.php
index ffb4a22377..91c4564f69 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tag/Tag.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tag/Tag.php
@@ -24,7 +24,7 @@ class Mage_Adminhtml_Block_Tag_Tag extends Mage_Adminhtml_Block_Widget_Grid_Cont
public function __construct()
{
$this->_controller = 'tag_tag';
- $this->_headerText = Mage::helper('tag')->__('Manage Tags');
+ $this->_headerText = Mage::helper('tag')->__('Tags');
$this->_addButtonLabel = Mage::helper('tag')->__('Add New Tag');
parent::__construct();
}
diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rule.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rule.php
index 4379814d1d..5ec0951256 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tax/Rule.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rule.php
@@ -24,7 +24,7 @@ class Mage_Adminhtml_Block_Tax_Rule extends Mage_Adminhtml_Block_Widget_Grid_Con
public function __construct()
{
$this->_controller = 'tax_rule';
- $this->_headerText = Mage::helper('tax')->__('Manage Tax Rules');
+ $this->_headerText = Mage::helper('tax')->__('Tax Rules');
$this->_addButtonLabel = Mage::helper('tax')->__('Add New Tax Rule');
parent::__construct();
}
diff --git a/app/code/core/Mage/Adminhtml/Helper/Help/Mapping.php b/app/code/core/Mage/Adminhtml/Helper/Help/Mapping.php
index e8727e2b36..3a4cf44c93 100644
--- a/app/code/core/Mage/Adminhtml/Helper/Help/Mapping.php
+++ b/app/code/core/Mage/Adminhtml/Helper/Help/Mapping.php
@@ -125,7 +125,7 @@ abstract class Mage_Adminhtml_Helper_Help_Mapping extends Mage_Core_Helper_Abstr
/* System → Import/Export */
'system_convert_gui' => 'store-operations/dataflow.html',
'system_convert_profile' => 'store-operations/dataflow.html',
- /* System → Manage Currency */
+ /* System → Currency */
'system_currency' => 'store-operations/currency-rates.html',
'system_currencysymbol' => 'store-operations/currency-symbols.html',
/* System → Transactional emails */
diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php
index ad534a4be6..36f87fc1c3 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php
@@ -37,8 +37,7 @@ class Mage_Adminhtml_Catalog_CategoryController extends Mage_Adminhtml_Controlle
protected function _initCategory($getRootInstead = false)
{
$this->_title($this->__('Catalog'))
- ->_title($this->__('Categories'))
- ->_title($this->__('Manage Categories'));
+ ->_title($this->__('Categories'));
$categoryId = (int) $this->getRequest()->getParam('id', false);
$storeId = (int) $this->getRequest()->getParam('store');
@@ -193,8 +192,8 @@ class Mage_Adminhtml_Catalog_CategoryController extends Mage_Adminhtml_Controlle
->setContainerCssClass('catalog-categories');
$this->_addBreadcrumb(
- Mage::helper('catalog')->__('Manage Catalog Categories'),
- Mage::helper('catalog')->__('Manage Categories')
+ Mage::helper('catalog')->__('Catalog Categories'),
+ Mage::helper('catalog')->__('Categories')
);
$block = $this->getLayout()->getBlock('catalog.wysiwyg.js');
diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/AttributeController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/AttributeController.php
index b0e6e1f717..997162cc29 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/AttributeController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/AttributeController.php
@@ -56,7 +56,7 @@ class Mage_Adminhtml_Catalog_Product_AttributeController extends Mage_Adminhtml_
{
$this->_title($this->__('Catalog'))
->_title($this->__('Attributes'))
- ->_title($this->__('Manage Attributes'));
+ ->_title($this->__('Attributes'));
if ($this->getRequest()->getParam('popup')) {
$this->loadLayout('popup');
@@ -65,8 +65,8 @@ class Mage_Adminhtml_Catalog_Product_AttributeController extends Mage_Adminhtml_
->_setActiveMenu('catalog/attributes/attributes')
->_addBreadcrumb(Mage::helper('catalog')->__('Catalog'), Mage::helper('catalog')->__('Catalog'))
->_addBreadcrumb(
- Mage::helper('catalog')->__('Manage Product Attributes'),
- Mage::helper('catalog')->__('Manage Product Attributes')
+ Mage::helper('catalog')->__('Product Attributes'),
+ Mage::helper('catalog')->__('Product Attributes')
)
;
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/SetController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/SetController.php
index 9346139661..b5f6c174ac 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/SetController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/SetController.php
@@ -31,7 +31,7 @@ class Mage_Adminhtml_Catalog_Product_SetController extends Mage_Adminhtml_Contro
{
$this->_title($this->__('Catalog'))
->_title($this->__('Attributes'))
- ->_title($this->__('Manage Attribute Sets'));
+ ->_title($this->__('Attribute Sets'));
$this->_setTypeId();
@@ -40,8 +40,8 @@ class Mage_Adminhtml_Catalog_Product_SetController extends Mage_Adminhtml_Contro
$this->_addBreadcrumb(Mage::helper('catalog')->__('Catalog'), Mage::helper('catalog')->__('Catalog'));
$this->_addBreadcrumb(
- Mage::helper('catalog')->__('Manage Attribute Sets'),
- Mage::helper('catalog')->__('Manage Attribute Sets')
+ Mage::helper('catalog')->__('Attribute Sets'),
+ Mage::helper('catalog')->__('Attribute Sets')
);
$this->_addContent($this->getLayout()->createBlock('adminhtml/catalog_product_attribute_set_toolbar_main'));
@@ -54,7 +54,7 @@ class Mage_Adminhtml_Catalog_Product_SetController extends Mage_Adminhtml_Contro
{
$this->_title($this->__('Catalog'))
->_title($this->__('Attributes'))
- ->_title($this->__('Manage Attribute Sets'));
+ ->_title($this->__('Attribute Sets'));
$this->_setTypeId();
$attributeSet = Mage::getModel('eav/entity_attribute_set')
@@ -75,8 +75,8 @@ class Mage_Adminhtml_Catalog_Product_SetController extends Mage_Adminhtml_Contro
$this->_addBreadcrumb(Mage::helper('catalog')->__('Catalog'), Mage::helper('catalog')->__('Catalog'));
$this->_addBreadcrumb(
- Mage::helper('catalog')->__('Manage Product Sets'),
- Mage::helper('catalog')->__('Manage Product Sets')
+ Mage::helper('catalog')->__('Product Sets'),
+ Mage::helper('catalog')->__('Product Sets')
);
$this->_addContent($this->getLayout()->createBlock('adminhtml/catalog_product_attribute_set_main'));
@@ -177,7 +177,7 @@ class Mage_Adminhtml_Catalog_Product_SetController extends Mage_Adminhtml_Contro
{
$this->_title($this->__('Catalog'))
->_title($this->__('Attributes'))
- ->_title($this->__('Manage Attribute Sets'))
+ ->_title($this->__('Attribute Sets'))
->_title($this->__('New Set'));
$this->_setTypeId();
diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php
index a10f7e2e71..a41cc758bd 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php
@@ -65,7 +65,7 @@ class Mage_Adminhtml_Catalog_ProductController extends Mage_Adminhtml_Controller
protected function _initProduct()
{
$this->_title($this->__('Catalog'))
- ->_title($this->__('Manage Products'));
+ ->_title($this->__('Products'));
$productId = (int) $this->getRequest()->getParam('id');
$product = Mage::getModel('catalog/product')
@@ -184,7 +184,7 @@ class Mage_Adminhtml_Catalog_ProductController extends Mage_Adminhtml_Controller
public function indexAction()
{
$this->_title($this->__('Catalog'))
- ->_title($this->__('Manage Products'));
+ ->_title($this->__('Products'));
$this->loadLayout();
$this->renderLayout();
diff --git a/app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php b/app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php
index 9924aa8998..c7dd285d5f 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php
@@ -32,7 +32,7 @@ class Mage_Adminhtml_Cms_PageController extends Mage_Adminhtml_Controller_Action
$this->loadLayout()
->_setActiveMenu('cms/page')
->_addBreadcrumb(Mage::helper('cms')->__('CMS'), Mage::helper('cms')->__('CMS'))
- ->_addBreadcrumb(Mage::helper('cms')->__('Manage Pages'), Mage::helper('cms')->__('Manage Pages'))
+ ->_addBreadcrumb(Mage::helper('cms')->__('Pages'), Mage::helper('cms')->__('Pages'))
;
return $this;
}
@@ -44,7 +44,7 @@ class Mage_Adminhtml_Cms_PageController extends Mage_Adminhtml_Controller_Action
{
$this->_title($this->__('CMS'))
->_title($this->__('Pages'))
- ->_title($this->__('Manage Content'));
+ ->_title($this->__('Content'));
$this->_initAction();
$this->renderLayout();
@@ -66,7 +66,7 @@ class Mage_Adminhtml_Cms_PageController extends Mage_Adminhtml_Controller_Action
{
$this->_title($this->__('CMS'))
->_title($this->__('Pages'))
- ->_title($this->__('Manage Content'));
+ ->_title($this->__('Content'));
// 1. Get ID and create model
$id = $this->getRequest()->getParam('page_id');
diff --git a/app/code/core/Mage/Adminhtml/controllers/CustomerController.php b/app/code/core/Mage/Adminhtml/controllers/CustomerController.php
index 4cc278cdcd..dfc9c2a998 100644
--- a/app/code/core/Mage/Adminhtml/controllers/CustomerController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/CustomerController.php
@@ -45,7 +45,7 @@ class Mage_Adminhtml_CustomerController extends Mage_Adminhtml_Controller_Action
*/
protected function _initCustomer($idFieldName = 'id')
{
- $this->_title($this->__('Customers'))->_title($this->__('Manage Customers'));
+ $this->_title($this->__('Customers'))->_title($this->__('Customers'));
$customerId = (int) $this->getRequest()->getParam($idFieldName);
$customer = Mage::getModel('customer/customer');
@@ -63,7 +63,7 @@ class Mage_Adminhtml_CustomerController extends Mage_Adminhtml_Controller_Action
*/
public function indexAction()
{
- $this->_title($this->__('Customers'))->_title($this->__('Manage Customers'));
+ $this->_title($this->__('Customers'))->_title($this->__('Customers'));
if ($this->getRequest()->getQuery('ajax')) {
$this->_forward('grid');
@@ -87,7 +87,6 @@ class Mage_Adminhtml_CustomerController extends Mage_Adminhtml_Controller_Action
* Add breadcrumb item
*/
$this->_addBreadcrumb(Mage::helper('adminhtml')->__('Customers'), Mage::helper('adminhtml')->__('Customers'));
- $this->_addBreadcrumb(Mage::helper('adminhtml')->__('Manage Customers'), Mage::helper('adminhtml')->__('Manage Customers'));
$this->renderLayout();
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/RatingController.php b/app/code/core/Mage/Adminhtml/controllers/RatingController.php
index 08a1d5fa62..9d63942881 100644
--- a/app/code/core/Mage/Adminhtml/controllers/RatingController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/RatingController.php
@@ -33,7 +33,7 @@ class Mage_Adminhtml_RatingController extends Mage_Adminhtml_Controller_Action
$this->loadLayout();
$this->_setActiveMenu('catalog/reviews_ratings/ratings');
- $this->_addBreadcrumb(Mage::helper('adminhtml')->__('Manage Ratings'), Mage::helper('adminhtml')->__('Manage Ratings'));
+ $this->_addBreadcrumb(Mage::helper('adminhtml')->__('Ratings'), Mage::helper('adminhtml')->__('Ratings'));
$this->_addContent($this->getLayout()->createBlock('adminhtml/rating_rating'));
$this->renderLayout();
@@ -52,7 +52,7 @@ class Mage_Adminhtml_RatingController extends Mage_Adminhtml_Controller_Action
$this->_title($ratingModel->getId() ? $ratingModel->getRatingCode() : $this->__('New Rating'));
$this->_setActiveMenu('catalog/reviews_ratings/ratings');
- $this->_addBreadcrumb(Mage::helper('adminhtml')->__('Manage Ratings'), Mage::helper('adminhtml')->__('Manage Ratings'));
+ $this->_addBreadcrumb(Mage::helper('adminhtml')->__('Ratings'), Mage::helper('adminhtml')->__('Ratings'));
$this->_addContent($this->getLayout()->createBlock('adminhtml/rating_edit'))
->_addLeft($this->getLayout()->createBlock('adminhtml/rating_edit_tabs'));
@@ -142,7 +142,7 @@ class Mage_Adminhtml_RatingController extends Mage_Adminhtml_Controller_Action
{
$this->_title($this->__('Catalog'))
->_title($this->__('Reviews and Ratings'))
- ->_title($this->__('Manage Ratings'));
+ ->_title($this->__('Ratings'));
Mage::register('entityId', Mage::getModel('rating/rating_entity')->getIdByCode('product'));
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/System/CurrencyController.php b/app/code/core/Mage/Adminhtml/controllers/System/CurrencyController.php
index 2a042a75a5..700e1df719 100644
--- a/app/code/core/Mage/Adminhtml/controllers/System/CurrencyController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/System/CurrencyController.php
@@ -47,7 +47,7 @@ class Mage_Adminhtml_System_CurrencyController extends Mage_Adminhtml_Controller
*/
public function indexAction()
{
- $this->_title($this->__('System'))->_title($this->__('Manage Currency Rates'));
+ $this->_title($this->__('System'))->_title($this->__('Currency Rates'));
$this->loadLayout();
$this->_setActiveMenu('system/currency');
diff --git a/app/code/core/Mage/Adminhtml/controllers/System/StoreController.php b/app/code/core/Mage/Adminhtml/controllers/System/StoreController.php
index 87154be97c..f98b37bc6c 100644
--- a/app/code/core/Mage/Adminhtml/controllers/System/StoreController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/System/StoreController.php
@@ -49,7 +49,7 @@ class Mage_Adminhtml_System_StoreController extends Mage_Adminhtml_Controller_Ac
$this->loadLayout()
->_setActiveMenu('system/store')
->_addBreadcrumb(Mage::helper('adminhtml')->__('System'), Mage::helper('adminhtml')->__('System'))
- ->_addBreadcrumb(Mage::helper('adminhtml')->__('Manage Stores'), Mage::helper('adminhtml')->__('Manage Stores'))
+ ->_addBreadcrumb(Mage::helper('adminhtml')->__('Stores'), Mage::helper('adminhtml')->__('Stores'))
;
return $this;
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Tax/Class/CustomerController.php b/app/code/core/Mage/Adminhtml/controllers/Tax/Class/CustomerController.php
index d86f3e6bc6..252cf41d21 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Tax/Class/CustomerController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Tax/Class/CustomerController.php
@@ -160,7 +160,7 @@ class Mage_Adminhtml_Tax_Class_CustomerController extends Mage_Adminhtml_Control
->_setActiveMenu('sales/tax/classes_customer')
->_addBreadcrumb(Mage::helper('tax')->__('Sales'), Mage::helper('tax')->__('Sales'))
->_addBreadcrumb(Mage::helper('tax')->__('Tax'), Mage::helper('tax')->__('Tax'))
- ->_addBreadcrumb(Mage::helper('tax')->__('Manage Customer Tax Classes'), Mage::helper('tax')->__('Manage Customer Tax Classes'))
+ ->_addBreadcrumb(Mage::helper('tax')->__('Customer Tax Classes'), Mage::helper('tax')->__('Customer Tax Classes'))
;
return $this;
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Tax/Class/ProductController.php b/app/code/core/Mage/Adminhtml/controllers/Tax/Class/ProductController.php
index ffdada2720..9e4c47e770 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Tax/Class/ProductController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Tax/Class/ProductController.php
@@ -159,7 +159,7 @@ class Mage_Adminhtml_Tax_Class_ProductController extends Mage_Adminhtml_Controll
->_setActiveMenu('sales/tax/classes_product')
->_addBreadcrumb(Mage::helper('tax')->__('Sales'), Mage::helper('tax')->__('Sales'))
->_addBreadcrumb(Mage::helper('tax')->__('Tax'), Mage::helper('tax')->__('Tax'))
- ->_addBreadcrumb(Mage::helper('tax')->__('Manage Product Tax Classes'), Mage::helper('tax')->__('Manage Product Tax Classes'))
+ ->_addBreadcrumb(Mage::helper('tax')->__('Product Tax Classes'), Mage::helper('tax')->__('Product Tax Classes'))
;
return $this;
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php b/app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php
index 299e39c893..87225225b7 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php
@@ -28,16 +28,16 @@ class Mage_Adminhtml_Tax_RateController extends Mage_Adminhtml_Controller_Action
{
$this->_title($this->__('Sales'))
->_title($this->__('Tax'))
- ->_title($this->__('Manage Tax Zones and Rates'));
+ ->_title($this->__('Tax Zones and Rates'));
/** @var Mage_Adminhtml_Block_Tax_Rate_Toolbar_Add $block */
$block = $this->getLayout()->createBlock('adminhtml/tax_rate_toolbar_add', 'tax_rate_toolbar');
$this->_initAction()
- ->_addBreadcrumb(Mage::helper('tax')->__('Manage Tax Rates'), Mage::helper('tax')->__('Manage Tax Rates'))
+ ->_addBreadcrumb(Mage::helper('tax')->__('Tax Rates'), Mage::helper('tax')->__('Tax Rates'))
->_addContent(
$block
->assign('createUrl', $this->getUrl('*/tax_rate/add'))
- ->assign('header', Mage::helper('tax')->__('Manage Tax Rates'))
+ ->assign('header', Mage::helper('tax')->__('Tax Rates'))
)
->_addContent($this->getLayout()->createBlock('adminhtml/tax_rate_grid', 'tax_rate_grid'))
->renderLayout();
@@ -52,7 +52,7 @@ class Mage_Adminhtml_Tax_RateController extends Mage_Adminhtml_Controller_Action
$this->_title($this->__('Sales'))
->_title($this->__('Tax'))
- ->_title($this->__('Manage Tax Zones and Rates'));
+ ->_title($this->__('Tax Zones and Rates'));
$this->_title($this->__('New Rate'));
@@ -65,7 +65,7 @@ class Mage_Adminhtml_Tax_RateController extends Mage_Adminhtml_Controller_Action
/** @var Mage_Adminhtml_Block_Tax_Rate_Toolbar_Save $block */
$block = $this->getLayout()->createBlock('adminhtml/tax_rate_toolbar_save');
$this->_initAction()
- ->_addBreadcrumb(Mage::helper('tax')->__('Manage Tax Rates'), Mage::helper('tax')->__('Manage Tax Rates'), $this->getUrl('*/tax_rate'))
+ ->_addBreadcrumb(Mage::helper('tax')->__('Tax Rates'), Mage::helper('tax')->__('Tax Rates'), $this->getUrl('*/tax_rate'))
->_addBreadcrumb(Mage::helper('tax')->__('New Tax Rate'), Mage::helper('tax')->__('New Tax Rate'))
->_addContent(
$block
@@ -121,7 +121,7 @@ class Mage_Adminhtml_Tax_RateController extends Mage_Adminhtml_Controller_Action
{
$this->_title($this->__('Sales'))
->_title($this->__('Tax'))
- ->_title($this->__('Manage Tax Zones and Rates'));
+ ->_title($this->__('Tax Zones and Rates'));
$rateId = (int)$this->getRequest()->getParam('rate');
$rateModel = Mage::getSingleton('tax/calculation_rate')->load(null);
@@ -144,7 +144,7 @@ class Mage_Adminhtml_Tax_RateController extends Mage_Adminhtml_Controller_Action
/** @var Mage_Adminhtml_Block_Tax_Rate_Toolbar_Save $block */
$block = $this->getLayout()->createBlock('adminhtml/tax_rate_toolbar_save');
$this->_initAction()
- ->_addBreadcrumb(Mage::helper('tax')->__('Manage Tax Rates'), Mage::helper('tax')->__('Manage Tax Rates'), $this->getUrl('*/tax_rate'))
+ ->_addBreadcrumb(Mage::helper('tax')->__('Tax Rates'), Mage::helper('tax')->__('Tax Rates'), $this->getUrl('*/tax_rate'))
->_addBreadcrumb(Mage::helper('tax')->__('Edit Tax Rate'), Mage::helper('tax')->__('Edit Tax Rate'))
->_addContent(
$block
@@ -234,7 +234,7 @@ class Mage_Adminhtml_Tax_RateController extends Mage_Adminhtml_Controller_Action
{
$this->_title($this->__('Sales'))
->_title($this->__('Tax'))
- ->_title($this->__('Manage Tax Zones and Rates'));
+ ->_title($this->__('Tax Zones and Rates'));
$this->_title($this->__('Import and Export Tax Rates'));
diff --git a/app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php b/app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php
index 5362ec9663..8cd4f3ddf8 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php
@@ -36,7 +36,7 @@ class Mage_Adminhtml_Tax_RuleController extends Mage_Adminhtml_Controller_Action
{
$this->_title($this->__('Sales'))
->_title($this->__('Tax'))
- ->_title($this->__('Manage Tax Rules'));
+ ->_title($this->__('Tax Rules'));
$this->_initAction()
->_addContent($this->getLayout()->createBlock('adminhtml/tax_rule'))
@@ -59,7 +59,7 @@ class Mage_Adminhtml_Tax_RuleController extends Mage_Adminhtml_Controller_Action
{
$this->_title($this->__('Sales'))
->_title($this->__('Tax'))
- ->_title($this->__('Manage Tax Rules'));
+ ->_title($this->__('Tax Rules'));
$taxRuleId = $this->getRequest()->getParam('rule');
$ruleModel = Mage::getModel('tax/calculation_rule');
diff --git a/app/code/core/Mage/Adminhtml/etc/adminhtml.xml b/app/code/core/Mage/Adminhtml/etc/adminhtml.xml
index a48db6818a..637cee5216 100644
--- a/app/code/core/Mage/Adminhtml/etc/adminhtml.xml
+++ b/app/code/core/Mage/Adminhtml/etc/adminhtml.xml
@@ -57,7 +57,7 @@
</children>
</convert>
<currency translate="title">
- <title>Manage Currency Rates</title>
+ <title>Currency Rates</title>
<action>adminhtml/system_currency</action>
<sort_order>50</sort_order>
</currency>
@@ -99,7 +99,7 @@
<sort_order>90</sort_order>
</cache>
<store translate="title" module="core">
- <title>Manage Stores</title>
+ <title>Stores</title>
<action>adminhtml/system_store/</action>
<sort_order>100</sort_order>
</store>
@@ -148,7 +148,7 @@
</children>
</acl>
<store translate="title">
- <title>Manage Stores</title>
+ <title>Stores</title>
</store>
<design translate="title">
<title>Design</title>
@@ -201,7 +201,7 @@
</children>
</config>
<currency translate="title">
- <title>Manage Currency Rates</title>
+ <title>Currency Rates</title>
<sort_order>30</sort_order>
</currency>
<email_template translate="title">
diff --git a/app/code/core/Mage/Catalog/etc/adminhtml.xml b/app/code/core/Mage/Catalog/etc/adminhtml.xml
index c47c894911..01c12b2e13 100644
--- a/app/code/core/Mage/Catalog/etc/adminhtml.xml
+++ b/app/code/core/Mage/Catalog/etc/adminhtml.xml
@@ -25,12 +25,12 @@
</depends>
<children>
<products translate="title" module="catalog">
- <title>Manage Products</title>
+ <title>Products</title>
<action>adminhtml/catalog_product/</action>
<sort_order>0</sort_order>
</products>
<categories translate="title" module="catalog">
- <title>Manage Categories</title>
+ <title>Categories</title>
<action>adminhtml/catalog_category/</action>
<sort_order>10</sort_order>
</categories>
@@ -38,11 +38,11 @@
<title>Attributes</title>
<children>
<attributes translate="title" module="catalog">
- <title>Manage Attributes</title>
+ <title>Attributes</title>
<action>adminhtml/catalog_product_attribute/</action>
</attributes>
<sets translate="title" module="catalog">
- <title>Manage Attribute Sets</title>
+ <title>Attribute Sets</title>
<action>adminhtml/catalog_product_set/</action>
</sets>
</children>
@@ -79,18 +79,18 @@
<title>Attributes</title>
<children>
<attributes translate="title">
- <title>Manage Attributes</title>
+ <title>Attributes</title>
</attributes>
<sets translate="title">
- <title>Manage Attribute Sets</title>
+ <title>Attribute Sets</title>
</sets>
</children>
</attributes>
<categories translate="title">
- <title>Manage Categories</title>
+ <title>Categories</title>
</categories>
<products translate="title">
- <title>Manage Products</title>
+ <title>Products</title>
</products>
<update_attributes translate="title">
<title>Update Attributes</title>
diff --git a/app/code/core/Mage/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php b/app/code/core/Mage/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php
index 2ca6cb0687..24eec138c5 100644
--- a/app/code/core/Mage/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php
+++ b/app/code/core/Mage/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php
@@ -45,7 +45,7 @@ class Mage_CurrencySymbol_Block_Adminhtml_System_Currencysymbol extends Mage_Adm
*/
public function getHeader()
{
- return Mage::helper('adminhtml')->__('Manage Currency Symbols');
+ return Mage::helper('adminhtml')->__('Currency Symbols');
}
/**
diff --git a/app/code/core/Mage/CurrencySymbol/controllers/Adminhtml/System/CurrencysymbolController.php b/app/code/core/Mage/CurrencySymbol/controllers/Adminhtml/System/CurrencysymbolController.php
index 0812179670..824067c3da 100644
--- a/app/code/core/Mage/CurrencySymbol/controllers/Adminhtml/System/CurrencysymbolController.php
+++ b/app/code/core/Mage/CurrencySymbol/controllers/Adminhtml/System/CurrencysymbolController.php
@@ -40,12 +40,12 @@ class Mage_CurrencySymbol_Adminhtml_System_CurrencysymbolController extends Mage
Mage::helper('currencysymbol')->__('System')
)
->_addBreadcrumb(
- Mage::helper('currencysymbol')->__('Manage Currency Rates'),
- Mage::helper('currencysymbol')->__('Manage Currency Rates')
+ Mage::helper('currencysymbol')->__('Currency Rates'),
+ Mage::helper('currencysymbol')->__('Currency Rates')
);
$this->_title($this->__('System'))
- ->_title($this->__('Manage Currency Rates'));
+ ->_title($this->__('Currency Rates'));
$this->renderLayout();
}
diff --git a/app/code/core/Mage/CurrencySymbol/etc/adminhtml.xml b/app/code/core/Mage/CurrencySymbol/etc/adminhtml.xml
index 793097320b..01c918d0bb 100644
--- a/app/code/core/Mage/CurrencySymbol/etc/adminhtml.xml
+++ b/app/code/core/Mage/CurrencySymbol/etc/adminhtml.xml
@@ -19,7 +19,7 @@
<system>
<children>
<currency translate="title" module="currencysymbol">
- <title>Manage Currency</title>
+ <title>Currency</title>
<children>
<rates translate="title">
<title>Rates</title>
@@ -44,7 +44,7 @@
<system>
<children>
<currency translate="title">
- <title>Manage Currency</title>
+ <title>Currency</title>
<children>
<rates translate="title">
<title>Rates</title>
diff --git a/app/code/core/Mage/Customer/etc/adminhtml.xml b/app/code/core/Mage/Customer/etc/adminhtml.xml
index 1369bc47fd..255da0c2e3 100644
--- a/app/code/core/Mage/Customer/etc/adminhtml.xml
+++ b/app/code/core/Mage/Customer/etc/adminhtml.xml
@@ -22,7 +22,7 @@
<!-- action>adminhtml/customer/</action -->
<children>
<manage translate="title" module="customer">
- <title>Manage Customers</title>
+ <title>Customers</title>
<action>adminhtml/customer/</action>
<sort_order>0</sort_order>
</manage>
@@ -52,7 +52,7 @@
<sort_order>10</sort_order>
</group>
<manage translate="title">
- <title>Manage Customers</title>
+ <title>Customers</title>
<sort_order>0</sort_order>
</manage>
<online translate="title">
diff --git a/app/code/core/Mage/Rating/etc/adminhtml.xml b/app/code/core/Mage/Rating/etc/adminhtml.xml
index 45075f0d44..78130207be 100644
--- a/app/code/core/Mage/Rating/etc/adminhtml.xml
+++ b/app/code/core/Mage/Rating/etc/adminhtml.xml
@@ -24,7 +24,7 @@
<reviews_ratings>
<children>
<ratings translate="title" module="rating">
- <title>Manage Ratings</title>
+ <title>Ratings</title>
</ratings>
</children>
</reviews_ratings>
diff --git a/app/code/core/Mage/Review/etc/adminhtml.xml b/app/code/core/Mage/Review/etc/adminhtml.xml
index 36694941ba..76a29185e9 100644
--- a/app/code/core/Mage/Review/etc/adminhtml.xml
+++ b/app/code/core/Mage/Review/etc/adminhtml.xml
@@ -35,7 +35,7 @@
</children>
</reviews>
<ratings translate="title" module="review">
- <title>Manage Ratings</title>
+ <title>Ratings</title>
<action>adminhtml/rating/index</action>
</ratings>
</children>
diff --git a/app/code/core/Mage/Tax/etc/adminhtml.xml b/app/code/core/Mage/Tax/etc/adminhtml.xml
index 593be22d25..f880ac9310 100644
--- a/app/code/core/Mage/Tax/etc/adminhtml.xml
+++ b/app/code/core/Mage/Tax/etc/adminhtml.xml
@@ -23,11 +23,11 @@
<sort_order>500</sort_order>
<children>
<rules translate="title" module="tax">
- <title>Manage Tax Rules</title>
+ <title>Tax Rules</title>
<action>adminhtml/tax_rule</action>
</rules>
<rates translate="title" module="tax">
- <title>Manage Tax Zones & Rates</title>
+ <title>Tax Zones & Rates</title>
<action>adminhtml/tax_rate</action>
</rates>
<import_export translate="title" module="tax">
@@ -70,11 +70,11 @@
<sort_order>20</sort_order>
</import_export>
<rates translate="title">
- <title>Manage Tax Zones & Rates</title>
+ <title>Tax Zones & Rates</title>
<sort_order>30</sort_order>
</rates>
<rules translate="title">
- <title>Manage Tax Rules</title>
+ <title>Tax Rules</title>
<sort_order>40</sort_order>
</rules>
</children>
diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance.php
index 2f7ad520e3..c4996f83a5 100644
--- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance.php
+++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance.php
@@ -28,7 +28,7 @@ class Mage_Widget_Block_Adminhtml_Widget_Instance extends Mage_Adminhtml_Block_W
{
$this->_blockGroup = 'widget';
$this->_controller = 'adminhtml_widget_instance';
- $this->_headerText = Mage::helper('widget')->__('Manage Widget Instances');
+ $this->_headerText = Mage::helper('widget')->__('Widget Instances');
parent::__construct();
$this->_updateButton('add', 'label', Mage::helper('widget')->__('Add New Widget Instance'));
}
diff --git a/app/code/core/Mage/Widget/controllers/Adminhtml/Widget/InstanceController.php b/app/code/core/Mage/Widget/controllers/Adminhtml/Widget/InstanceController.php
index 58a93a3a6f..1c601c6739 100644
--- a/app/code/core/Mage/Widget/controllers/Adminhtml/Widget/InstanceController.php
+++ b/app/code/core/Mage/Widget/controllers/Adminhtml/Widget/InstanceController.php
@@ -51,8 +51,8 @@ class Mage_Widget_Adminhtml_Widget_InstanceController extends Mage_Adminhtml_Con
Mage::helper('widget')->__('CMS')
)
->_addBreadcrumb(
- Mage::helper('widget')->__('Manage Widget Instances'),
- Mage::helper('widget')->__('Manage Widget Instances')
+ Mage::helper('widget')->__('Widget Instances'),
+ Mage::helper('widget')->__('Widget Instances')
);
return $this;
}
diff --git a/app/design/adminhtml/default/default/locale/en_US/translate.csv b/app/design/adminhtml/default/default/locale/en_US/translate.csv
index 0a0dc7b517..d70345f458 100644
--- a/app/design/adminhtml/default/default/locale/en_US/translate.csv
+++ b/app/design/adminhtml/default/default/locale/en_US/translate.csv
@@ -61,7 +61,7 @@
"Option","Option"
"Primary Billing Address","Primary Billing Address"
"Create Backup","Create Backup"
-"Manage Options (values for your attribute)","Manage Options (values for your attribute)"
+"Options (values for your attribute)","Options (values for your attribute)"
"Total Due","Total Due"
"Copyright 2007","Copyright 2007"
"Newsletter Subscribers","Newsletter Subscribers"
@@ -185,7 +185,7 @@
"Add New Address","Add New Address"
"Account Created in:","Account Created in:"
"Default Billing","Default Billing"
-"Manage Titles (Size, Color, etc.)","Manage Titles (Size, Color, etc.)"
+"Titles (Size, Color, etc.)","Titles (Size, Color, etc.)"
"Please confirm site switching. All data not saved will be lost.","Please confirm site switching. All data not saved will be lost."
"Please select from each ratings above","Please select from each ratings above"
"Qty Shipped","Qty Shipped"
diff --git a/app/design/adminhtml/default/default/template/catalog/product.phtml b/app/design/adminhtml/default/default/template/catalog/product.phtml
index 673c7b5970..bc3964d8b2 100644
--- a/app/design/adminhtml/default/default/template/catalog/product.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/product.phtml
@@ -21,7 +21,7 @@
<div class="content-header">
<table cellspacing="0">
<tr>
- <td style="width:50%;"><h3 class="icon-head head-products"><?php echo Mage::helper('catalog')->__('Manage Products') ?></h3></td>
+ <td style="width:50%;"><h3 class="icon-head head-products"><?php echo Mage::helper('catalog')->__('Products') ?></h3></td>
<td class="a-right">
<?php echo $this->getButtonsHtml() ?>
</td>
diff --git a/app/design/adminhtml/default/default/template/catalog/product/attribute/options.phtml b/app/design/adminhtml/default/default/template/catalog/product/attribute/options.phtml
index 8c64adeed0..e4d3182401 100644
--- a/app/design/adminhtml/default/default/template/catalog/product/attribute/options.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/product/attribute/options.phtml
@@ -33,7 +33,7 @@
<div class="entity-edit">
<div class="entry-edit-head">
- <h4 class="icon-head head-edit-form fieldset-legend"><?php echo Mage::helper('catalog')->__('Manage Titles (Size, Color, etc.)') ?></h4>
+ <h4 class="icon-head head-edit-form fieldset-legend"><?php echo Mage::helper('catalog')->__('Titles (Size, Color, etc.)') ?></h4>
</div>
<div class="box">
<div class="hor-scroll">
@@ -58,7 +58,7 @@
<br/>
<div class="entity-edit" id="matage-options-panel">
<div class="entry-edit-head">
- <h4 class="icon-head head-edit-form fieldset-legend"><?php echo Mage::helper('catalog')->__('Manage Options (values of your attribute)') ?></h4>
+ <h4 class="icon-head head-edit-form fieldset-legend"><?php echo Mage::helper('catalog')->__('Options (values of your attribute)') ?></h4>
</div>
<div class="box">
<div class="hor-scroll">
diff --git a/app/design/adminhtml/default/default/template/eav/attribute/options.phtml b/app/design/adminhtml/default/default/template/eav/attribute/options.phtml
index b1894fd71b..ed7b5c5498 100644
--- a/app/design/adminhtml/default/default/template/eav/attribute/options.phtml
+++ b/app/design/adminhtml/default/default/template/eav/attribute/options.phtml
@@ -33,7 +33,7 @@
<div class="entity-edit">
<div class="entry-edit-head">
- <h4 class="icon-head head-edit-form fieldset-legend"><?php echo $this->__('Manage Titles (Size, Color, etc.)') ?></h4>
+ <h4 class="icon-head head-edit-form fieldset-legend"><?php echo $this->__('Titles (Size, Color, etc.)') ?></h4>
</div>
<div class="box">
<div class="hor-scroll">
@@ -58,7 +58,7 @@
<br/>
<div class="entity-edit" id="matage-options-panel">
<div class="entry-edit-head">
- <h4 class="icon-head head-edit-form fieldset-legend"><?php echo $this->__('Manage Options (values of your attribute)') ?></h4>
+ <h4 class="icon-head head-edit-form fieldset-legend"><?php echo $this->__('Options (values of your attribute)') ?></h4>
</div>
<div class="box">
<div class="hor-scroll">
diff --git a/app/design/adminhtml/default/default/template/system/config/switcher.phtml b/app/design/adminhtml/default/default/template/system/config/switcher.phtml
index b6d86d1d94..09e672dc3c 100644
--- a/app/design/adminhtml/default/default/template/system/config/switcher.phtml
+++ b/app/design/adminhtml/default/default/template/system/config/switcher.phtml
@@ -32,7 +32,7 @@
</select>
<?php if (Mage::getSingleton('admin/session')->isAllowed('system/store')): ?>
<p style="margin:10px 0 0;">
- <a href="<?php echo $this->getUrl('*/system_store') ?>"><?php echo $this->__('Manage Stores') ?></a>
+ <a href="<?php echo $this->getUrl('*/system_store') ?>"><?php echo $this->__('Stores') ?></a>
</p>
<?php endif ?>
</div>
diff --git a/app/design/frontend/base/default/template/customer/account/dashboard/address.phtml b/app/design/frontend/base/default/template/customer/account/dashboard/address.phtml
index 0f2a9314b3..e8b9c5fc3a 100644
--- a/app/design/frontend/base/default/template/customer/account/dashboard/address.phtml
+++ b/app/design/frontend/base/default/template/customer/account/dashboard/address.phtml
@@ -17,7 +17,7 @@
<div class="box">
<div class="box-title">
<h3><?php echo $this->__('Address Book') ?></h3>
- <a href="<?php echo $this->getAddressBookUrl() ?>"><?php echo $this->__('Manage Addresses') ?></a>
+ <a href="<?php echo $this->getAddressBookUrl() ?>"><?php echo $this->__('Addresses') ?></a>
</div>
<div class="box-content">
<div class="col-1">
diff --git a/app/design/frontend/rwd/default/template/customer/account/dashboard/address.phtml b/app/design/frontend/rwd/default/template/customer/account/dashboard/address.phtml
index 4d6d51762a..728cd0bafc 100644
--- a/app/design/frontend/rwd/default/template/customer/account/dashboard/address.phtml
+++ b/app/design/frontend/rwd/default/template/customer/account/dashboard/address.phtml
@@ -16,7 +16,7 @@
<div class="box-account box-info">
<div class="box-head">
<h2><?php echo $this->__('Address Book') ?></h2>
- <a href="<?php echo $this->getAddressBookUrl() ?>"><?php echo $this->__('Manage Addresses') ?></a>
+ <a href="<?php echo $this->getAddressBookUrl() ?>"><?php echo $this->__('Addresses') ?></a>
</div>
<div class="col2-set">
<div class="col-1">
diff --git a/app/locale/en_US/Mage_Adminhtml.csv b/app/locale/en_US/Mage_Adminhtml.csv
index 61a65307dc..976c04cea0 100644
--- a/app/locale/en_US/Mage_Adminhtml.csv
+++ b/app/locale/en_US/Mage_Adminhtml.csv
@@ -571,18 +571,12 @@
"Magento root directory","Magento root directory"
"OpenMage %s","OpenMage %s"
"Make sure that data encoding in the file is consistent and saved in one of supported encodings (UTF-8 or ANSI).","Make sure that data encoding in the file is consistent and saved in one of supported encodings (UTF-8 or ANSI)."
-"Manage Attribute Sets","Manage Attribute Sets"
-"Manage Attributes","Manage Attributes"
-"Manage Categories","Manage Categories"
-"Manage Content","Manage Content"
-"Manage Currency Rates","Manage Currency Rates"
-"Manage Customers","Manage Customers"
-"Manage Options (values of your attribute)","Manage Options (values of your attribute)"
-"Manage Ratings","Manage Ratings"
-"Manage Stores","Manage Stores"
-"Manage Tax Rules","Manage Tax Rules"
-"Manage Tax Zones and Rates","Manage Tax Zones and Rates"
-"Manage Titles (Size, Color, etc.)","Manage Titles (Size, Color, etc.)"
+"Content","Content"
+"Currency Rates","Currency Rates"
+"Options (values of your attribute)","Options (values of your attribute)"
+"Tax Rules","Tax Rules"
+"Tax Zones and Rates","Tax Zones and Rates"
+"Titles (Size, Color, etc.)","Titles (Size, Color, etc.)"
"Manual","Manual"
"Mass Product Assignment","Mass Product Assignment"
"Matched Expression","Matched Expression"
diff --git a/app/locale/en_US/Mage_Catalog.csv b/app/locale/en_US/Mage_Catalog.csv
index 6f461c89f4..5df7f112cc 100644
--- a/app/locale/en_US/Mage_Catalog.csv
+++ b/app/locale/en_US/Mage_Catalog.csv
@@ -389,17 +389,12 @@
"List Mode","List Mode"
"List of Products that are set as New","List of Products that are set as New"
"List of types","List of types"
-"Manage Attribute Sets","Manage Attribute Sets"
-"Manage Attributes","Manage Attributes"
-"Manage Catalog Categories","Manage Catalog Categories"
-"Manage Categories","Manage Categories"
-"Manage Label / Options","Manage Label / Options"
-"Manage Options (values of your attribute)","Manage Options (values of your attribute)"
-"Manage Product Attributes","Manage Product Attributes"
-"Manage Product Sets","Manage Product Sets"
-"Manage Products","Manage Products"
+"Catalog Categories","Catalog Categories"
+"Label / Options","Label / Options"
+"Options (values of your attribute)","Options (values of your attribute)"
+"Product Sets","Product Sets"
"Manage Stock","Manage Stock"
-"Manage Titles (Size, Color, etc.)","Manage Titles (Size, Color, etc.)"
+"Titles (Size, Color, etc.)","Titles (Size, Color, etc.)"
"Max Characters","Max Characters"
"Maximal Depth","Maximal Depth"
"Maximum Image Size","Maximum Image Size"
diff --git a/app/locale/en_US/Mage_Checkout.csv b/app/locale/en_US/Mage_Checkout.csv
index aece1f29fa..c9ad2ac293 100644
--- a/app/locale/en_US/Mage_Checkout.csv
+++ b/app/locale/en_US/Mage_Checkout.csv
@@ -161,7 +161,7 @@
"Loading next step...","Loading next step..."
"Login","Login"
"Login/Registration Before","Login/Registration Before"
-"Manage Terms and Conditions","Manage Terms and Conditions"
+"Terms and Conditions","Terms and Conditions"
"Maximum Display Recently Added Item(s)","Maximum Display Recently Added Item(s)"
"Maximum qty allowed for Shipping to multiple addresses is %s","Maximum qty allowed for Shipping to multiple addresses is %s"
"Mini-cart promotion block","Mini-cart promotion block"
diff --git a/app/locale/en_US/Mage_Cms.csv b/app/locale/en_US/Mage_Cms.csv
index 3920b54d59..9748335e68 100644
--- a/app/locale/en_US/Mage_Cms.csv
+++ b/app/locale/en_US/Mage_Cms.csv
@@ -75,7 +75,6 @@
"Layout","Layout"
"Layout Update XML","Layout Update XML"
"Link to a CMS Page","Link to a CMS Page"
-"Manage Pages","Manage Pages"
"Media Gallery","Media Gallery"
"Media Storage","Media Storage"
"Meta Data","Meta Data"
diff --git a/app/locale/en_US/Mage_Core.csv b/app/locale/en_US/Mage_Core.csv
index cee988a752..2c355dfe9f 100644
--- a/app/locale/en_US/Mage_Core.csv