Skip to content

Commit

Permalink
Fixes #887 Merge localpages.xml and strings.xml (#894)
Browse files Browse the repository at this point in the history
* Fixes #887 Merge localpages.xml and strings.xml

* Added new line to l10n.toml

* add newline at EOF

(nit)

* add newline at EOF

(nit)

* removed extraneous whitespace in Italian "Private Browsing" body string
  • Loading branch information
keianhzo committed Dec 17, 2018
1 parent 0a07110 commit b230f01
Show file tree
Hide file tree
Showing 19 changed files with 165 additions and 242 deletions.
26 changes: 0 additions & 26 deletions app/src/main/res/values-de/localpages_strings.xml

This file was deleted.

18 changes: 18 additions & 0 deletions app/src/main/res/values-de/strings.xml
Expand Up @@ -490,4 +490,22 @@
<!-- This string is displayed in any button used for removing all the items in the current context. -->
<string name="remove_all">Alle löschen</string>

<!-- This string is used as the title of the Private Browsing page that is opened when the
Private Browsing Mode button from the tray is clicked. -->
<string name="private_browsing_title">Privater Modus</string>

<!-- This string is used as the body of the Private Browsing page that is opened when the
Private Browsing Mode button from the tray is clicked. -->
<string name="private_browsing_body"><![CDATA[
<p>Wenn Sie in einem privaten Fenster surfen, wird %1$s <strong>Folgendes nicht speichern</strong>:</p>
<ul class="two-column">
<li>Besuchte Seiten</li>
<li>Suchanfragen</li>
<li>Cookies</li>
<li>Temporäre Dateien</li>
</ul>
<p>Der Private Modus <strong>bedeutet nicht</strong>, dass Sie beim Surfen im Internet anonym bleiben. Ihr Arbeitgeber oder Internetanbieter kann immer noch feststellen, welche Seiten Sie besuchen.</p>
<p class="about-info">Weitere Informationen über den <a id="learnMore">privaten Modus</a>.</p>
]]></string>

</resources>
26 changes: 0 additions & 26 deletions app/src/main/res/values-es/localpages_strings.xml

This file was deleted.

20 changes: 19 additions & 1 deletion app/src/main/res/values-es/strings.xml
Expand Up @@ -488,6 +488,24 @@
<string name="show_history_tooltip">Mostrar historial</string>

<!-- This string is displayed in any button used for removing all the items in the current context. -->
<string name="remove_all">Eliminar todo</string>
<string name="remove_all">Eliminar todo</string>

<!-- This string is used as the title of the Private Browsing page that is opened when the
Private Browsing Mode button from the tray is clicked. -->
<string name="private_browsing_title">Navegación privada</string>

<!-- This string is used as the body of the Private Browsing page that is opened when the
Private Browsing Mode button from the tray is clicked. -->
<string name="private_browsing_body"><![CDATA[
<p>Cuando navega en una ventana privada, %1$s <strong>no guarda</strong>:</p>
<ul class="two-column">
<li>las páginas visitadas</li>
<li>las búsquedas</li>
<li>las cookies</li>
<li>los archivos temporales</li>
</ul>
<p>La navegación privada <strong>no le hace anónimo</strong> en Internet. Su empleador o proveedor de acceso a Internet aún pueden saber qué páginas ha visitado.</p>
<p class="about-info">Más información sobre la <a id="learnMore">navegación privada</a>.</p>
]]></string>

</resources>
26 changes: 0 additions & 26 deletions app/src/main/res/values-fr/localpages_strings.xml

This file was deleted.

20 changes: 19 additions & 1 deletion app/src/main/res/values-fr/strings.xml
Expand Up @@ -488,6 +488,24 @@
<string name="show_history_tooltip">Afficher l’historique</string>

<!-- This string is displayed in any button used for removing all the items in the current context. -->
<string name="remove_all">Tout supprimer</string>
<string name="remove_all">Tout supprimer</string>

<!-- This string is used as the title of the Private Browsing page that is opened when the
Private Browsing Mode button from the tray is clicked. -->
<string name="private_browsing_title">Navigation privée</string>

<!-- This string is used as the body of the Private Browsing page that is opened when the
Private Browsing Mode button from the tray is clicked. -->
<string name="private_browsing_body"><![CDATA[
<p>Lorsque vous naviguez dans une fenêtre privée, %1$s <strong>n’enregistre pas</strong>:</p>
<ul class="two-column">
<li>les pages consultées</li>
<li>recherches</li>
<li>cookies</li>
<li>fichiers temporaires</li>
</ul>
<p>La navigation privée <strong>ne vous offre pas l’anonymat</strong> sur Internet. Votre fournisseur d’accès à Internet ou votre employeur peuvent toujours connaître les pages que vous visitez.</p>
<p class="about-info">En savoir plus <a id="learnMore">Navigation privée</a>.</p>
]]></string>

</resources>
26 changes: 0 additions & 26 deletions app/src/main/res/values-it/localpages_strings.xml

This file was deleted.

18 changes: 18 additions & 0 deletions app/src/main/res/values-it/strings.xml
Expand Up @@ -490,4 +490,22 @@
<!-- This string is displayed in any button used for removing all the items in the current context. -->
<string name="remove_all">Rimuovi tutto</string>

<!-- This string is used as the title of the Private Browsing page that is opened when the
Private Browsing Mode button from the tray is clicked. -->

<string name="private_browsing_title">Navigazione anonima</string>
<!-- This string is used as the body of the Private Browsing page that is opened when the
Private Browsing Mode button from the tray is clicked. -->
<string name="private_browsing_body"><![CDATA[
<p>Quando si naviga tramite una finestra privata, %1$s <strong>non salva</strong>:</p>
<ul class="two-column">
<li>le pagine visitate;</li>
<li>le ricerche;</li>
<li>i cookie;</li>
<li>i file temporanei.</li>
</ul>
<p>La navigazione anonima<strong>non rende anonimo l’utente </strong> su Internet. Il datore di lavoro o il provider Internet può ancora venire a conoscenza delle pagine visitate.</p>
<p class="about-info">Ulteriori informazioni sulla <a id="learnMore">navigazione anonima/a>.</p>
]]></string>

</resources>
26 changes: 0 additions & 26 deletions app/src/main/res/values-ja/localpages_strings.xml

This file was deleted.

19 changes: 18 additions & 1 deletion app/src/main/res/values-ja/strings.xml
Expand Up @@ -490,4 +490,21 @@
<!-- This string is displayed in any button used for removing all the items in the current context. -->
<string name="remove_all">すべて削除</string>

</resources>
<!-- This string is used as the title of the Private Browsing page that is opened when the
Private Browsing Mode button from the tray is clicked. -->
<string name="private_browsing_title">プライベートブラウジング</string>
<!-- This string is used as the body of the Private Browsing page that is opened when the
Private Browsing Mode button from the tray is clicked. -->
<string name="private_browsing_body"><![CDATA[
<p>%1$sプライベートウィンドウでは以下を<strong>保存しません</strong>:</p>
<ul class="two-column">
<li>表示したページ</li>
<li>検索履歴</li>
<li>Cookie</li>
<li>一時ファイル/li>
</ul>
<p>プライベートブラウジングで<strong>匿名化はできません</strong>。ネットワーク管理者やインターネットサービスプロバイダーは、依然としてあなたが訪れたページを追跡できます。</p>
<p class="about-info"><a id="learnMore">プライベートブラウジングの詳細</a>。</p>
]]></string>

</resources>
26 changes: 0 additions & 26 deletions app/src/main/res/values-ko/localpages_strings.xml

This file was deleted.

18 changes: 18 additions & 0 deletions app/src/main/res/values-ko/strings.xml
Expand Up @@ -490,4 +490,22 @@
<!-- This string is displayed in any button used for removing all the items in the current context. -->
<string name="remove_all">모두 삭제</string>

<!-- This string is used as the title of the Private Browsing page that is opened when the
Private Browsing Mode button from the tray is clicked. -->
<string name="private_browsing_title">프라이빗 브라우징</string>

<!-- This string is used as the body of the Private Browsing page that is opened when the
Private Browsing Mode button from the tray is clicked. -->
<string name="private_browsing_body"><![CDATA[
<p>프라이빗 창으로 브라우징할 경우, %1$s은(는) <strong>다음을 저장하지 않습니다</strong>:</p>
<ul class="two-column">
<li>방문한 웹페이지</li>
<li>검색</li>
<li>쿠키</li>
<li>임시 파일</li>
</ul>
<p>프라이빗 브라우징<strong>이 인터넷 상에서 귀하를 완전히 감추어주는 것은 아닙니다</strong>. 귀하의 고용주 또는 인터넷 서비스 제공자는 귀하가 방문하는 웹페이지를 알 수 있습니다.</p>
<p class="about-info">프라이빗 브라우징에 대해 자세히 알아보십시오<a id="learnMore"></a>.</p>
]]></string>

</resources>
26 changes: 0 additions & 26 deletions app/src/main/res/values-zh-rCN/localpages_strings.xml

This file was deleted.

20 changes: 19 additions & 1 deletion app/src/main/res/values-zh-rCN/strings.xml
Expand Up @@ -490,4 +490,22 @@
<!-- This string is displayed in any button used for removing all the items in the current context. -->
<string name="remove_all">全部移除</string>

</resources>
<!-- This string is used as the title of the Private Browsing page that is opened when the
Private Browsing Mode button from the tray is clicked. -->
<string name="private_browsing_title">隐私浏览</string>

<!-- This string is used as the body of the Private Browsing page that is opened when the
Private Browsing Mode button from the tray is clicked. -->
<string name="private_browsing_body"><![CDATA[
<p>当您在隐私浏览窗口中浏览时,%1$s <strong>不会保存</strong>:</p>
<ul class="two-column">
<li>访问过的页面</li>
<li>搜索记录</li>
<li>cookie</li>
<li>临时文件</li>
</ul>
<p>隐私浏览<strong>不会使您</strong>在互联网上匿名。您的雇主或者网络服务提供商仍然可以知道您访问了什么页面。</p>
<p class="about-info">详细了解<a id="learnMore">隐私浏览</a>。</p>
]]></string>

</resources>
26 changes: 0 additions & 26 deletions app/src/main/res/values-zh-rTW/localpages_strings.xml

This file was deleted.

0 comments on commit b230f01

Please sign in to comment.