| Index: chrome/app/resources/locale_settings_mr.xtb
|
| ===================================================================
|
| --- chrome/app/resources/locale_settings_mr.xtb (revision 33801)
|
| +++ chrome/app/resources/locale_settings_mr.xtb (working copy)
|
| @@ -85,4 +85,6 @@
|
| <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
|
| <translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_WIDTH_CHARS">60</translation>
|
| <translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_HEIGHT_LINES">8</translation>
|
| +<translation id="IDS_DOWNLOAD_IN_PROGRESS_WIDTH_CHARS">67</translation>
|
| +<translation id="IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES">4</translation>
|
| </translationbundle>
|
|
|
| Property changes on: chrome\app\resources\locale_settings_mr.xtb
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
| Merged /branches/chrome_webkit_merge_branch/chrome/app/resources/locale_settings_mr.xtb:r69-2775
|
| Merged /branches/172/src/chrome/app/resources/locale_settings_mr.xtb:r15630,16043
|
|
|
|
|