aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpinky@build01 <jenkins@cyanogenmod.com>2016-07-11 19:17:13 -0700
committerpinky@build01 <jenkins@cyanogenmod.com>2016-07-11 19:17:13 -0700
commitcbbdd9fd73f0558c36e9b0451fc34e15ce73240c (patch)
tree218d8f795c6f91250a577475d50bf83d6390125e
parente3a71a2b528bd90c58fa44c37d5fae76bd8fe9c7 (diff)
downloadandroid_packages_apps_CMFileManager-cbbdd9fd73f0558c36e9b0451fc34e15ce73240c.tar.gz
android_packages_apps_CMFileManager-cbbdd9fd73f0558c36e9b0451fc34e15ce73240c.tar.bz2
android_packages_apps_CMFileManager-cbbdd9fd73f0558c36e9b0451fc34e15ce73240c.zip
Automatic translation import
Change-Id: Ibd3d7238b391e4cc31c4d567322129743ebaffdc Ticket: RM-231
-rw-r--r--res/values-ja/strings.xml4
-rw-r--r--res/values-nb/plurals.xml12
-rw-r--r--res/values-nb/strings.xml2
3 files changed, 9 insertions, 9 deletions
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index e4133ac7..c3bcefe0 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -475,7 +475,7 @@
<!-- Associations Dialog - Title -->
<string name="associations_dialog_title">連携</string>
<!-- Associations Dialog - Remember the user action -->
- <string name="associations_dialog_remember">選択を記憶</string>
+ <string name="associations_dialog_remember">選択を保存</string>
<!-- Associations Dialog - Open with Title -->
<string name="associations_dialog_openwith_title">他のアプリで開く</string>
<!-- Associations Dialog - Open action (button title) -->
@@ -744,7 +744,7 @@
<!-- Secure Storage unlock failed toast -->
<string name="secure_storage_unlock_failed">ストレージのロックを解除できません</string>
<!-- Secure Storage unlock validation, length -->
- <string name="secure_storage_unlock_validation_length">パスワードは最低<xliff:g id="characters">%1$d</xliff:g>文字以上である必要があります。</string>
+ <string name="secure_storage_unlock_validation_length">パスワードは最低<xliff:g id="characters">%1$d</xliff:g>文字以上で指定してください。</string>
<!-- Secure Storage unlock validation, equal -->
<string name="secure_storage_unlock_validation_equals">パスワードが一致しません。</string>
<!-- Secure storage open file warning -->
diff --git a/res/values-nb/plurals.xml b/res/values-nb/plurals.xml
index 3fbac880..95ebfaf4 100644
--- a/res/values-nb/plurals.xml
+++ b/res/values-nb/plurals.xml
@@ -21,22 +21,22 @@
<item quantity="other"><xliff:g id="folders">%1$d</xliff:g> mapper</item>
</plurals>
<plurals name="n_files">
- <item quantity="one">0 filer</item>
- <item quantity="other">1 fil</item>
+ <item quantity="one"><xliff:g id="files">%1$d</xliff:g> fil</item>
+ <item quantity="other"><xliff:g id="files">%1$d</xliff:g> filer</item>
</plurals>
<!-- Search - Found items -->
<plurals name="search_found_items">
- <item quantity="one">Ingen elementer funnet</item>
- <item quantity="other">1 element funnet</item>
+ <item quantity="one"><xliff:g id="count">%1$d</xliff:g> element funnet</item>
+ <item quantity="other"><xliff:g id="count">%d</xliff:g> elementer funnet</item>
</plurals>
<!-- Statusbar text if there are selected files or folders -->
<plurals name="selection_folders">
<item quantity="one"><xliff:g id="folders">%1$d</xliff:g> mappe valgt.</item>
- <item quantity="other"><xliff:g id="folders">%1$d</xliff:g> mappe valgt.</item>
+ <item quantity="other"><xliff:g id="folders">%1$d</xliff:g> mapper valgt.</item>
</plurals>
<plurals name="selection_files">
<item quantity="one"><xliff:g id="files">%1$d</xliff:g> fil valgt.</item>
- <item quantity="other"><xliff:g id="files">%1$d</xliff:g> fil valgt.</item>
+ <item quantity="other"><xliff:g id="files">%1$d</xliff:g> filer valgt.</item>
</plurals>
<!-- Actions - Confirm the number of items that are going to be deleted -->
<plurals name="deleting_n_items">
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index a4204ac5..cb173bb4 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -660,7 +660,7 @@
<!-- Preferences - Editor - Hex dump -->
<string name="pref_hexdump">Hexdump av binære filer</string>
<!-- Preferences - Editor - Hex dump desc -->
- <string name="pref_hexdump_desc">Generer en hex-dump av den binære filen og åpne den i en hex-editor</string>
+ <string name="pref_hexdump_desc">Når en binærfil åpnes, genereres en hex-dump av filen og åpne den i en hex-editor</string>
<!-- Preferences - Editor - Syntax highlight category -->
<string name="pref_editor_syntax_highlight_category">Syntaks utheving</string>
<!-- Preferences - Editor - Syntax highlight -->