diff options
| author | Chih-Chung Chang <chihchung@google.com> | 2009-08-11 01:32:24 +0800 |
|---|---|---|
| committer | Chih-Chung Chang <chihchung@google.com> | 2009-08-11 01:32:24 +0800 |
| commit | 60f640e3864e6d2dd52b3993f838c2461eb13e1f (patch) | |
| tree | 176b32284ae3d72236f06a17c62298b3c4993471 /res/values-nb/strings.xml | |
| parent | be1cb8546ee56ba86aae76310664f16222b36695 (diff) | |
| parent | 382b384ec2cd948a82fe42294b18e4ec630bbdf6 (diff) | |
| download | LegacyCamera-60f640e3864e6d2dd52b3993f838c2461eb13e1f.zip LegacyCamera-60f640e3864e6d2dd52b3993f838c2461eb13e1f.tar.gz LegacyCamera-60f640e3864e6d2dd52b3993f838c2461eb13e1f.tar.bz2 | |
resolved conflicts for merge of 382b384e to master
Diffstat (limited to 'res/values-nb/strings.xml')
| -rw-r--r-- | res/values-nb/strings.xml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 3bfad6b..ae8dd59 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -64,8 +64,6 @@ <skip /> <!-- no translation found for review_play (6015456244323302817) --> <skip /> - <!-- no translation found for review_attach (7957325229025880473) --> - <skip /> <!-- no translation found for review_cancel (8188009385853399254) --> <skip /> <!-- no translation found for review_done (5417465988786728114) --> @@ -237,8 +235,6 @@ <skip /> <!-- no translation found for multiselect_cancel (5969428692864002165) --> <skip /> - <!-- no translation found for progress_dialog_title (4771577387849747804) --> - <skip /> <!-- no translation found for delete_images_message (4504926868037899430) --> <skip /> <!-- no translation found for video_reach_size_limit (6179877322015552390) --> |