awesome-bookmarks/arcanechat-android
3
0
Fork 0
mirror of https://github.com/ArcaneChat/android.git synced 2026-07-03 14:05:24 +02:00
Code Issues Packages Projects Releases 3 Wiki Activity

Merge remote-tracking branch 'upstream/master' into lite

Browse Source
This commit is contained in:
adbenitez
2021-01-16 12:49:17 -05:00
parent 9ec005de09 5371f312ac
commit ee5eee9355
6 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitmodules
-3
View File
@@ -1,3 +0,0 @@
[submodule "jni/deltachat-core-rust"]
path = jni/deltachat-core-rust
url = https://github.com/deltachat/deltachat-core-rust
jni/dc_wrapper.c
-6
View File
@@ -256,12 +256,6 @@ JNIEXPORT void Java_com_b44t_messenger_DcContext_stopIo(JNIEnv *env, jobject obj
}
JNIEXPORT jboolean Java_com_b44t_messenger_DcContext_isIoRunning(JNIEnv *env, jobject obj)
{
return dc_is_io_running(get_dc_context(env, obj)) != 0;
}
JNIEXPORT void Java_com_b44t_messenger_DcContext_maybeNetwork(JNIEnv *env, jobject obj)
{
dc_maybe_network(get_dc_context(env, obj));
jni/deltachat-core-rust
-1
Submodule jni/deltachat-core-rust deleted from c55bdf8895
res/values-tr/strings.xml
+2 -2
View File
@@ -413,8 +413,8 @@
<!-- share and forward messages -->
<!-- Translators: Title shown above a chat/contact list; the user selects the recipient of the messages he wants to forward to -->
<string name="forward_to">İlet…</string>
<string name="share_multiple_attachments">%1$d dosya seçilen sohbete gönderilsin mi?\n\nDosyalar, değiştirilmeden özgün boyutlarında gönderilir; örn. görseller ve videolar yeniden kodlanmaz.</string>
<string name="share_multiple_attachments_multiple_chats">%1$d dosya %2$d sohbete gönderilsin mi?\n\nDosyalar, değiştirilmeden özgün boyutlarında gönderilir; örn. görseller ve videolar yeniden kodlanmaz.</string>
<string name="share_multiple_attachments">%1$d dosya seçilen sohbete gönderilsin mi?\n\nDosyalar, değiştirilmeden özgün boyutlarında gönderilir; ör. görseller ve videolar yeniden kodlanmaz.</string>
<string name="share_multiple_attachments_multiple_chats">%1$d dosya %2$d sohbete gönderilsin mi?\n\nDosyalar, değiştirilmeden özgün boyutlarında gönderilir; ör. görseller ve videolar yeniden kodlanmaz.</string>
<string name="share_text_multiple_chats">Bu metin %1$d sohbete gönderilsin mi?\n\n\"%2$s\"</string>
<string name="share_abort">Eksik izinlerden dolayı paylaşımdan vazgeçildi.</string>
res/values-uk/strings.xml
+1 -1
View File
@@ -11,7 +11,7 @@
<string name="off">Вимкн.</string>
<string name="def">За замовчуванням</string>
<string name="default_value">За замовчуванням (%1$s)</string>
<string name="default_value_as_above">За замовчуванням (так сам, як вказано вище)</string>
<string name="default_value_as_above">За замовчуванням (так само, як вказано вище)</string>
<string name="custom">Персональне налаштування</string>
<string name="none">Не задано</string>
<string name="automatic">Автоматично</string>
src/com/b44t/messenger/DcContext.java
-1
View File
@@ -101,7 +101,6 @@ public class DcContext {
public native void startIo ();
public native void stopIo ();
public native boolean isIoRunning ();
public native void maybeNetwork ();
public native void setConfig (String key, String value);