diff options
author | Markus Doits <markus.doits@googlemail.com> | 2011-11-03 20:14:24 +0100 |
---|---|---|
committer | Markus Doits <markus.doits@googlemail.com> | 2011-11-03 20:14:24 +0100 |
commit | 1b7fbb1eebea32ebce28c5f1fa501edf0f2744fc (patch) | |
tree | e8cc68c908c802dbc84a2f19271337ddd2bbe2b0 /res/values/arrays.xml | |
parent | 0502be76524cee950fb33aa1e687f70caabf4030 (diff) | |
parent | 9fbda63b6f20870f9ce6875a625c4e780d250aa9 (diff) | |
download | open-keychain-1b7fbb1eebea32ebce28c5f1fa501edf0f2744fc.tar.gz open-keychain-1b7fbb1eebea32ebce28c5f1fa501edf0f2744fc.tar.bz2 open-keychain-1b7fbb1eebea32ebce28c5f1fa501edf0f2744fc.zip |
Update to latest version in master
Merge branch 'master' into apg_service
Conflicts:
src/org/thialfihar/android/apg/Apg.java
src/org/thialfihar/android/apg/Preferences.java
Diffstat (limited to 'res/values/arrays.xml')
-rw-r--r-- | res/values/arrays.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index df87ab61c..25a4e66df 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -206,6 +206,7 @@ <item>es</item> <item>it</item> <item>no</item> + <item>pt</item> <item>sl</item> <item>zh</item> </string-array> |