Merge "TIF: Add content rating system for Spain" into lmp-dev (65dc0524) · Commits · e / os / android_frameworks_base

core/res/res/values/strings.xml

+11 −0

Original line number	Diff line number	Diff line
		@@ -4878,6 +4878,17 @@
		<!-- TV content rating system strings for DK TV -->

		<!-- TV content rating system strings for ES TV -->
		<string name="display_name_estv" translatable="false">ES-TV</string>
		<string name="display_name_estv_all" translatable="false">TP</string>
		<string name="display_name_estv_i" translatable="false">i</string>
		<string name="display_name_estv_7" translatable="false">+7</string>
		<string name="display_name_estv_13" translatable="false">+13</string>
		<string name="display_name_estv_18" translatable="false">+18</string>
		<string name="description_estv_all">Programas para todos los públicos</string>
		<string name="description_estv_i">Programas especialmente recomendados para la infancia</string>
		<string name="description_estv_7">Programas no recomendados para menores de 7 años (NR7)</string>
		<string name="description_estv_13">Programas no recomendados para menores de 13 años (NR13)</string>
		<string name="description_estv_18">Programas no recomendados para menores de 18 años (NR18)</string>

		<!-- TV content rating system strings for FI TV -->

+30 −0

Original line number	Diff line number	Diff line
		@@ -66,6 +66,36 @@
		<!-- TV content rating system for DK TV -->

		<!-- TV content rating system for ES TV -->
		<rating-system-definition id="ES_TV"
		displayName="@string/display_name_estv"
		country="ES">
		<rating-definition id="ES_TV_ALL"
		displayName="@string/display_name_estv_all"
		description="@string/description_estv_all"
		ageHint="0" />
		<rating-definition id="ES_TV_I"
		displayName="@string/display_name_estv_i"
		description="@string/description_estv_i"
		ageHint="0" />
		<rating-definition id="ES_TV_7"
		displayName="@string/display_name_estv_7"
		description="@string/description_estv_7"
		ageHint="7" />
		<rating-definition id="ES_TV_13"
		displayName="@string/display_name_estv_13"
		description="@string/description_estv_13"
		ageHint="13" />
		<rating-definition id="ES_TV_18"
		displayName="@string/display_name_estv_18"
		description="@string/description_estv_18"
		ageHint="18" />
		<order>
		<rating id="ES_TV_ALL" />
		<rating id="ES_TV_7" />
		<rating id="ES_TV_13" />
		<rating id="ES_TV_18" />
		</order>
		</rating-system-definition>

		<!-- TV content rating system for FI TV -->

+26 −10

Original line number	Diff line number	Diff line
		@@ -132,10 +132,10 @@ import java.util.List;
		* <td>DK_TV</td>
		* <td></td>
		* </tr-->
		* <!--tr>
		* <tr>
		* <td>ES_TV</td>
		* <td></td>
		* </tr-->
		* <td>The Spanish rating system for television programs</td>
		* </tr>
		* <!--tr>
		* <td>FI_TV</td>
		* <td></td>
		@@ -345,10 +345,30 @@ import java.util.List;
		* <td>DK_TV_ALL</td>
		* <td></td>
		* </tr-->
		* <!--tr>
		* <tr>
		* <td>ES_TV_ALL</td>
		* <td></td>
		* </tr-->
		* <td>A rating string for {@code ES_TV}. This rating is for programs for all ages.</td>
		* </tr>
		* <tr>
		* <td>ES_TV_I</td>
		* <td>A rating string for {@code ES_TV}. This rating is for the recommended programs
		* especially for children.</td>
		* </tr>
		* <tr>
		* <td>ES_TV_7</td>
		* <td>A rating string for {@code ES_TV}. This rating is for programs not recommended for
		* children under 7.</td>
		* </tr>
		* <tr>
		* <td>ES_TV_13</td>
		* <td>A rating string for {@code ES_TV}. This rating is for programs not recommended for
		* children under 13.</td>
		* </tr>
		* <tr>
		* <td>ES_TV_18</td>
		* <td>A rating string for {@code ES_TV}. This rating is for programs not recommended for
		* children under 18.</td>
		* </tr>
		* <!--tr>
		* <td>FI_TV_ALL</td>
		* <td></td>
		@@ -654,10 +674,6 @@ import java.util.List;
		* <td></td>
		* </tr-->
		* <!--tr>
		* <td>ES_TV_</td>
		* <td></td>
		* </tr-->
		* <!--tr>
		* <td>FI_TV_</td>
		* <td></td>
		* </tr-->