From 09a01cf5a829150d2109aad3a41d4a4766305998 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Wed, 17 Jun 2015 01:41:32 -0400 Subject: [PATCH 1/5] [tx-robot] updated from transifex --- .../src/main/res/values-oc/strings.xml | 171 +++++++++++++++++- .../src/main/res/values-pt-rPT/strings.xml | 13 ++ 2 files changed, 176 insertions(+), 8 deletions(-) diff --git a/News-Android-App/src/main/res/values-oc/strings.xml b/News-Android-App/src/main/res/values-oc/strings.xml index ef03aa30c..57f6e6ca1 100644 --- a/News-Android-App/src/main/res/values-oc/strings.xml +++ b/News-Android-App/src/main/res/values-oc/strings.xml @@ -1,39 +1,193 @@ + Sincronizacion auto. + ownCloud News Reader + Selector d\'interval de sincronizacion + NewsDetailActivity + SubscriptionActivity + Lector de news + Detalh del lector de news + Informacion + Pas cap d\'article + Telecargament d\'articles suplementari en cors... Pacientatz. + Legir + Pas cap de connexion Wi-Fi + Telecargar los imatges sens connexion Wi-Fi ? + Avètz atench lo limit maximal de XX articles + Actualitats ownCloud + Novèls articles disponibles + Recargar + Totes los articles pas legits + Articles favorits + Apondre un flux - Refresca + Refrescar + A prepaus / Jornal de las modificacions + Marcar totes coma legits + Telecargar los imatges + + d\'articles + Importar un compte + Còde font de l\'article - Rapòrt de bug + Mandar un corrièl - Parteja - Enregistra - Configuracion + Favorit + Legit + Legir lo Podcast + Afichar dins lo navigador + Mandar l\'article al desvolopaire + Partejar + Paramètres del servidor + Salvar + Paramètres + Paramètres de sincronizacion + Apondre un flux novèl + Legir a votz nauta + Avètz X novèls articles pas legits + X novèls articles pas legits disponibles - Non d\'usancièr + Nom d\'utilizaire Senhal + https://1.2.3.4/owncloud + S\'identificar + Connexion en cors… + Lo senhal es incorrècte + Aqueste camp es requesit + Aquesta URL es incorrècta + X ancians articles telecargats + Cap d\'article suplementari pas disponible + Sincronizacion de l’estat dels articles + Sincronizacion del dorsièr + Sincronizacion dels fluxes + Sincronizacion dels articles - Configuracion + Paramètres - General + Generals + Òrdre de triada + + Recent -> Ancian + Ancian -> Recent + + + 1 + 0 + + Voidar l\'escondedor + Netejatge de l\'escondedor en cors... Pacientatz. + Calcul de la talha de l\'escondedor en cors... Pacientatz. + Certanas modificacions son pas sincronizadas. Volètz reïnicializar l\'escondedor malgrat tot ? Atencion + Sincro. a l\'aviada + Amagar los articles legits + Desactivar la verificacion del nom de maquina + Navigar amb los botons de volum + Marcar coma legit tot en desfilant + Passar la vista detalhada e dobrir dirèctament l\'article dins lo navigador + Afichar una notificacion quand d\'articles novèls son disponibles + Acceptar los certificats pas segurs ? + Totjorn + Aqueste còp + Anullar + Verificacion del certificat + Podcast + Activar la presa en carga dels Podcasts + Cap de podcast pas seleccionat + Afichatge + Tèma de l\'app + Disposicion de la lista dels fluxes + + Escur + Clar + + + 0 + 1 + + + Simple + Espandit + Espandit amb WebView + + + 0 + 1 + 2 + Error - Avertiment de securitat + Un problèma s\'es produsit :-( + La version d\'aquesta aplicacion es pas compatibla amb vòstra aplicacion News de ownCloud. Metètz a jorn l\'aplicacion News e lo framework d\'aplicacions. + Avertiment de seguretat + Utilizatz pas HTTPS. Una persona malvolenta poiriá interceptar vòstre trafic e obténer de donadas sensiblas (ex. vòstre senhal). Es bravament recomandat d\'utilizar HTTPS ! + Donadas & sincronizacion + Voidar l\'escondedor + Mesa en escondedor fòra linha dels imatges + Talha maximala de l\'escondedor + + 0 + 1 + 2 + 3 + + + 250 Mo + 500 Mo + 750 Mo + 1 Go + 2 Go + 5 Go + 10 Go + + + 250 + 500 + 750 + 1000 + 2000 + 5000 + 10000 + + + 5 Minutas + 15 Minutas + 30 Minutas + 45 Minutas + 1 Ora + 2 Oras + 3 Oras + 6 Oras + 12 Oras + 24 Oras + + + 5 + 15 + 30 + 45 + 60 + 120 + 180 + 360 + 720 + 1440 + + Notificacions Erro Ocorreu algo de errado :( From 732cd0542a2c7bb637cc51eaa4a10ad269122519 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Thu, 18 Jun 2015 01:41:31 -0400 Subject: [PATCH 2/5] [tx-robot] updated from transifex --- News-Android-App/src/main/res/values-ru/strings.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/News-Android-App/src/main/res/values-ru/strings.xml b/News-Android-App/src/main/res/values-ru/strings.xml index e26dcdd84..e253ff82b 100644 --- a/News-Android-App/src/main/res/values-ru/strings.xml +++ b/News-Android-App/src/main/res/values-ru/strings.xml @@ -110,6 +110,7 @@ Экран Тема приложения Макет списка лент + Количество строк для заголовка Темная Светлая @@ -128,6 +129,18 @@ 1 2 + + 1 + 2 + 3 + 4 + + + 1 + 2 + 3 + 4 + Ошибка Что-то пошло не так :( From d307a7fbcaa9ce4319669bef37b14d6ea73872d2 Mon Sep 17 00:00:00 2001 From: Daniel Schaal Date: Thu, 18 Jun 2015 19:23:16 +0200 Subject: [PATCH 3/5] First try defaultTrustManager, then appTrustManager Also only print stackTrace after every check failed. --- .../ssl/MemorizingTrustManager.java | 31 +++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/ssl/MemorizingTrustManager.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/ssl/MemorizingTrustManager.java index 5a2376d64..e609b5b81 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/ssl/MemorizingTrustManager.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/ssl/MemorizingTrustManager.java @@ -275,29 +275,28 @@ public void checkCertTrusted(X509Certificate[] chain, String authType, boolean i { Log.d(TAG, "checkCertTrusted(" + chain + ", " + authType + ", " + isServer + ")"); try { - Log.d(TAG, "checkCertTrusted: trying appTrustManager"); + Log.d(TAG, "checkCertTrusted: trying defaultTrustManager"); if (isServer) - appTrustManager.checkServerTrusted(chain, authType); + defaultTrustManager.checkServerTrusted(chain, authType); else - appTrustManager.checkClientTrusted(chain, authType); + defaultTrustManager.checkClientTrusted(chain, authType); } catch (CertificateException ae) { - // if the cert is stored in our appTrustManager, we ignore expiredness - ae.printStackTrace(); - if (isExpiredException(ae)) { - Log.i(TAG, "checkCertTrusted: accepting expired certificate from keystore"); - return; - } - if (isCertKnown(chain[0])) { - Log.i(TAG, "checkCertTrusted: accepting cert already stored in keystore"); - return; - } try { - Log.d(TAG, "checkCertTrusted: trying defaultTrustManager"); + Log.d(TAG, "checkCertTrusted: trying appTrustManager"); if (isServer) - defaultTrustManager.checkServerTrusted(chain, authType); + appTrustManager.checkServerTrusted(chain, authType); else - defaultTrustManager.checkClientTrusted(chain, authType); + appTrustManager.checkClientTrusted(chain, authType); } catch (CertificateException e) { + // if the cert is stored in our appTrustManager, we ignore expiredness + if (isExpiredException(e)) { + Log.i(TAG, "checkCertTrusted: accepting expired certificate from keystore"); + return; + } + if (isCertKnown(chain[0])) { + Log.i(TAG, "checkCertTrusted: accepting cert already stored in keystore"); + return; + } e.printStackTrace(); interact(chain, authType, e); } From d6fdc0b0b7dc7f2c76591f11a6e4dc3d8b55e99f Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Sat, 20 Jun 2015 01:41:31 -0400 Subject: [PATCH 4/5] [tx-robot] updated from transifex --- News-Android-App/src/main/res/values-sl/strings.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/News-Android-App/src/main/res/values-sl/strings.xml b/News-Android-App/src/main/res/values-sl/strings.xml index 590405f49..9af2ed3c7 100644 --- a/News-Android-App/src/main/res/values-sl/strings.xml +++ b/News-Android-App/src/main/res/values-sl/strings.xml @@ -110,6 +110,7 @@ Prikaz Ime teme Postavitev seznama virov + Vrstični števec za naslov Temna Svetla @@ -128,6 +129,18 @@ 1 2 + + 1 + 2 + 3 + 4 + + + 1 + 2 + 3 + 4 + Napaka Prišlo je do napake :( From 55e56104bf7ce4a64eb935e85e8b6ca1f16b00f8 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Sun, 21 Jun 2015 01:41:31 -0400 Subject: [PATCH 5/5] [tx-robot] updated from transifex --- News-Android-App/src/main/res/values-tr/strings.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/News-Android-App/src/main/res/values-tr/strings.xml b/News-Android-App/src/main/res/values-tr/strings.xml index b202ca0d8..ea9c7d606 100644 --- a/News-Android-App/src/main/res/values-tr/strings.xml +++ b/News-Android-App/src/main/res/values-tr/strings.xml @@ -110,6 +110,7 @@ Görüntüle Uyg. teması Besleme listesi yerleşimi + Başlık için satır sayısı Koyu Açık @@ -128,6 +129,18 @@ 1 2 + + 1 + 2 + 3 + 4 + + + 1 + 2 + 3 + 4 + Hata Bir şeyler yanlış gitti :(