Open Camera Code

Camera app for Android.

Brought to you by: mark-h

Code Merge Request #41: update ./res/values-zh-rCN (simplified Chinese) (merged)

Merging...

Merged

Something went wrong. Please, merge manually

Checking if merge is possible...

Something went wrong. Please, merge manually

tumuyan wants to merge 1 commit from /u/tumuyan/opencamera/ to master, 2018-11-11

translate strings from English to Chinese

Commit	Date
[3d8035] (HEAD, master) by tumuyan update ./res/values-zh-rCN (simplified Chinese)	2018-11-03 16:01:38	Tree

Discussion

Mark - 2018-11-04

Thanks! I can add this for the next version. For copyright issues, can I ask please if you are willing to either assign copyright to me, or if you'd prefer, release your translation under CC0 ( http://creativecommons.org/publicdomain/zero/1.0/ )? (This makes licensing issues easier for Open Camera, e.g., if I wanted to relicence as BSD instead of GPL in future.)

Of course I will add you to the credits - please let me know what name, and if you would like me to list an email and/or URL for you.

(I'll probably do the merge "manually" to avoid pulling in the gradle diffs.)

If you would like to refer to this comment somewhere else in this project, copy and paste the following link:
- tumuyan - 2018-11-05
  
  I agree to use the CC0 (including the translation I made later).
  It is a great pleasure for me to contribute to Open camera.
  
  Name and mail: tumuyan (tumuyan@gmail.com).
  
  If you would like to refer to this comment somewhere else in this project, copy and paste the following link:
  - Mark - 2018-11-05
    
    Thanks! I will take a look at this.
    
    If you would like to refer to this comment somewhere else in this project, copy and paste the following link:

Mark - 2018-11-11

Status: open --> merged
If you would like to refer to this comment somewhere else in this project, copy and paste the following link:

Log in to post a comment.