aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-06-23 12:15:18 +0200
committerDaniel Gultsch <daniel@gultsch.de>2015-06-23 12:15:18 +0200
commit2dd16a8b56e7755582b2f195fd86deb1ea77252d (patch)
tree97342ad18be891ee0d4adfd45d19fd63bdc74e10 /src/main/res
parent9b7a606cb03bbaf36fc691f02ef32ab9c158de6d (diff)
parent5a48afdd4d44b5865831df470a2c5d00e9cc9599 (diff)
Merge branch 'development'1.4.4
Diffstat (limited to 'src/main/res')
-rw-r--r--src/main/res/drawable-hdpi/ic_send_picture_away.pngbin0 -> 790 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_send_picture_dnd.pngbin0 -> 884 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_send_picture_offline.pngbin0 -> 657 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_send_picture_online.pngbin0 -> 867 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_send_picture_away.pngbin0 -> 512 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_send_picture_dnd.pngbin0 -> 585 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_send_picture_offline.pngbin0 -> 456 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_send_picture_online.pngbin0 -> 580 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_send_picture_away.pngbin0 -> 899 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_send_picture_dnd.pngbin0 -> 1016 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_send_picture_offline.pngbin0 -> 799 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_send_picture_online.pngbin0 -> 997 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_send_picture_away.pngbin0 -> 1327 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_send_picture_dnd.pngbin0 -> 1516 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_send_picture_offline.pngbin0 -> 1159 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_send_picture_online.pngbin0 -> 1493 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_send_picture_away.pngbin0 -> 1632 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_send_picture_dnd.pngbin0 -> 1784 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_send_picture_offline.pngbin0 -> 1428 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_send_picture_online.pngbin0 -> 1800 bytes
-rw-r--r--src/main/res/values-bg/strings.xml5
-rw-r--r--src/main/res/values-ca@valencia/strings.xml2
-rw-r--r--src/main/res/values-cs/strings.xml5
-rw-r--r--src/main/res/values-de/strings.xml5
-rw-r--r--src/main/res/values-es/strings.xml5
-rw-r--r--src/main/res/values-eu/strings.xml5
-rw-r--r--src/main/res/values-id/strings.xml5
-rw-r--r--src/main/res/values-ja/strings.xml5
-rw-r--r--src/main/res/values-ko/strings.xml5
-rw-r--r--src/main/res/values-nl/strings.xml5
-rw-r--r--src/main/res/values-pl/strings.xml5
-rw-r--r--src/main/res/values-sr/strings.xml5
-rw-r--r--src/main/res/values-sv/strings.xml5
-rw-r--r--src/main/res/values-zh-rCN/strings.xml5
-rw-r--r--src/main/res/values/arrays.xml2
35 files changed, 67 insertions, 2 deletions
diff --git a/src/main/res/drawable-hdpi/ic_send_picture_away.png b/src/main/res/drawable-hdpi/ic_send_picture_away.png
new file mode 100644
index 00000000..09d1c7b7
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_send_picture_away.png
Binary files differ
diff --git a/src/main/res/drawable-hdpi/ic_send_picture_dnd.png b/src/main/res/drawable-hdpi/ic_send_picture_dnd.png
new file mode 100644
index 00000000..77964b5b
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_send_picture_dnd.png
Binary files differ
diff --git a/src/main/res/drawable-hdpi/ic_send_picture_offline.png b/src/main/res/drawable-hdpi/ic_send_picture_offline.png
new file mode 100644
index 00000000..28135e25
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_send_picture_offline.png
Binary files differ
diff --git a/src/main/res/drawable-hdpi/ic_send_picture_online.png b/src/main/res/drawable-hdpi/ic_send_picture_online.png
new file mode 100644
index 00000000..feb926c6
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_send_picture_online.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_send_picture_away.png b/src/main/res/drawable-mdpi/ic_send_picture_away.png
new file mode 100644
index 00000000..d3ebca53
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_send_picture_away.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_send_picture_dnd.png b/src/main/res/drawable-mdpi/ic_send_picture_dnd.png
new file mode 100644
index 00000000..1d293f20
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_send_picture_dnd.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_send_picture_offline.png b/src/main/res/drawable-mdpi/ic_send_picture_offline.png
new file mode 100644
index 00000000..95d5621e
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_send_picture_offline.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_send_picture_online.png b/src/main/res/drawable-mdpi/ic_send_picture_online.png
new file mode 100644
index 00000000..be4194d3
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_send_picture_online.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_picture_away.png b/src/main/res/drawable-xhdpi/ic_send_picture_away.png
new file mode 100644
index 00000000..f9aa21dc
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_send_picture_away.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_picture_dnd.png b/src/main/res/drawable-xhdpi/ic_send_picture_dnd.png
new file mode 100644
index 00000000..95e4acce
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_send_picture_dnd.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_picture_offline.png b/src/main/res/drawable-xhdpi/ic_send_picture_offline.png
new file mode 100644
index 00000000..75ff2fc4
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_send_picture_offline.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_picture_online.png b/src/main/res/drawable-xhdpi/ic_send_picture_online.png
new file mode 100644
index 00000000..0f68d5f5
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_send_picture_online.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_picture_away.png b/src/main/res/drawable-xxhdpi/ic_send_picture_away.png
new file mode 100644
index 00000000..7898ed4f
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_send_picture_away.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_picture_dnd.png b/src/main/res/drawable-xxhdpi/ic_send_picture_dnd.png
new file mode 100644
index 00000000..ccffabbe
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_send_picture_dnd.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_picture_offline.png b/src/main/res/drawable-xxhdpi/ic_send_picture_offline.png
new file mode 100644
index 00000000..7b5687e4
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_send_picture_offline.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_picture_online.png b/src/main/res/drawable-xxhdpi/ic_send_picture_online.png
new file mode 100644
index 00000000..82eab70c
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_send_picture_online.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_picture_away.png b/src/main/res/drawable-xxxhdpi/ic_send_picture_away.png
new file mode 100644
index 00000000..1daa8ecc
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_send_picture_away.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_picture_dnd.png b/src/main/res/drawable-xxxhdpi/ic_send_picture_dnd.png
new file mode 100644
index 00000000..d8257aad
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_send_picture_dnd.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_picture_offline.png b/src/main/res/drawable-xxxhdpi/ic_send_picture_offline.png
new file mode 100644
index 00000000..d487709b
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_send_picture_offline.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_picture_online.png b/src/main/res/drawable-xxxhdpi/ic_send_picture_online.png
new file mode 100644
index 00000000..c095d795
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_send_picture_online.png
Binary files differ
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index b27481dd..52bb0054 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -446,4 +446,9 @@
<item quantity="one">Изберете %d контакт</item>
<item quantity="other">Изберете %d контакта</item>
</plurals>
+ <string name="pref_quick_action_summary">Замяна на бутона за изпращане с бързо действие</string>
+ <string name="pref_quick_action">Бързо действие</string>
+ <string name="none">Нищо</string>
+ <string name="recently_used">Използвани наскоро</string>
+ <string name="choose_quick_action">Изберете бързо действие</string>
</resources>
diff --git a/src/main/res/values-ca@valencia/strings.xml b/src/main/res/values-ca@valencia/strings.xml
deleted file mode 100644
index c757504a..00000000
--- a/src/main/res/values-ca@valencia/strings.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources/>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index f49cb1b9..c199ec76 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -448,4 +448,9 @@
<item quantity="few">Vybrat %d kontakty</item>
<item quantity="other">Vybrat %d kontaktů</item>
</plurals>
+ <string name="pref_quick_action_summary">Nahradit tlačítko odeslání rychlou akcí</string>
+ <string name="pref_quick_action">Rychlá akce</string>
+ <string name="none">Žádná</string>
+ <string name="recently_used">Naposledy použitá</string>
+ <string name="choose_quick_action">Vybrat rychlou akci</string>
</resources>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 08b0d4a5..000c253b 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -446,4 +446,9 @@
<item quantity="one">%d Kontakt ausgewählt</item>
<item quantity="other">%d Kontakte ausgewählt</item>
</plurals>
+ <string name="pref_quick_action_summary">Ersetze Absende-Knopf durch Schnell-Tasten</string>
+ <string name="pref_quick_action">Schnell-Tasten</string>
+ <string name="none">keine</string>
+ <string name="recently_used">zuletzt verwendet</string>
+ <string name="choose_quick_action">wähle Schnell-Taste</string>
</resources>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 109715e3..880ee66b 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -446,4 +446,9 @@
<item quantity="one">Seleccionado %d contacto</item>
<item quantity="other">Seleccionados %d contactos</item>
</plurals>
+ <string name="pref_quick_action_summary">Cambiar el botón de enviar por botón de acción rápida</string>
+ <string name="pref_quick_action">Acción Rápida</string>
+ <string name="none">Ninguna</string>
+ <string name="recently_used">Usada más recientemente</string>
+ <string name="choose_quick_action">Elegir acción rápida</string>
</resources>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index ac66bfc1..b594c069 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -446,4 +446,9 @@
<item quantity="one">Hautatu kontaktu %d</item>
<item quantity="other">Hautatu %d kontaktu</item>
</plurals>
+ <string name="pref_quick_action_summary">Bidaltze botoia ekintza azkar batekin aldatu</string>
+ <string name="pref_quick_action">Ekintza azkarra</string>
+ <string name="none">Bat ere ez</string>
+ <string name="recently_used">Azkenengo aldiz erabilitakoa</string>
+ <string name="choose_quick_action">Ekintza azkarra aukeratu</string>
</resources>
diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml
index 69bd0911..3ce9cc82 100644
--- a/src/main/res/values-id/strings.xml
+++ b/src/main/res/values-id/strings.xml
@@ -444,4 +444,9 @@
<plurals name="select_contact">
<item quantity="other">Pilih %d kontak</item>
</plurals>
+ <string name="pref_quick_action_summary">Timpa tombol kirim dengan aksi cepat</string>
+ <string name="pref_quick_action">Aksi Cepat</string>
+ <string name="none">Tak satupun</string>
+ <string name="recently_used">Maling sering digunakan</string>
+ <string name="choose_quick_action">Pilih aksi cepat</string>
</resources>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 35fb5472..38735f39 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -444,4 +444,9 @@
<plurals name="select_contact">
<item quantity="other">%d 連絡先を選択</item>
</plurals>
+ <string name="pref_quick_action_summary">送信ボタンをクイックアクションで置き換えます</string>
+ <string name="pref_quick_action">クイックアクション</string>
+ <string name="none">なし</string>
+ <string name="recently_used">最近使用した</string>
+ <string name="choose_quick_action">クイックアクションの選択</string>
</resources>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index d00ab0fd..9354c432 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -444,4 +444,9 @@
<plurals name="select_contact">
<item quantity="other">%d 연락처 선택 </item>
</plurals>
+ <string name="pref_quick_action_summary">전송 버튼을 빠른 동작 버튼으로 교체</string>
+ <string name="pref_quick_action">빠른 동작</string>
+ <string name="none">없음</string>
+ <string name="recently_used">최근 사용된 항목</string>
+ <string name="choose_quick_action">빠른 동작 선택</string>
</resources>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 2532130d..e3f0e69b 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -446,4 +446,9 @@
<item quantity="one">Selecteer %d contact</item>
<item quantity="other">Selecteer %d contacten</item>
</plurals>
+ <string name="pref_quick_action_summary">Vervang verzendknop door snelle actie</string>
+ <string name="pref_quick_action">Snelle actie</string>
+ <string name="none">Geen</string>
+ <string name="recently_used">Recent gebruikt</string>
+ <string name="choose_quick_action">Kies snelle actie</string>
</resources>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 70c3a49d..6a983f50 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -448,4 +448,9 @@
<item quantity="few">%d kontakty wybrane</item>
<item quantity="other">%d kontaktów wybranych</item>
</plurals>
+ <string name="pref_quick_action_summary">Zastąp przycisk wysyłania szybką akcją</string>
+ <string name="pref_quick_action">Szybka akcja</string>
+ <string name="none">Brak</string>
+ <string name="recently_used">Ostatnio używana</string>
+ <string name="choose_quick_action">Wybierz szybką akcję</string>
</resources>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index ea5cbdb8..60f2e586 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -448,4 +448,9 @@
<item quantity="few">Изабери %d контакта</item>
<item quantity="other">Изабери %d контаката</item>
</plurals>
+ <string name="pref_quick_action_summary">Замени дугме за слање брзом радњом</string>
+ <string name="pref_quick_action">Брза радња</string>
+ <string name="none">Ниједна</string>
+ <string name="recently_used">Недавно коришћена</string>
+ <string name="choose_quick_action">Изаберите брзу радњу</string>
</resources>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 4f84110b..9c60db53 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -446,4 +446,9 @@
<item quantity="one">Välj %d kontakt</item>
<item quantity="other">Välj %d kontakter</item>
</plurals>
+ <string name="pref_quick_action_summary">Byt sänd-knappen mot snabbfunktion</string>
+ <string name="pref_quick_action">Snabbfunktion</string>
+ <string name="none">Ingen</string>
+ <string name="recently_used">Senast använd</string>
+ <string name="choose_quick_action">Välj snabbfunktion</string>
</resources>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 2f80e064..e194bffd 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -444,4 +444,9 @@
<plurals name="select_contact">
<item quantity="other">选择 %d 个联系人</item>
</plurals>
+ <string name="pref_quick_action_summary">以快速动作替代发送按钮</string>
+ <string name="pref_quick_action">快速动作</string>
+ <string name="none">无</string>
+ <string name="recently_used">最近使用过的</string>
+ <string name="choose_quick_action">选择快速动作</string>
</resources>
diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml
index fec077cc..5be352d1 100644
--- a/src/main/res/values/arrays.xml
+++ b/src/main/res/values/arrays.xml
@@ -44,6 +44,7 @@
<item>@string/none</item>
<item>@string/recently_used</item>
<item>@string/attach_take_picture</item>
+ <item>@string/attach_choose_picture</item>
<item>@string/attach_record_voice</item>
<item>@string/send_location</item>
</string-array>
@@ -52,6 +53,7 @@
<item>none</item>
<item>recent</item>
<item>photo</item>
+ <item>picture</item>
<item>voice</item>
<item>location</item>
</string-array>