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-fr | |
| parent | be1cb8546ee56ba86aae76310664f16222b36695 (diff) | |
| parent | 382b384ec2cd948a82fe42294b18e4ec630bbdf6 (diff) | |
| download | packages_apps_LegacyCamera-60f640e3864e6d2dd52b3993f838c2461eb13e1f.zip packages_apps_LegacyCamera-60f640e3864e6d2dd52b3993f838c2461eb13e1f.tar.gz packages_apps_LegacyCamera-60f640e3864e6d2dd52b3993f838c2461eb13e1f.tar.bz2 | |
resolved conflicts for merge of 382b384e to master
Diffstat (limited to 'res/values-fr')
| -rw-r--r-- | res/values-fr/strings.xml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 4524a23..4e0e73c 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -57,7 +57,6 @@ <string name="review_share">"PARTAGER"</string> <string name="review_set">"DÉFINIR COMME"</string> <string name="review_play">"LIRE"</string> - <string name="review_attach">"JOINDRE"</string> <string name="review_cancel">"ANNULER"</string> <string name="review_done">"FERMER"</string> <string name="review_ok">"OK"</string> @@ -194,7 +193,6 @@ <string name="multiselect_delete">"Supprimer"</string> <!-- no translation found for multiselect_cancel (5969428692864002165) --> <skip /> - <string name="progress_dialog_title">"En cours…"</string> <string name="delete_images_message">"Suppression des images en cours, veuillez patienter..."</string> <!-- no translation found for video_reach_size_limit (6179877322015552390) --> <skip /> |