components/bookmark_bar_strings.grdp - Issue 769153007: Managed bookmarks for supervised users

Side by Side Diff: components/bookmark_bar_strings.grdp

Issue 769153007: Managed bookmarks for supervised users (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 5 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc ('K') | « chrome/common/chrome_switches.cc ('k') | components/bookmarks/common/bookmark_pref_names.h » ('j') | components/policy/core/browser/managed_bookmarks_tracker.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <?xml version="1.0" encoding="utf-8"?>	1 <?xml version="1.0" encoding="utf-8"?>

2 <grit-part>	2 <grit-part>

3 <if expr="not is_android and not is_ios and not use_titlecase">	3 <if expr="not is_android and not is_ios and not use_titlecase">

4 <message name="IDS_BOOKMARK_BAR_FOLDER_NAME" desc="Name shown in the tree fo r the Bookmarks Bar folder.">	4 <message name="IDS_BOOKMARK_BAR_FOLDER_NAME" desc="Name shown in the tree fo r the Bookmarks Bar folder.">

5 Bookmarks bar	5 Bookmarks bar

6 </message>	6 </message>

7 </if>	7 </if>

8 <if expr="not is_android and not is_ios and use_titlecase">	8 <if expr="not is_android and not is_ios and use_titlecase">

9 <message name="IDS_BOOKMARK_BAR_FOLDER_NAME" desc="In Title Case: Name shown in the tree for the Bookmarks Bar folder.">	9 <message name="IDS_BOOKMARK_BAR_FOLDER_NAME" desc="In Title Case: Name shown in the tree for the Bookmarks Bar folder.">

10 Bookmarks Bar	10 Bookmarks Bar

(...skipping 19 matching lines...) Expand all Loading...
30 </message>	30 </message>

31 <message name="IDS_BOOKMARK_BAR_OTHER_FOLDER_NAME" desc="Name shown in the t ree for the other bookmarks folder">	31 <message name="IDS_BOOKMARK_BAR_OTHER_FOLDER_NAME" desc="Name shown in the t ree for the other bookmarks folder">

32 Other bookmarks	32 Other bookmarks

33 </message>	33 </message>

34 <message name="IDS_BOOKMARK_BAR_MANAGED_FOLDER_DOMAIN_NAME" desc="Name shown in the tree for the managed bookmarks folder, when the managed bookmarks come f rom a domain">	34 <message name="IDS_BOOKMARK_BAR_MANAGED_FOLDER_DOMAIN_NAME" desc="Name shown in the tree for the managed bookmarks folder, when the managed bookmarks come f rom a domain">

35 <ph name="DOMAIN">$1<ex>google.com</ex></ph> bookmarks	35 <ph name="DOMAIN">$1<ex>google.com</ex></ph> bookmarks

36 </message>	36 </message>

37 <message name="IDS_BOOKMARK_BAR_MANAGED_FOLDER_DEFAULT_NAME" desc="Name show n in the tree for the managed bookmarks folder, when the managed bookmarks don't come from a domain">	37 <message name="IDS_BOOKMARK_BAR_MANAGED_FOLDER_DEFAULT_NAME" desc="Name show n in the tree for the managed bookmarks folder, when the managed bookmarks don't come from a domain">

38 Managed bookmarks	38 Managed bookmarks

39 </message>	39 </message>

	40 <message name="IDS_BOOKMARK_BAR_SUPERVISED_FOLDER_DEFAULT_NAME" desc="Name s hown in the tree for the managed bookmarks folder for supervised users, when the general managed bookmarks are not active.">

	41 Supervised bookmarks
	Pam (message me for reviews) 2015/01/14 14:03:37 This is shown even when the general managed bookma This is shown even when the general managed bookmarks are active, isn't it? Also, the bookmarks aren't supervised. What about "Recommended bookmarks" or similar? Marc Treib 2015/01/14 16:40:50 Right. Leftover from Friedrich's old code where I Show quoted text On 2015/01/14 14:03:37, Pam (also PM for reviews) wrote: > This is shown even when the general managed bookmarks are active, isn't it? Right. Leftover from Friedrich's old code where I forgot to update the comment. Show quoted text > Also, the bookmarks aren't supervised. What about "Recommended bookmarks" or > similar? "recommended" is certainly better than "supervised", I've updated the string. Generally, I tend to let other people do the string bike shedding :)
	42 </message>

40 </if>	43 </if>

41 <if expr="use_titlecase">	44 <if expr="use_titlecase">

42 <message name="IDS_BOOKMARK_BAR_MOBILE_FOLDER_NAME" desc="In Title Case: Nam e shown in the tree for the mobile bookmarks folder">	45 <message name="IDS_BOOKMARK_BAR_MOBILE_FOLDER_NAME" desc="In Title Case: Nam e shown in the tree for the mobile bookmarks folder">

43 Mobile Bookmarks	46 Mobile Bookmarks

44 </message>	47 </message>

45 <message name="IDS_BOOKMARK_BAR_OTHER_FOLDER_NAME" desc="In Title Case: Name shown in the tree for the other bookmarks folder">	48 <message name="IDS_BOOKMARK_BAR_OTHER_FOLDER_NAME" desc="In Title Case: Name shown in the tree for the other bookmarks folder">

46 Other Bookmarks	49 Other Bookmarks

47 </message>	50 </message>

48 <message name="IDS_BOOKMARK_BAR_MANAGED_FOLDER_DOMAIN_NAME" desc="In Title C ase: Name shown in the tree for the managed bookmarks folder, when the managed b ookmarks come from a domain">	51 <message name="IDS_BOOKMARK_BAR_MANAGED_FOLDER_DOMAIN_NAME" desc="In Title C ase: Name shown in the tree for the managed bookmarks folder, when the managed b ookmarks come from a domain">

49 <ph name="DOMAIN">$1<ex>google.com</ex></ph> Bookmarks	52 <ph name="DOMAIN">$1<ex>google.com</ex></ph> Bookmarks

50 </message>	53 </message>

51 <message name="IDS_BOOKMARK_BAR_MANAGED_FOLDER_DEFAULT_NAME" desc="In Title Case: Name shown in the tree for the managed bookmarks folder, when the managed bookmarks don't come from a domain">	54 <message name="IDS_BOOKMARK_BAR_MANAGED_FOLDER_DEFAULT_NAME" desc="In Title Case: Name shown in the tree for the managed bookmarks folder, when the managed bookmarks don't come from a domain">

52 Managed Bookmarks	55 Managed Bookmarks

53 </message>	56 </message>

	57 <message name="IDS_BOOKMARK_BAR_SUPERVISED_FOLDER_DEFAULT_NAME" desc="In Tit le Case: Name shown in the tree for the managed bookmarks folder for supervised users, when the general managed bookmarks are not active.">

	58 Supervised Bookmarks
	Pam (message me for reviews) 2015/01/14 14:03:37 Ditto x 2 above Ditto x 2 above Marc Treib 2015/01/14 16:40:50 Done. Show quoted text On 2015/01/14 14:03:37, Pam (also PM for reviews) wrote: > Ditto x 2 above Done.
	59 </message>

54 </if>	60 </if>

55 </grit-part>	61 </grit-part>

OLD	NEW