aboutsummaryrefslogtreecommitdiffstats
path: root/res (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'development' into feature/take_pictureDaniel Gultsch2014-05-131-71/+116
|\
| * FixBeriain2014-05-131-79/+79
| |
| * Merge https://github.com/siacs/Conversations into developmentBeriain2014-05-1310-18/+364
| |\
| * | Update basque translation and include preferencesBeriain2014-05-131-0/+8
| | |
| * | Update basque translationBeriain2014-05-121-0/+34
| | |
| * | Merge https://github.com/siacs/Conversations into developmentBeriain2014-05-126-60/+111
| |\ \
| * | | Update basque translationBeriain2014-05-081-0/+3
| | | |
* | | | submenu for attach fileDaniel Gultsch2014-05-132-0/+13
| |_|/ |/| |
* | | german translationDaniel Gultsch2014-05-131-1/+1
| | |
* | | further translationsDaniel Gultsch2014-05-134-15/+65
| | |
* | | fixed french languageDaniel Gultsch2014-05-131-13/+13
| | |
* | | Merge pull request #88 from BenoitBouvarel/developmentDaniel Gultsch2014-05-123-0/+127
|\ \ \ | | | | | | | | Translation into French
| * | | Traduction FrancaiseBenoit Bouvarel2014-05-073-0/+127
| | | |
* | | | Merge pull request #101 from kruks23/developmentDaniel Gultsch2014-05-121-0/+28
|\ \ \ \ | | | | | | | | | | Preferences Spanish Translations
| * | | | Preferences Spanish Translationskruks232014-05-121-0/+28
| | |_|/ | |/| |
* | | | Fix a typo in catalan translationalvar2014-05-121-1/+1
| | | |
* | | | Translation into catalan languagealvar2014-05-122-0/+141
| | | |
* | | | fixed parsing error on missing %sDaniel Gultsch2014-05-121-2/+2
|/ / /
* | | Better error handling if attach file doesnt work (on permission denied)0.2-betaDaniel Gultsch2014-05-121-0/+5
| | | | | | | | | and unified encrypted and unencrypted file attachment
* | | transfered preferences descritpions into strings.xmliNPUTmice2014-05-112-22/+45
| | |
* | | Delete styles.xmlkruks232014-05-101-19/+0
| | |
* | | Merge remote-tracking branch 'origin/development' into developmentkruks232014-05-101-0/+19
|\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: res/values-es/arrays.xml res/values-es/strings.xml
| * | | #79 First translation into spanish.kruks232014-05-063-0/+127
| | | |
* | | | Translation into spanish.kruks232014-05-102-52/+42
| | | |
* | | | #79 First translation into spanish.kruks232014-05-101-0/+19
| | | |
* | | | added dialog for otr file transfer0.2-alphaDaniel Gultsch2014-05-092-2/+5
| | | |
* | | | nicer descriptions in notificaton for images and encrypted messagesDaniel Gultsch2014-05-091-1/+4
| | | |
* | | | Improve OTR fingerprint dialog and fix german sentenceDominik Schürmann2014-05-082-2/+10
| |_|/ |/| |
* | | more informative dialog if contact doesn't announce public keyDaniel Gultsch2014-05-081-0/+2
| | |
* | | code cleanupDaniel Gultsch2014-05-081-0/+1
| |/ |/|
* | fixed #70 #65Daniel Gultsch2014-05-071-1/+1
| |
* | basic german translationDaniel Gultsch2014-05-062-0/+108
| |
* | Merge https://github.com/siacs/Conversations into developmentBeriain2014-05-067-75/+10
|\|
| * more cleanup in res filesDaniel Gultsch2014-05-032-34/+9
| |
| * removed unnecessary filesDaniel Gultsch2014-05-034-40/+0
| |
| * added restart button to openkeychain dialogDaniel Gultsch2014-05-031-1/+1
| |
* | Update basque and spanish translationsBeriain2014-05-066-90/+2
| |
* | Add Basque and Spanish translationsMikel2014-05-028-0/+304
|/
* nicer dialog screen if openkeychain is not installedDaniel Gultsch2014-05-021-0/+4
|
* reworked openpgp integration part #1Daniel Gultsch2014-05-011-0/+1
|
* unified presence selection for otr and file transferDaniel Gultsch2014-04-261-0/+10
|
* couple of more optimazations on image loadingDaniel Gultsch2014-04-253-2/+5
|
* smoother scrolling (first step)Daniel Gultsch2014-04-253-5/+20
|
* allow images to be opened with gallary appDaniel Gultsch2014-04-212-2/+11
|
* put more string into strings.xmlDaniel Gultsch2014-04-182-2/+8
|
* added clear history dialog (no funcionality)Daniel Gultsch2014-04-183-1/+28
|
* made ui with sending images a little smootherDaniel Gultsch2014-04-153-1/+5
|
* Merge pull request #59 from jelmer/typo-preemptivelyDaniel Gultsch2014-04-141-1/+1
|\ | | | | Fix typo: Preemptivly -> Preemptively.
| * Fix typo: Preemptivly -> Preemptively.Jelmer Vernooij2014-04-141-1/+1
| |
* | Fix two typos: assoziated -> associated.Jelmer Vernooij2014-04-141-1/+1
| |