diff options
| author | Steve Kondik <shade@chemlab.org> | 2011-07-26 13:12:57 -0400 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2011-07-26 14:06:18 -0400 |
| commit | 33ab30e851a9eb2e28ae4a4d20df44c71a7c4b76 (patch) | |
| tree | 25c5bf2a14b29bc07c4115aea94250a04e575af3 /res/values-nb/strings.xml | |
| parent | b35a8f433c2aef469394c868c4e72a625af4b357 (diff) | |
| parent | 783921abbc95bf8042bb5294b6a292335b5c157f (diff) | |
| download | android_packages_apps_Calendar-33ab30e851a9eb2e28ae4a4d20df44c71a7c4b76.tar.gz android_packages_apps_Calendar-33ab30e851a9eb2e28ae4a4d20df44c71a7c4b76.tar.bz2 android_packages_apps_Calendar-33ab30e851a9eb2e28ae4a4d20df44c71a7c4b76.zip | |
Merge branch 'gingerbread' of git://android.git.kernel.org/platform/packages/apps/Calendar into upstream-2.3.5cm-7.1.0gingerbread-release
Conflicts:
res/values-zh-rTW/strings.xml
Change-Id: I058f9e3e30c23d2b8ca3c064b9e8e9cbeae29848
Diffstat (limited to 'res/values-nb/strings.xml')
| -rw-r--r-- | res/values-nb/strings.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 7ed4fab8..b102aaff 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -140,7 +140,7 @@ <string name="preferences_use_home_tz_title" msgid="5597546849968598210">"Bruk egen tidssone"</string> <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"Viser kalender- og aktivitetstidspunkter i din egen tidssone når du er på reise"</string> <string name="preferences_home_tz_title" msgid="6680000444088818578">"Egen tidssone"</string> - <string name="preferences_about_title" msgid="2810624892412097879">"Om"</string> + <string name="preferences_about_title" msgid="2810624892412097879">"Info"</string> <string name="preferences_build_version" msgid="8242471883413502068">"Delversjon"</string> <string-array name="prefEntries_alerts_vibrateWhen"> <item msgid="2539376794936035639">"Alltid"</item> |