Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 322a33ab authored by Hasso Tepper's avatar Hasso Tepper Committed by jackmu95
Browse files

CMFileManager: Make use of plurals correctly

* Make selection strings use of plurals allowing to translate these into
  languages where the logic of plurals is different than in English.

* Rename some plurals as these are not used only in properties dialog
  any more.

* Remove quantity="zero" cases from plurals as these are never used in
  English.

* Remove now unused strings from translations and rename plurals.

Change-Id: I8c07f1ba85b208d37626106e0e2f691468c1cbc4
parent 5a5f2716
Loading
Loading
Loading
Loading
+2 −16
Original line number Diff line number Diff line
@@ -274,13 +274,13 @@
  <!-- Fso Properties Dialog * Others Label -->
  <string name="fso_properties_dialog_others">Ander:</string>
  <!-- Fso Properties Dialog * Folders -->
  <plurals name="fso_properties_dialog_folders">
  <plurals name="n_folders">
    <item quantity="zero">0 vouergidse</item>
    <item quantity="one">1 vouergids</item>
    <item quantity="other"><xliff:g id="folders">%1$d</xliff:g> vouergidse</item>
  </plurals>
  <!-- Fso Properties Dialog * Files -->
  <plurals name="fso_properties_dialog_files">
  <plurals name="n_files">
    <item quantity="zero">0 lêers</item>
    <item quantity="one">1 lêer</item>
    <item quantity="other"><xliff:g id="files">%1$d</xliff:g> lêers</item>
@@ -571,20 +571,6 @@
  <string name="filetime_format_mode_MMddyyyy_HHmmss">mm/dd/yyyy hh:mm:ss</string>
  <string name="filetime_format_mode_yyyyMMdd_HHmmss">yyyy-mm-dd hh:mm:ss</string>

  <!-- Selection. All possibilities. [1 folder; >1 folders; 1 file; >1 files;
     >1 folders and 1 file; 1 folder and >1 files; >1 folders and >1 files]
     Avoid using plural item because is more complex to achieved all strings -->
  <string name="selection_one_folder"><xliff:g id="folders">%1$s</xliff:g> vouergids geselekteer.</string>
  <string name="selection_other_folders"><xliff:g id="folders">%1$s</xliff:g> vouergidse geselekteer.</string>
  <string name="selection_one_file"><xliff:g id="files">%1$s</xliff:g> lêer geselekteer.</string>
  <string name="selection_other_files"><xliff:g id="files">%1$s</xliff:g> lêers geselekteer.</string>
  <string name="selection_other_folders_one_file"><xliff:g id="folders">%1$s</xliff:g> vouergids en
    <xliff:g id="files">%2$s</xliff:g> lêer geselekteer.</string>
  <string name="selection_one_folder_other_files"><xliff:g id="folder2">%1$s</xliff:g> vouergids en
    <xliff:g id="file2">%2$s</xliff:g> lêers geselekteer.</string>
  <string name="selection_other_folders_other_files"><xliff:g id="folder2">%1$s</xliff:g> vouergidse
    en <xliff:g id="files">%2$s</xliff:g> lêers geselekteer.</string>

  <!-- Category descriptions -->
  <string name="category_system">STELSEL</string>
  <string name="category_app">PROGRAM</string>
+2 −10
Original line number Diff line number Diff line
@@ -145,13 +145,13 @@
  <string name="fso_properties_dialog_owner">Vlastník:</string>
  <string name="fso_properties_dialog_group">Skupina:</string>
  <string name="fso_properties_dialog_others">Ostatní:</string>
  <plurals name="fso_properties_dialog_folders">
  <plurals name="n_folders">
    <item quantity="zero">0 složek</item>
    <item quantity="one">1 složka</item>
    <item quantity="few"><xliff:g id="folders">%1$d</xliff:g> složky</item>
    <item quantity="other"><xliff:g id="folders">%1$d</xliff:g> složek</item>
  </plurals>
  <plurals name="fso_properties_dialog_files">
  <plurals name="n_files">
    <item quantity="zero">0 souborů</item>
    <item quantity="one">1 soubor</item>
    <item quantity="few"><xliff:g id="files">%1$d</xliff:g> soubory</item>
@@ -309,14 +309,6 @@
  <string name="filetime_format_mode_MMddyyyy_HHmmss">mm/dd/yyyy hh:mm:ss</string>
  <string name="filetime_format_mode_yyyyMMdd_HHmmss">yyyy-mm-dd hh:mm:ss</string>

  <string name="selection_one_folder"><xliff:g id="folders">%1$s</xliff:g> složka vybrána.</string>
  <string name="selection_other_folders">Vybraných složek: <xliff:g id="folders">%1$s</xliff:g></string>
  <string name="selection_one_file"><xliff:g id="files">%1$s</xliff:g> soubor vybrán.</string>
  <string name="selection_other_files">Vybraných souborů: <xliff:g id="files">%1$s</xliff:g></string>
  <string name="selection_other_folders_one_file">Vybraných složek: <xliff:g id="folders">%1$s</xliff:g> a <xliff:g id="files">%2$s</xliff:g> soubor vybrán.</string>
  <string name="selection_one_folder_other_files">Vybrána složka <xliff:g id="folder2">%1$s</xliff:g> a vybraných souborů: <xliff:g id="file2">%2$s</xliff:g></string>
  <string name="selection_other_folders_other_files">Vybraných složek: <xliff:g id="folder2">%1$s</xliff:g> a vybraných souborů: <xliff:g id="files">%2$s</xliff:g></string>

  <string name="category_system">SYSTÉM</string>
  <string name="category_app">APLIKACE</string>
  <string name="category_binary">BINÁRNÍ SOUBOR</string>
+2 −2
Original line number Diff line number Diff line
@@ -16,12 +16,12 @@

<resources xmlns:android="http://schemas.android.com/apk/res/android"
  xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <plurals name="fso_properties_dialog_folders">
  <plurals name="n_folders">
    <item quantity="zero">0 mapper</item>
    <item quantity="one">1 mappe</item>
    <item quantity="other"><xliff:g id="folders">%1$d</xliff:g> mapper</item>
  </plurals>
  <plurals name="fso_properties_dialog_files">
  <plurals name="n_files">
    <item quantity="zero">0 filer</item>
    <item quantity="one">1 fil</item>
    <item quantity="other"><xliff:g id="files">%1$d</xliff:g> filer</item>
+0 −7
Original line number Diff line number Diff line
@@ -271,13 +271,6 @@
  <string name="filetime_format_mode_ddMMyyyy_HHmmss">dd/mm/åååå tt:mm:ss</string>
  <string name="filetime_format_mode_MMddyyyy_HHmmss">mm/dd/åååå tt:mm:ss</string>
  <string name="filetime_format_mode_yyyyMMdd_HHmmss">åååå-mm-dd tt:mm:ss</string>
  <string name="selection_one_folder"><xliff:g id="folders">%1$s</xliff:g> mappe valgt.</string>
  <string name="selection_other_folders"><xliff:g id="folders">%1$s</xliff:g> mapper valgt.</string>
  <string name="selection_one_file"><xliff:g id="files">%1$s</xliff:g> fil valgt.</string>
  <string name="selection_other_files"><xliff:g id="files">%1$s</xliff:g> filer valgt.</string>
  <string name="selection_other_folders_one_file"><xliff:g id="folders">%1$s</xliff:g> mapper og <xliff:g id="files">%2$s</xliff:g> fil valgt.</string>
  <string name="selection_one_folder_other_files"><xliff:g id="folder2">%1$s</xliff:g> mappe og <xliff:g id="file2">%2$s</xliff:g> filer valgt.</string>
  <string name="selection_other_folders_other_files"><xliff:g id="folder2">%1$s</xliff:g> mapper og <xliff:g id="files">%2$s</xliff:g> filer valgt.</string>
  <string name="category_system">SYSTEM</string>
  <string name="category_app">APP</string>
  <string name="category_binary">BINÆR</string>
+2 −11
Original line number Diff line number Diff line
@@ -172,14 +172,14 @@
    <string name="fso_properties_dialog_others">Andere:</string>

    <!-- Fso properties - Folders -->
    <plurals name="fso_properties_dialog_folders">
    <plurals name="n_folders">
        <item quantity="zero">Kein Ordner</item>
        <item quantity="one">1 Ordner</item>
        <item quantity="other"><xliff:g id="folders">%1$d</xliff:g> Ordner</item>
    </plurals>

    <!-- Fso properties - Files -->
    <plurals name="fso_properties_dialog_files">
    <plurals name="n_files">
        <item quantity="zero">Keine Dateien</item>
        <item quantity="one">1 Datei</item>
        <item quantity="other"><xliff:g id="files">%1$d</xliff:g> Dateien</item>
@@ -354,15 +354,6 @@
    <string name="filetime_format_mode_MMddyyyy_HHmmss">mm/dd/yyyy hh:mm:ss</string>
    <string name="filetime_format_mode_yyyyMMdd_HHmmss">yyyy-mm-dd hh:mm:ss</string>

    <!-- Selections -->
    <string name="selection_one_folder"><xliff:g id="folders">%1$s</xliff:g> Ordner ausgewählt</string>
    <string name="selection_other_folders"><xliff:g id="folders">%1$s</xliff:g> Ordner ausgewählt</string>
    <string name="selection_one_file"><xliff:g id="files">%1$s</xliff:g> Datei ausgewählt.</string>
    <string name="selection_other_files"><xliff:g id="files">%1$s</xliff:g> Dateien ausgewählt</string>
    <string name="selection_other_folders_one_file"><xliff:g id="folders">%1$s</xliff:g> Ordner und <xliff:g id="files">%2$s</xliff:g> Datei ausgewählt</string>
    <string name="selection_one_folder_other_files"><xliff:g id="folder2">%1$s</xliff:g> Ordner und <xliff:g id="file2">%2$s</xliff:g> Dateien ausgewählt</string>
    <string name="selection_other_folders_other_files"><xliff:g id="folder2">%1$s</xliff:g> Ordner und <xliff:g id="files">%2$s</xliff:g> Dateien ausgewählt</string>

    <!-- Category descriptions -->
    <string name="category_system">SYSTEM</string>
    <string name="category_app">APP</string>
Loading