Skip to content

Commit

Permalink
Tiny bug fix plus updating strings and Japanese translation
Browse files Browse the repository at this point in the history
git-svn-id: http://ringdroid.googlecode.com/svn/trunk@36 35bc551c-9c80-11dd-979b-47109e308e52
  • Loading branch information
dmazzoni committed Jul 17, 2009
1 parent 2f3878d commit b41d140
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 18 deletions.
13 changes: 3 additions & 10 deletions res/values-ja/strings.xml
Expand Up @@ -54,7 +54,7 @@
<string name="choose_contact_ringtone_button">連絡先着信音に設定する</string>
<string name="do_nothing_with_ringtone_button">閉じる</string>

<!-- Progress dialog text for loading or saving... -->
<!-- Progress dialog while loading a sound -->
<string name="progress_dialog_loading">ロード中…</string>
<string name="progress_dialog_saving">Saving...</string>

Expand All @@ -71,8 +71,8 @@
Context menu items
-->

<string name="context_menu_edit">Edit</string>
<string name="context_menu_delete">Delete</string>
<string name="context_menu_edit">編集</string>
<string name="context_menu_delete">削除</string>

<!--
File Save dialog
Expand All @@ -93,13 +93,6 @@

<string name="artist_name">Ringdroid</string>

<!--
Context menu
-->

<string name="context_edit">編集</string>
<string name="context_delete">削除</string>

<!--
Delete confirmation dialog
-->
Expand Down
7 changes: 0 additions & 7 deletions res/values/strings.xml
Expand Up @@ -93,13 +93,6 @@

<string name="artist_name">Ringdroid</string>

<!--
Context menu
-->

<string name="context_edit">Edit</string>
<string name="context_delete">Delete</string>

<!--
Delete confirmation dialog
-->
Expand Down
2 changes: 1 addition & 1 deletion src/com/ringdroid/RingdroidEditActivity.java
Expand Up @@ -882,7 +882,7 @@ private void setOffsetGoalNoUpdate(int offset) {
}

private String formatTime(int pixels) {
if (mSoundFile != null) {
if (mSoundFile != null && mWaveformView != null) {
return formatDecimal(mWaveformView.pixelsToSeconds(pixels));
} else {
return "";
Expand Down

0 comments on commit b41d140

Please sign in to comment.