Skip to content

Commit

Permalink
Merge branch 'develop' into release/v2.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@codinguser
codinguser committed Aug 5, 2016
2 parents 8b867b5 + 1559e9a commit 8bd94ed
Show file tree
Hide file tree
Showing 5 changed files with 117 additions and 118 deletions.
2 changes: 1 addition & 1 deletion app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ apply plugin: 'io.fabric'
def versionMajor = 2
def versionMinor = 1
def versionPatch = 0
def versionBuild = 0
def versionBuild = 1

def buildTime() {
def df = new SimpleDateFormat("yyyyMMdd HH:mm 'UTC'")
Expand Down
104 changes: 52 additions & 52 deletions app/src/main/res/values-iw-rIL/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,30 +17,30 @@
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="title_create_account">Create Account</string>
<string name="title_edit_account">Edit Account</string>
<string name="info_details">Info</string>
<string name="menu_export">Export&#8230;</string>
<string name="description_add_transaction_icon">Add a new transaction to an account</string>
<string name="label_no_accounts">No accounts to display</string>
<string name="label_account_name">Account name</string>
<string name="btn_cancel">Cancel</string>
<string name="btn_save">Save</string>
<string name="btn_test">Test</string>
<string name="label_passcode">Enter Passcode</string>
<string name="toast_wrong_passcode">Wrong passcode, please try again</string>
<string name="toast_passcode_set">Passcode set</string>
<string name="label_confirm_passcode">Please confirm your passcode</string>
<string name="toast_invalid_passcode_confirmation">Invalid passcode confirmation. Please try again</string>
<string name="label_transaction_name">Description</string>
<string name="label_transaction_amount">Amount</string>
<string name="title_add_transaction">New transaction</string>
<string name="label_no_transactions">No transactions to display</string>
<string name="title_edit_account">ערוך חשבון</string>
<string name="info_details">פרטים</string>
<string name="menu_export">ייצוא&#8230;</string>
<string name="description_add_transaction_icon">הוספת העברה כספים לחשבון</string>
<string name="label_no_accounts">אין חשבונות לתצוגה</string>
<string name="label_account_name">שם חשבון</string>
<string name="btn_cancel">ביטול</string>
<string name="btn_save">שמור</string>
<string name="btn_test">בדיקה</string>
<string name="label_passcode">הזן סיסמה</string>
<string name="toast_wrong_passcode">סיסמה שגויה, אנא נסה שוב</string>
<string name="toast_passcode_set">סיסמה נשמרה</string>
<string name="label_confirm_passcode">אנא וודא את הסיסמה</string>
<string name="toast_invalid_passcode_confirmation">ווידוי סיסמה שגוי. אנא נסה שוב</string>
<string name="label_transaction_name">פרטים</string>
<string name="label_transaction_amount">סכום</string>
<string name="title_add_transaction">העברה חדשה</string>
<string name="label_no_transactions">אין העברות להציג</string>
<string name="label_timeanddate">DATE &amp; TIME</string>
<string name="label_account">Account</string>
<string name="label_debit">DEBIT</string>
<string name="label_credit">CREDIT</string>
<string name="title_accounts">Accounts</string>
<string name="title_transactions">Transactions</string>
<string name="label_account">חשבון</string>
<string name="label_debit">חוב</string>
<string name="label_credit">אשראי</string>
<string name="title_accounts">חשבונות</string>
<string name="title_transactions">העברות</string>
<string name="menu_delete">Delete</string>
<string name="alert_dialog_ok_delete">Delete</string>
<string name="alert_dialog_cancel">Cancel</string>
Expand All @@ -66,40 +66,40 @@
<item>DropBox</item>
<item>Google Drive</item>
<item>ownCloud</item>
<item>Send to&#8230;</item>
<item>שלח אל&#8230;</item>
</string-array>
<string name="btn_move">Move</string>
<string name="btn_move">העבר</string>
<string name="title_move_transactions">Move %1$d transaction(s)</string>
<string name="label_move_destination">Destination Account</string>
<string name="label_move_destination">חשבון יעד</string>
<string name="permission_access_sdcard">Access SD Card</string>
<string name="toast_incompatible_currency">Cannot move transactions.\nThe destination account uses a different currency from origin account</string>
<string name="header_general_settings">General</string>
<string name="header_about_gnucash">About</string>
<string name="title_choose_currency">Choose default currency</string>
<string name="title_default_currency">Default currency</string>
<string name="summary_default_currency">Default currency to assign to new accounts</string>
<string name="label_permission_record_transactions">Enables recording transactions in GnuCash for Android</string>
<string name="label_permission_create_accounts">Enables creation of accounts in GnuCash for Android</string>
<string name="label_permission_group">Your GnuCash data</string>
<string name="description_permission_group">Read and modify GnuCash data</string>
<string name="label_permission_record_transaction">Record transactions in GnuCash</string>
<string name="label_permission_create_account">Create accounts in GnuCash</string>
<string name="label_display_account">Display account</string>
<string name="btn_create_accounts">Create Accounts</string>
<string name="title_default_accounts">Select accounts to create</string>
<string name="error_no_accounts">No accounts exist in GnuCash.\nCreate an account before adding a widget</string>
<string name="title_build_version">Build version</string>
<string name="title_license">License</string>
<string name="summary_licence_details">Apache License v2.0. Click for details</string>
<string name="title_general_prefs">General Preferences</string>
<string name="label_widget_configuration">Select Account</string>
<string name="toast_no_transactions_to_export">There are no transactions available to export</string>
<string name="header_passcode_settings">Passcode</string>
<string name="title_passcode_preferences">Passcode Preferences</string>
<string name="title_passcode_enabled">Passcode Turned On</string>
<string name="title_passcode_disabled">Passcode Turned Off</string>
<string name="title_change_passcode">Change Passcode</string>
<string name="title_about_gnucash">About GnuCash</string>
<string name="header_about_gnucash">אודות</string>
<string name="title_choose_currency">בחר מטבע ברירת מחדל</string>
<string name="title_default_currency">מטבע ברירת מחדל</string>
<string name="summary_default_currency">מטבע ברירת מחדל להקצות לחשבונות חדשים</string>
<string name="label_permission_record_transactions">מאפשר תיעוד תנועות GnuCash עבור אנדרואיד</string>
<string name="label_permission_create_accounts">אפשר יצירת חשבונות של GnuCash עבור אנדרואיד</string>
<string name="label_permission_group">נתוני הGnuCash שלך</string>
<string name="description_permission_group">קרוא ושנה נתוני GnuCash</string>
<string name="label_permission_record_transaction">שמור העברות בGnuCash</string>
<string name="label_permission_create_account">צור חשבונות ב GnuCash</string>
<string name="label_display_account">הצג חשבון</string>
<string name="btn_create_accounts">צור חשבונות</string>
<string name="title_default_accounts">בחר חשבונות ליצור</string>
<string name="error_no_accounts">לא קיימים חשבונות ב- GnuCassh.\n צור חשבון לפני הוספת widget</string>
<string name="title_build_version">‏גרסת Build</string>
<string name="title_license">רישיון</string>
<string name="summary_licence_details">רישיון אפאצ\'י v 2.0. לחץ לפרטים</string>
<string name="title_general_prefs">העדפות כלליות</string>
<string name="label_widget_configuration">בחר חשבון</string>
<string name="toast_no_transactions_to_export">אין תנועות זמינות לייצא</string>
<string name="header_passcode_settings">קוד הגישה</string>
<string name="title_passcode_preferences">העדפות קוד גישה</string>
<string name="title_passcode_enabled">קוד גישה מופעל</string>
<string name="title_passcode_disabled">קוד גישה כבוי</string>
<string name="title_change_passcode">שנה את קוד הגישה</string>
<string name="title_about_gnucash">אודות GnuCash</string>
<string name="summary_about_gnucash">A mobile finance management and expense-tracker designed for Android</string>
<string name="title_about">About</string>
<string name="toast_format_exported_to">%1$s file exported to:\n</string>
Expand Down
25 changes: 12 additions & 13 deletions app/src/main/res/values-ko-rKR/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,13 +132,12 @@
<string name="summary_xml_ofx_header">데스크탑용 GnuCash 이외의 타 응용 프로그램에 내보낼 때에 사용하세요</string>
<string name="title_whats_new">새로운 기능</string>
<string name="whats_new">
- 새로운 머티리얼 디자인 \n
- 머티리얼 디자인\n
- 한 거래에 여러 통화 지원\n
- 거래총액 계산기\n
- 거래총액 계산기 기능\n
- 보고서 기능 강화\n
- 새로운 도움말과 피드백 섹션\n
- 많은 문제점 해결 및 개선\n
</string>
- 도움말과 피드백 섹션\n
- 그밖에 버그 수정 및 개선\n</string>
<string name="label_dismiss">닫기</string>
<string name="toast_transanction_amount_required">거래기록에 저장할 금액을 입력해 주세요</string>
<string name="toast_error_edit_multi_currency_transaction">다중 통화 거래는 수정할 수 없습니다.</string>
Expand Down Expand Up @@ -174,7 +173,7 @@
<string name="label_no_recurring_transactions">반복되는 거래내역이 없습니다</string>
<string name="toast_recurring_transaction_deleted">반복되는 거래를 삭제했습니다</string>
<string name="label_placeholder_account">견본 계정</string>
<string name="label_default_transfer_account">Default Transfer Account</string>
<string name="label_default_transfer_account">기본 송금계정으로 지정</string>
<plurals name="label_sub_accounts">
<item quantity="other">%d의 하위 계정</item>
</plurals>
Expand Down Expand Up @@ -258,8 +257,8 @@
<string name="menu_toggle_legend">범례 보기</string>
<string name="menu_toggle_labels">레이블 표시</string>
<string name="menu_toggle_percentage_mode">비율 표시</string>
<string name="menu_toggle_average_lines">Show average lines</string>
<string name="menu_group_smaller_slices">Group Smaller Slices</string>
<string name="menu_toggle_average_lines">평균선 표시</string>
<string name="menu_group_smaller_slices">작은 슬라이스를 묶어서 표시</string>
<string name="label_chart_no_data">차트 데이터가 없습니다</string>
<string name="label_chart_overall">전체</string>
<string name="label_chart_total">합계</string>
Expand Down Expand Up @@ -343,16 +342,16 @@
<string name="wizard_title_account_setup">계정 설정</string>
<string name="wizard_title_select_currency">통화 선택</string>
<string name="wizard_title_feedback_options">피드백 옵션</string>
<string name="wizard_option_create_default_accounts">기본 계정을 생성합니다</string>
<string name="wizard_option_import_my_accounts">내 계정 가져오기</string>
<string name="wizard_option_let_me_handle_it">제가 처리할게요</string>
<string name="wizard_option_create_default_accounts">내장된 기본 계정 생성</string>
<string name="wizard_option_import_my_accounts">계정정보 불러오기</string>
<string name="wizard_option_let_me_handle_it">수동으로 설정</string>
<string name="wizard_option_currency_other">기타...</string>
<string name="wizard_option_auto_send_crash_reports">비정상 종료시 자동으로 보고서 보내기</string>
<string name="wizard_option_disable_crash_reports">보고서를 보내지 않음</string>
<string name="wizard_btn_back">이전</string>
<string name="title_setup_gnucash">GnuCash 설정</string>
<string name="wizard_title_welcome_to_gnucash">GnuCash 사용을 환영합니다</string>
<string name="msg_wizard_welcome_page">시작하기 전에 \n몇가지 설정부터 하겠습니다\n\n다음을 눌러주세요.</string>
<string name="msg_wizard_welcome_page">시작하기 전에 \n몇가지 설정부터 하겠습니다.\n\n다음을 눌러주세요.</string>
<string name="title_split_editor">Split Editor</string>
<string name="toast_error_check_split_amounts">Check that all splits have valid amounts before saving!</string>
<string name="label_error_invalid_expression">식이 맞지 않습니다!</string>
Expand All @@ -369,7 +368,7 @@
<string name="hint_exchange_rate">환율</string>
<string name="btn_fetch_quote">Fetch quote</string>
<string name="hint_converted_amount">환전후 금액</string>
<string name="title_report_sheet">Sheet</string>
<string name="title_report_sheet">표</string>
<string name="label_last_3_months_expenses">최근 3개월간의 지출</string>
<string name="label_total_assets">총자산</string>
<string name="label_total_liabilities">총부채</string>
Expand Down
Loading

0 comments on commit 8bd94ed

Please sign in to comment.