aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values/strings.xml (follow)
Commit message (Collapse)AuthorAgeFilesLines
* report host-account as account state in UIDaniel Gultsch2016-05-131-0/+1
|
* Ask to uninstall the plugins because the features are directly integratedChristian S2016-05-061-0/+2
|
* Merge remote-tracking branch 'refs/remotes/origin/share_location' into ↵Christian S2016-05-061-1/+5
|\ | | | | | | development
| * added missing stringsChristian S2016-05-061-2/+3
| |
| * add share locationChristian S2016-05-051-0/+3
| |
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-05-061-0/+1
|\ \ | |/ |/|
| * report bind failure as account stateDaniel Gultsch2016-05-051-0/+1
| |
* | add audio recorderChristian S2016-05-051-0/+2
| |
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-05-051-0/+2
|\|
| * republish pgp signature when changing statusDaniel Gultsch2016-05-051-0/+2
| |
* | changed some strings and added licencesChristian S2016-05-051-0/+4
| |
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into HEADChristian S2016-05-041-4/+16
|\|
| * pulled translations from transifexDaniel Gultsch2016-05-041-1/+1
| |
| * catch ActivityNotFoundException when requesting battery opDaniel Gultsch2016-04-291-0/+1
| |
| * cleaned up captcha dialogDaniel Gultsch2016-04-281-2/+1
| |
| * renamed welcome header to untranslatable 'Start your Conversations'Daniel Gultsch2016-04-271-1/+1
| |
| * prevent user from accidentally changing password after using magic createDaniel Gultsch2016-04-261-0/+1
| |
| * expert setting to manually change presenceDaniel Gultsch2016-04-221-0/+10
| |
* | changed updater a bitChristian S2016-04-231-1/+1
| |
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-231-1/+1
|\|
* | changed some stringsChristian S2016-04-231-2/+2
| |
* | changed and added some stringsChristian S2016-04-211-10/+10
| |
* | Merge branch 'refs/heads/siacs/master' into welcome-screenChristian S2016-04-211-0/+7
|\|
| * added magic create welcome screenDaniel Gultsch2016-04-191-0/+7
| |
* | corrected stringsChristian S2016-04-151-1/+0
| |
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-151-0/+5
|\|
| * add setting for quick sharingDaniel Gultsch2016-04-141-0/+4
| |
* | disallow account deactivationChristian S2016-04-151-0/+1
| | | | | | | | added reconnect to account context menu
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-141-0/+2
|\|
| * added share uri button to conference detailsDaniel Gultsch2016-04-121-0/+2
| |
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-111-3/+5
|\|
| * introduced setting to turn of notification ledDaniel Gultsch2016-04-091-3/+5
| |
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-091-0/+1
|\|
| * check file owner when attaching files or using them as avatarDaniel Gultsch2016-04-071-0/+1
| |
* | updated about infoChristian S2016-04-031-1/+3
| |
* | Merge branch 'siacs/master' into developmentChristian S2016-03-261-0/+1
|\|
| * allow to delete attachments. fixes #1539Daniel Gultsch2016-03-231-0/+1
| |
* | added missing/new stringsChristian S2016-03-231-0/+2
| |
* | Merge branch 'siacs/master' into developmentChristian S2016-03-171-0/+3
|\|
| * reworked sharewith activity to stay open during sharingDaniel Gultsch2016-03-161-0/+3
| | | | | | | | closing the activity prematuraly caused uri permissions to be revoked
* | Merge branch 'siacs/master' into developmentChristian S2016-03-131-0/+1
|\|
| * warn in conversations when account is disabledDaniel Gultsch2016-03-061-0/+1
| |
* | updated stringsChristian S2016-03-051-0/+1
| |
* | Merge branch 'siacs/master' into developmentChristian S2016-03-051-0/+2
|\|
| * show host in file size checkerDaniel Gultsch2016-03-041-0/+1
| |
| * don't automatically crop avatarDaniel Gultsch2016-03-041-0/+1
| |
* | Merge branch 'siacs/master' into developmentChristian S2016-03-041-1/+3
|\|
| * expert option to treat vibrate as silent mode for XA. fixes #1530Daniel Gultsch2016-03-011-0/+2
| |
| * let users confirm each member in a conference even if that contact is ↵Daniel Gultsch2016-03-011-0/+1
| | | | | | | | already trusted
* | Merge branch 'siacs/master' into developmentChristian S2016-02-271-1/+2
|\|