Jim Miller
547204c1ed
resolved conflicts for merge of d1b162af to master
2009-12-03 07:55:09 -08:00
Jim Miller
dbd49f026f
am 6d69fb7c: Fix 2266119: Simplify account creation strings and remove translation requirement
...
Merge commit '6d69fb7c577f49558e8431564e3700913a9c1ac5' into eclair-mr2
* commit '6d69fb7c577f49558e8431564e3700913a9c1ac5':
Fix 2266119: Simplify account creation strings and remove translation requirement
2009-12-02 19:04:52 -08:00
Jim Miller
6d69fb7c57
Fix 2266119: Simplify account creation strings and remove translation requirement
...
This removes the word "account" to eliminate the need for translation and to simplify
the use of overlays for vendors that need to customize these strings.
2009-12-02 18:58:55 -08:00
Eric Fischer
743b143d0e
Import revised translations. DO NOT MERGE
...
Approver: jerryw
2009-11-13 17:21:24 -08:00
Eric Fischer
bf67508d16
Import revised translations. DO NOT MERGE
...
Approver: jerryw
2009-11-12 19:48:23 -08:00
Eric Fischer
93517e94ae
Import revised translations. DO NOT MERGE
2009-11-06 15:27:24 -08:00
Eric Fischer
ba2d6de4b7
Import revised translations. DO NOT MERGE
...
Approver: jerryw
2009-10-21 10:44:46 -07:00
Eric Fischer
bdbc5647c6
Reimport translations.
...
Change-Id: I2a37ff6a07f79136ac2bd3fb3e4db72371f45e8c
2009-10-13 16:32:56 -07:00
Eric Fischer
a745f9ae44
Import revised translations. DO NOT MERGE
2009-10-13 16:05:51 -07:00
Eric Fischer
468c2dedfc
Import revised translations. DO NOT MERGE
2009-09-17 14:31:25 -07:00
Eric Fischer
c17da29a98
Import revised translations. DO NOT MERGE
2009-09-08 16:27:08 -07:00
Eric Fischer
f16f1297bd
Import new translations
2009-07-13 15:45:49 -07:00
Eric Fischer
1b32206538
AI 144912: Merge from cupcake:
...
Change 144891 on 2009/04/07 by enf@ebcdic
Import a bunch of revised translations.
Automated import of CL 144912
2009-04-07 13:55:06 -07:00
Eric Fischer
2cfbb10fd0
AI 143164: am: CL 142860 Add a special case for copying translations from other applications.
...
If you absolutely must add a string after string freeze, and that
same string has already been translated for another application
in a similar context, you can copy the translation by specifying
it by numeric message ID.
Fix the incorrect IDs I had told people for a couple of strings,
add the script that will make a flat-file version of translations
so you can find out the IDs yourself, and reimport the translations
for the couple of applications that wanted to copy translations.
Original author: enf
Merged from: //branches/cupcake/...
Automated import of CL 143164
2009-03-27 15:49:34 -07:00
Eric Fischer
8dcff90a5e
Automated import from //branches/donutburger/...@141868,141868
2009-03-24 21:02:50 -07:00
The Android Open Source Project
3469902379
auto import from //branches/cupcake_rel/...@140373
2009-03-18 17:39:48 -07:00
The Android Open Source Project
3db9542af6
auto import from //depot/cupcake/@136594
2009-03-05 14:34:38 -08:00
The Android Open Source Project
96c5af40d6
auto import from //depot/cupcake/@135843
2009-03-03 19:32:22 -08:00
The Android Open Source Project
8c2158a5eb
auto import from //depot/cupcake/@135843
2009-03-03 18:28:50 -08:00
The Android Open Source Project
1f5bbf66d1
auto import from //depot/cupcake/@132589
2009-03-03 14:04:31 -08:00
The Android Open Source Project
7a8703fda9
auto import from //depot/cupcake/@137055
2009-03-02 22:54:40 -08:00
The Android Open Source Project
88a1d6f92d
auto import from //branches/cupcake/...@132276
2009-02-19 10:57:35 -08:00
The Android Open Source Project
f7ae27b973
auto import from //branches/cupcake/...@130745
2009-02-10 15:44:04 -08:00
