diff options
| author | steckbrief <steckbrief@chefmail.de> | 2015-02-20 22:19:31 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2015-02-20 22:19:31 +0100 |
| commit | 20eae3955700341188bc1907a506970f5817a153 (patch) | |
| tree | 6e50d9083a4392875b5f9dbe92b38973cf95c332 /src/main/res/values-fr/arrays.xml | |
| parent | 980a84a6ce4358e8662addf203695e01d9f931dc (diff) | |
| parent | ecbceae88b7a7aa871e5396efec1e2ff8d056d46 (diff) | |
Merge master-origin
Conflicts:
src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
src/main/java/eu/siacs/conversations/ui/XmppActivity.java
src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
src/main/java/eu/siacs/conversations/utils/UIHelper.java
src/main/res/values-de/strings.xml
Diffstat (limited to 'src/main/res/values-fr/arrays.xml')
| -rw-r--r-- | src/main/res/values-fr/arrays.xml | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/src/main/res/values-fr/arrays.xml b/src/main/res/values-fr/arrays.xml deleted file mode 100644 index ae140796..00000000 --- a/src/main/res/values-fr/arrays.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources> - - <string-array name="resources"> - <item>Mobile</item> - <item>Téléphone</item> - <item>Tablette</item> - <item>Conversations</item> - <item>Android</item> - </string-array> - <string-array name="filesizes"> - <item>jamais</item> - <item>256 KB</item> - <item>512 KB</item> - <item>1 MB</item> - </string-array> - <string-array name="filesizes_values"> - <item>0</item> - <item>262144</item> - <item>524288</item> - <item>1048576</item> - </string-array> - -</resources>
\ No newline at end of file |