Merge pull request #384 from jmpascal/1.6.1

ANDROID-274
Alfresco · Mar 7, 2016 · 826f011 · 826f011
2 parents bbd52ec + 01de9f9
commit 826f011
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/alfresco-mobile-android/src/main/res/values-ja/strings.xml b/alfresco-mobile-android/src/main/res/values-ja/strings.xml
@@ -21,7 +21,7 @@
     <string name="empty_accounts">使用できる Alfresco アカウントがありません</string>
 
     <!-- SIGN IN & CREATE ACCOUNT SCREEN -->
-    <string name="general_login_server_title">Alfresco Server のホスト名を入力してください</string>
+    <string name="general_login_server_title">Alfresco サーバーのホスト名を入力してください</string>
     <string name="general_login_server_hostname">ホスト名</string>
     <string name="general_login_server_next">続行</string>
     <string name="general_login_server_done">完了</string>
@@ -64,8 +64,8 @@
     <string name="account_hostname_required_hint">ホスト名は、www.example.com のような形式で入力してください (必須です)。</string>
     <string name="account_hostname_hint">www.example.com (必須)</string>
     <string name="account_description">説明</string>
-    <string name="account_description_optional_hint">説明を入力します (任意です)。 デフォルトは Alfresco Server です</string>
-    <string name="account_description_hint">Alfresco Server (任意)</string>
+    <string name="account_description_optional_hint">説明を入力します (任意です)。 デフォルトは Alfresco サーバーです</string>
+    <string name="account_description_hint">Alfresco サーバー (任意)</string>
     <string name="account_advanced">詳細設定</string>
     <string name="account_authentication">アカウントの認証方法</string>
     <string name="account_https">HTTPS</string>
@@ -791,13 +791,13 @@
     <!-- ANDROID FOR WORK -->
     <!-- AlfrescoUserName restriction -->
     <string name="title_alfresco_username">ユーザー名</string>
-    <string name="description_alfresco_username">Alfresco Server に接続するときに使用するユーザー名</string>
+    <string name="description_alfresco_username">Alfresco サーバーに接続するときに使用するユーザー名</string>
     <!-- AlfrescoRepositoryURL restriction -->
     <string name="title_alfresco_repository_url">Alfresco リポジトリの URL</string>
-    <string name="description_alfresco_repository_url">Alfresco Server の接続先</string>
+    <string name="description_alfresco_repository_url">Alfresco サーバーの接続先</string>
     <!-- AlfrescoShareURL restriction -->
     <string name="title_alfresco_share_url">Alfresco Share の URL</string>
-    <string name="description_alfresco_share_url">Alfresco Share Server の接続先</string>
+    <string name="description_alfresco_share_url">Alfresco Share サーバーの接続先</string>
     <!-- AlfrescoDisplayName restriction -->
     <string name="title_alfresco_display_name">アカウントの表示名</string>
     <string name="description_alfresco_display_name">リポジトリに接続しているサーバーの名前。</string>

diff --git a/alfresco-mobile-android/src/main/res/values/strings.xml b/alfresco-mobile-android/src/main/res/values/strings.xml
@@ -398,7 +398,7 @@
     <string name="sync_empty_title">Keep your files in sync</string>
     <string name="sync_empty_description">You can view and edit your synced files when you\'re offline</string>
 
-    <string name="sync_info_one_title">Sync has changed !</string>
+    <string name="sync_info_one_title">Sync has changed!</string>
     <string name="sync_info_one_first_text">You can now sync different files on different devices. Just find a file and sync it!</string>
     <string name="sync_info_one_second_text">View and edit your synced files when you\'re offline. When you\'re back online they\'ll automatically sync with Alfresco.</string>
     <string name="sync_info_two_title">What about the files I already favorited?</string>

diff --git a/...dation/src/main/java/org/alfresco/mobile/android/platform/extensions/AnalyticsHelper.java b/...dation/src/main/java/org/alfresco/mobile/android/platform/extensions/AnalyticsHelper.java
@@ -135,7 +135,6 @@ protected static Integer getNumberOfSyncedFolder(Context context, AlfrescoAccoun
                     null, null);
             syncedFolders = syncedCursor != null ? syncedCursor.getCount() : 0;
             CursorUtils.closeCursor(syncedCursor);
-            Log.d("Analytics Folders", syncedFolders + "");
         }
         catch (Exception e)
         {
@@ -159,7 +158,6 @@ protected static Integer getNumberOfSyncedFiles(Context context, AlfrescoAccount
                     null, null);
             syncedFiles = syncedCursor != null ? syncedCursor.getCount() : 0;
             CursorUtils.closeCursor(syncedCursor);
-            Log.d("Analytics Files", syncedFiles + "");
         }
         catch (Exception e)
         {
@@ -189,7 +187,6 @@ protected static Long getSizeOfSyncedFiles(Context context, AlfrescoAccount acco
                 }
             }
             CursorUtils.closeCursor(syncedCursor);
-            Log.d("Analytics Size", syncedSize + "");
         }
         catch (Exception e)
         {

diff --git a/platform/foundation/src/main/res/values-ja/alfresco_strings.xml b/platform/foundation/src/main/res/values-ja/alfresco_strings.xml
@@ -303,7 +303,7 @@
     <!-- ACCOUNT -->
     <string name="account_verify">アカウント情報を確認しています&#8230;</string>
     <string name="account_wizard_alldone_description">アカウントを使用する準備ができました。</string>
-    <string name="account_default_onpremise">Alfresco Server</string>
+    <string name="account_default_onpremise">Alfresco サーバー</string>
     <string name="account_default_cloud">Alfresco in the Cloud</string>
 
     <!-- WAITING SESSION -->