diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2015-05-12 14:41:17 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2015-05-12 14:41:17 -0700 |
commit | 95139bfa6c8a64a568a5700d6d254db6294b35d6 (patch) | |
tree | 9fd44dbc0d2d626e29df8a0a630fe69cb7526deb /res/values-ne-rNP | |
parent | 22ed889f877f2feee09698c726b515c7d66c5a1a (diff) | |
parent | 2517f887951b2d02294c6f20a4d22ca71314bdba (diff) | |
download | android_packages_apps_Trebuchet-95139bfa6c8a64a568a5700d6d254db6294b35d6.tar.gz android_packages_apps_Trebuchet-95139bfa6c8a64a568a5700d6d254db6294b35d6.tar.bz2 android_packages_apps_Trebuchet-95139bfa6c8a64a568a5700d6d254db6294b35d6.zip |
resolved conflicts for merge of 2517f887 to ub-launcher3-master
Change-Id: I4848774da89811dc173a475cb1d958add6d2bfd0
Diffstat (limited to 'res/values-ne-rNP')
-rw-r--r-- | res/values-ne-rNP/strings.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml index 1681644ee..3730e1de7 100644 --- a/res/values-ne-rNP/strings.xml +++ b/res/values-ne-rNP/strings.xml @@ -53,6 +53,9 @@ <string name="workspace_description_format" msgid="2950174241104043327">"गृह स्क्रिन %1$d"</string> <string name="default_scroll_format" msgid="7475544710230993317">"पृष्ठ %2$d को %1$d"</string> <string name="workspace_scroll_format" msgid="8458889198184077399">"गृह स्क्रिन %2$d को %2$d"</string> + <!-- String.format failed for translation --> + <!-- no translation found for apps_customize_widgets_scroll_format (3106209519974971521) --> + <skip /> <string name="first_run_cling_title" msgid="2459738000155917941">"स्वागतम"</string> <string name="migration_cling_title" msgid="9181776667882933767">"तपाईँको अनुप्रयोग आईकनको प्रतिलिप गर्नुहोस्"</string> <string name="migration_cling_description" msgid="2752413805582227644">"आफ्नो पुरानो गृह स्क्रीनबाट अाईकन र फोल्डरहरू आयात गर्नुहोस्?"</string> |