Merge lp:tomdroid/beta into lp:~tomdroid-maintainers/tomdroid/main

[NoahY]

1) Provides editing capabilities:

- ability to add new notes
- ability to edit and save notes and note titles
- ability to add Tomboy-style formatting to text
- ability to delete notes

- on new note, it creates a local note
- on save note, it updates the local note
- on delete note, it adds a tag "system:deleted"

2) Full two-way sync with Snowy/UbuntuOne and SD Card:

On sync it:

- checks if there are local changes newer than last sync
- if no changes, does a simple one-way sync
- if there are changes, it:
  - asks if you want to push local changes
  - if you are pushing local changes, pushes all local notes that aren't on the remote
  - if you are not pushing, deletes all local notes that aren't on remote
  - compares local and remote note dates:
    - if a local note is newer and you are pushing local changes and the local has the "system:deleted" tag, deletes both remote and local versions
    - if a local note is newer and you are pushing local changes, rejects the remote note, pushing the local version instead
    - if local is newer but you aren't pushing or local is older, overwrites the local with the remote
    - if local date = remote date, skips the note

3) UI changes, including making use of the built-in actionbar and offering split-view for tablets in landscape.

See this question for details:

https://answers.launchpad.net/tomdroid/+question/203318

[lp:tomdroid/beta]

306. By NoahY on 2012-07-22

fixed 2.3 bug (again)

307. By NoahY on 2012-07-22

converted highlight and mono to togglebuttons, fixed listview font color

308. By NoahY on 2012-07-22

fixed notebook template showing in list (lp Bug #360732)

309. By NoahY on 2012-07-22

set note height in note_edit to match_parent

310. By NoahY on 2012-07-22

added ability to delete all notes, toggle including note templates, bug fixes for all note titles empty and no notes in list

[Mads Boserup Lauritsen (madsbola)]

Hi Noah

I am a "non coding" person, but are more than willing to test a apk file on my phone, if that can help you somehow?

I am eager to have your coding implemented in the Tomdroid, as it then will be close to fullfill my basic needs as a notetaking app.

I am using U1, so maybe I could do some testing of this, as I read you had some problems on the other thread.

Best regards, and thx for your efforts

/Mads

[NoahY (noahy)]

Hi Mads,

I can include a debug apk with each bzr commit, which would probably help broaden the testing community... I'll do that now, hope it doesn't cause any problems.

[lp:tomdroid/beta]

311. By NoahY on 2012-07-22

added "Edit" to context menu, uploaded debug apk for testing

[NoahY (noahy)]

Okay, I think you can now get the apk from here:

http://bazaar.launchpad.net/~tomdroid-dev/tomdroid/note-editing-and-syncing/view/head:/bin/tomdroid-debug.apk

Click "Download File", then install. Please do post feedback if you can... I notice that the merge request is for over 5000 lines of code, may not happen any time soon :)

[Lucas Oman (yatc18ks0g8-92-ngeefk4xayt)]

Hey Noah,

Thanks for fixing it on 2.3! Looks great.

Last night, while using it on my Nexus 7, I had typed out a long note, then got distracted while talking to a friend. My tablet shut off during the conversation, and when I turned it back on, my entire note was gone! You may choose to solve this a different way, but can I suggest simply saving every edit that's made, just like the desktop version does?

You're doing fantastic work. Thanks!

[Stefan Hammer (j-4-deactivatedaccount)]

I just edited the main activity to also use MyTheme, because the About Dialogue was also just one line.
Further I realised, that the nice default pressed and highlighted animations on android <=2.3 are gone and replaced with a greyish overlay over the notes-list. So klicking on a note colours the list gray, then black again and then the note shows. Long-press on a note in the list makes the list grey, the options menu appears and then it becomes normal again. Previously, there were nice orange animations which showed the state of the long-press.

Do you have an idea, why this is happening? This is also true for the Android 2.3 SDK, if you can't imagine what I mean. Further, I wanted to report other stuff I found during the weekend, but you cleaned them out already - well done!

[Stefan Hammer (j-4-deactivatedaccount)]

oh... if you create a new note, but you do not enter any title or content and press the back key again (the only way to abort the creation of a new note, as there is no "abort" menu entry, a new note is created with no title and no content. maybe there is a chance to catch the press of the back button and delete the note again, if both fields are empty and tell the user to enter a title, if there is no title!

[Mads Boserup Lauritsen (madsbola)]

Hey Noah

Some comments on the first testing.

Fantastic that it is now possible to edit notes.

Best regards
/Mads

ps. As I mentioned I am not a coding guy, but if you ever comes to Copenhagen I'll certainly will offer you a homegrown tomato from our roofgarden. Check out www.tagtomat.dk for pictures of the process.
pps. To all the other developers who does a great job. Thx, I really appreciate it, and would as a "TomatoGuy" be more than willing to share a beer or two if you pass Copenhagen once in the future.

Sync
I just testet it on Xperia X10 mini pro, and it syncs without problem with U1 (running android 2.3.7 CynogenMod).

Editing
Works well, simply fantastic :-)

Maybe related to Lucas comment a suggestion could be. When you press the "back" button the note is saved. Now I just jumped around the different notes, and found out that you need to press "save note" after editing. Of course it works (and thx for that).

Links
I could not get links to work, neither the internal links between notes (headlines) nor external links like www.ubuntu.com

Installing
I had to uninstall the Tomdroid 0.5 manually before installing the new APK, but it installs fine and runs afterwards.

Blinking screen
The same as Stefan mentions above.

Home Screen
The top bar of the screen is pure black. At the earlier version the top bar was yellow and a small sync icon showed, but maybe it is not needed now, if the app syncs at startup.

Shortcuts to the home screen
I tried to create shortcuts of the notes. It creates the shortcut, but the specific shortcut does not open on press.

[NoahY (noahy)]

@Lucas - sorry about that... during testing, save frequently! I tried catching the onTextChanged, but somehow putting the text into the buffer actually changes the text itself. I'm not sure we want to save after every edit, since reverting changes is not as easy as on a computer. On the other hand, I don't think that's my call, and I'll leave it up to the maintainers to decide how and when to save. Anyway, the onPause() problem was that I was accidentally retrieving the note from the database onResume(). Should be fixed now.

@Stefan - thanks for catching that, I'm glad to see the maintainers taking interest! The grey thing was me trying to keep the selected item highlighted... and failing. I've reverted my changes, should be back to default now... still can't get it to show which note is being viewed in the two-pane mode.

As for the new note empty title thing, I didn't really see it as a problem, but I know Tomboy has default values (via a template, I guess?). Sure, it would be an option to wait to save the note until you actually hit the save button... in this case, I just followed Tomboy's behaviour, since it is relatively easy to delete notes now. But it can be done either way.

@Mads - I like the idea of saving on back button... on the other hand, how then would you cancel changes? I know that is Tomboy's behaviour, so we can go with that... also of course on sync we can revert. I guess then the "Save" button becomes irrelevent, though? For now, I will add a preference to just have it save at every onPause(), which is everytime the activity loses focus (onDestroy() doesn't work properly for back button), and remove the "Save" button if it the pref is set.

As for links, I removed something I shouldn't have from the manifest, sorry... back now.

Reinstalling - that is to be expected, since it's just a debug apk.

The app doesn't sync at startup... you have to go to the menu > Sync. I'll leave it up to the maintainers to decide whether to leave it like that or as Stefan suggests, import the action bar for <11. Right now, on 11+, it shows the actionbar with menu buttons. I'm not sure what is the pure black you are seeing at the top... maybe you can give a screenshot?

Shortcuts - this was the same problem as the links, should be fixed in latest commit.

[lp:tomdroid/beta]

312. By NoahY on 2012-07-23

readded tests, fixed color problem

313. By NoahY on 2012-07-23

fixed linking, shortcuts, grey bar on list, data loss onPause(), added pref to save onPause(), link to main activity on app icon

[Stefan Hammer (j-4-deactivatedaccount)]

I have some ideas about the sync method. Atm, you are asking whether to push or to pull for all notes.
I think it might be easily possible to change this to the same behaviour Tomboy shows on the Desktop.

There they do following on sync:

Compare these dates: Last modified date local, last modified date on last sync and last modified Server.
   If last modified date = previous modified date on last sync = last modified server --> do nothing
   If last modified date > previous modified date on last sync = last modified server --> push local note to server
   If last modified date = previous modified date on last sync < last modified server --> pull remote note to device
   If last modified date > previous modified date on last && last modified server > previous modified date on last -->
Ask user what to do:
   "Note conflict detected" - "The server version of "note title" conflicts with your local note. What do you want to do with your local note?
   o) Rename local note: <texteditfield> (default value: "note title (old) )
   o) Overwrite local note
   _) Always perform this action

The string are taken directly from Tomdroid to be consistent with the desktop version!

I think, at the moment we do not store the "previous modified date on last sync" value, but you can create a new database entry therefore. Just save the value on every sync!
It would be great if we had the same behaviour as the desktop version here and to avoid users getting asked "weird" things on every sync!
Thanks for your great work and all the bugfixing. I added you on google+ for further cooperation ;-)

A few more thing: The menu entry Syncing... doesn't disappear with the appearance of the Toast message "sync completed".
In EditView: If you swipe down, the content text field scrolls up and vice versa. Further, a scrollbar would be awesome (i think this is just one xml entry). Can you fade out the note title behind the style-buttons? atm the text shine through between them (if it is not possible easily, forget it!)

I love the autosave option, but I think it should go to "text Preferences". You removed the "Save" Menu entry on autosaving, which is great, but as you already mentioned above another button would be good to have: a "Discard Changes" button instead of the save one.

Greetings from Vienna!

[Stefan Hammer (j-4-deactivatedaccount)]

Unfortunately changing the Text size in EditView does nothing on my devices. Can anyone confirm this issue? Further is the dialog not really "touch friendly" A radiobutton-list would be nicer!

[Mads Boserup Lauritsen (madsbola)]

@ Stefan
Change of txt size on my device in editmode works.

@Noah
Attached sceenshot shows the 'pure black' top bar. As shown in the other
screenshot the previous Tomdroid had yellow icon, and in the right upper
corner a sync icon that rotated while syncing. These icons have disappeared
on my device now.

Maybe it is not nessaseary while in edit/view mode, but I it was very
usefull in the home screen with the sync icon.

@xlm view in edit mode
When I press the Xlm view while in edit mode the specific note crashes, and
I am returned to the start screen with all my notes.

/Mads
Den 23/07/2012 15.24 skrev "Stefan Hammer" <email address hidden>:

> Unfortunately changing the Text size in EditView does nothing on my
> devices. Can anyone confirm this issue? Further is the dialog not really
> "touch friendly" A radiobutton-list would be nicer!
> --
>
> https://code.launchpad.net/~tomdroid-dev/tomdroid/note-editing-and-syncing/+merge/116119
> Your team Tomdroid Developers is subscribed to branch
> lp:~tomdroid-dev/tomdroid/note-editing-and-syncing.
>

[Stefan Hammer (j-4-deactivatedaccount)]

Hi!

I created a new branch on top of yours with the ActionBarCompatibility.
Therefore, we now have the native ActionBar from version 1.5 to 4.1.
https://code.launchpad.net/~tomdroid-dev/tomdroid/note-editing-and-syncing-with-combatActionBar

I tested the branch extensively on android 2.3 where it works like charm. However, it instantly crashes on 1.6. I will continue my work tomorrow. I also have to clean out the code a little bit. I already deleted unused drawable icons etc.

Another bug report for your branch: Longpress in a Listitem -> Edit leads to the "note not found" message and then the app crashes. must be a small typo or something.

[Stefan Hammer (j-4-deactivatedaccount)]

The crash in Android 1.6 is because of this code in SyncMessageHandler:

 @SuppressLint("NewApi")
 private void refreshActivity() {
  TLog.d(TAG, "refreshing activity");

  if(Integer.parseInt(Build.VERSION.SDK) > 10)
   activity.invalidateOptionsMenu();

Deleting the if statement with the invalidateOptionsMenu() fixes the crash. Is it needed at higher SDKs?
This crash is also there in the note-editing-and-syncing branch.

[Stefan Hammer (j-4-deactivatedaccount)]

For test-hungry people, who want to be the first to try it:
http://homepage.univie.ac.at/s.hammer/files/tomdroid_sync_actionbar.apk

Sorry for spamming so much today... it was a hard tomdroid-working day ;-)

[Lucas Oman (yatc18ks0g8-92-ngeefk4xayt)]

To be honest, I'm not sure why you guys are working so hard to support
1.6. Check this out:

http://developer.android.com/about/dashboards/index.html

According to the latest numbers, only 0.5% of app store users are on
1.6. Usage of API 7 (Eclair) jumps significantly to almost 5%. Maybe
it's time to reconsider supported versions, especially if it's getting
in the way of new functionality.

Just a thought. Great work, guys!

On Mon, Jul 23, 2012 at 4:10 PM, Stefan Hammer <email address hidden> wrote:
> For test-hungry people, who want to be the first to try it:
> http://homepage.univie.ac.at/s.hammer/files/tomdroid_sync_actionbar.apk
>
> Sorry for spamming so much today... it was a hard tomdroid-working day ;-)
> --
> https://code.launchpad.net/~tomdroid-dev/tomdroid/note-editing-and-syncing/+merge/116119
> You are subscribed to branch lp:~tomdroid-dev/tomdroid/note-editing-and-syncing.
>

[NoahY (noahy)]

Sorry guys, i think i've done what i can - this was meant to be a spare-time project, and that spare time ran out yesterday... i'll try to fix a couple of the bugs mentioned, but my intention was to give this to the maintainers as a rough start. hopefully it will not be too difficult to get into shape, for myself it works well enough. good luck, Stefan, hope it gets out to the world some day!

[lp:tomdroid/beta]

314. By NoahY on 2012-07-24

fixed "Syncing..." by restarting activity

315. By Stefan Hammer on 2012-07-24

fixed crasher when longpress on listitem and edit. now it really calls editview.

316. By Stefan Hammer on 2012-07-24

bzrignore bin/ folder

317. By Stefan Hammer on 2012-07-24

update .bzrignore

318. By Stefan Hammer on 2012-07-24

made scroll bars and highlighted title consistent with desktop tomboy.

319. By Stefan Hammer on 2012-07-24

make scrolling smoother and insert overscroll animation to noteview and editview.

320. By Stefan Hammer on 2012-07-24

scrolling again

[Stefan Hammer (j-4-deactivatedaccount)]

Hi NoahY!
Thanks for your great work and for your awesome contributions. You somehow revived the project with your effort.
I think, with this starting point we can manage to get it bugfree, clean and out to the wild (given that the other guy still help me bughunting!)
If you have some spare time sometimes in the future, you are welcomed to help us out again! Thank you very much!
I already started to fix things up:

Fixed crasher on longpress note in list -> edit -> note not found -> crash.

@mads
I can' reproduce your bug: "When I press the Xlm view while in edit mode the specific note crashes, and
I am returned to the start screen with all my notes."
Can you somehow get a log with logcat and maybe also send me the specific note which triggers this bug? Thanks!

Included scrollbars and overscroll animations in noteview and editview and made scrolling smoother in edit mode.

Further is the dialog not really "touch friendly" therefore i changed it to a radiobuttonlist... unfortunately, this happened in the Actionbar branch... sh** happens!

I still have to fix:
Changing the Text size in EditView only works, if you select some text, but not if you change the size and start typing afterwards.
A "discard changes" menu button in edit view.
Bug: there are no notes on androids 1.6

Did I forget any already mentioned bugs/issues in this list?

[lp:tomdroid/beta]

321. By Stefan Hammer on 2012-07-24

clean imports

[Stefan Hammer (j-4-deactivatedaccount)]

For the evening, a new testbuild of the edit+sync+actionbar branch: http://goo.gl/fKg6N

There should be no severe bug from Android 2 to 4.1, Android 1.6 loads no notes at the moment... no idea what's wrong there.

Have fun!

[lp:tomdroid/beta]

322. By Stefan Hammer on 2012-07-24

clean up and reviewd half of the code

323. By Stefan Hammer on 2012-07-29

Fix crash: tomdroid is not in the RAM - call ViewNote from shortcut -crash. same for creating a shortcut: have to call Preferences.init() first. Further, change strings of shortcut activity to meaningfull things.

324. By Stefan Hammer on 2012-07-29

consistent look for all versions and tablets.

325. By Stefan Hammer on 2012-07-29

bzr ignore bin

326. By Stefan Hammer on 2012-07-29

Always autosave as it is default in Tomboy and we risk loss of data when the Activity comes into the background eg by a call. therefore remove preferences option and include a discard changes button to revert the changes since the last save.

[Stefan Hammer (j-4-deactivatedaccount)]

I changed the code to always autosave, as we risk loss of data otherwise (eg through a phone call) and it is anyway the same behaviour as Tomboy. A "Discard changes" should help to discard huge mistakes (such as everything deleted,...).
Further, I fixed crashes with the shortcut and shortcuthelper activity.
The updated test build is again available here: http://goo.gl/fKg6N

I still have to fix:
Changing the Text size in EditView only works, if you select some text, but not if you change the size and start typing afterwards.
Bug: On androids 1.6 notes do not show up in the list if one note is corrupt and cannot be parsed. Otherwise it works great from 1.6 to 4.1
I found another serious bug: clicking on the XML-Button changes the textview to XML content - clicking again changes it back, but clicking a third time deletes the whole content!
I think we have to change the sync behaviour to check every note separately if we have to push, pull or start a conflict handling (in Tomboy: copy note to new one). I already lost several edits because I don't sync before edit and then push the notes to the server... very bad!

Did I forget any already mentioned bugs/issues in this list?

[Mads Boserup Lauritsen (madsbola)]

I tested the build from the other day 24.th the one with the Action Bar,
and can add to the bug list that on my device, it renders bullet list
wrong, so the bullet has no indent but shows directly on top of the first
letter.

As I remember it, this was an issue earlier, but I think you fixed it back
then Stefan?

I do not want to triple push the XLM just for testing..., but I have not
found any other bugs.

Amazing with autosave. I just lost a note, as a incomming sms switched away
fro m Tomdroid.

/Mads
Den 29/07/2012 23.24 skrev "Stefan Hammer" <email address hidden>:

> I changed the code to always autosave, as we risk loss of data otherwise
> (eg through a phone call) and it is anyway the same behaviour as Tomboy. A
> "Discard changes" should help to discard huge mistakes (such as everything
> deleted,...).
> Further, I fixed crashes with the shortcut and shortcuthelper activity.
> The updated test build is again available here: http://goo.gl/fKg6N
>
> I still have to fix:
> Changing the Text size in EditView only works, if you select some text,
> but not if you change the size and start typing afterwards.
> Bug: On androids 1.6 notes do not show up in the list if one note is
> corrupt and cannot be parsed. Otherwise it works great from 1.6 to 4.1
> I found another serious bug: clicking on the XML-Button changes the
> textview to XML content - clicking again changes it back, but clicking a
> third time deletes the whole content!
> I think we have to change the sync behaviour to check every note
> separately if we have to push, pull or start a conflict handling (in
> Tomboy: copy note to new one). I already lost several edits because I don't
> sync before edit and then push the notes to the server... very bad!
>
> Did I forget any already mentioned bugs/issues in this list?
> --
>
> https://code.launchpad.net/~tomdroid-dev/tomdroid/note-editing-and-syncing/+merge/116119
> Your team Tomdroid Developers is subscribed to branch
> lp:~tomdroid-dev/tomdroid/note-editing-and-syncing.
>

[Stefan Hammer (j-4-deactivatedaccount)]

@mads: No, I nerver could fixed the bullet-indent bug. I tried very long, but couldn't find out what is wrong there.

[lp:tomdroid/beta]

327. By Stefan Hammer on 2012-07-30

choose text size dialog as radiobutton list also in this branch.

328. By Stefan Hammer on 2012-07-30

you can now change the textsize without selecting before. the curser is then the start of the new size. the end is, when you change the size again.

329. By Stefan Hammer on 2012-07-30

fix xml-button-no-content-bug. the bug was not there during step by step debugging, but only if you run the program. adding a small delay for shownote() fixed it. but there must be a nicer solution.

330. By Stefan Hammer on 2012-07-30

modify xml layouts

[Stefan Hammer (j-4-deactivatedaccount)]

Fixed today:
Changing the Text size in EditView only works, if you select some text, but not if you change the size and start typing afterwards. -> not you can change the size and just type!
I found another serious bug: clicking on the XML-Button changes the textview to XML content - clicking again changes it back, but clicking a third time deletes the whole content!

I still have to fix:
Bug: On androids 1.6 notes do not show up in the list if one note is corrupt and cannot be parsed. Otherwise it works great from 1.6 to 4.1
I think we have to change the sync behaviour to check every note separately if we have to push, pull or start a conflict handling (in Tomboy: copy note to new one). I already lost several edits because I don't sync before edit and then push the notes to the server... very bad!

Did I forget any already mentioned bugs/issues in this list?

[lp:tomdroid/beta]

331. By NoahY on 2012-08-01

reverted to fix xml-disappear bug

[NoahY (noahy)]

@Stefan - good to see it's still going :) I reverted a change that should fix the xml-button bug, placing showNote() inside the handler... I can't remember why I took it out of there, but there may be some undesired side-effects of putting it back; still, that's where it belongs, and even with your hack there were still losses if it took too long to parse.

[lp:tomdroid/beta]

332. By NoahY on 2012-08-01

new auto-sync: try to push and pull at the same time, let choose if both are newer than last sync

[NoahY (noahy)]

Here's a new sort of sync, a bit easier than what you were proposing, but could be adapted. Now it does this:

- tries to sync both ways
- if note exists in both places, compares note dates and sync date
- if both remote and local are newer than last sync, ask which to keep
- if either remote or local are older than last sync date, choose based on which is newer

I know, this could theoretically lead to undesired results, but is it really going to be a problem? I mean, do we really need to worry about editing one place, then syncing changes, then editing (the old version without syncing) again in another place and syncing those changes? If we've edited the old version a second time, it's pretty clear we don't want the old changes performed elsewhere...

[lp:tomdroid/beta]

333. By NoahY on 2012-08-01

added sync dialog on conflict

334. By NoahY on 2012-08-01

added SyncDialog file

335. By NoahY on 2012-08-03

added revert options, xml editing in case the note doesn't parse

[Stefan Hammer (j-4-deactivatedaccount)]

I think we have to implement a method for conflict resolving. It doesn't have to be saving the other version as a standalone note. This is just what Tomboy is doing, therefore I suggested it.
We could also make a diff of both notes as a new note content or save both note contents with some separation to be able to manually resolve the conflict.

Imagine you have a ToDo list and add something on your desktop at the bottom of the note, which gets automatically synced. Then you do something which was on top of the list and change/delete it on the mobile phone (of course you do not sync before... who does?). If you then sync the mobile phone you have to choose to delete the changes on the desktop or the ones on the mobile. What if you can't remember anything...

We should make sure that the average user doesn't loose any data and that the App is easy and self explanatory.

Thanks for the new sync method! It is even more awesome now (I still have to test it...)!

[Stefan Hammer (j-4-deactivatedaccount)]

New Bugs with the real two way sync:
When syncing with the SD card I get asked by every single note if I want to keep the remote or the local. Further, a new, empty note is created on every sync.

the sync dialogue does not show on note conflicts. local changes of the note just get reverted. on next sync tomboy on the desktop deletes a note on the server. nothing else - this definitively needs some more work!
pushing notes also does not work... the toast appears "note successfully sent to server" but when syncing tomboy again, the changes don't show up - tomboy just tells that it deleted on note on the server. This needs a closer look in the logs as it is not working as expected.

It is not allowed to use the same note title twice. if you do so, sync on tomboy will fail!

old bug:
Bug: On androids 1.6 notes do not show up in the list if one note is corrupt and cannot be parsed. Otherwise it works great from 1.6 to 4.1

[lp:tomdroid/beta]

336. By NoahY on 2012-08-05

added refresh

337. By NoahY on 2012-08-05

added missing last-sync-date to sdcardsync

[NoahY (noahy)]

I'm not sure about all of the sync problems you are having... two-way sync works fine, even conflict resolution for me on Ubuntu One sync. The SDCard was missing an update call for the last-sync-date, so it always thought there was a new file. Should be fixed now.

[NoahY (noahy)]

Also, I don't have the problem with using the same title twice.

[Lucas Oman (yatc18ks0g8-92-ngeefk4xayt)]

But it has to be able to sync with the desktop client, which does not play
well with duplicate titles. And really, the logic breaks down when it comes
to wiki link resolution.
On Aug 4, 2012 11:56 PM, "NoahY" <email address hidden> wrote:

> Also, I don't have the problem with using the same title twice.
> --
>
> https://code.launchpad.net/~tomdroid-dev/tomdroid/note-editing-and-syncing/+merge/116119
> You are subscribed to branch
> lp:~tomdroid-dev/tomdroid/note-editing-and-syncing.
>
>

[Stefan Hammer (j-4-deactivatedaccount)]

It looks like the dialogue is opened and instantly moves to the background on android 4 and the dialogue is closing the listactivity on android 2.3.
after a lot of tries, the conflict handling seems to work, but the dialog is not shown properly on top of the app. If you do not respond to the sync dialouge (because it is not shown for some reason), sync stops at this point and that was why I got such weird results last time.

Further, I realised that at some point, when saving the note with the back-button, the app starts to sync and instantly overwrites the local changes with the server version. (maybe when the sync is still in progress due to not responding to the dialogue?)
We need some time-out for the sync I suppose, in case the dialogue is cancelled or not seen for some reason.
However, the procedure is not really stable at the moment... @noahy: if you have time maybe you can debug it a little (most importantly the sync dialouge should be shown on all android versions on top of the app). Otherwise, I will have a look at it later next week.

Happy coding,
Stefan

> I'm not sure about all of the sync problems you are having... two-way sync
> works fine, even conflict resolution for me on Ubuntu One sync. The SDCard
> was missing an update call for the last-sync-date, so it always thought there
> was a new file. Should be fixed now.

[lp:tomdroid/beta]

338. By NoahY on 2012-08-05

added diff activity on conflicts

339. By NoahY on 2012-08-06

fixed sync refresh, readded apk

340. By NoahY on 2012-08-06

reworked sync notification, finishing, refreshing; added slider for formatting bar

341. By NoahY on 2012-08-08

sync progress dialog

[NoahY (noahy)]

I've added a new conflict resolution activity... it's pretty radical, but could be made less intimidating with some UI tweaks. Anyway, seems to work for me on 1.5 and 4.0. Also a new updating progress bar, not perfect, but seems to work. Say, where's Olivier, anyway?

[lp:tomdroid/beta]

342. By NoahY on 2012-08-09

radically simplified sync, progress on progress bar...

343. By NoahY on 2012-08-09

fixed sync to sd card on no notes, added pref for backup to sd card when using online sync

344. By NoahY on 2012-08-09

progress bar fixes

345. By NoahY on 2012-08-09

more progressbar tweaks

346. By NoahY on 2012-08-11

fixed note-content tag, fixed xml <>& replacements, fixed sd card backup

347. By NoahY on 2012-08-14

lots of sync fixes, moved authentication to just before syncing, removed some toasts, etc.

348. By NoahY on 2012-08-15

moved save to menu, tweak firstnote

349. By NoahY on 2012-08-15

added missing text to firstnote

350. By NoahY on 2012-08-15

removed note that changing services will empty notes (it won't now)

351. By NoahY on 2012-08-15

set textChanged to false on save

352. By NoahY on 2012-08-15

fixed sync dialog stuck on no notes to sync, changed toast to LENGTH_SHORT

353. By NoahY on 2012-08-15

fixed empty/duplicate note title - causing problems in sync

354. By NoahY on 2012-08-16

commented out xml button from menu (probably not useful)

355. By NoahY on 2012-08-16

moved save button to menu, revert button to actionbar (save is now automatic)

356. By NoahY on 2012-08-16

delete empty note on revert changes

357. By NoahY on 2012-08-16

added NEWS

358. By NoahY on 2012-08-16

fixed note unique title function, added auto-delete for blank notes

359. By NoahY on 2012-08-16

made sync bundle all remote updates in one, added ability to clear remote notes

[Marnanel Thurman (marnanel)]

My review based on the apk I downloaded last night (tested on an HTC phone):

1) THANK YOU. This will make my life a great deal easier.

2) I can't seem to edit the title of a newly-created note at all.

3) When I back out of editing a note, the "Discard Changes?" dialogue has two buttons, "Cancel" and "Yes". This is really rather confusing, because discarding the note is a cancelling action, yet pressing "Cancel" cancels the cancelling.

4) When I finish a sentence I'd rather like temporary shift to capitals as with other text areas. I don't know how easy this is, but I suspect it's just a flag somewhere.

5) The toolbar that pops out from the top right is probably unnecessary, since formatting in Tomboy notes is done inline.

6) Also, once the toolbar's been popped out, it can't be put back again. This is a nuisance, since it obscures the title.

7) I would prefer notes to be editable the moment you open them, rather than having to press a button (as it was in Conboy for Maemo, and as it is in Tomboy.)

8) The "save" option is really rather hard to find, buried in the actions menu.

9) Saving should be automatic as you type anyway, as in Conboy and Tomboy, rather than something you have to ask for. But if you don't do this, you should also have the option on the "discard changes?" dialogue of "no, save them".

I may come back and add more thoughts later, but this looks very promising. Thank you again.

[lp:tomdroid/beta]

360. By NoahY on 2012-08-17

added ability to cancel sync, reset sync date on switching service

361. By NoahY on 2012-08-17

merges

[NoahY (noahy)]

@Thomas

1) THANK YOU. This will make my life a great deal easier.

You're welcome, mine too :)

2) I can't seem to edit the title of a newly-created note at all.

strange, what is your Android version?

3) When I back out of editing a note, the "Discard Changes?" dialogue has two buttons, "Cancel" and "Yes". This is really rather confusing, because discarding the note is a cancelling action, yet pressing "Cancel" cancels the cancelling.

I'm not sure about this... Stefan was the one who made the dialog, but I can see his reasoning - you are cancelling the action you have decided to perform. I'll leave it up to him/Olivier to decide on a change.

4) When I finish a sentence I'd rather like temporary shift to capitals as with other text areas. I don't know how easy this is, but I suspect it's just a flag somewhere.

Yes, that's just a flag, can do.

5) The toolbar that pops out from the top right is probably unnecessary, since formatting in Tomboy notes is done inline.

I don't understand what you mean; how can you format notes without the toolbar?

6) Also, once the toolbar's been popped out, it can't be put back again. This is a nuisance, since it obscures the title.

Pressing the button again closes it for me...

7) I would prefer notes to be editable the moment you open them, rather than having to press a button (as it was in Conboy for Maemo, and as it is in Tomboy.)

Good point, worth discussing.

8) The "save" option is really rather hard to find, buried in the actions menu.

This is by design, since the notes DO save automatically on pause. Tomboy has no save button, for this reason.

9) Saving should be automatic as you type anyway, as in Conboy and Tomboy, rather than something you have to ask for. But if you don't do this, you should also have the option on the "discard changes?" dialogue of "no, save them".

As said, save IS automatic, but only on pause; to save on every keypress is probably not feasible for a mobile platform. Not sure, though.

[lp:tomdroid/beta]

362. By NoahY on 2012-08-17

set note content entry to "sentence caps"

363. By NoahY on 2012-08-17

added sync cancel to NEWS

364. By NoahY on 2012-08-17

re-added cancel sync if no changes, fixed preferences sync toasts

365. By NoahY on 2012-08-17

merges

366. By NoahY on 2012-08-17

stopped pushing note templates, may be causing problems

367. By NoahY on 2012-08-17

fixed sentence caps bug leading to single line, added theme to prefs, search

368. By NoahY on 2012-08-17

added routine to circumvent full sync if snowy server revision is old (only push changed notes)

369. By NoahY on 2012-08-17

fixed revert all for deleted notes

370. By NoahY on 2012-08-17

fixed scroll to top after delete note (lp:1038115)

371. By NoahY on 2012-08-17

new format bar

372. By NoahY on 2012-08-17

merged with lp:~tomdroid-dev/tomdroid/note-editing-and-syncing-with-combatActionBar

373. By NoahY on 2012-08-18

added option to choose light/dark theme, formatbar tweaks

374. By NoahY on 2012-08-18

compat title reflects dark/light choice

375. By NoahY on 2012-08-18

added cancel to push function

376. By NoahY on 2012-08-18

merge with Stefan

377. By NoahY on 2012-08-18

added routine to check for two different notes with same title, run conflict resolution; may have also fixed lp:1038118

378. By NoahY on 2012-08-18

fixed sync dialog to integrate with sync properly, show progress, etc.

379. By NoahY on 2012-08-19

renamed syncdialog class

380. By NoahY on 2012-08-19

fixed actionbar for prefs (lp:1038635), maybe fixed flickering listview (lp:1038633)

381. By NoahY on 2012-08-19

fixed resetting local notes

382. By NoahY on 2012-08-19

added date and revision reset to "revert all"

383. By NoahY on 2012-08-19

fixed note comparison, layout (lp:1038699 ), set light theme for everything

384. By NoahY on 2012-08-19

collapsed elements in CompareNotes.java, added test function to Tomdroid.java

385. By NoahY on 2012-08-19

merge with Stefan (lp:1038633)

386. By NoahY on 2012-08-20

removed strings, updated pot file

387. By NoahY on 2012-08-20

merge translations

388. By NoahY on 2012-08-20

removed theme pref strings

389. By Stefan Hammer on 2012-08-20

fix bug #1038118 with expanding textview. With the same trick for editnote view fixed Bug #1038352.

390. By Stefan Hammer on 2012-08-20

merged last revision and reverted it.

391. By NoahY on 2012-08-21

moved title change to after note loads, invalidate rightPane as well

392. By NoahY on 2012-08-21

fixed lp:1038968

393. By NoahY on 2012-08-21

merge changes

394. By NoahY on 2012-08-21

added changes to NEWS, added progress dialog to preferences

395. By NoahY on 2012-08-21

fixed syncing with Tomboy after deleting all remote notes

396. By Stefan Hammer on 2012-08-21

merged lp:tomdroid/stable and updated translations from launchpad and pot for launchpad.

397. By Stefan Hammer on 2012-08-21

add 0.7.1 screenshots from Android 2.3 and 4.1/tablet

398. By Olivier Bilodeau on 2012-08-22

typo fix in NEWS

399. By Olivier Bilodeau on 2012-08-22

merged latest from stable

400. By Olivier Bilodeau on 2012-08-22

0.7.1 bump

401. By NoahY on 2012-08-22

fixed lp:1039703, lp:1039824 - moved dialogs into showDialog() to allow rotation

402. By NoahY on 2012-08-22

updated NEWS

403. By NoahY on 2012-08-22

fixed bug lp:1039814 Crash on Backup Notes

404. By NoahY on 2012-08-22

cancel save errors if no errors

405. By NoahY on 2012-08-22

fixed bug lp:1039671 Crash when the server URL that includes "illegal characters"

406. By NoahY on 2012-08-22

added gmail-style two-color pane and selector; joined landscape layouts into one, using different dimen files

407. By NoahY on 2012-08-22

widened listview

408. By NoahY on 2012-08-22

fix for fc on resume Tomdroid after clearing database

409. By NoahY on 2012-08-22

moved first note strings into strings.xml, updated pot file

410. By NoahY on 2012-08-22

merge

411. By NoahY on 2012-08-22

merge

412. By Stefan Hammer on 2012-08-22

Add ability to receive text-shares from other apps. this fixes bug #1039104.

413. By Stefan Hammer on 2012-08-22

updated news accordingly

414. By NoahY on 2012-08-23

* fixed bug lp:1040333 Crash on Revert
* fixed bug lp:1040338 Crash on Cancel
* fixed bug lp:1040389 Share/Send from chrome or play crash

415. By Stefan Hammer on 2012-08-23

fix crasher when Note-Not-Found-Dialogue is shown in Editview. onDestroy should not be called in this situation, as there is no note.

416. By Stefan Hammer on 2012-08-23

fix unexpected behaviour: when creating a new note and write something, but then pressing dismiss button, note was saved anyways. now note gets deleted on Discard when never saved before.

417. By Stefan Hammer on 2012-08-23

finnished last task as I found errors.

418. By NoahY on 2012-08-23

added ability to send note files and import note files as well

419. By NoahY on 2012-08-23

fixed sending note

420. By NoahY on 2012-08-23

fixed send file

421. By NoahY on 2012-08-24

fixed bug lp:1040551 Tomdroid two-way sync to SD card messes up titles

422. By NoahY on 2012-08-24

removed escaping of ' and " in XmlUtils (was interferring with titles and Tomboy doesn't escape them)

423. By NoahY on 2012-08-25

reverted padding in note view and edit

424. By NoahY on 2012-08-25

fixed deleting wrong (deleted) note

425. By NoahY on 2012-08-25

removed api 8 showDialog(int, bundle) calls, since we're supporting 6

426. By NoahY on 2012-08-25

fixed first note

427. By NoahY on 2012-08-25

using "synchronization" for consistency
updated xml files

428. By NoahY on 2012-08-26

removed another Tomboy Web

429. By NoahY on 2012-08-26

fixing sync dialog on switch service (needs more testing)

430. By NoahY on 2012-08-26

more dialog tweaking

431. By NoahY on 2012-08-26

fixing dialogs using onPrepareDialog(), added ability to edit tags

432. By NoahY on 2012-08-26

fixing dialogs

433. By NoahY on 2012-08-26

fixed xml parser to allow for nested and boundary-crossing spans

434. By NoahY on 2012-08-26

tweaks on xml cross-tagging

435. By NoahY on 2012-08-26

fixed bug lp:1041931 rev 432 crashes on Longpress in List -> Delete Edit
fixed bug lp:1041936 rev 432 crashes on receiving a text-share

436. By NoahY on 2012-08-28

fixed first run dialog

437. By NoahY on 2012-08-28

fixed rotate to change layout in Tomdroid

438. By NoahY on 2012-08-28

fixed sd card not finishing sync, fc on dismissDialog

439. By NoahY on 2012-08-28

fixing lp:1042599 Can not sync to ubuntu one

440. By NoahY on 2012-08-29

fixed list selector remaining on portrait

441. By NoahY on 2012-08-31

* moved search function to main activity (allowing two-pane landscape view in results)
* added option to show deleted notes in list

442. By NoahY on 2012-08-31

fixed paint flags for undeleted notes

443. By NoahY on 2012-08-31

 set title for search activity

444. By NoahY on 2012-08-31

add update on resume to Tomdroid

445. By NoahY on 2012-09-01

moved title link function into NoteManager to avoid repetition

446. By NoahY on 2012-09-05

trying to fix sync bugs, may be creating new ones...

447. By NoahY on 2012-09-05

adding auto backup

448. By NoahY on 2012-09-05

merge and auto backup

449. By NoahY on 2012-09-05

auto backup work

450. By NoahY on 2012-09-05

auto backup working

451. By NoahY on 2012-09-05

converted firstnote to array, toggle autobackup visible, string updates

452. By NoahY on 2012-09-06

first note tweak

453. By NoahY on 2012-09-06

revert to Koichi's solution for first note (merge)

454. By NoahY on 2012-09-07

reworked sync to compare before changing any notes; revisioning should be correct now

455. By NoahY on 2012-09-07

fixed sync for sdcard

456. By NoahY on 2012-09-07

merge with ignore case

457. By NoahY on 2012-09-07

merge link:internal, fix to avoid linking to self

458. By NoahY on 2012-09-08

fixed lp:1047257 Deleted note from tomboy not synced (ubuntu 1)

459. By NoahY on 2012-09-08

merge - sort button

460. By NoahY on 2012-09-08

merge search without xml tags, add ability to import plain text

461. By NoahY on 2012-09-08

* added file picker to import plain text and note files from within Tomdroid

462. By NoahY on 2012-09-08

fixed selection marking on change sort

463. By NoahY on 2012-09-09

added options to turn off hyperlink matching
removed linkmovement method (prevented text selection)
moved sort preference into Display Preferences

464. By NoahY on 2012-09-09

filepicker integration

465. By NoahY on 2012-09-09

removed file picker, using OI as import method

466. By Stefan Hammer on 2012-09-10

show sort-by-button only if there is room (no space on small displays) and as menu to have the text there (below android 2.3 there is no text for buttons in actionbar combat). Further add home menu entry for search results as there was no possibility to go back to list.

467. By Stefan Hammer on 2012-09-11

merge koichis fix for lp:1049026

468. By Olivier Bilodeau on 2012-10-17

merged tomdroid-dev's note-editing.. branch into tomdroid-maint's one

469. By Olivier Bilodeau on 2012-10-17

0.7.2 release bump

bonuses: fixed release documents, removed dead path

470. By Olivier Bilodeau on 2012-10-17

author, changelog and debugging prepped for release

471. By Stefan Hammer on 2012-10-17

fix bug #1051294. closing cursers after every lookup.

472. By Stefan Hammer on 2012-11-03

merge tomdroid-dev branch

473. By Stefan Hammer on 2012-11-03

probably fixes bug #1074676. waiting for test to verify this. however, fix does not break anything. good sign :-)

474. By Stefan Hammer on 2012-11-04

fix bug #1074661 where note files opened with gmail are not parsed as xml.

475. By Stefan Hammer on 2012-11-04

update NEWS

476. By Stefan Hammer on 2012-11-04

fix lp:1074894 NotesList -> Longpress -> Revert -> CRASH

477. By Stefan Hammer on 2012-11-13

fixed bug lp:1064149 Tomdroid Sync fails, datetime_format error

478. By Olivier Bilodeau on 2013-01-05

doc: added logcat instructions

We repeat them quite often.

479. By Stefan Hammer on 2013-02-24

Fixed bug #1074676 and changed chreate date to 1.1.2000 (dirty fix until we store this on in the db)

480. By Stefan Hammer on 2013-02-24

fix bug #1068793

481. By Stefan Hammer on 2013-02-24

fix bug #1068785

482. By Stefan Hammer on 2013-03-09

merged fix for Bug #1051932 by Michael Cerman. Thanks

483. By Stefan Hammer on 2013-03-09

It is now possible to change sync-method, sync-server, folder location without loosing any notes

484. By Stefan Hammer on 2013-03-09

fixed Bug #1071732 Delete Remote Notes still uses the fancy porgress dialogue incomartible to older Android versions.

485. By Stefan Hammer on 2013-03-09

now it is possible to open a .note file from mail, gmail, etc.

486. By Stefan Hammer on 2013-03-10

fix note not found on import if note is already present. further, raise changedate on import, otherwise it won't be synced.

487. By Stefan Hammer on 2013-03-10

fix Bug #1070787 Note Title should be more obvious in Conflict resolving dialogue

488. By Stefan Hammer on 2013-03-10

update news

489. By Stefan Hammer on 2013-03-10

fix several small issues and the string related bugs. eg translation comments, refernces to locations,...

490. By Stefan Hammer on 2013-03-10

exported xml to po and added dependencies of xml2po script to README.

491. By Stefan Hammer on 2013-03-11

Now it is really possible to open mail attachments. this was horrible. could not find out that mimetype is acutally application/note and that viewing from attachments had to be received differently.

492. By Stefan Hammer on 2013-03-11

just check for the beginning, otherwise attachments are handled as text.

493. By Stefan Hammer on 2013-03-11

fixed grammar in string

494. By Stefan Hammer on 2013-03-12

update translations

495. By Stefan Hammer on 2013-03-12

fix bug lp:1120488

496. By Stefan Hammer on 2013-03-12

update NEWS

497. By Stefan Hammer on 2013-03-12

Timo corrected some mistakes i made adding the http header.

498. By Stefan Hammer on 2013-03-12

Add support for self-signed SSL certificates. lp:1153289 We still need to show the certificate to the user to verify it and save it afterwards. For now this is a quick hack to support the Rainy server

499. By Stefan Hammer on 2013-03-13

Update translations, merge news from 0.6.0 and re-add deleted strings.

500. By Stefan Hammer on 2013-03-13

fixed bug #1134866 and bug #982749. both bugs were in the url validation of the server-url preference. now no spaces are allowed any more and bad urls are not saved.

501. By Stefan Hammer on 2013-03-18

fix lp:1149319 now there is a return arrow left from the actionbar home icon if it is enabled and it is disabled in the home activity and others.

502. By Stefan Hammer on 2013-03-30

fix bug #1158806 and bug #1158804

503. By Stefan Hammer on 2013-03-30

Change descriptions of link-preferences to begin with captial letter

504. By Stefan Hammer on 2013-03-31

mergd bugfix for bug #1038353 by mili. thanks for your help!

505. By Stefan Hammer on 2013-03-31

updated pot file for translations

506. By Stefan Hammer on 2013-03-31

merged changes from stable version including removal of ubuntu one parts, added default sync service to sdcard as we have no default sync url. updated translations.

507. By Stefan Hammer on 2013-03-31

fix bug #1068691 and remove stringconverter in favour of xmlutils. further sort classes needed for xml parsing and writing from utils into org.tomdroid.xml. I hope everyone agrees with this change.

508. By Stefan Hammer on 2013-05-19

fix bug #1164889 where single and double quotes are not escaped in note title on sync.

509. By Stefan Hammer on 2013-07-15

several small changes: move strings to translatable source, remove unnecessary boolean changes and made public variables private for security reasons (suggested by eclipse)

510. By Stefan Hammer on 2013-07-15

fix bug lp:1153214 where the receive function tried to fill a SyncService array. now the note is locally changed/added by NoteManager. Further i added a getUribyGuid function to NoteManager for conveniently showing notes when clicking on note files.

511. By Stefan Hammer on 2013-10-07

generated gradle project files for Android Studio

512. By Stefan Hammer on 2013-10-10

notexmlcontentbuilder rewritten as a graph problem to be more robust and bugfree. fix bug in snowysyncservice.

513. By Stefan Hammer on 2013-10-11

Finished the new NoteXMLContentBuilder... from spannable strings to xml now owrks perfekt!

514. By Stefan Hammer on 2013-10-11

started to add missing database fields

515. By Stefan Hammer on 2013-10-11

continue to add fields in database to remember everything we parse from a xml note or websync to be able to write it out on export

516. By Stefan Hammer on 2013-10-11

revert to 513 and keep newest changes in extra branch for testing

517. By Stefan Hammer on 2013-10-12

Added a lot of documentation to our new algorithm to make it understandable and maintainable. updated AUTHORS and ChangeLog

518. By Stefan Hammer on 2013-10-12

remove global variable for the discarding of brand new notes as it is ugly

519. By Stefan Hammer on 2013-10-12

fix bug lp:1155646 where empty conflict dialogue appears and does not go away.

520. By Stefan Hammer on 2013-10-12

moved ontogglebutton events from stylebar to generic function in order to add more awesome to it.

521. By Stefan Hammer on 2013-10-12

cleaned up the ontextchangelistener in editNote to be able to add new features and remove unexpected behaviour when changing styles

522. By Stefan Hammer on 2013-10-12

fix a parsing issue with bullet lists

523. By Stefan Hammer on 2013-10-12

Could not revert a single note any more as we did not follow the sync specifications correctly

524. By Stefan Hammer on 2013-10-13

Now we are able to convert any spans from EditView into a valid xml. including crossing spans, nested spans, lists,...

525. By Stefan Hammer on 2013-10-13

fix nullpointer exception in xmlcontentbuilder

526. By Stefan Hammer on 2013-10-19

Squeezed in a simple method to create new bullets. the whole editview class needs a rewriting. we need to remember the startposition of all different kinds of spans and need to check where we landed as soon as the cursor gets moved around. but for now, this should be fine and work without crashes and data loss

527. By Stefan Hammer on 2013-10-19

fix crasher in CompareNotes. preferences were not initialized again.

528. By Stefan Hammer on 2013-10-19

updated the translation files

529. By Stefan Hammer on 2013-10-19

going through release-todo list to get 0.7.3 done! now updated copyrights, authors, news, readme, changelog,... still need the signed apk from olivier and a release text!

530. By Stefan Hammer on 2013-10-24

added release date for 0.7.3 beta

531. By Stefan Hammer on 2013-10-24

released 0.7.3

532. By Stefan Hammer on 2013-10-24

now it is time to start working on 0.7.4

533. By Stefan Hammer on 2013-10-24

Added google play store whats new string to get it translated in time for the stable release

534. By Stefan Hammer on 2013-10-24

missed the maximum length of 500 characters for the whats new section

535. By Stefan Hammer on 2013-10-24

fix bug lp 1244409 string changes

536. By Stefan Hammer on 2013-10-25

fix play store whats new section according to bug lg:1244445 and lp:1244412

537. By Stefan Hammer on 2013-12-16

Added an 114x114 icon for the Amazon app store

538. By Stefan Hammer on 2013-12-21

Preparations for 0.7.4 stable release. fixed small bug when saving a note, updated translations, added things to release checklist

539. By Stefan Hammer on 2013-12-21

added 0.7.4 screenshots

540. By Stefan Hammer on 2013-12-21

revert ist not working for sdcard or online sync - disable it for now.

541. By Stefan Hammer on 2013-12-21

reached the releaseing on lauchpad headline in the release checklist.

542. By Stefan Hammer on 2013-12-21

Found a release name - will export apk now

543. By Stefan Hammer on 2013-12-21

redesigned feature graphic

544. By Stefan Hammer on 2013-12-23

Fix bug where all the note content is lost when a smiley is inserted in the text with the android keyboard. now relacing all illegal characters

545. By Stefan Hammer on 2013-12-24

fix date in news

546. By Stefan Hammer on 2013-12-24

raised the version number and enabled logging again

547. By Stefan Hammer on 2013-12-27

Fix CursorWindowAllocationException reported on google play

=== modified file '.bzrignore'
--- .bzrignore	2011-10-27 16:26:26 +0000
+++ .bzrignore	2013-12-27 09:31:31 +0000
@@ -1,4 +1,4 @@
-bin
+bin/
 src/org/tomdroid/R.java
 sdcard.img.private
 gen/*

=== modified file '.classpath'
--- .classpath	2013-03-14 13:54:32 +0000
+++ .classpath	2013-12-27 09:31:31 +0000
@@ -2,10 +2,13 @@
 <classpath>
 	<classpathentry kind="src" path="tests"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry kind="lib" path="libs/signpost-core-1.2.1.2.jar"/>
-	<classpathentry kind="lib" path="libs/signpost-commonshttp4-1.2.1.2.jar"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK/com.kaloer.filepicker.MainActivity"/>
+	<classpathentry exported="true" kind="lib" path="libs/signpost-core-1.2.1.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/signpost-commonshttp4-1.2.1.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/diffutils-1.2.1.jar"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

=== modified file '.settings/org.eclipse.jdt.core.prefs'
--- .settings/org.eclipse.jdt.core.prefs	2009-04-24 16:42:15 +0000
+++ .settings/org.eclipse.jdt.core.prefs	2013-12-27 09:31:31 +0000
@@ -1,21 +1,28 @@
-#Tue Apr 21 12:14:39 MDT 2009
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
 org.eclipse.jdt.core.compiler.problem.deprecation=warning
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
@@ -23,31 +30,48 @@
 org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
 org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
 org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
 org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
 org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
 org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
 org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
 org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
 org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
 org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
 org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
 org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
 org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
 org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
 org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
 org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
 org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
 org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
 org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
 org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
 org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
@@ -60,6 +84,7 @@
 org.eclipse.jdt.core.compiler.problem.unusedImport=warning
 org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
 org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
 org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
@@ -67,4 +92,4 @@
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6

=== removed file '.settings/org.eclipse.jdt.ui.prefs'
--- .settings/org.eclipse.jdt.ui.prefs	2009-04-24 16:42:15 +0000
+++ .settings/org.eclipse.jdt.ui.prefs	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-#Tue Apr 21 12:14:39 MDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates/>

=== modified file 'AUTHORS'
--- AUTHORS	2013-03-13 13:54:52 +0000
+++ AUTHORS	2013-12-27 09:31:31 +0000
@@ -8,16 +8,20 @@
 Jacob Henner <[e-mail]>
 Koichi Akabe <[e-mail]>
 Matthew Rasmus <[e-mail]>
-Matthew Stevenson <[e-mail]>
+Matthew Stevenson <matt@matt-desktop>
 Michael Fletcher <[e-mail]>
+Michal Cerman <[e-mail]>
+Dominik Steininger <[e-mail]> 
+noahy <[e-mail]> 
 Olivier Bilodeau <[e-mail]>
 Piotr Adamski <[e-mail]>
 Rodja Trappe <[e-mail]>
 Stefan Hammer <[e-mail]>
+Timo Dörr <[e-mail]>
 Thomas Frenzel <[e-mail]>
 
 TRANSLATORS
 ===========
 
-Please see the "Launchpad Contributions:" section in the 
+Please see the "Launchpad Contributions:" section in the
 /locales/*.po files for a full list of contributors!

=== modified file 'AndroidManifest.xml'
--- AndroidManifest.xml	2013-03-14 21:48:03 +0000
+++ AndroidManifest.xml	2013-12-27 09:31:31 +0000
@@ -1,13 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.tomdroid"
-      android:versionName="0.6.1" android:versionCode="9">
+      android:versionName="0.8.0dev" android:versionCode="14">
 
-	<uses-sdk android:minSdkVersion="3"
-	          android:targetSdkVersion="4" />
+	<uses-sdk android:minSdkVersion="4"
+	          android:targetSdkVersion="11" />
           
-    <supports-screens android:anyDensity="true" />
-        	       
+    <supports-screens android:resizeable="true"
+                      android:smallScreens="true"
+                      android:normalScreens="true"
+                      android:largeScreens="true"
+                      android:xlargeScreens="true"
+                      android:anyDensity="true"/>
+    
+    <uses-permission android:name="android.permission.INTERNET" />
+	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
+    <uses-permission android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT" />
+    	       
 	<application
 		android:icon="@drawable/ic_launcher"
 		android:label="@string/app_name"
@@ -15,9 +25,10 @@
 	>
 
         <activity android:label="@string/app_name"
-        		  android:name=".ui.Tomdroid"
-        		  android:launchMode="singleTop"
-        		  >
+			android:theme="@style/LightTheme"
+			android:name=".ui.Tomdroid"
+			android:configChanges="orientation|screenSize"
+			>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -30,53 +41,135 @@
         	</intent-filter>
         	<!-- enable the search dialog to send searches to SearchableActivity -->
         	<meta-data android:name="android.app.default_searchable"
-                   android:value=".ui.Search" />
-        </activity>
-    
-		<activity android:name=".ui.ViewNote">
-		    <intent-filter>
-			    <action android:name="android.intent.action.VIEW" />
-			    <category android:name="android.intent.category.DEFAULT" />
-			    <category android:name="android.intent.category.BROWSABLE" />
-			    <data android:mimeType="vnd.android.cursor.item/vnd.tomdroid.note" />
-			</intent-filter>
-		</activity>
-		
-		<activity android:name=".ui.Search"
-		          android:launchMode="singleTop">
+                   android:value=".ui.Tomdroid" />
 			<intent-filter>
 				<action android:name="android.intent.action.SEARCH" />
 			</intent-filter>
 			<meta-data	android:name="android.app.searchable"
 						android:resource="@xml/searchable"/>
-		</activity>
-		<provider	android:name=".util.SearchSuggestionProvider"
-					android:authorities="org.tomdroid.util.SearchSuggestionProvider"
-        />
+        </activity>
+    
+		<activity android:name=".ui.ViewNote"
+			android:theme="@style/LightTheme"
+			android:label="@string/view_title"
+			>
+			<intent-filter>
+				<action android:name="android.intent.action.VIEW" />
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+				<data android:mimeType="vnd.android.cursor.item/vnd.tomdroid.note" />
+			</intent-filter>
+		</activity>
+		<activity android:name=".ui.EditNote"
+			android:configChanges="keyboardHidden|orientation|screenSize"
+			android:theme="@style/LightTheme"
+			android:label="@string/edit_title"
+		    >
+		</activity>
+		<activity android:name=".util.Receive"
+		    android:theme="@style/LightTheme"
+		    >
+		    <!-- To receive data from other apps via share -->
+        	<intent-filter>
+        		<action android:name="android.intent.action.SEND" />
+        		<category android:name="android.intent.category.DEFAULT" />
+        		<data android:mimeType="text/plain" />
+    		</intent-filter>
+			<!-- To receive note files from file browser (open all .note files) -->
+			<intent-filter>
+				<action android:name="android.intent.action.VIEW" />
+				<category android:name="android.intent.category.DEFAULT" />
+		        <category android:name="android.intent.category.BROWSABLE" />
+				<data android:scheme="file" />
+				<data android:host="*" />
+				<data android:port="*" />
+  				<data android:mimeType="*/*" />
+				<data android:pathPattern=".*\\.note" />
+			</intent-filter>
+			<intent-filter>
+				<action android:name="android.intent.action.VIEW" />
+				<category android:name="android.intent.category.DEFAULT" />
+		        <category android:name="android.intent.category.BROWSABLE" />
+				<data android:scheme="content" />
+				<data android:host="*" />
+				<data android:port="*" />
+  				<data android:mimeType="*/*" />
+				<data android:pathPattern=".*\\.note" />
+			</intent-filter>
+			<!-- To open all text files (open all text files) -->
+			<intent-filter>
+				<action android:name="android.intent.action.VIEW" />
+				<category android:name="android.intent.category.DEFAULT" />
+		        <category android:name="android.intent.category.BROWSABLE" />
+				<data android:scheme="content" />
+				<data android:host="*" />
+				<data android:port="*" />
+				<data android:pathPattern=".*" />
+  				<data android:mimeType="text/*" />
+			</intent-filter>
+			<intent-filter>
+				<action android:name="android.intent.action.VIEW" />
+				<category android:name="android.intent.category.DEFAULT" />
+		        <category android:name="android.intent.category.BROWSABLE" />
+				<data android:scheme="file" />
+				<data android:host="*" />
+				<data android:port="*" />
+				<data android:pathPattern=".*" />
+  				<data android:mimeType="text/*" />
+			</intent-filter>
+			<!-- To receive note files from mail client (open with application/note mimetype) -->
+			<intent-filter>
+				<action android:name="android.intent.action.VIEW" />
+				<category android:name="android.intent.category.DEFAULT" />
+		        <category android:name="android.intent.category.BROWSABLE" />
+				<data android:scheme="file" />
+				<data android:host="*" />
+				<data android:port="*" />
+  				<data android:mimeType="application/note" />
+			</intent-filter>
+			<intent-filter>
+				<action android:name="android.intent.action.VIEW" />
+				<category android:name="android.intent.category.DEFAULT" />
+		        <category android:name="android.intent.category.BROWSABLE" />
+				<data android:scheme="content" />
+				<data android:host="*" />
+				<data android:port="*" />
+  				<data android:mimeType="application/note" />
+			</intent-filter>
+		</activity>
+		<provider	
+		    android:name=".util.SearchSuggestionProvider"
+			android:authorities="org.tomdroid.util.SearchSuggestionProvider"
+			/>
 		
 		<provider android:name="NoteProvider"
             android:authorities="org.tomdroid.notes"
         />
-        
-        <activity android:name=".ui.PreferencesActivity" android:label="@string/app_name"
-			android:configChanges="keyboardHidden|orientation" >
+        <activity android:name=".ui.PreferencesActivity" 
+        	android:theme="@style/LightTheme"
+ 			android:label="@string/pref_title"
+ 			android:configChanges="orientation|screenSize"
+ 			>
     	</activity>
-
-        <activity android:name=".ui.ShortcutActivity" android:label="@string/shortcut_menu_item_caption">
+        <activity android:name=".ui.ShortcutActivity" 
+			android:theme="@style/LightTheme"
+            android:label="@string/shortcut_menu_item_caption">
             <intent-filter>
                 <action android:name="android.intent.action.CREATE_SHORTCUT"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
-
-      <uses-library android:name="android.test.runner" />
+    	<activity android:name=".ui.CompareNotes"  
+			android:theme="@style/LightTheme"
+        	android:label="@string/app_name">  
+		</activity>
+		  
+        <activity android:name=".ui.FilePickerActivity"
+			android:theme="@style/LightTheme"
+        	android:label="@string/filePickerTitle"/>
+    	
+    	<uses-library android:name="android.test.runner" />
     </application>
-    
-	<uses-permission android:name="android.permission.INTERNET" />
-	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
-    <uses-permission android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT" />
-
-<instrumentation android:name="android.test.InstrumentationTestRunner" android:targetPackage="org.tomdroid"></instrumentation>
+	<instrumentation android:name="android.test.InstrumentationTestRunner" android:targetPackage="org.tomdroid"></instrumentation>
 
 </manifest> 

=== modified file 'ChangeLog'
--- ChangeLog	2013-03-14 21:48:03 +0000
+++ ChangeLog	2013-12-27 09:31:31 +0000
@@ -1,3 +1,791 @@
[phone]  Stefan Hammer  <[e-mail]>
+
+	* ChangeLog:
+	* NEWS:
+	* README:
+	* src/org/tomdroid/util/TLog.java:
+
+	reached the releaseing on lauchpad headline in the release checklist.
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* data/market-screenshots/0.7.4 - note-options-And4.4.png:
+	* res/menu/main_longclick.xml:
+	* res/menu/main_longclick_deleted.xml:
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	revert ist not working for sdcard or online sync - disable it for now.
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* data/market-screenshots/0.7.4 - note-list-And4.4.png:
+	* data/market-screenshots/0.7.4 - note-view-And4.4.png:
+	* data/market-screenshots/0.7.4 - tablet-edit-view.png:
+	* data/market-screenshots/0.7.4 - tablet-view.png:
+	* sdcard.img:
+
+	added 0.7.4 screenshots
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* data/market-screenshots/0.7.4 - note-options-And4.4.png:
+	* data/market-screenshots/0.7.4 - preferences-And4.4.png:
+	* data/market-screenshots/0.7.4 - welcome-dialog-And4.4.png:
+	* data/market-screenshots/0.7.4- note-edit-And4.4.png:
+	* locales/tomdroid-oc.po:
+	* locales/tomdroid-sk.po:
+	* locales/tomdroid-sq.po:
+	* locales/tomdroid-su.po:
+	* res/values-oc:
+	* res/values-oc/strings.xml:
+	* res/values-sk:
+	* res/values-sk/strings.xml:
+	* res/values-sq:
+	* res/values-sq/strings.xml:
+	* res/values-su:
+	* res/values-su/strings.xml:
+	* AndroidManifest.xml:
+	* doc/dev/RELEASE-CHECKLIST:
+	* locales/tomdroid-ar.po:
+	* locales/tomdroid-bg.po:
+	* locales/tomdroid-bs.po:
+	* locales/tomdroid-ca.po:
+	* locales/tomdroid-cs.po:
+	* locales/tomdroid-da.po:
+	* locales/tomdroid-de.po:
+	* locales/tomdroid-el.po:
+	* locales/tomdroid-en_AU.po:
+	* locales/tomdroid-en_GB.po:
+	* locales/tomdroid-eo.po:
+	* locales/tomdroid-es.po:
+	* locales/tomdroid-et.po:
+	* locales/tomdroid-eu.po:
+	* locales/tomdroid-fa.po:
+	* locales/tomdroid-fi.po:
+	* locales/tomdroid-fo.po:
+	* locales/tomdroid-fr.po:
+	* locales/tomdroid-gd.po:
+	* locales/tomdroid-gl.po:
+	* locales/tomdroid-hi.po:
+	* locales/tomdroid-hr.po:
+	* locales/tomdroid-hu.po:
+	* locales/tomdroid-id.po:
+	* locales/tomdroid-is.po:
+	* locales/tomdroid-it.po:
+	* locales/tomdroid-ja.po:
+	* locales/tomdroid-jv.po:
+	* locales/tomdroid-ko.po:
+	* locales/tomdroid-la.po:
+	* locales/tomdroid-ml.po:
+	* locales/tomdroid-ms.po:
+	* locales/tomdroid-nb.po:
+	* locales/tomdroid-nl.po:
+	* locales/tomdroid-pl.po:
+	* locales/tomdroid-pt.po:
+	* locales/tomdroid-pt_BR.po:
+	* locales/tomdroid-ru.po:
+	* locales/tomdroid-si.po:
+	* locales/tomdroid-sr.po:
+	* locales/tomdroid-sv.po:
+	* locales/tomdroid-ta.po:
+	* locales/tomdroid-te.po:
+	* locales/tomdroid-tr.po:
+	* locales/tomdroid-ug.po:
+	* locales/tomdroid-uk.po:
+	* locales/tomdroid-vi.po:
+	* locales/tomdroid-zh_CN.po:
+	* locales/tomdroid-zh_TW.po:
+	* res/values-ar/strings.xml:
+	* res/values-bg/strings.xml:
+	* res/values-bs/strings.xml:
+	* res/values-ca/strings.xml:
+	* res/values-cs/strings.xml:
+	* res/values-da/strings.xml:
+	* res/values-de/strings.xml:
+	* res/values-el/strings.xml:
+	* res/values-en-rAU/strings.xml:
+	* res/values-en-rGB/strings.xml:
+	* res/values-eo/strings.xml:
+	* res/values-es/strings.xml:
+	* res/values-et/strings.xml:
+	* res/values-eu/strings.xml:
+	* res/values-fa/strings.xml:
+	* res/values-fi/strings.xml:
+	* res/values-fo/strings.xml:
+	* res/values-fr/strings.xml:
+	* res/values-gd/strings.xml:
+	* res/values-gl/strings.xml:
+	* res/values-hi/strings.xml:
+	* res/values-hr/strings.xml:
+	* res/values-hu/strings.xml:
+	* res/values-id/strings.xml:
+	* res/values-is/strings.xml:
+	* res/values-it/strings.xml:
+	* res/values-ja/strings.xml:
+	* res/values-jv/strings.xml:
+	* res/values-ko/strings.xml:
+	* res/values-la/strings.xml:
+	* res/values-ml/strings.xml:
+	* res/values-ms/strings.xml:
+	* res/values-nb/strings.xml:
+	* res/values-nl/strings.xml:
+	* res/values-pl/strings.xml:
+	* res/values-pt-rBR/strings.xml:
+	* res/values-pt/strings.xml:
+	* res/values-ru/strings.xml:
+	* res/values-si/strings.xml:
+	* res/values-sr/strings.xml:
+	* res/values-sv/strings.xml:
+	* res/values-ta/strings.xml:
+	* res/values-te/strings.xml:
+	* res/values-tr/strings.xml:
+	* res/values-ug/strings.xml:
+	* res/values-uk/strings.xml:
+	* res/values-vi/strings.xml:
+	* res/values-zh-rCN/strings.xml:
+	* res/values-zh-rTW/strings.xml:
+	* res/values-zh/strings.xml:
+	* src/org/tomdroid/sync/sd/SdCardSyncService.java:
+	* src/org/tomdroid/ui/EditNote.java:
+
+	Preparations for 0.7.4 stable release. fixed small bug when saving a note, updated translations, added things to release checklist
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* data/icon-launcher/icon-114.png:
+
+	Added an 114x114 icon for the Amazon app store
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* locales/tomdroid.pot:
+	* res/values/strings.xml:
+
+	fix play store whats new section according to bug lg:1244445 and lp:1244412
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* locales/tomdroid.pot:
+	* res/values/strings.xml:
+
+	fix bug lp 1244409 string changes
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* locales/tomdroid.pot:
+	* res/values/strings.xml:
+
+	missed the maximum length of 500 characters for the whats new section
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* locales/tomdroid.pot:
+	* res/values/strings.xml:
+
+	Added google play store whats new string to get it translated in time for the stable release
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* AndroidManifest.xml:
+	* src/org/tomdroid/util/TLog.java:
+
+	now it is time to start working on 0.7.4
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* doc/dev/RELEASE-CHECKLIST:
+
+	released 0.7.3
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* .settings/org.eclipse.jdt.ui.prefs:
+	* .settings/org.eclipse.jdt.core.prefs:
+	* NEWS:
+
+	added release date for 0.7.3 beta
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* AUTHORS:
+	* AndroidManifest.xml:
+	* ChangeLog:
+	* NEWS:
+	* README:
+	* doc/dev/RELEASE-CHECKLIST:
+	* doc/dev/TODO:
+	* src/org/tomdroid/Note.java:
+	* src/org/tomdroid/sync/web/WebConnection.java:
+	* src/org/tomdroid/ui/EditNote.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/ui/ViewNote.java:
+	* src/org/tomdroid/util/Receive.java:
+	* src/org/tomdroid/util/TLog.java:
+	* src/org/tomdroid/xml/NoteContentHandler.java:
+
+	going through release-todo list to get 0.7.3 done! now updated copyrights, authors, news, readme, changelog,... still need the signed apk from olivier and a release text!
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* locales/tomdroid-en_AU.po:
+	* locales/tomdroid-hr.po:
+	* locales/tomdroid-is.po:
+	* locales/tomdroid-jv.po:
+	* locales/tomdroid-vi.po:
+	* res/values-en-rAU:
+	* res/values-en-rAU/strings.xml:
+	* res/values-hr:
+	* res/values-hr/strings.xml:
+	* res/values-is:
+	* res/values-is/strings.xml:
+	* res/values-jv:
+	* res/values-jv/strings.xml:
+	* res/values-vi:
+	* res/values-vi/strings.xml:
+	* locales/tomdroid-ar.po:
+	* locales/tomdroid-bg.po:
+	* locales/tomdroid-bs.po:
+	* locales/tomdroid-ca.po:
+	* locales/tomdroid-cs.po:
+	* locales/tomdroid-da.po:
+	* locales/tomdroid-de.po:
+	* locales/tomdroid-el.po:
+	* locales/tomdroid-en_GB.po:
+	* locales/tomdroid-eo.po:
+	* locales/tomdroid-es.po:
+	* locales/tomdroid-et.po:
+	* locales/tomdroid-eu.po:
+	* locales/tomdroid-fa.po:
+	* locales/tomdroid-fi.po:
+	* locales/tomdroid-fo.po:
+	* locales/tomdroid-fr.po:
+	* locales/tomdroid-gd.po:
+	* locales/tomdroid-gl.po:
+	* locales/tomdroid-hi.po:
+	* locales/tomdroid-hu.po:
+	* locales/tomdroid-id.po:
+	* locales/tomdroid-it.po:
+	* locales/tomdroid-ja.po:
+	* locales/tomdroid-ko.po:
+	* locales/tomdroid-la.po:
+	* locales/tomdroid-ml.po:
+	* locales/tomdroid-ms.po:
+	* locales/tomdroid-nb.po:
+	* locales/tomdroid-nl.po:
+	* locales/tomdroid-pl.po:
+	* locales/tomdroid-pt.po:
+	* locales/tomdroid-pt_BR.po:
+	* locales/tomdroid-ru.po:
+	* locales/tomdroid-si.po:
+	* locales/tomdroid-sr.po:
+	* locales/tomdroid-sv.po:
+	* locales/tomdroid-ta.po:
+	* locales/tomdroid-te.po:
+	* locales/tomdroid-tr.po:
+	* locales/tomdroid-ug.po:
+	* locales/tomdroid-uk.po:
+	* locales/tomdroid-zh.po:
+	* locales/tomdroid-zh_CN.po:
+	* locales/tomdroid-zh_TW.po:
+	* locales/tomdroid.pot:
+	* res/values-ar/strings.xml:
+	* res/values-cs/strings.xml:
+	* res/values-da/strings.xml:
+	* res/values-de/strings.xml:
+	* res/values-en-rGB/strings.xml:
+	* res/values-es/strings.xml:
+	* res/values-fr/strings.xml:
+	* res/values-gd/strings.xml:
+	* res/values-gl/strings.xml:
+	* res/values-id/strings.xml:
+	* res/values-it/strings.xml:
+	* res/values-ja/strings.xml:
+	* res/values-nl/strings.xml:
+	* res/values-pl/strings.xml:
+	* res/values-pt/strings.xml:
+	* res/values-ru/strings.xml:
+	* res/values-si/strings.xml:
+	* res/values-sr/strings.xml:
+	* res/values-sv/strings.xml:
+	* res/values-tr/strings.xml:
+	* res/values-uk/strings.xml:
+	* res/values-zh-rCN/strings.xml:
+	* src/org/tomdroid/util/Receive.java:
+
+	updated the translation files
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* src/org/tomdroid/ui/CompareNotes.java:
+
+	fix crasher in CompareNotes. preferences were not initialized again.
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* src/org/tomdroid/Note.java:
+	* src/org/tomdroid/ui/EditNote.java:
+	* src/org/tomdroid/xml/NoteContentBuilder.java:
+	* src/org/tomdroid/xml/NoteContentHandler.java:
+	* src/org/tomdroid/xml/NoteXMLContentBuilder.java:
+
+	Squeezed in a simple method to create new bullets. the whole editview class needs a rewriting. we need to remember the startposition of all different kinds of spans and need to check where we landed as soon as the cursor gets moved around. but for now, this should be fine and work without crashes and data loss
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* src/org/tomdroid/util/TagNode.java:
+	* src/org/tomdroid/xml/NoteXMLContentBuilder.java:
+
+	fix nullpointer exception in xmlcontentbuilder
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* src/org/tomdroid/ui/EditNote.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/util/TagNode.java:
+	* src/org/tomdroid/xml/NoteXMLContentBuilder.java:
+
+	Now we are able to convert any spans from EditView into a valid xml. including crossing spans, nested spans, lists,...
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* src/org/tomdroid/sync/web/SnowySyncService.java:
+
+	Could not revert a single note any more as we did not follow the sync specifications correctly
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* src/org/tomdroid/xml/NoteXMLContentBuilder.java:
+
+	fix a parsing issue with bullet lists
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* src/org/tomdroid/ui/EditNote.java:
+	* src/org/tomdroid/xml/NoteXMLContentBuilder.java:
+
+	cleaned up the ontextchangelistener in editNote to be able to add new features and remove unexpected behaviour when changing styles
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* src/org/tomdroid/ui/EditNote.java:
+
+	moved ontogglebutton events from stylebar to generic function in order to add more awesome to it.
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* src/org/tomdroid/ui/CompareNotes.java:
+	* src/org/tomdroid/ui/EditNote.java:
+
+	fix bug lp:1155646 where empty conflict dialogue appears and does not go away.
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* src/org/tomdroid/ui/EditNote.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/util/NewNote.java:
+
+	remove global variable for the discarding of brand new notes as it is ugly
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* AUTHORS:
+	* NEWS:
+	* src/org/tomdroid/util/TagNode.java:
+	* src/org/tomdroid/util/TagType.java:
+	* src/org/tomdroid/xml/NoteXMLContentBuilder.java:
+
+	Added a lot of documentation to our new algorithm to make it understandable and maintainable. updated AUTHORS and ChangeLog
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* src/org/tomdroid/Note.java:
+	* src/org/tomdroid/NoteManager.java:
+	* src/org/tomdroid/NoteProvider.java:
+	* src/org/tomdroid/sync/sd/NoteHandler.java:
+	* src/org/tomdroid/sync/sd/SdCardSyncService.java:
+	* src/org/tomdroid/sync/web/SnowySyncService.java:
+	* src/org/tomdroid/util/FirstNote.java:
+	* tests/org/tomdroid/NoteManagerTest.java:
+	* tests/org/tomdroid/NoteTest.java:
+
+	revert to 513 and keep newest changes in extra branch for testing
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* src/org/tomdroid/Note.java:
+	* src/org/tomdroid/NoteManager.java:
+	* src/org/tomdroid/NoteProvider.java:
+	* src/org/tomdroid/sync/sd/NoteHandler.java:
+	* src/org/tomdroid/sync/sd/SdCardSyncService.java:
+	* src/org/tomdroid/sync/web/SnowySyncService.java:
+	* src/org/tomdroid/util/FirstNote.java:
+	* tests/org/tomdroid/NoteManagerTest.java:
+	* tests/org/tomdroid/NoteTest.java:
+
+	continue to add fields in database to remember everything we parse from a xml note or websync to be able to write it out on export
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* src/org/tomdroid/Note.java:
+	* src/org/tomdroid/NoteManager.java:
+	* src/org/tomdroid/NoteProvider.java:
+	* src/org/tomdroid/sync/web/SnowySyncService.java:
+
+	started to add missing database fields
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* src/org/tomdroid/sync/web/SnowySyncService.java:
+	* src/org/tomdroid/util/TagNode.java:
+	* src/org/tomdroid/xml/NoteXMLContentBuilder.java:
+
+	Finished the new NoteXMLContentBuilder... from spannable strings to xml now owrks perfekt!
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* src/org/tomdroid/util/TagNode.java:
+	* src/org/tomdroid/util/TagType.java:
+	* src/org/tomdroid/sync/web/SnowySyncService.java:
+	* src/org/tomdroid/xml/NoteXMLContentBuilder.java:
+
+	notexmlcontentbuilder rewritten as a graph problem to be more robust and bugfree. fix bug in snowysyncservice.
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* build.gradle:
+	* gradle:
+	* gradle/wrapper:
+	* gradle/wrapper/gradle-wrapper.jar:
+	* gradle/wrapper/gradle-wrapper.properties:
+	* gradlew:
+	* gradlew.bat:
+	* .classpath:
+
+	generated gradle project files for Android Studio
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* src/org/tomdroid/NoteManager.java:
+	* src/org/tomdroid/ui/CompareNotes.java:
+	* src/org/tomdroid/util/Receive.java:
+
+	fix bug lp:1153214 where the receive function tried to fill a SyncService array. now the note is locally changed/added by NoteManager. Further i added a getUribyGuid function to NoteManager for conveniently showing notes when clicking on note files.
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* src/org/tomdroid/ui/EditNote.java:
+	* src/org/tomdroid/xml/NoteContentHandler.java:
+	* src/org/tomdroid/xml/NoteXMLContentBuilder.java:
+
+	several small changes: move strings to translatable source, remove unnecessary boolean changes and made public variables private for security reasons (suggested by eclipse)
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* .classpath:
+	* src/org/tomdroid/sync/web/SnowySyncService.java:
+	* src/org/tomdroid/xml/XmlUtils.java:
+
+	fix bug #1164889 where single and double quotes are not escaped in note title on sync.
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* src/org/tomdroid/xml/LinkifyPhone.java:
+	* src/org/tomdroid/xml/NoteContentBuilder.java:
+	* src/org/tomdroid/xml/NoteXMLContentBuilder.java:
+	* src/org/tomdroid/xml/XmlUtils.java:
+	* src/org/tomdroid/util/LinkifyPhone.java:
+	* src/org/tomdroid/util/NoteContentBuilder.java:
+	* src/org/tomdroid/util/NoteXMLContentBuilder.java:
+	* src/org/tomdroid/util/StringConverter.java:
+	* src/org/tomdroid/util/XmlUtils.java:
+	* res/menu/edit_note.xml:
+	* src/org/tomdroid/Note.java:
+	* src/org/tomdroid/NoteManager.java:
+	* src/org/tomdroid/NoteProvider.java:
+	* src/org/tomdroid/ui/EditNote.java:
+	* src/org/tomdroid/ui/FilePickerActivity.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/ui/ViewNote.java:
+	* src/org/tomdroid/util/Receive.java:
+	* src/org/tomdroid/util/Send.java:
+
+	fix bug #1068691 and remove stringconverter in favour of xmlutils. further sort classes needed for xml parsing and writing from utils into org.tomdroid.xml. I hope everyone agrees with this change.
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* locales/tomdroid-bg.po:
+	* locales/tomdroid-et.po:
+	* locales/tomdroid-gl.po:
+	* locales/tomdroid-id.po:
+	* locales/tomdroid-la.po:
+	* locales/tomdroid-ml.po:
+	* locales/tomdroid-nl.po:
+	* locales/tomdroid-sr.po:
+	* locales/tomdroid-zh_TW.po:
+	* res/values-bg:
+	* res/values-bg/strings.xml:
+	* res/values-et:
+	* res/values-et/strings.xml:
+	* res/values-gl:
+	* res/values-gl/strings.xml:
+	* res/values-id:
+	* res/values-id/strings.xml:
+	* res/values-la:
+	* res/values-la/strings.xml:
+	* res/values-ml:
+	* res/values-ml/strings.xml:
+	* res/values-nl:
+	* res/values-nl/strings.xml:
+	* res/values-sr:
+	* res/values-sr/strings.xml:
+	* res/values-zh-rTW:
+	* res/values-zh-rTW/strings.xml:
+	* src/org/tomdroid/sync/web/MySSLSocketFactory.java:
+	* locales/tomdroid-bg.po:
+	* locales/tomdroid-et.po:
+	* locales/tomdroid-gl.po:
+	* locales/tomdroid-id.po:
+	* locales/tomdroid-la.po:
+	* locales/tomdroid-ml.po:
+	* locales/tomdroid-nl.po:
+	* locales/tomdroid-sr.po:
+	* locales/tomdroid-zh_TW.po:
+	* res/values-bg:
+	* res/values-bg/strings.xml:
+	* res/values-et:
+	* res/values-et/strings.xml:
+	* res/values-gl:
+	* res/values-gl/strings.xml:
+	* res/values-id:
+	* res/values-id/strings.xml:
+	* res/values-la:
+	* res/values-la/strings.xml:
+	* res/values-ml:
+	* res/values-ml/strings.xml:
+	* res/values-nl:
+	* res/values-nl/strings.xml:
+	* res/values-sr:
+	* res/values-sr/strings.xml:
+	* res/values-zh-rTW:
+	* res/values-zh-rTW/strings.xml:
+	* src/org/tomdroid/sync/web/MySSLSocketFactory.java:
+	* AUTHORS:
+	* AndroidManifest.xml:
+	* ChangeLog:
+	* NEWS:
+	* doc/dev/RELEASE-CHECKLIST:
+	* locales/tomdroid-ar.po:
+	* locales/tomdroid-bs.po:
+	* locales/tomdroid-ca.po:
+	* locales/tomdroid-cs.po:
+	* locales/tomdroid-da.po:
+	* locales/tomdroid-de.po:
+	* locales/tomdroid-el.po:
+	* locales/tomdroid-en_GB.po:
+	* locales/tomdroid-eo.po:
+	* locales/tomdroid-es.po:
+	* locales/tomdroid-eu.po:
+	* locales/tomdroid-fa.po:
+	* locales/tomdroid-fi.po:
+	* locales/tomdroid-fo.po:
+	* locales/tomdroid-fr.po:
+	* locales/tomdroid-gd.po:
+	* locales/tomdroid-hi.po:
+	* locales/tomdroid-hu.po:
+	* locales/tomdroid-it.po:
+	* locales/tomdroid-ja.po:
+	* locales/tomdroid-ko.po:
+	* locales/tomdroid-ms.po:
+	* locales/tomdroid-nb.po:
+	* locales/tomdroid-pl.po:
+	* locales/tomdroid-pt.po:
+	* locales/tomdroid-pt_BR.po:
+	* locales/tomdroid-ru.po:
+	* locales/tomdroid-si.po:
+	* locales/tomdroid-sv.po:
+	* locales/tomdroid-ta.po:
+	* locales/tomdroid-te.po:
+	* locales/tomdroid-tr.po:
+	* locales/tomdroid-ug.po:
+	* locales/tomdroid-uk.po:
+	* locales/tomdroid-zh.po:
+	* locales/tomdroid-zh_CN.po:
+	* locales/tomdroid.pot:
+	* res/values-ar/strings.xml:
+	* res/values-bs/strings.xml:
+	* res/values-ca/strings.xml:
+	* res/values-cs/strings.xml:
+	* res/values-da/strings.xml:
+	* res/values-de/strings.xml:
+	* res/values-el/strings.xml:
+	* res/values-en-rGB/strings.xml:
+	* res/values-eo/strings.xml:
+	* res/values-es/strings.xml:
+	* res/values-eu/strings.xml:
+	* res/values-fa/strings.xml:
+	* res/values-fi/strings.xml:
+	* res/values-fo/strings.xml:
+	* res/values-fr/strings.xml:
+	* res/values-gd/strings.xml:
+	* res/values-hi/strings.xml:
+	* res/values-hu/strings.xml:
+	* res/values-it/strings.xml:
+	* res/values-ja/strings.xml:
+	* res/values-ko/strings.xml:
+	* res/values-ms/strings.xml:
+	* res/values-nb/strings.xml:
+	* res/values-pl/strings.xml:
+	* res/values-pt-rBR/strings.xml:
+	* res/values-pt/strings.xml:
+	* res/values-ru/strings.xml:
+	* res/values-si/strings.xml:
+	* res/values-sv/strings.xml:
+	* res/values-ta/strings.xml:
+	* res/values-te/strings.xml:
+	* res/values-tr/strings.xml:
+	* res/values-ug/strings.xml:
+	* res/values-uk/strings.xml:
+	* res/values-zh-rCN/strings.xml:
+	* res/values-zh/strings.xml:
+	* res/values/strings.xml:
+	* res/xml/preferences.xml:
+	* src/org/tomdroid/util/Preferences.java:
+
+	merged changes from stable version including removal of ubuntu one parts, added default sync service to sdcard as we have no default sync url. updated translations.
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* locales/tomdroid.pot:
+	* res/values/strings.xml:
+
+	update market description to the newest version
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	release 0.6.1 polyglot
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* NEWS:
+
+	change release date
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* doc/dev/RELEASE-CHECKLIST:
+
+	logging is not neccesary in manifest any more
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* locales/tomdroid-ar.po:
+	* locales/tomdroid-bg.po:
+	* locales/tomdroid-bs.po:
+	* locales/tomdroid-ca.po:
+	* locales/tomdroid-cs.po:
+	* locales/tomdroid-da.po:
+	* locales/tomdroid-de.po:
+	* locales/tomdroid-el.po:
+	* locales/tomdroid-en_GB.po:
+	* locales/tomdroid-eo.po:
+	* locales/tomdroid-es.po:
+	* locales/tomdroid-et.po:
+	* locales/tomdroid-eu.po:
+	* locales/tomdroid-fa.po:
+	* locales/tomdroid-fi.po:
+	* locales/tomdroid-fo.po:
+	* locales/tomdroid-fr.po:
+	* locales/tomdroid-gd.po:
+	* locales/tomdroid-gl.po:
+	* locales/tomdroid-hi.po:
+	* locales/tomdroid-hu.po:
+	* locales/tomdroid-id.po:
+	* locales/tomdroid-it.po:
+	* locales/tomdroid-ja.po:
+	* locales/tomdroid-ko.po:
+	* locales/tomdroid-la.po:
+	* locales/tomdroid-ml.po:
+	* locales/tomdroid-ms.po:
+	* locales/tomdroid-nb.po:
+	* locales/tomdroid-nl.po:
+	* locales/tomdroid-pl.po:
+	* locales/tomdroid-pt.po:
+	* locales/tomdroid-pt_BR.po:
+	* locales/tomdroid-ru.po:
+	* locales/tomdroid-si.po:
+	* locales/tomdroid-sr.po:
+	* locales/tomdroid-sv.po:
+	* locales/tomdroid-ta.po:
+	* locales/tomdroid-te.po:
+	* locales/tomdroid-tr.po:
+	* locales/tomdroid-ug.po:
+	* locales/tomdroid-uk.po:
+	* locales/tomdroid-zh.po:
+	* locales/tomdroid-zh_CN.po:
+	* locales/tomdroid-zh_TW.po:
+	* res/values-ar/strings.xml:
+	* res/values-bg/strings.xml:
+	* res/values-bs/strings.xml:
+	* res/values-ca/strings.xml:
+	* res/values-cs/strings.xml:
+	* res/values-da/strings.xml:
+	* res/values-de/strings.xml:
+	* res/values-el/strings.xml:
+	* res/values-en-rGB/strings.xml:
+	* res/values-eo/strings.xml:
+	* res/values-es/strings.xml:
+	* res/values-et/strings.xml:
+	* res/values-eu/strings.xml:
+	* res/values-fa/strings.xml:
+	* res/values-fi/strings.xml:
+	* res/values-fo/strings.xml:
+	* res/values-fr/strings.xml:
+	* res/values-gd/strings.xml:
+	* res/values-gl/strings.xml:
+	* res/values-hi/strings.xml:
+	* res/values-hu/strings.xml:
+	* res/values-id/strings.xml:
+	* res/values-it/strings.xml:
+	* res/values-ja/strings.xml:
+	* res/values-ko/strings.xml:
+	* res/values-la/strings.xml:
+	* res/values-ml/strings.xml:
+	* res/values-ms/strings.xml:
+	* res/values-nb/strings.xml:
+	* res/values-nl/strings.xml:
+	* res/values-pl/strings.xml:
+	* res/values-pt-rBR/strings.xml:
+	* res/values-pt/strings.xml:
+	* res/values-ru/strings.xml:
+	* res/values-si/strings.xml:
+	* res/values-sr/strings.xml:
+	* res/values-sv/strings.xml:
+	* res/values-ta/strings.xml:
+	* res/values-te/strings.xml:
+	* res/values-tr/strings.xml:
+	* res/values-ug/strings.xml:
+	* res/values-uk/strings.xml:
+	* res/values-zh-rCN/strings.xml:
+	* res/values-zh-rTW/strings.xml:
+	* res/values-zh/strings.xml:
+
+	a last update of the translations
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* locales/tomdroid.pot:
+
+	push new string changes to .pot file otherwise eclipse complains about untranslated strings
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* AndroidManifest.xml:
+	* ChangeLog:
+	* README:
+	* doc/dev/RELEASE-CHECKLIST:
+
+	RELESE: now i am half through the release checklist.
+
 2013-03-14  Stefan Hammer  <[e-mail]>
 
 	* src/org/tomdroid/sync/SyncManager.java:
@@ -167,6 +955,2136 @@
 
 	Make translations available on launchpad with running bash androidxml2po.bash -e
 
[phone]  Stefan Hammer  <[e-mail]>
+
+	* locales/tomdroid.pot:
+
+	updated pot file for translations
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* AUTHORS:
+	* NEWS:
+	* res/values/strings.xml:
+	* res/xml/preferences.xml:
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/util/Preferences.java:
+
+	mergd bugfix for bug #1038353 by mili. thanks for your help!
+
[phone]  mili  <[e-mail]>
+
+	* res/values/strings.xml:
+	* res/xml/preferences.xml:
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/util/Preferences.java:
+
+	SyncOnStart added bug #1038353
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* locales/tomdroid.pot:
+	* res/values/strings.xml:
+
+	Change descriptions of link-preferences to begin with captial letter
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* src/org/tomdroid/ui/FilePickerActivity.java:
+
+	fix bug #1158806 and bug #1158804
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* res/drawable-hdpi/action_icon.png:
+	* res/drawable-hdpi/action_icon_up.png:
+	* res/drawable-ldpi/action_icon.png:
+	* res/drawable-ldpi/action_icon_up.png:
+	* res/drawable-mdpi/action_icon.png:
+	* res/drawable-mdpi/action_icon_up.png:
+	* res/drawable-xhdpi/action_icon.png:
+	* res/drawable-xhdpi/action_icon_up.png:
+	* res/layout/main.xml:
+	* src/org/tomdroid/ui/CompareNotes.java:
+	* src/org/tomdroid/ui/FilePickerActivity.java:
+	* src/org/tomdroid/ui/ShortcutActivity.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/ui/actionbar/ActionBarActivity.java:
+	* src/org/tomdroid/ui/actionbar/ActionBarHelper.java:
+	* src/org/tomdroid/ui/actionbar/ActionBarHelperBase.java:
+	* src/org/tomdroid/ui/actionbar/ActionBarHelperHoneycomb.java:
+	* src/org/tomdroid/ui/actionbar/ActionBarHelperICS.java:
+	* src/org/tomdroid/ui/actionbar/ActionBarListActivity.java:
+
+	fix lp:1149319 now there is a return arrow left from the actionbar home icon if it is enabled and it is disabled in the home activity and others.
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* src/org/tomdroid/ui/PreferencesActivity.java:
+
+	fixed bug #1134866 and bug #982749. both bugs were in the url validation of the server-url preference. now no spaces are allowed any more and bad urls are not saved.
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* locales/tomdroid-bg.po:
+	* locales/tomdroid-et.po:
+	* locales/tomdroid-gl.po:
+	* locales/tomdroid-id.po:
+	* locales/tomdroid-la.po:
+	* locales/tomdroid-ml.po:
+	* locales/tomdroid-nl.po:
+	* locales/tomdroid-sr.po:
+	* res/values-bg:
+	* res/values-bg/strings.xml:
+	* res/values-et:
+	* res/values-et/strings.xml:
+	* res/values-gl:
+	* res/values-gl/strings.xml:
+	* res/values-id:
+	* res/values-id/strings.xml:
+	* res/values-la:
+	* res/values-la/strings.xml:
+	* res/values-ml:
+	* res/values-ml/strings.xml:
+	* res/values-nl:
+	* res/values-nl/strings.xml:
+	* res/values-sr:
+	* res/values-sr/strings.xml:
+	* AUTHORS:
+	* NEWS:
+	* locales/tomdroid-ar.po:
+	* locales/tomdroid-bs.po:
+	* locales/tomdroid-ca.po:
+	* locales/tomdroid-cs.po:
+	* locales/tomdroid-da.po:
+	* locales/tomdroid-de.po:
+	* locales/tomdroid-el.po:
+	* locales/tomdroid-en_GB.po:
+	* locales/tomdroid-eo.po:
+	* locales/tomdroid-es.po:
+	* locales/tomdroid-eu.po:
+	* locales/tomdroid-fa.po:
+	* locales/tomdroid-fi.po:
+	* locales/tomdroid-fo.po:
+	* locales/tomdroid-fr.po:
+	* locales/tomdroid-gd.po:
+	* locales/tomdroid-hi.po:
+	* locales/tomdroid-hu.po:
+	* locales/tomdroid-it.po:
+	* locales/tomdroid-ja.po:
+	* locales/tomdroid-ko.po:
+	* locales/tomdroid-ms.po:
+	* locales/tomdroid-nb.po:
+	* locales/tomdroid-pl.po:
+	* locales/tomdroid-pt.po:
+	* locales/tomdroid-pt_BR.po:
+	* locales/tomdroid-ru.po:
+	* locales/tomdroid-si.po:
+	* locales/tomdroid-sv.po:
+	* locales/tomdroid-ta.po:
+	* locales/tomdroid-te.po:
+	* locales/tomdroid-tr.po:
+	* locales/tomdroid-ug.po:
+	* locales/tomdroid-uk.po:
+	* locales/tomdroid-zh.po:
+	* locales/tomdroid-zh_CN.po:
+	* locales/tomdroid-zh_TW.po:
+	* locales/tomdroid.pot:
+	* res/values-ar/strings.xml:
+	* res/values-bs/strings.xml:
+	* res/values-ca/strings.xml:
+	* res/values-cs/strings.xml:
+	* res/values-da/strings.xml:
+	* res/values-de/strings.xml:
+	* res/values-el/strings.xml:
+	* res/values-en-rGB/strings.xml:
+	* res/values-eo/strings.xml:
+	* res/values-es/strings.xml:
+	* res/values-eu/strings.xml:
+	* res/values-fa/strings.xml:
+	* res/values-fi/strings.xml:
+	* res/values-fo/strings.xml:
+	* res/values-fr/strings.xml:
+	* res/values-gd/strings.xml:
+	* res/values-hi/strings.xml:
+	* res/values-hu/strings.xml:
+	* res/values-it/strings.xml:
+	* res/values-ja/strings.xml:
+	* res/values-ko/strings.xml:
+	* res/values-ms/strings.xml:
+	* res/values-nb/strings.xml:
+	* res/values-pl/strings.xml:
+	* res/values-pt-rBR/strings.xml:
+	* res/values-pt/strings.xml:
+	* res/values-ru/strings.xml:
+	* res/values-si/strings.xml:
+	* res/values-sv/strings.xml:
+	* res/values-ta/strings.xml:
+	* res/values-te/strings.xml:
+	* res/values-tr/strings.xml:
+	* res/values-ug/strings.xml:
+	* res/values-uk/strings.xml:
+	* res/values-zh-rCN/strings.xml:
+	* res/values-zh-rTW/strings.xml:
+	* res/values-zh/strings.xml:
+	* res/values/strings.xml:
+
+	Update translations, merge news from 0.6.0 and re-add deleted strings.
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* src/org/tomdroid/sync/web/MySSLSocketFactory.java:
+	* src/org/tomdroid/sync/web/OAuthConnection.java:
+	* src/org/tomdroid/sync/web/WebConnection.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	Add support for self-signed SSL certificates. lp:1153289  We still need to show the certificate to the user to verify it and save it afterwards. For now this is a quick hack to support the Rainy server
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* src/org/tomdroid/sync/web/AnonymousConnection.java:
+	* src/org/tomdroid/sync/web/WebConnection.java:
+
+	Timo corrected some mistakes i made adding the http header.
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* NEWS:
+
+	update NEWS
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* src/org/tomdroid/sync/web/AnonymousConnection.java:
+	* src/org/tomdroid/sync/web/OAuthConnection.java:
+	* src/org/tomdroid/sync/web/WebConnection.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	fix bug lp:1120488 
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* locales/tomdroid.pot:
+
+	update translations
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* res/values/strings.xml:
+
+	fixed grammar in string
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* src/org/tomdroid/util/Receive.java:
+
+	just check for the beginning, otherwise attachments are handled as text.
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* AndroidManifest.xml:
+	* res/values/strings.xml:
+	* src/org/tomdroid/util/Receive.java:
+
+	Now it is really possible to open mail attachments. this was horrible. could not find out that mimetype is acutally application/note and that viewing from attachments had to be received differently.
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* locales/tomdroid.pot:
+	* util/xml2po/README:
+
+	exported xml to po and added dependencies of xml2po script to README.
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* res/drawable/button.xml:
+	* NEWS:
+	* res/drawable/button_toggle.xml:
+	* res/layout/note_edit.xml:
+	* res/values/strings.xml:
+	* src/org/tomdroid/ui/EditNote.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	fix several small issues and the string related bugs. eg translation comments, refernces to locations,...
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* NEWS:
+
+	update news
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* res/layout/note_compare.xml:
+	* res/values/strings.xml:
+	* src/org/tomdroid/ui/CompareNotes.java:
+
+	fix Bug #1070787 Note Title should be more obvious in Conflict resolving dialogue
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* src/org/tomdroid/Note.java:
+	* src/org/tomdroid/ui/ViewNote.java:
+	* src/org/tomdroid/util/Receive.java:
+
+	fix note not found on import if note is already present. further, raise changedate on import, otherwise it won't be synced.
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* AndroidManifest.xml:
+	* src/org/tomdroid/util/Receive.java:
+
+	now it is possible to open a .note file from mail, gmail, etc.
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* src/org/tomdroid/ui/PreferencesActivity.java:
+
+	fixed Bug #1071732 Delete Remote Notes still uses the fancy porgress dialogue incomartible to older Android versions.
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* NEWS:
+	* src/org/tomdroid/sync/web/SnowySyncService.java:
+	* src/org/tomdroid/ui/PreferencesActivity.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	It is now possible to change sync-method, sync-server, folder location without loosing any notes
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* AUTHORS:
+	* NEWS:
+	* src/org/tomdroid/ui/EditNote.java:
+
+	merged fix for Bug #1051932 by Michael Cerman. Thanks
+
[phone]  Michal Cerman  <[e-mail]>
+
+	* src/org/tomdroid/ui/EditNote.java:
+
+	Fixed the bug #1051932(&amp; gets replaced with &amp;amp; on clicking save button). The note is now redrawn after the save process.
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* res/values/strings.xml:
+
+	fix bug #1068785
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* res/values/strings.xml:
+
+	fix bug #1068793
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* src/org/tomdroid/sync/web/SnowySyncService.java:
+	* src/org/tomdroid/ui/PreferencesActivity.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	Fixed bug #1074676 and changed chreate date to 1.1.2000 (dirty fix until we store this on in the db)
+
[phone]  Olivier Bilodeau  <[e-mail]>
+
+	* doc/gather-logs.txt:
+
+	doc: added logcat instructions
+	
+	We repeat them quite often.
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* NEWS:
+	* src/org/tomdroid/Note.java:
+	* src/org/tomdroid/sync/sd/SdCardSyncService.java:
+	* src/org/tomdroid/sync/web/SnowySyncService.java:
+
+	fixed bug lp:1064149 Tomdroid Sync fails, datetime_format error
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* sdcard.img:
+	* src/org/tomdroid/Note.java:
+
+	revert sd, set create-date to 2000
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* sdcard.img:
+	* src/org/tomdroid/Note.java:
+	* src/org/tomdroid/sync/sd/SdCardSyncService.java:
+	* src/org/tomdroid/sync/web/SnowySyncService.java:
+
+	trying to fix time format bugs: Bug #1064149 and#1074676
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* NEWS:
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	fix lp:1074894 NotesList -> Longpress -> Revert -> CRASH
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* NEWS:
+
+	update NEWS
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* src/org/tomdroid/util/Receive.java:
+
+	fix bug #1074661 where note files opened with gmail are not parsed as xml.
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* src/org/tomdroid/util/Preferences.java:
+
+	probably fixes bug #1074676. waiting for test to verify this. however, fix does not break anything. good sign :-)
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* AndroidManifest.xml:
+	* NEWS:
+	* src/org/tomdroid/sync/web/SnowySyncService.java:
+	* src/org/tomdroid/ui/FilePickerActivity.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/ui/ViewNote.java:
+
+	merge tomdroid-dev branch
+
[phone]  noahy  <[e-mail]>
+
+	* NEWS:
+	* src/org/tomdroid/sync/web/SnowySyncService.java:
+
+	fixed lp:1074602
+
[phone]  noahy  <[e-mail]>
+
+	* AndroidManifest.xml:
+	* NEWS:
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/ui/ViewNote.java:
+
+	fixed lp:1068684
+	fixed lp:1068689
+	revert to open only text files from file explorer
+
[phone]  noahy  <[e-mail]>
+
+	* NEWS:
+	* src/org/tomdroid/ui/FilePickerActivity.java:
+
+	fixed lp:1068681
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* src/org/tomdroid/NoteManager.java:
+	* src/org/tomdroid/sync/SyncService.java:
+	* src/org/tomdroid/sync/web/SnowySyncService.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/util/TLog.java:
+
+	fix bug #1051294. closing cursers after every lookup.
+
[phone]  Olivier Bilodeau  <[e-mail]>
+
+	* AUTHORS:
+	* ChangeLog:
+	* src/org/tomdroid/util/TLog.java:
+
+	author, changelog and debugging prepped for release
+
[phone]  Olivier Bilodeau  <[e-mail]>
+
+	* doc/user:
+	* AndroidManifest.xml:
+	* NEWS:
+	* README:
+	* doc/dev/RELEASE-CHECKLIST:
+
+	0.7.2 release bump
+	
+	bonuses: fixed release documents, removed dead path
+
[phone]  Olivier Bilodeau  <[e-mail]>
+
+	* res/drawable-hdpi/file.png:
+	* res/drawable-hdpi/folder.png:
+	* res/drawable-ldpi/file.png:
+	* res/drawable-ldpi/folder.png:
+	* res/drawable-mdpi/file.png:
+	* res/drawable-mdpi/folder.png:
+	* res/layout/file_picker_content_view.xml:
+	* res/layout/file_picker_empty_view.xml:
+	* res/layout/file_picker_list_item.xml:
+	* src/org/tomdroid/ui/FilePickerActivity.java:
+	* src/org/tomdroid/util/NavButtonAdapter.java:
+	* res/layout/search.xml:
+	* AndroidManifest.xml:
+	* NEWS:
+	* locales/tomdroid.pot:
+	* res/layout/main.xml:
+	* res/values/strings.xml:
+	* src/org/tomdroid/NoteManager.java:
+	* src/org/tomdroid/sync/SyncManager.java:
+	* src/org/tomdroid/sync/sd/NoteHandler.java:
+	* src/org/tomdroid/sync/web/SnowySyncService.java:
+	* src/org/tomdroid/ui/CompareNotes.java:
+	* src/org/tomdroid/ui/EditNote.java:
+	* src/org/tomdroid/ui/PreferencesActivity.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/ui/ViewNote.java:
+	* src/org/tomdroid/ui/actionbar/ActionBarHelperHoneycomb.java:
+	* src/org/tomdroid/ui/actionbar/ActionBarHelperICS.java:
+	* src/org/tomdroid/util/FirstNote.java:
+	* src/org/tomdroid/util/NewNote.java:
+	* src/org/tomdroid/util/NoteListCursorAdapter.java:
+	* src/org/tomdroid/util/Preferences.java:
+	* src/org/tomdroid/util/Receive.java:
+	* src/org/tomdroid/util/Send.java:
+
+	merged tomdroid-dev's note-editing.. branch into tomdroid-maint's one
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* locales/tomdroid.pot:
+
+	export pot, as i made string changes.
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* res/layout/search.xml:
+	* NEWS:
+	* res/layout/main.xml:
+	* res/values/strings.xml:
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	fixed bug 1053366. now note-not-found and no-notes-in-database,... are displayed again.
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* src/org/tomdroid/NoteManager.java:
+	* src/org/tomdroid/sync/SyncManager.java:
+	* src/org/tomdroid/sync/sd/NoteHandler.java:
+	* src/org/tomdroid/sync/web/SnowySyncService.java:
+	* src/org/tomdroid/ui/CompareNotes.java:
+	* src/org/tomdroid/ui/EditNote.java:
+	* src/org/tomdroid/ui/FilePickerActivity.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/ui/ViewNote.java:
+	* src/org/tomdroid/ui/actionbar/ActionBarHelperHoneycomb.java:
+	* src/org/tomdroid/ui/actionbar/ActionBarHelperICS.java:
+	* src/org/tomdroid/util/FirstNote.java:
+	* src/org/tomdroid/util/NavButtonAdapter.java:
+	* src/org/tomdroid/util/NewNote.java:
+	* src/org/tomdroid/util/NoteListCursorAdapter.java:
+	* src/org/tomdroid/util/Send.java:
+
+	remove unneccesary imports.
+
[phone]  noahy  <[e-mail]>
+
+	* src/org/tomdroid/util/Receive.java:
+
+	merge
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* src/org/tomdroid/util/Receive.java:
+
+	Fix crasher on import note. Preferences were not initialized -> nullpointer on Preferences.getString
+
[phone]  noahy  <[e-mail]>
+
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/util/Receive.java:
+
+	fixing lp:1051908
+
[phone]  noahy  <[e-mail]>
+
+	* NEWS:
+
+	news
+
[phone]  noahy  <[e-mail]>
+
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	fix for lp:1050007
+
[phone]  noahy  <[e-mail]>
+
+	* res/layout/file_picker_content_view.xml:
+	* src/org/tomdroid/ui/FilePickerActivity.java:
+
+	fixed file picker formatting
+
[phone]  noahy  <[e-mail]>
+
+	* res/menu-sw600dp-land/main.xml:
+	* res/menu/main.xml:
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/util/NoteXMLContentBuilder.java:
+
+	merges
+
[phone]  noahy  <[e-mail]>
+
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	trying to stop reoccuring viewnote
+
[phone]  noahy  <[e-mail]>
+
+	* src/org/tomdroid/ui/PreferencesActivity.java:
+
+	fixed error in sort order preference
+
[phone]  noahy  <[e-mail]>
+
+	* res/drawable-hdpi/file.png:
+	* res/drawable-hdpi/folder.png:
+	* res/drawable-ldpi/file.png:
+	* res/drawable-ldpi/folder.png:
+	* res/drawable-mdpi/file.png:
+	* res/drawable-mdpi/folder.png:
+	* res/layout/file_picker_content_view.xml:
+	* res/layout/file_picker_empty_view.xml:
+	* res/layout/file_picker_list_item.xml:
+	* src/org/tomdroid/ui/FilePickerActivity.java:
+	* src/org/tomdroid/util/NavButtonAdapter.java:
+	* AndroidManifest.xml:
+	* res/values/strings.xml:
+	* src/org/tomdroid/ui/PreferencesActivity.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/util/Preferences.java:
+
+	revert to internal file picker
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* NEWS:
+	* src/org/tomdroid/util/NoteXMLContentBuilder.java:
+
+	merge koichis fix for lp:1049026
+
[phone]  Koichi Akabe  <[e-mail]>
+
+	* src/org/tomdroid/util/NoteXMLContentBuilder.java:
+
+	fix checking position on replace illegal XML characters
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* res/menu-sw600dp-land/main.xml:
+	* res/menu/main.xml:
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	show sort-by-button only if there is room (no space on small displays) and as menu to have the text there (below android 2.3 there is no text for buttons in actionbar combat). Further add home menu entry for search results as there was no possibility to go back to list.
+
[phone]  noahy  <[e-mail]>
+
+	* res/drawable-hdpi/file.png:
+	* res/drawable-hdpi/folder.png:
+	* res/drawable-ldpi/file.png:
+	* res/drawable-ldpi/folder.png:
+	* res/drawable-mdpi/file.png:
+	* res/drawable-mdpi/folder.png:
+	* res/layout/file_picker_content_view.xml:
+	* res/layout/file_picker_empty_view.xml:
+	* res/layout/file_picker_list_item.xml:
+	* src/com:
+	* src/com/kaloer:
+	* src/com/kaloer/filepicker:
+	* src/com/kaloer/filepicker/FilePickerActivity.java:
+	* AndroidManifest.xml:
+	* res/values/strings.xml:
+	* src/org/tomdroid/ui/PreferencesActivity.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/util/Preferences.java:
+
+	removed file picker, using OI as import method
+
[phone]  noahy  <[e-mail]>
+
+	* res/layout/file_picker_content_view.xml:
+	* AndroidManifest.xml:
+	* res/layout/file_picker_empty_view.xml:
+	* res/values/strings.xml:
+	* src/com/kaloer/filepicker/FilePickerActivity.java:
+	* src/org/tomdroid/util/Receive.java:
+
+	filepicker integration
+
[phone]  noahy  <[e-mail]>
+
+	* NEWS:
+	* res/values/strings.xml:
+	* res/xml/preferences.xml:
+	* src/org/tomdroid/ui/EditNote.java:
+	* src/org/tomdroid/ui/PreferencesActivity.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/ui/ViewNote.java:
+	* src/org/tomdroid/util/Preferences.java:
+
+	added options to turn off hyperlink matching
+	removed linkmovement method (prevented text selection)
+	moved sort preference into Display Preferences
+
[phone]  noahy  <[e-mail]>
+
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	fixed selection marking on change sort
+
[phone]  noahy  <[e-mail]>
+
+	* res/drawable-hdpi/file.png:
+	* res/drawable-hdpi/folder.png:
+	* res/drawable-ldpi/file.png:
+	* res/drawable-ldpi/folder.png:
+	* res/drawable-mdpi/file.png:
+	* res/drawable-mdpi/folder.png:
+	* res/layout/file_picker_empty_view.xml:
+	* res/layout/file_picker_list_item.xml:
+	* src/com:
+	* src/com/kaloer:
+	* src/com/kaloer/filepicker:
+	* src/com/kaloer/filepicker/FilePickerActivity.java:
+	* .classpath:
+	* .settings/org.eclipse.jdt.core.prefs:
+	* AndroidManifest.xml:
+	* NEWS:
+	* locales/tomdroid.pot:
+	* res/menu-sw600dp-land/main.xml:
+	* res/menu/main.xml:
+	* res/values-ar/strings.xml:
+	* res/values-bs/strings.xml:
+	* res/values-ca/strings.xml:
+	* res/values-cs/strings.xml:
+	* res/values-da/strings.xml:
+	* res/values-de/strings.xml:
+	* res/values-el/strings.xml:
+	* res/values-en-rGB/strings.xml:
+	* res/values-eo/strings.xml:
+	* res/values-es/strings.xml:
+	* res/values-eu/strings.xml:
+	* res/values-fa/strings.xml:
+	* res/values-fi/strings.xml:
+	* res/values-fo/strings.xml:
+	* res/values-fr/strings.xml:
+	* res/values-gd/strings.xml:
+	* res/values-hi/strings.xml:
+	* res/values-hu/strings.xml:
+	* res/values-it/strings.xml:
+	* res/values-ja/strings.xml:
+	* res/values-ko/strings.xml:
+	* res/values-ms/strings.xml:
+	* res/values-nb/strings.xml:
+	* res/values-pl/strings.xml:
+	* res/values-pt-rBR/strings.xml:
+	* res/values-pt/strings.xml:
+	* res/values-ru/strings.xml:
+	* res/values-si/strings.xml:
+	* res/values-sv/strings.xml:
+	* res/values-ta/strings.xml:
+	* res/values-te/strings.xml:
+	* res/values-tr/strings.xml:
+	* res/values-ug/strings.xml:
+	* res/values-uk/strings.xml:
+	* res/values-zh-rCN/strings.xml:
+	* res/values-zh-rTW/strings.xml:
+	* res/values-zh/strings.xml:
+	* res/values/strings.xml:
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/util/Receive.java:
+
+	* added file picker to import plain text and note files from within Tomdroid
+
[phone]  noahy  <[e-mail]>
+
+	* src/org/tomdroid/util/StringConverter.java:
+	* AndroidManifest.xml:
+	* NEWS:
+	* res/menu/main_longclick.xml:
+	* res/menu/main_longclick_deleted.xml:
+	* src/org/tomdroid/Note.java:
+	* src/org/tomdroid/NoteManager.java:
+	* src/org/tomdroid/NoteProvider.java:
+	* src/org/tomdroid/util/Receive.java:
+
+	merge search without xml tags, add ability to import plain text
+
[phone]  Koichi Akabe  <[e-mail]>
+
+	* src/org/tomdroid/util/StringConverter.java:
+	* src/org/tomdroid/Note.java:
+	* src/org/tomdroid/NoteManager.java:
+	* src/org/tomdroid/NoteProvider.java:
+
+	search contents without xml tags
+	escape "%" and "_", which are used as SQL keyword
+
[phone]  noahy  <[e-mail]>
+
+	* res/menu-sw600dp-land/main.xml:
+	* res/menu/main.xml:
+	* res/values/strings.xml:
+	* res/xml/preferences.xml:
+	* src/org/tomdroid/NoteManager.java:
+	* src/org/tomdroid/NoteProvider.java:
+	* src/org/tomdroid/ui/PreferencesActivity.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	merge - sort button
+
[phone]  Koichi Akabe  <[e-mail]>
+
+	* res/drawable-hdpi/ic_menu_sort_datemodified.png:
+	* res/drawable-hdpi/ic_menu_sort_title.png:
+	* res/drawable-ldpi/ic_menu_sort_datemodified.png:
+	* res/drawable-ldpi/ic_menu_sort_title.png:
+	* res/drawable-mdpi/ic_menu_sort_datemodified.png:
+	* res/drawable-mdpi/ic_menu_sort_title.png:
+	* res/menu-sw600dp-land/main.xml:
+	* res/menu/main.xml:
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	remove sort icons
+	change title on sorting
+
[phone]  Koichi Akabe  <[e-mail]>
+
+	* res/drawable-hdpi/ic_menu_sort_datemodified.png:
+	* res/drawable-hdpi/ic_menu_sort_title.png:
+	* res/drawable-ldpi/ic_menu_sort_datemodified.png:
+	* res/drawable-ldpi/ic_menu_sort_title.png:
+	* res/drawable-mdpi/ic_menu_sort_datemodified.png:
+	* res/drawable-mdpi/ic_menu_sort_title.png:
+	* res/menu-sw600dp-land/main.xml:
+	* res/menu/main.xml:
+	* res/values/strings.xml:
+	* res/xml/preferences.xml:
+	* src/org/tomdroid/NoteManager.java:
+	* src/org/tomdroid/NoteProvider.java:
+	* src/org/tomdroid/ui/PreferencesActivity.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	add sort button
+
[phone]  noahy  <[e-mail]>
+
+	* src/org/tomdroid/sync/SyncService.java:
+
+	fixed lp:1047257 Deleted note from tomboy not synced (ubuntu 1)
+
[phone]  noahy  <[e-mail]>
+
+	* src/org/tomdroid/xml/LinkInternalSpan.java:
+	* src/org/tomdroid/NoteManager.java:
+	* src/org/tomdroid/ui/EditNote.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/ui/ViewNote.java:
+	* src/org/tomdroid/util/NoteXMLContentBuilder.java:
+	* src/org/tomdroid/xml/NoteContentHandler.java:
+
+	merge link:internal, fix to avoid linking to self
+
[phone]  Koichi Akabe  <[e-mail]>
+
+	* src/org/tomdroid/util/NoteXMLContentBuilder.java:
+	* src/org/tomdroid/xml/NoteContentHandler.java:
+
+	fix behavior on editing note with link:internal
+
[phone]  Koichi Akabe  <[e-mail]>
+
+	* data/market-screenshots/0.5 - note-list.png:
+	* data/market-screenshots/0.5 - note-options.png:
+	* data/market-screenshots/0.5 - note-view.png:
+	* data/market-screenshots/0.5 - preferences.png:
+	* data/market-screenshots/0.5 - search.png:
+	* data/market-screenshots/0.5 - welcome-dialog.png:
+	* data/market-screenshots/0.7.1 - note-edit-And4.1.png:
+	* data/market-screenshots/0.7.1 - note-list-And2.3.png:
+	* data/market-screenshots/0.7.1 - note-view-And2.3.png:
+	* data/market-screenshots/0.7.1 - preferences-And2.3.png:
+	* data/market-screenshots/0.7.1 - preferences-And4.1.png:
+	* data/market-screenshots/0.7.1 - search-And4.1.png:
+	* data/market-screenshots/0.7.1 - tablet-view.png:
+	* data/market-screenshots/0.7.1 - welcome-dialog-And4.1.png:
+	* libs/diffutils-1.2.1.jar:
+	* locales/tomdroid-bs.po:
+	* locales/tomdroid-el.po:
+	* locales/tomdroid-eo.po:
+	* locales/tomdroid-fa.po:
+	* locales/tomdroid-fi.po:
+	* locales/tomdroid-nb.po:
+	* locales/tomdroid-si.po:
+	* locales/tomdroid-ta.po:
+	* locales/tomdroid-zh_TW.po:
+	* res/drawable-hdpi/actionbar_shadow.9.png:
+	* res/drawable-hdpi/ic_menu_sync.png:
+	* res/drawable-hdpi/icon.png:
+	* res/drawable-hdpi/text.png:
+	* res/drawable-hdpi/xml.png:
+	* res/drawable-ldpi/actionbar_shadow.9.png:
+	* res/drawable-ldpi/ic_menu_sync.png:
+	* res/drawable-ldpi/icon.png:
+	* res/drawable-ldpi/text.png:
+	* res/drawable-ldpi/xml.png:
+	* res/drawable-mdpi/actionbar_shadow.9.png:
+	* res/drawable-mdpi/ic_menu_sync.png:
+	* res/drawable-mdpi/icon.png:
+	* res/drawable-mdpi/text.png:
+	* res/drawable-mdpi/xml.png:
+	* res/drawable-xhdpi/actionbar_shadow.9.png:
+	* res/drawable-xhdpi/ic_menu_sync.png:
+	* res/drawable-xhdpi/icon.png:
+	* res/drawable-xhdpi/text.png:
+	* res/drawable-xhdpi/xml.png:
+	* res/drawable/actionbar_compat_item.xml:
+	* res/drawable/actionbar_compat_item_focused.xml:
+	* res/drawable/actionbar_compat_item_pressed.xml:
+	* res/drawable/btn_small.9.png:
+	* res/drawable/btn_small_toggle.9.png:
+	* res/drawable/button_toggle.xml:
+	* res/drawable/drop_shadow.xml:
+	* res/drawable/drop_shadow_selected.xml:
+	* res/drawable/drop_shadow_separator.xml:
+	* res/drawable/highlight.png:
+	* res/drawable/mono.png:
+	* res/drawable/size.png:
+	* res/drawable/tray_handle_normal.png:
+	* res/drawable/triangle_selector.xml:
+	* res/drawable/white_triangle.png:
+	* res/layout-sw600dp-land:
+	* res/layout-sw600dp-land/main.xml:
+	* res/layout-v11:
+	* res/layout-v11/actionbar_indeterminate_progress.xml:
+	* res/layout/actionbar_compat.xml:
+	* res/layout/note_compare.xml:
+	* res/layout/note_edit.xml:
+	* res/layout/strings.xml:
+	* res/menu-sw600dp-land:
+	* res/menu-sw600dp-land/edit_note.xml:
+	* res/menu-sw600dp-land/main.xml:
+	* res/menu-sw600dp-land/search.xml:
+	* res/menu-sw600dp-land/view_note.xml:
+	* res/menu/edit_note.xml:
+	* res/menu/main_longclick_deleted.xml:
+	* res/menu/search.xml:
+	* res/values-bs:
+	* res/values-bs/strings.xml:
+	* res/values-el:
+	* res/values-el/strings.xml:
+	* res/values-eo:
+	* res/values-eo/strings.xml:
+	* res/values-fa:
+	* res/values-fa/strings.xml:
+	* res/values-fi:
+	* res/values-fi/strings.xml:
+	* res/values-nb:
+	* res/values-nb/strings.xml:
+	* res/values-si:
+	* res/values-si/strings.xml:
+	* res/values-sw600dp-land:
+	* res/values-sw600dp-land/dimen.xml:
+	* res/values-sw800dp-land:
+	* res/values-sw800dp-land/dimen.xml:
+	* res/values-ta:
+	* res/values-ta/strings.xml:
+	* res/values-v11:
+	* res/values-v11/styles.xml:
+	* res/values-zh-rTW:
+	* res/values-zh-rTW/strings.xml:
+	* res/values/attrs.xml:
+	* res/values/dimen.xml:
+	* res/values/ids.xml:
+	* res/values/styles.xml:
+	* res/xml/sync_provider.xml:
+	* src/org/tomdroid/ui/CompareNotes.java:
+	* src/org/tomdroid/ui/EditNote.java:
+	* src/org/tomdroid/ui/actionbar:
+	* src/org/tomdroid/ui/actionbar/ActionBarActivity.java:
+	* src/org/tomdroid/ui/actionbar/ActionBarHelper.java:
+	* src/org/tomdroid/ui/actionbar/ActionBarHelperBase.java:
+	* src/org/tomdroid/ui/actionbar/ActionBarHelperHoneycomb.java:
+	* src/org/tomdroid/ui/actionbar/ActionBarHelperICS.java:
+	* src/org/tomdroid/ui/actionbar/ActionBarListActivity.java:
+	* src/org/tomdroid/ui/actionbar/ActionBarPreferenceActivity.java:
+	* src/org/tomdroid/ui/actionbar/SimpleMenu.java:
+	* src/org/tomdroid/ui/actionbar/SimpleMenuItem.java:
+	* src/org/tomdroid/util/Honeycomb.java:
+	* src/org/tomdroid/util/NewNote.java:
+	* src/org/tomdroid/util/NoteXMLContentBuilder.java:
+	* src/org/tomdroid/util/Receive.java:
+	* tests/org/tomdroid:
+	* tests/org/tomdroid/NoteManagerTest.java:
+	* tests/org/tomdroid/NoteTest.java:
+	* res/anim:
+	* res/anim/pulse.xml:
+	* res/drawable-hdpi/icon_actionbar_dot.png:
+	* res/drawable-hdpi/icon_actionbar_sync.png:
+	* res/drawable-hdpi/icon_actionbar_sync_background.png:
+	* res/drawable-ldpi/icon_actionbar_dot.png:
+	* res/drawable-ldpi/icon_actionbar_sync.png:
+	* res/drawable-ldpi/icon_actionbar_sync_background.png:
+	* res/drawable-mdpi/icon_actionbar_dot.png:
+	* res/drawable-mdpi/icon_actionbar_sync.png:
+	* res/drawable-mdpi/icon_actionbar_sync_background.png:
+	* res/drawable-xhdpi/icon_actionbar_dot.png:
+	* res/drawable-xhdpi/icon_actionbar_sync.png:
+	* res/drawable-xhdpi/icon_actionbar_sync_background.png:
+	* res/drawable/actionbar_background.png:
+	* res/drawable/actionbar_icon.xml:
+	* res/drawable/icon.png:
+	* res/drawable/icon_focused.png:
+	* res/layout/actionbar.xml:
+	* src/org/tomdroid/ui/Actionbar.java:
+	* src/org/tomdroid/ui/Search.java:
+	* src/org/tomdroid/ui/SyncMessageHandler.java:
+	* src/org/tomdroid/util/FirstNote.properties:
+	* tests/org/tomdroid:
+	* tests/org/tomdroid/NoteManagerTest.java:
+	* tests/org/tomdroid/NoteTest.java:
+	* .bzrignore:
+	* .classpath:
+	* AUTHORS:
+	* AndroidManifest.xml:
+	* ChangeLog:
+	* NEWS:
+	* doc/dev/RELEASE-CHECKLIST:
+	* doc/dev/TODO:
+	* locales/tomdroid-ar.po:
+	* locales/tomdroid-ca.po:
+	* locales/tomdroid-cs.po:
+	* locales/tomdroid-da.po:
+	* locales/tomdroid-de.po:
+	* locales/tomdroid-en_GB.po:
+	* locales/tomdroid-es.po:
+	* locales/tomdroid-eu.po:
+	* locales/tomdroid-fo.po:
+	* locales/tomdroid-fr.po:
+	* locales/tomdroid-gd.po:
+	* locales/tomdroid-hi.po:
+	* locales/tomdroid-hu.po:
+	* locales/tomdroid-it.po:
+	* locales/tomdroid-ja.po:
+	* locales/tomdroid-ko.po:
+	* locales/tomdroid-ms.po:
+	* locales/tomdroid-pl.po:
+	* locales/tomdroid-pt.po:
+	* locales/tomdroid-pt_BR.po:
+	* locales/tomdroid-ru.po:
+	* locales/tomdroid-sv.po:
+	* locales/tomdroid-te.po:
+	* locales/tomdroid-tr.po:
+	* locales/tomdroid-ug.po:
+	* locales/tomdroid-uk.po:
+	* locales/tomdroid-zh.po:
+	* locales/tomdroid-zh_CN.po:
+	* locales/tomdroid.pot:
+	* project.properties:
+	* res/layout/main.xml:
+	* res/layout/main_list_item.xml:
+	* res/layout/note_view.xml:
+	* res/layout/search.xml:
+	* res/layout/shortcuts_list.xml:
+	* res/menu/main.xml:
+	* res/menu/main_longclick.xml:
+	* res/menu/view_note.xml:
+	* res/values-ar/strings.xml:
+	* res/values-ca/strings.xml:
+	* res/values-cs/strings.xml:
+	* res/values-da/strings.xml:
+	* res/values-de/strings.xml:
+	* res/values-en-rGB/strings.xml:
+	* res/values-es/strings.xml:
+	* res/values-eu/strings.xml:
+	* res/values-fo/strings.xml:
+	* res/values-fr/strings.xml:
+	* res/values-gd/strings.xml:
+	* res/values-hi/strings.xml:
+	* res/values-hu/strings.xml:
+	* res/values-it/strings.xml:
+	* res/values-ja/strings.xml:
+	* res/values-ko/strings.xml:
+	* res/values-ms/strings.xml:
+	* res/values-pl/strings.xml:
+	* res/values-pt-rBR/strings.xml:
+	* res/values-pt/strings.xml:
+	* res/values-ru/strings.xml:
+	* res/values-sv/strings.xml:
+	* res/values-te/strings.xml:
+	* res/values-tr/strings.xml:
+	* res/values-ug/strings.xml:
+	* res/values-uk/strings.xml:
+	* res/values-zh-rCN/strings.xml:
+	* res/values-zh/strings.xml:
+	* res/values/strings.xml:
+	* res/xml/preferences.xml:
+	* src/org/tomdroid/Note.java:
+	* src/org/tomdroid/NoteManager.java:
+	* src/org/tomdroid/sync/SyncManager.java:
+	* src/org/tomdroid/sync/SyncService.java:
+	* src/org/tomdroid/sync/sd/NoteHandler.java:
+	* src/org/tomdroid/sync/sd/SdCardSyncService.java:
+	* src/org/tomdroid/sync/web/OAuthConnection.java:
+	* src/org/tomdroid/sync/web/SnowySyncService.java:
+	* src/org/tomdroid/ui/PreferencesActivity.java:
+	* src/org/tomdroid/ui/ShortcutActivity.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/ui/ViewNote.java:
+	* src/org/tomdroid/util/ErrorList.java:
+	* src/org/tomdroid/util/FirstNote.java:
+	* src/org/tomdroid/util/LinkifyPhone.java:
+	* src/org/tomdroid/util/NoteContentBuilder.java:
+	* src/org/tomdroid/util/NoteListCursorAdapter.java:
+	* src/org/tomdroid/util/Preferences.java:
+	* src/org/tomdroid/util/Send.java:
+	* src/org/tomdroid/util/XmlUtils.java:
+	* src/org/tomdroid/xml/NoteContentHandler.java:
+	* util/xml2po/README:
+	* doc/user/README:
+	* README:
+
+	merge with trunk(beta)
+
[phone]  Koichi Akabe  <[e-mail]>
+
+	* src/org/tomdroid/NoteManager.java:
+	* src/org/tomdroid/ui/ViewNote.java:
+
+	change to get note ids for case-insensitive titles
+
[phone]  Koichi Akabe  <[e-mail]>
+
+	* src/org/tomdroid/xml/LinkInternalSpan.java:
+	* src/org/tomdroid/ui/ViewNote.java:
+	* src/org/tomdroid/xml/NoteContentHandler.java:
+
+	separate class LinkInternalSpan to its own file
+
[phone]  Koichi Akabe  <[e-mail]>
+
+	* src/org/tomdroid/ui/ViewNote.java:
+	* src/org/tomdroid/xml/NoteContentHandler.java:
+
+	add link:internal tag to create link manually
+	add a function to avoid auto-links are dupulicated with manually created one
+
[phone]  noahy  <[e-mail]>
+
+	* src/org/tomdroid/NoteManager.java:
+
+	merge with ignore case
+
[phone]  Koichi Akabe  <[e-mail]>
+
+	* src/org/tomdroid/NoteManager.java:
+
+	ignore case on validate note title
+
[phone]  noahy  <[e-mail]>
+
+	* src/org/tomdroid/sync/SyncService.java:
+	* src/org/tomdroid/sync/sd/SdCardSyncService.java:
+	* src/org/tomdroid/ui/CompareNotes.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	fixed sync for sdcard
+
[phone]  noahy  <[e-mail]>
+
+	* src/org/tomdroid/Note.java:
+	* src/org/tomdroid/sync/SyncService.java:
+	* src/org/tomdroid/sync/sd/NoteHandler.java:
+	* src/org/tomdroid/sync/sd/SdCardSyncService.java:
+	* src/org/tomdroid/sync/web/SnowySyncService.java:
+	* src/org/tomdroid/ui/CompareNotes.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	reworked sync to compare before changing any notes; revisioning should be correct now
+
[phone]  noahy  <[e-mail]>
+
+	* res/values/arrays.xml:
+	* locales/tomdroid.pot:
+	* res/values-ar/strings.xml:
+	* res/values-bs/strings.xml:
+	* res/values-ca/strings.xml:
+	* res/values-cs/strings.xml:
+	* res/values-da/strings.xml:
+	* res/values-de/strings.xml:
+	* res/values-el/strings.xml:
+	* res/values-en-rGB/strings.xml:
+	* res/values-eo/strings.xml:
+	* res/values-es/strings.xml:
+	* res/values-eu/strings.xml:
+	* res/values-fa/strings.xml:
+	* res/values-fi/strings.xml:
+	* res/values-fo/strings.xml:
+	* res/values-fr/strings.xml:
+	* res/values-gd/strings.xml:
+	* res/values-hi/strings.xml:
+	* res/values-hu/strings.xml:
+	* res/values-it/strings.xml:
+	* res/values-ja/strings.xml:
+	* res/values-ko/strings.xml:
+	* res/values-ms/strings.xml:
+	* res/values-nb/strings.xml:
+	* res/values-pl/strings.xml:
+	* res/values-pt-rBR/strings.xml:
+	* res/values-pt/strings.xml:
+	* res/values-ru/strings.xml:
+	* res/values-si/strings.xml:
+	* res/values-sv/strings.xml:
+	* res/values-ta/strings.xml:
+	* res/values-te/strings.xml:
+	* res/values-tr/strings.xml:
+	* res/values-ug/strings.xml:
+	* res/values-uk/strings.xml:
+	* res/values-zh-rCN/strings.xml:
+	* res/values-zh-rTW/strings.xml:
+	* res/values-zh/strings.xml:
+	* res/values/strings.xml:
+	* src/org/tomdroid/util/FirstNote.java:
+
+	revert to Koichi's solution for first note (merge)
+
[phone]  Koichi Akabe  <[e-mail]>
+
+	* src/org/tomdroid/util/FirstNote.java:
+
+	revert to use TextUtils for joining string-array
+
[phone]  Koichi Akabe  <[e-mail]>
+
+	* locales/tomdroid.pot:
+	* src/org/tomdroid/ui/EditNote.java:
+	* src/org/tomdroid/ui/PreferencesActivity.java:
+
+	merge with trunk
+
[phone]  Koichi Akabe  <[e-mail]>
+
+	* locales/tomdroid.pot:
+	* res/values-ar/strings.xml:
+	* res/values-bs/strings.xml:
+	* res/values-ca/strings.xml:
+	* res/values-cs/strings.xml:
+	* res/values-da/strings.xml:
+	* res/values-de/strings.xml:
+	* res/values-el/strings.xml:
+	* res/values-en-rGB/strings.xml:
+	* res/values-eo/strings.xml:
+	* res/values-es/strings.xml:
+	* res/values-eu/strings.xml:
+	* res/values-fa/strings.xml:
+	* res/values-fi/strings.xml:
+	* res/values-fo/strings.xml:
+	* res/values-fr/strings.xml:
+	* res/values-gd/strings.xml:
+	* res/values-hi/strings.xml:
+	* res/values-hu/strings.xml:
+	* res/values-it/strings.xml:
+	* res/values-ja/strings.xml:
+	* res/values-ko/strings.xml:
+	* res/values-ms/strings.xml:
+	* res/values-nb/strings.xml:
+	* res/values-pl/strings.xml:
+	* res/values-pt-rBR/strings.xml:
+	* res/values-pt/strings.xml:
+	* res/values-ru/strings.xml:
+	* res/values-si/strings.xml:
+	* res/values-sv/strings.xml:
+	* res/values-ta/strings.xml:
+	* res/values-te/strings.xml:
+	* res/values-tr/strings.xml:
+	* res/values-ug/strings.xml:
+	* res/values-uk/strings.xml:
+	* res/values-zh-rCN/strings.xml:
+	* res/values-zh-rTW/strings.xml:
+	* res/values-zh/strings.xml:
+	* res/values/strings.xml:
+
+	modified translation comment
+	update translation template
+
[phone]  Koichi Akabe  <[e-mail]>
+
+	* res/values/strings.xml:
+	* src/org/tomdroid/util/FirstNote.java:
+
+	split the first note string into items of a string-array
+
[phone]  noahy  <[e-mail]>
+
+	* locales/tomdroid.pot:
+	* res/values-ar/strings.xml:
+	* res/values-bs/strings.xml:
+	* res/values-ca/strings.xml:
+	* res/values-cs/strings.xml:
+	* res/values-da/strings.xml:
+	* res/values-de/strings.xml:
+	* res/values-el/strings.xml:
+	* res/values-en-rGB/strings.xml:
+	* res/values-eo/strings.xml:
+	* res/values-es/strings.xml:
+	* res/values-eu/strings.xml:
+	* res/values-fa/strings.xml:
+	* res/values-fi/strings.xml:
+	* res/values-fo/strings.xml:
+	* res/values-fr/strings.xml:
+	* res/values-gd/strings.xml:
+	* res/values-hi/strings.xml:
+	* res/values-hu/strings.xml:
+	* res/values-it/strings.xml:
+	* res/values-ja/strings.xml:
+	* res/values-ko/strings.xml:
+	* res/values-ms/strings.xml:
+	* res/values-nb/strings.xml:
+	* res/values-pl/strings.xml:
+	* res/values-pt-rBR/strings.xml:
+	* res/values-pt/strings.xml:
+	* res/values-ru/strings.xml:
+	* res/values-si/strings.xml:
+	* res/values-sv/strings.xml:
+	* res/values-ta/strings.xml:
+	* res/values-te/strings.xml:
+	* res/values-tr/strings.xml:
+	* res/values-ug/strings.xml:
+	* res/values-uk/strings.xml:
+	* res/values-zh-rCN/strings.xml:
+	* res/values-zh-rTW/strings.xml:
+	* res/values-zh/strings.xml:
+	* res/values/strings.xml:
+	* src/org/tomdroid/util/FirstNote.java:
+
+	first note tweak
+
[phone]  noahy  <[e-mail]>
+
+	* res/values/arrays.xml:
+	* locales/tomdroid.pot:
+	* res/values-ar/strings.xml:
+	* res/values-bs/strings.xml:
+	* res/values-ca/strings.xml:
+	* res/values-cs/strings.xml:
+	* res/values-da/strings.xml:
+	* res/values-de/strings.xml:
+	* res/values-el/strings.xml:
+	* res/values-en-rGB/strings.xml:
+	* res/values-eo/strings.xml:
+	* res/values-es/strings.xml:
+	* res/values-eu/strings.xml:
+	* res/values-fa/strings.xml:
+	* res/values-fi/strings.xml:
+	* res/values-fo/strings.xml:
+	* res/values-fr/strings.xml:
+	* res/values-gd/strings.xml:
+	* res/values-hi/strings.xml:
+	* res/values-hu/strings.xml:
+	* res/values-it/strings.xml:
+	* res/values-ja/strings.xml:
+	* res/values-ko/strings.xml:
+	* res/values-ms/strings.xml:
+	* res/values-nb/strings.xml:
+	* res/values-pl/strings.xml:
+	* res/values-pt-rBR/strings.xml:
+	* res/values-pt/strings.xml:
+	* res/values-ru/strings.xml:
+	* res/values-si/strings.xml:
+	* res/values-sv/strings.xml:
+	* res/values-ta/strings.xml:
+	* res/values-te/strings.xml:
+	* res/values-tr/strings.xml:
+	* res/values-ug/strings.xml:
+	* res/values-uk/strings.xml:
+	* res/values-zh-rCN/strings.xml:
+	* res/values-zh-rTW/strings.xml:
+	* res/values-zh/strings.xml:
+	* res/values/strings.xml:
+	* src/org/tomdroid/ui/EditNote.java:
+	* src/org/tomdroid/ui/PreferencesActivity.java:
+	* src/org/tomdroid/util/FirstNote.java:
+
+	converted firstnote to array, toggle autobackup visible, string updates
+
[phone]  noahy  <[e-mail]>
+
+	* NEWS:
+	* src/org/tomdroid/ui/EditNote.java:
+
+	auto backup working
+
[phone]  noahy  <[e-mail]>
+
+	* src/org/tomdroid/util/Preferences.java:
+
+	auto backup work
+
[phone]  noahy  <[e-mail]>
+
+	* res/values/strings.xml:
+	* res/xml/preferences.xml:
+	* src/org/tomdroid/sync/sd/SdCardSyncService.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	merge and auto backup
+
[phone]  Koichi Akabe  <[e-mail]>
+
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	allocate dialogInput before creating dialog
+
[phone]  noahy  <[e-mail]>
+
+	* res/xml/preferences.xml:
+	* src/org/tomdroid/sync/sd/SdCardSyncService.java:
+	* src/org/tomdroid/ui/EditNote.java:
+	* src/org/tomdroid/util/Preferences.java:
+
+	adding auto backup
+
[phone]  noahy  <[e-mail]>
+
+	* src/org/tomdroid/NoteManager.java:
+	* src/org/tomdroid/sync/SyncManager.java:
+	* src/org/tomdroid/sync/SyncService.java:
+	* src/org/tomdroid/sync/sd/SdCardSyncService.java:
+	* src/org/tomdroid/sync/web/SnowySyncService.java:
+	* src/org/tomdroid/ui/CompareNotes.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/util/NoteListCursorAdapter.java:
+
+	trying to fix sync bugs, may be creating new ones...
+
[phone]  noahy  <[e-mail]>
+
+	* src/org/tomdroid/NoteManager.java:
+	* src/org/tomdroid/ui/EditNote.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/ui/ViewNote.java:
+
+	moved title link function into NoteManager to avoid repetition
+
[phone]  noahy  <[e-mail]>
+
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	add update on resume to Tomdroid
+
[phone]  noahy  <[e-mail]>
+
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	set title for search activity
+
[phone]  noahy  <[e-mail]>
+
+	* src/org/tomdroid/util/NoteListCursorAdapter.java:
+
+	fixed paint flags for undeleted notes
+
[phone]  noahy  <[e-mail]>
+
+	* res/menu/main_longclick_deleted.xml:
+	* src/org/tomdroid/util/Honeycomb.java:
+	* src/org/tomdroid/ui/Search.java:
+	* AndroidManifest.xml:
+	* NEWS:
+	* locales/tomdroid.pot:
+	* res/values-ar/strings.xml:
+	* res/values-bs/strings.xml:
+	* res/values-ca/strings.xml:
+	* res/values-cs/strings.xml:
+	* res/values-da/strings.xml:
+	* res/values-de/strings.xml:
+	* res/values-el/strings.xml:
+	* res/values-en-rGB/strings.xml:
+	* res/values-eo/strings.xml:
+	* res/values-es/strings.xml:
+	* res/values-eu/strings.xml:
+	* res/values-fa/strings.xml:
+	* res/values-fi/strings.xml:
+	* res/values-fo/strings.xml:
+	* res/values-fr/strings.xml:
+	* res/values-gd/strings.xml:
+	* res/values-hi/strings.xml:
+	* res/values-hu/strings.xml:
+	* res/values-it/strings.xml:
+	* res/values-ja/strings.xml:
+	* res/values-ko/strings.xml:
+	* res/values-ms/strings.xml:
+	* res/values-nb/strings.xml:
+	* res/values-pl/strings.xml:
+	* res/values-pt-rBR/strings.xml:
+	* res/values-pt/strings.xml:
+	* res/values-ru/strings.xml:
+	* res/values-si/strings.xml:
+	* res/values-sv/strings.xml:
+	* res/values-ta/strings.xml:
+	* res/values-te/strings.xml:
+	* res/values-tr/strings.xml:
+	* res/values-ug/strings.xml:
+	* res/values-uk/strings.xml:
+	* res/values-zh-rCN/strings.xml:
+	* res/values-zh-rTW/strings.xml:
+	* res/values-zh/strings.xml:
+	* res/values/strings.xml:
+	* res/xml/preferences.xml:
+	* src/org/tomdroid/Note.java:
+	* src/org/tomdroid/NoteManager.java:
+	* src/org/tomdroid/ui/PreferencesActivity.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/util/NoteListCursorAdapter.java:
+	* src/org/tomdroid/util/NoteXMLContentBuilder.java:
+	* src/org/tomdroid/util/Preferences.java:
+
+	* moved search function to main activity (allowing two-pane landscape view in results)
+	* added option to show deleted notes in list
+
[phone]  noahy  <[e-mail]>
+
+	* src/org/tomdroid/sync/web/SnowySyncService.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/util/FirstNote.java:
+
+	fixed list selector remaining on portrait
+
[phone]  noahy  <[e-mail]>
+
+	* src/org/tomdroid/sync/web/SnowySyncService.java:
+
+	fixing lp:1042599 Can not sync to ubuntu one
+
[phone]  noahy  <[e-mail]>
+
+	* src/org/tomdroid/sync/sd/SdCardSyncService.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	fixed sd card not finishing sync, fc on dismissDialog
+
[phone]  noahy  <[e-mail]>
+
+	* AndroidManifest.xml:
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	fixed rotate to change layout in Tomdroid
+
[phone]  noahy  <[e-mail]>
+
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	fixed first run dialog
+
[phone]  noahy  <[e-mail]>
+
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/util/Receive.java:
+
+	fixed bug lp:1041931 rev 432 crashes on Longpress in List -> Delete Edit
+	fixed bug lp:1041936 rev 432 crashes on receiving a text-share
+
[phone]  noahy  <[e-mail]>
+
+	* src/org/tomdroid/util/NoteXMLContentBuilder.java:
+
+	tweaks on xml cross-tagging
+
[phone]  noahy  <[e-mail]>
+
+	* NEWS:
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/util/NewNote.java:
+	* src/org/tomdroid/util/NoteContentBuilder.java:
+	* src/org/tomdroid/util/NoteXMLContentBuilder.java:
+	* src/org/tomdroid/xml/NoteContentHandler.java:
+
+	fixed xml parser to allow for nested and boundary-crossing spans
+
[phone]  noahy  <[e-mail]>
+
+	* locales/tomdroid.pot:
+	* res/values-ar/strings.xml:
+	* res/values-bs/strings.xml:
+	* res/values-ca/strings.xml:
+	* res/values-cs/strings.xml:
+	* res/values-da/strings.xml:
+	* res/values-de/strings.xml:
+	* res/values-el/strings.xml:
+	* res/values-en-rGB/strings.xml:
+	* res/values-eo/strings.xml:
+	* res/values-es/strings.xml:
+	* res/values-eu/strings.xml:
+	* res/values-fa/strings.xml:
+	* res/values-fi/strings.xml:
+	* res/values-fo/strings.xml:
+	* res/values-fr/strings.xml:
+	* res/values-gd/strings.xml:
+	* res/values-hi/strings.xml:
+	* res/values-hu/strings.xml:
+	* res/values-it/strings.xml:
+	* res/values-ja/strings.xml:
+	* res/values-ko/strings.xml:
+	* res/values-ms/strings.xml:
+	* res/values-nb/strings.xml:
+	* res/values-pl/strings.xml:
+	* res/values-pt-rBR/strings.xml:
+	* res/values-pt/strings.xml:
+	* res/values-ru/strings.xml:
+	* res/values-si/strings.xml:
+	* res/values-sv/strings.xml:
+	* res/values-ta/strings.xml:
+	* res/values-te/strings.xml:
+	* res/values-tr/strings.xml:
+	* res/values-ug/strings.xml:
+	* res/values-uk/strings.xml:
+	* res/values-zh-rCN/strings.xml:
+	* res/values-zh-rTW/strings.xml:
+	* res/values-zh/strings.xml:
+	* res/values/strings.xml:
+	* src/org/tomdroid/Note.java:
+	* src/org/tomdroid/sync/SyncService.java:
+	* src/org/tomdroid/sync/web/SnowySyncService.java:
+	* src/org/tomdroid/ui/CompareNotes.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	fixing dialogs
+
[phone]  noahy  <[e-mail]>
+
+	* locales/tomdroid.pot:
+	* res/menu/main_longclick.xml:
+	* res/values-ar/strings.xml:
+	* res/values-bs/strings.xml:
+	* res/values-ca/strings.xml:
+	* res/values-cs/strings.xml:
+	* res/values-da/strings.xml:
+	* res/values-de/strings.xml:
+	* res/values-el/strings.xml:
+	* res/values-en-rGB/strings.xml:
+	* res/values-eo/strings.xml:
+	* res/values-es/strings.xml:
+	* res/values-eu/strings.xml:
+	* res/values-fa/strings.xml:
+	* res/values-fi/strings.xml:
+	* res/values-fo/strings.xml:
+	* res/values-fr/strings.xml:
+	* res/values-gd/strings.xml:
+	* res/values-hi/strings.xml:
+	* res/values-hu/strings.xml:
+	* res/values-it/strings.xml:
+	* res/values-ja/strings.xml:
+	* res/values-ko/strings.xml:
+	* res/values-ms/strings.xml:
+	* res/values-nb/strings.xml:
+	* res/values-pl/strings.xml:
+	* res/values-pt-rBR/strings.xml:
+	* res/values-pt/strings.xml:
+	* res/values-ru/strings.xml:
+	* res/values-si/strings.xml:
+	* res/values-sv/strings.xml:
+	* res/values-ta/strings.xml:
+	* res/values-te/strings.xml:
+	* res/values-tr/strings.xml:
+	* res/values-ug/strings.xml:
+	* res/values-uk/strings.xml:
+	* res/values-zh-rCN/strings.xml:
+	* res/values-zh-rTW/strings.xml:
+	* res/values-zh/strings.xml:
+	* res/values/strings.xml:
+	* src/org/tomdroid/Note.java:
+	* src/org/tomdroid/NoteManager.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	fixing dialogs using onPrepareDialog(), added ability to edit tags
+
[phone]  noahy  <[e-mail]>
+
+	* locales/tomdroid.pot:
+	* res/values-ar/strings.xml:
+	* res/values-bs/strings.xml:
+	* res/values-ca/strings.xml:
+	* res/values-cs/strings.xml:
+	* res/values-da/strings.xml:
+	* res/values-de/strings.xml:
+	* res/values-el/strings.xml:
+	* res/values-en-rGB/strings.xml:
+	* res/values-eo/strings.xml:
+	* res/values-es/strings.xml:
+	* res/values-eu/strings.xml:
+	* res/values-fa/strings.xml:
+	* res/values-fi/strings.xml:
+	* res/values-fo/strings.xml:
+	* res/values-fr/strings.xml:
+	* res/values-gd/strings.xml:
+	* res/values-hi/strings.xml:
+	* res/values-hu/strings.xml:
+	* res/values-it/strings.xml:
+	* res/values-ja/strings.xml:
+	* res/values-ko/strings.xml:
+	* res/values-ms/strings.xml:
+	* res/values-nb/strings.xml:
+	* res/values-pl/strings.xml:
+	* res/values-pt-rBR/strings.xml:
+	* res/values-pt/strings.xml:
+	* res/values-ru/strings.xml:
+	* res/values-si/strings.xml:
+	* res/values-sv/strings.xml:
+	* res/values-ta/strings.xml:
+	* res/values-te/strings.xml:
+	* res/values-tr/strings.xml:
+	* res/values-ug/strings.xml:
+	* res/values-uk/strings.xml:
+	* res/values-zh-rCN/strings.xml:
+	* res/values-zh-rTW/strings.xml:
+	* res/values-zh/strings.xml:
+	* res/values/strings.xml:
+	* src/org/tomdroid/ui/CompareNotes.java:
+	* src/org/tomdroid/ui/EditNote.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	more dialog tweaking
+
[phone]  noahy  <[e-mail]>
+
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	fixing sync dialog on switch service (needs more testing)
+
[phone]  noahy  <[e-mail]>
+
+	* locales/tomdroid.pot:
+	* res/values-ar/strings.xml:
+	* res/values-bs/strings.xml:
+	* res/values-ca/strings.xml:
+	* res/values-cs/strings.xml:
+	* res/values-da/strings.xml:
+	* res/values-de/strings.xml:
+	* res/values-el/strings.xml:
+	* res/values-en-rGB/strings.xml:
+	* res/values-eo/strings.xml:
+	* res/values-es/strings.xml:
+	* res/values-eu/strings.xml:
+	* res/values-fa/strings.xml:
+	* res/values-fi/strings.xml:
+	* res/values-fo/strings.xml:
+	* res/values-fr/strings.xml:
+	* res/values-gd/strings.xml:
+	* res/values-hi/strings.xml:
+	* res/values-hu/strings.xml:
+	* res/values-it/strings.xml:
+	* res/values-ja/strings.xml:
+	* res/values-ko/strings.xml:
+	* res/values-ms/strings.xml:
+	* res/values-nb/strings.xml:
+	* res/values-pl/strings.xml:
+	* res/values-pt-rBR/strings.xml:
+	* res/values-pt/strings.xml:
+	* res/values-ru/strings.xml:
+	* res/values-si/strings.xml:
+	* res/values-sv/strings.xml:
+	* res/values-ta/strings.xml:
+	* res/values-te/strings.xml:
+	* res/values-tr/strings.xml:
+	* res/values-ug/strings.xml:
+	* res/values-uk/strings.xml:
+	* res/values-zh-rCN/strings.xml:
+	* res/values-zh-rTW/strings.xml:
+	* res/values-zh/strings.xml:
+	* res/values/strings.xml:
+
+	removed another Tomboy Web
+
[phone]  noahy  <[e-mail]>
+
+	* locales/tomdroid.pot:
+	* res/values-ar/strings.xml:
+	* res/values-bs/strings.xml:
+	* res/values-ca/strings.xml:
+	* res/values-cs/strings.xml:
+	* res/values-da/strings.xml:
+	* res/values-de/strings.xml:
+	* res/values-el/strings.xml:
+	* res/values-en-rGB/strings.xml:
+	* res/values-eo/strings.xml:
+	* res/values-es/strings.xml:
+	* res/values-eu/strings.xml:
+	* res/values-fa/strings.xml:
+	* res/values-fi/strings.xml:
+	* res/values-fo/strings.xml:
+	* res/values-fr/strings.xml:
+	* res/values-gd/strings.xml:
+	* res/values-hi/strings.xml:
+	* res/values-hu/strings.xml:
+	* res/values-it/strings.xml:
+	* res/values-ja/strings.xml:
+	* res/values-ko/strings.xml:
+	* res/values-ms/strings.xml:
+	* res/values-nb/strings.xml:
+	* res/values-pl/strings.xml:
+	* res/values-pt-rBR/strings.xml:
+	* res/values-pt/strings.xml:
+	* res/values-ru/strings.xml:
+	* res/values-si/strings.xml:
+	* res/values-sv/strings.xml:
+	* res/values-ta/strings.xml:
+	* res/values-te/strings.xml:
+	* res/values-tr/strings.xml:
+	* res/values-ug/strings.xml:
+	* res/values-uk/strings.xml:
+	* res/values-zh-rCN/strings.xml:
+	* res/values-zh-rTW/strings.xml:
+	* res/values-zh/strings.xml:
+	* res/values/strings.xml:
+
+	using "synchronization" for consistency
+	updated xml files
+
[phone]  noahy  <[e-mail]>
+
+	* res/values/strings.xml:
+
+	fixed first note
+
[phone]  noahy  <[e-mail]>
+
+	* res/values/strings.xml:
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	removed api 8 showDialog(int, bundle) calls, since we're supporting 6
+
[phone]  noahy  <[e-mail]>
+
+	* src/org/tomdroid/NoteManager.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/ui/ViewNote.java:
+
+	fixed deleting wrong (deleted) note
+
[phone]  noahy  <[e-mail]>
+
+	* res/layout/note_edit.xml:
+	* res/layout/note_view.xml:
+
+	reverted padding in note view and edit
+
[phone]  noahy  <[e-mail]>
+
+	* src/org/tomdroid/NoteManager.java:
+	* src/org/tomdroid/util/XmlUtils.java:
+
+	removed escaping of ' and " in XmlUtils (was interferring with titles and Tomboy doesn't escape them)
+
[phone]  noahy  <[e-mail]>
+
+	* NEWS:
+	* res/values/strings.xml:
+	* src/org/tomdroid/Note.java:
+	* src/org/tomdroid/NoteManager.java:
+	* src/org/tomdroid/sync/sd/SdCardSyncService.java:
+	* src/org/tomdroid/ui/CompareNotes.java:
+	* src/org/tomdroid/util/Receive.java:
+	* src/org/tomdroid/util/Send.java:
+
+	fixed bug lp:1040551 Tomdroid two-way sync to SD card messes up titles
+
[phone]  noahy  <[e-mail]>
+
+	* res/menu-sw600dp-land/edit_note.xml:
+	* res/menu-sw600dp-land/main.xml:
+	* res/menu/edit_note.xml:
+	* src/org/tomdroid/ui/EditNote.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/ui/ViewNote.java:
+	* src/org/tomdroid/util/Send.java:
+
+	fixed send file
+
[phone]  noahy  <[e-mail]>
+
+	* src/org/tomdroid/util/Send.java:
+
+	fixed sending note
+
[phone]  noahy  <[e-mail]>
+
+	* AndroidManifest.xml:
+	* NEWS:
+	* res/layout/main_list_item.xml:
+	* res/values/strings.xml:
+	* src/org/tomdroid/NoteManager.java:
+	* src/org/tomdroid/sync/SyncService.java:
+	* src/org/tomdroid/sync/sd/NoteHandler.java:
+	* src/org/tomdroid/sync/sd/SdCardSyncService.java:
+	* src/org/tomdroid/ui/CompareNotes.java:
+	* src/org/tomdroid/ui/EditNote.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/ui/ViewNote.java:
+	* src/org/tomdroid/util/Receive.java:
+	* src/org/tomdroid/util/Send.java:
+
+	added ability to send note files and import note files as well
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* src/org/tomdroid/ui/EditNote.java:
+	* src/org/tomdroid/util/NewNote.java:
+
+	finnished last task as I found errors.
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* src/org/tomdroid/ui/EditNote.java:
+	* src/org/tomdroid/util/NewNote.java:
+
+	fix unexpected behaviour: when creating a new note and write something, but then pressing dismiss button, note was saved anyways. now note gets deleted on Discard when never saved before.
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* src/org/tomdroid/ui/EditNote.java:
+
+	fix crasher when Note-Not-Found-Dialogue is shown in Editview. onDestroy should not be called in this situation, as there is no note.
+
[phone]  noahy  <[e-mail]>
+
+	* NEWS:
+	* src/org/tomdroid/NoteManager.java:
+	* src/org/tomdroid/sync/sd/SdCardSyncService.java:
+
+	* fixed bug lp:1040333 Crash on Revert
+	* fixed bug lp:1040338 Crash on Cancel
+	* fixed bug lp:1040389 Share/Send from chrome or play crash
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* NEWS:
+
+	updated news accordingly
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* src/org/tomdroid/util/Receive.java:
+	* AndroidManifest.xml:
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/util/NewNote.java:
+
+	Add ability to receive text-shares from other apps. this fixes bug #1039104.
+
[phone]  noahy  <[e-mail]>
+
+	* locales/tomdroid.pot:
+
+	merge
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* data/market-screenshots/0.7.1 - tablet-view.png:
+
+	add screenshot of new tablet view.
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* locales/tomdroid.pot:
+
+	export for launchpad translations.
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* res/values/strings.xml:
+
+	Add hints for translators.
+
[phone]  noahy  <[e-mail]>
+
+	* data/market-screenshots/0.7.1 - tablet-view.png:
+	* locales/tomdroid.pot:
+	* res/values-ar/strings.xml:
+	* res/values-bs/strings.xml:
+	* res/values-ca/strings.xml:
+	* res/values-cs/strings.xml:
+	* res/values-da/strings.xml:
+	* res/values-de/strings.xml:
+	* res/values-el/strings.xml:
+	* res/values-en-rGB/strings.xml:
+	* res/values-eo/strings.xml:
+	* res/values-es/strings.xml:
+	* res/values-eu/strings.xml:
+	* res/values-fa/strings.xml:
+	* res/values-fi/strings.xml:
+	* res/values-fo/strings.xml:
+	* res/values-fr/strings.xml:
+	* res/values-gd/strings.xml:
+	* res/values-hi/strings.xml:
+	* res/values-hu/strings.xml:
+	* res/values-it/strings.xml:
+	* res/values-ja/strings.xml:
+	* res/values-ko/strings.xml:
+	* res/values-ms/strings.xml:
+	* res/values-nb/strings.xml:
+	* res/values-pl/strings.xml:
+	* res/values-pt-rBR/strings.xml:
+	* res/values-pt/strings.xml:
+	* res/values-ru/strings.xml:
+	* res/values-si/strings.xml:
+	* res/values-sv/strings.xml:
+	* res/values-ta/strings.xml:
+	* res/values-te/strings.xml:
+	* res/values-tr/strings.xml:
+	* res/values-ug/strings.xml:
+	* res/values-uk/strings.xml:
+	* res/values-zh-rCN/strings.xml:
+	* res/values-zh-rTW/strings.xml:
+	* res/values-zh/strings.xml:
+	* res/values/strings.xml:
+
+	merge
+
[phone]  noahy  <[e-mail]>
+
+	* src/org/tomdroid/util/FirstNote.properties:
+	* NEWS:
+	* locales/tomdroid.pot:
+	* res/layout/note_view.xml:
+	* res/values-ar/strings.xml:
+	* res/values-bs/strings.xml:
+	* res/values-ca/strings.xml:
+	* res/values-cs/strings.xml:
+	* res/values-da/strings.xml:
+	* res/values-de/strings.xml:
+	* res/values-el/strings.xml:
+	* res/values-en-rGB/strings.xml:
+	* res/values-eo/strings.xml:
+	* res/values-es/strings.xml:
+	* res/values-eu/strings.xml:
+	* res/values-fa/strings.xml:
+	* res/values-fi/strings.xml:
+	* res/values-fo/strings.xml:
+	* res/values-fr/strings.xml:
+	* res/values-gd/strings.xml:
+	* res/values-hi/strings.xml:
+	* res/values-hu/strings.xml:
+	* res/values-it/strings.xml:
+	* res/values-ja/strings.xml:
+	* res/values-ko/strings.xml:
+	* res/values-ms/strings.xml:
+	* res/values-nb/strings.xml:
+	* res/values-pl/strings.xml:
+	* res/values-pt-rBR/strings.xml:
+	* res/values-pt/strings.xml:
+	* res/values-ru/strings.xml:
+	* res/values-si/strings.xml:
+	* res/values-sv/strings.xml:
+	* res/values-ta/strings.xml:
+	* res/values-te/strings.xml:
+	* res/values-tr/strings.xml:
+	* res/values-ug/strings.xml:
+	* res/values-uk/strings.xml:
+	* res/values-zh-rCN/strings.xml:
+	* res/values-zh-rTW/strings.xml:
+	* res/values-zh/strings.xml:
+	* res/values/strings.xml:
+	* src/org/tomdroid/ui/PreferencesActivity.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/util/FirstNote.java:
+
+	moved first note strings into strings.xml, updated pot file
+
[phone]  noahy  <[e-mail]>
+
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	fix for fc on resume Tomdroid after clearing database
+
[phone]  noahy  <[e-mail]>
+
+	* res/values-sw600dp-land/dimen.xml:
+	* res/values-sw800dp-land/dimen.xml:
+
+	widened listview
+
[phone]  noahy  <[e-mail]>
+
+	* res/drawable/drop_shadow.xml:
+	* res/drawable/drop_shadow_selected.xml:
+	* res/drawable/drop_shadow_separator.xml:
+	* res/drawable/triangle_selector.xml:
+	* res/drawable/white_triangle.png:
+	* res/values-sw600dp-land:
+	* res/values-sw600dp-land/dimen.xml:
+	* res/values-sw800dp-land:
+	* res/values-sw800dp-land/dimen.xml:
+	* res/layout-sw800dp-land:
+	* res/layout-sw800dp-land/main.xml:
+	* NEWS:
+	* res/layout-sw600dp-land/main.xml:
+	* res/layout/main_list_item.xml:
+	* res/layout/note_edit.xml:
+	* res/layout/note_view.xml:
+	* res/values/dimen.xml:
+	* src/org/tomdroid/NoteManager.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/util/NoteListCursorAdapter.java:
+
+	added gmail-style two-color pane and selector; joined landscape layouts into one, using different dimen files
+
[phone]  noahy  <[e-mail]>
+
+	* NEWS:
+	* src/org/tomdroid/ui/PreferencesActivity.java:
+
+	fixed bug lp:1039671 Crash when the server URL that includes "illegal characters"
+
[phone]  noahy  <[e-mail]>
+
+	* src/org/tomdroid/util/ErrorList.java:
+
+	cancel save errors if no errors
+
[phone]  noahy  <[e-mail]>
+
+	* NEWS:
+	* src/org/tomdroid/sync/sd/SdCardSyncService.java:
+
+	fixed bug lp:1039814 Crash on Backup Notes
+
[phone]  noahy  <[e-mail]>
+
+	* NEWS:
+
+	updated NEWS
+
[phone]  noahy  <[e-mail]>
+
+	* AndroidManifest.xml:
+	* NEWS:
+	* src/org/tomdroid/ui/PreferencesActivity.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	fixed lp:1039703, lp:1039824 - moved dialogs into showDialog() to allow rotation
+
[phone]  Olivier Bilodeau  <[e-mail]>
+
+	* AndroidManifest.xml:
+	* NEWS:
+
+	0.7.1 bump
+
[phone]  Olivier Bilodeau  <[e-mail]>
+
+	* NEWS:
+	* res/values/strings.xml:
+
+	merged latest from stable
+
 2012-08-21  Olivier Bilodeau  <[e-mail]>
 
 	* res/values/strings.xml:
@@ -179,6 +3097,102 @@
 
 	updated NEWS for upcoming 0.6.1
 
[phone]  Olivier Bilodeau  <[e-mail]>
+
+	* NEWS:
+
+	typo fix in NEWS
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* data/market-screenshots/0.7.1 - note-edit-And4.1.png:
+	* data/market-screenshots/0.7.1 - note-list-And2.3.png:
+	* data/market-screenshots/0.7.1 - note-view-And2.3.png:
+	* data/market-screenshots/0.7.1 - preferences-And2.3.png:
+	* data/market-screenshots/0.7.1 - preferences-And4.1.png:
+	* data/market-screenshots/0.7.1 - search-And4.1.png:
+	* data/market-screenshots/0.7.1 - tablet-view.png:
+	* data/market-screenshots/0.7.1 - welcome-dialog-And4.1.png:
+
+	add 0.7.1 screenshots from Android 2.3 and 4.1/tablet
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* data/market-screenshots/0.5 - note-list.png:
+	* data/market-screenshots/0.5 - note-options.png:
+	* data/market-screenshots/0.5 - note-view.png:
+	* data/market-screenshots/0.5 - preferences.png:
+	* data/market-screenshots/0.5 - search.png:
+	* data/market-screenshots/0.5 - welcome-dialog.png:
+	* locales/tomdroid-bs.po:
+	* locales/tomdroid-el.po:
+	* locales/tomdroid-eo.po:
+	* locales/tomdroid-fa.po:
+	* locales/tomdroid-fi.po:
+	* locales/tomdroid-nb.po:
+	* locales/tomdroid-si.po:
+	* locales/tomdroid-ta.po:
+	* locales/tomdroid-zh_TW.po:
+	* res/values-bs:
+	* res/values-bs/strings.xml:
+	* res/values-el:
+	* res/values-el/strings.xml:
+	* res/values-eo:
+	* res/values-eo/strings.xml:
+	* res/values-fa:
+	* res/values-fa/strings.xml:
+	* res/values-fi:
+	* res/values-fi/strings.xml:
+	* res/values-nb:
+	* res/values-nb/strings.xml:
+	* res/values-si:
+	* res/values-si/strings.xml:
+	* res/values-ta:
+	* res/values-ta/strings.xml:
+	* res/values-zh-rTW:
+	* res/values-zh-rTW/strings.xml:
+	* locales/tomdroid-ar.po:
+	* locales/tomdroid-ca.po:
+	* locales/tomdroid-cs.po:
+	* locales/tomdroid-da.po:
+	* locales/tomdroid-de.po:
+	* locales/tomdroid-en_GB.po:
+	* locales/tomdroid-es.po:
+	* locales/tomdroid-eu.po:
+	* locales/tomdroid-fo.po:
+	* locales/tomdroid-fr.po:
+	* locales/tomdroid-gd.po:
+	* locales/tomdroid-hi.po:
+	* locales/tomdroid-hu.po:
+	* locales/tomdroid-it.po:
+	* locales/tomdroid-ja.po:
+	* locales/tomdroid-ko.po:
+	* locales/tomdroid-ms.po:
+	* locales/tomdroid-pl.po:
+	* locales/tomdroid-pt.po:
+	* locales/tomdroid-pt_BR.po:
+	* locales/tomdroid-ru.po:
+	* locales/tomdroid-sv.po:
+	* locales/tomdroid-te.po:
+	* locales/tomdroid-tr.po:
+	* locales/tomdroid-ug.po:
+	* locales/tomdroid-uk.po:
+	* locales/tomdroid-zh.po:
+	* locales/tomdroid-zh_CN.po:
+	* locales/tomdroid.pot:
+	* res/values-ca/strings.xml:
+	* res/values-de/strings.xml:
+	* res/values-es/strings.xml:
+	* res/values-eu/strings.xml:
+	* res/values-hu/strings.xml:
+	* res/values-it/strings.xml:
+	* res/values-ja/strings.xml:
+	* res/values-pl/strings.xml:
+	* res/values-zh-rCN/strings.xml:
+	* util/xml2po/README:
+
+	merged lp:tomdroid/stable and updated translations from launchpad and pot for launchpad.
+
 2012-08-21  Stefan Hammer  <[e-mail]>
 
 	* data/market-screenshots/0.5 - search.png:
@@ -292,6 +3306,852 @@
 
 	updated translations for launchpad
 
[phone]  noahy  <[e-mail]>
+
+	* src/org/tomdroid/sync/web/SnowySyncService.java:
+
+	fixed syncing with Tomboy after deleting all remote notes
+
[phone]  noahy  <[e-mail]>
+
+	* NEWS:
+	* src/org/tomdroid/ui/PreferencesActivity.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	added changes to NEWS, added progress dialog to preferences
+
[phone]  noahy  <[e-mail]>
+
+	* NEWS:
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	merge changes
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	reverted fix  which was not working well (removed rightPane.invalidate())
+
[phone]  Olivier Bilodeau  <[e-mail]>
+
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	yet another unfortunate merge
+
[phone]  Olivier Bilodeau  <[e-mail]>
+
+	* NEWS:
+
+	updated NEWS w/ some of the latest changes
+
[phone]  Olivier Bilodeau  <[e-mail]>
+
+	* NEWS:
+
+	linked NEWS items to bug entries
+
[phone]  noahy  <[e-mail]>
+
+	* src/org/tomdroid/sync/SyncService.java:
+	* src/org/tomdroid/sync/sd/SdCardSyncService.java:
+	* src/org/tomdroid/sync/web/SnowySyncService.java:
+
+	fixed lp:1038968
+
[phone]  noahy  <[e-mail]>
+
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	moved title change to after note loads, invalidate rightPane as well
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	merged last revision and reverted it.
+
[phone]  noahy  <[e-mail]>
+
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	trying to fix lp:1038118
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* res/layout/note_edit.xml:
+	* res/layout/note_view.xml:
+
+	fix bug #1038118 with expanding textview. With the same trick for editnote view fixed Bug #1038352.
+
[phone]  noahy  <[e-mail]>
+
+	* locales/tomdroid.pot:
+	* res/values-ar/strings.xml:
+	* res/values-ca/strings.xml:
+	* res/values-cs/strings.xml:
+	* res/values-da/strings.xml:
+	* res/values-de/strings.xml:
+	* res/values-en-rGB/strings.xml:
+	* res/values-es/strings.xml:
+	* res/values-eu/strings.xml:
+	* res/values-fo/strings.xml:
+	* res/values-fr/strings.xml:
+	* res/values-gd/strings.xml:
+	* res/values-hi/strings.xml:
+	* res/values-hu/strings.xml:
+	* res/values-it/strings.xml:
+	* res/values-ja/strings.xml:
+	* res/values-ko/strings.xml:
+	* res/values-ms/strings.xml:
+	* res/values-pl/strings.xml:
+	* res/values-pt-rBR/strings.xml:
+	* res/values-pt/strings.xml:
+	* res/values-ru/strings.xml:
+	* res/values-sv/strings.xml:
+	* res/values-te/strings.xml:
+	* res/values-tr/strings.xml:
+	* res/values-ug/strings.xml:
+	* res/values-uk/strings.xml:
+	* res/values-zh-rCN/strings.xml:
+	* res/values-zh/strings.xml:
+
+	removed theme pref strings
+
[phone]  noahy  <[e-mail]>
+
+	* locales/tomdroid-ar.po:
+	* locales/tomdroid-ca.po:
+	* locales/tomdroid-cs.po:
+	* locales/tomdroid-da.po:
+	* locales/tomdroid-de.po:
+	* locales/tomdroid-en_GB.po:
+	* locales/tomdroid-es.po:
+	* locales/tomdroid-eu.po:
+	* locales/tomdroid-fo.po:
+	* locales/tomdroid-fr.po:
+	* locales/tomdroid-gd.po:
+	* locales/tomdroid-hi.po:
+	* locales/tomdroid-hu.po:
+	* locales/tomdroid-it.po:
+	* locales/tomdroid-ja.po:
+	* locales/tomdroid-ko.po:
+	* locales/tomdroid-ms.po:
+	* locales/tomdroid-pl.po:
+	* locales/tomdroid-pt.po:
+	* locales/tomdroid-pt_BR.po:
+	* locales/tomdroid-ru.po:
+	* locales/tomdroid-sv.po:
+	* locales/tomdroid-te.po:
+	* locales/tomdroid-tr.po:
+	* locales/tomdroid-ug.po:
+	* locales/tomdroid-uk.po:
+	* locales/tomdroid-zh.po:
+	* locales/tomdroid-zh_CN.po:
+	* locales/tomdroid.pot:
+	* res/values-ar/strings.xml:
+	* res/values-ca/strings.xml:
+	* res/values-cs/strings.xml:
+	* res/values-da/strings.xml:
+	* res/values-de/strings.xml:
+	* res/values-en-rGB/strings.xml:
+	* res/values-es/strings.xml:
+	* res/values-eu/strings.xml:
+	* res/values-fo/strings.xml:
+	* res/values-fr/strings.xml:
+	* res/values-gd/strings.xml:
+	* res/values-hi/strings.xml:
+	* res/values-hu/strings.xml:
+	* res/values-it/strings.xml:
+	* res/values-ja/strings.xml:
+	* res/values-ko/strings.xml:
+	* res/values-ms/strings.xml:
+	* res/values-pl/strings.xml:
+	* res/values-pt-rBR/strings.xml:
+	* res/values-pt/strings.xml:
+	* res/values-ru/strings.xml:
+	* res/values-sv/strings.xml:
+	* res/values-te/strings.xml:
+	* res/values-tr/strings.xml:
+	* res/values-ug/strings.xml:
+	* res/values-uk/strings.xml:
+	* res/values-zh-rCN/strings.xml:
+	* res/values-zh/strings.xml:
+	* res/values/strings.xml:
+
+	merge translations
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* locales/tomdroid-ar.po:
+	* locales/tomdroid-ca.po:
+	* locales/tomdroid-cs.po:
+	* locales/tomdroid-da.po:
+	* locales/tomdroid-de.po:
+	* locales/tomdroid-en_GB.po:
+	* locales/tomdroid-es.po:
+	* locales/tomdroid-eu.po:
+	* locales/tomdroid-fo.po:
+	* locales/tomdroid-fr.po:
+	* locales/tomdroid-gd.po:
+	* locales/tomdroid-hi.po:
+	* locales/tomdroid-hu.po:
+	* locales/tomdroid-it.po:
+	* locales/tomdroid-ja.po:
+	* locales/tomdroid-ko.po:
+	* locales/tomdroid-ms.po:
+	* locales/tomdroid-pl.po:
+	* locales/tomdroid-pt.po:
+	* locales/tomdroid-pt_BR.po:
+	* locales/tomdroid-ru.po:
+	* locales/tomdroid-sv.po:
+	* locales/tomdroid-te.po:
+	* locales/tomdroid-tr.po:
+	* locales/tomdroid-ug.po:
+	* locales/tomdroid-uk.po:
+	* locales/tomdroid-zh.po:
+	* locales/tomdroid-zh_CN.po:
+	* locales/tomdroid.pot:
+	* res/values-ar/strings.xml:
+	* res/values-ca/strings.xml:
+	* res/values-cs/strings.xml:
+	* res/values-da/strings.xml:
+	* res/values-de/strings.xml:
+	* res/values-en-rGB/strings.xml:
+	* res/values-es/strings.xml:
+	* res/values-eu/strings.xml:
+	* res/values-fo/strings.xml:
+	* res/values-fr/strings.xml:
+	* res/values-gd/strings.xml:
+	* res/values-hi/strings.xml:
+	* res/values-hu/strings.xml:
+	* res/values-it/strings.xml:
+	* res/values-ja/strings.xml:
+	* res/values-ko/strings.xml:
+	* res/values-ms/strings.xml:
+	* res/values-pl/strings.xml:
+	* res/values-pt-rBR/strings.xml:
+	* res/values-pt/strings.xml:
+	* res/values-ru/strings.xml:
+	* res/values-sv/strings.xml:
+	* res/values-te/strings.xml:
+	* res/values-tr/strings.xml:
+	* res/values-ug/strings.xml:
+	* res/values-uk/strings.xml:
+	* res/values-zh-rCN/strings.xml:
+	* res/values-zh/strings.xml:
+	* res/values/strings.xml:
+
+	fix bug #1038769, export to pot, import already done translations.
+
[phone]  noahy  <[e-mail]>
+
+	* locales/tomdroid.pot:
+	* res/values/strings.xml:
+
+	removed strings, updated pot file
+
[phone]  noahy  <[e-mail]>
+
+	* res/layout/main.xml:
+
+	merge with Stefan (lp:1038633)
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* res/layout/main.xml:
+
+	had to remoce cachecolorhint to fix bug #1038633 for now.
+
[phone]  noahy  <[e-mail]>
+
+	* res/layout/note_compare.xml:
+	* res/values/strings.xml:
+	* src/org/tomdroid/ui/CompareNotes.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	collapsed elements in CompareNotes.java, added test function to Tomdroid.java
+
[phone]  noahy  <[e-mail]>
+
+	* res/layout/note_compare.xml:
+	* res/values/strings.xml:
+	* res/xml/preferences.xml:
+	* src/org/tomdroid/ui/CompareNotes.java:
+	* src/org/tomdroid/ui/EditNote.java:
+	* src/org/tomdroid/ui/PreferencesActivity.java:
+	* src/org/tomdroid/ui/Search.java:
+	* src/org/tomdroid/ui/ShortcutActivity.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/ui/ViewNote.java:
+	* src/org/tomdroid/util/Preferences.java:
+
+	fixed note comparison, layout (lp:1038699 ), set light theme for everything
+
[phone]  noahy  <[e-mail]>
+
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	added date and revision reset to "revert all"
+
[phone]  noahy  <[e-mail]>
+
+	* AndroidManifest.xml:
+	* res/values/strings.xml:
+	* src/org/tomdroid/ui/PreferencesActivity.java:
+
+	fixed resetting local notes
+
[phone]  noahy  <[e-mail]>
+
+	* src/org/tomdroid/ui/actionbar/ActionBarPreferenceActivity.java:
+	* src/org/tomdroid/ui/PreferencesActivity.java:
+	* src/org/tomdroid/ui/actionbar/ActionBarHelperBase.java:
+
+	fixed actionbar for prefs (lp:1038635), maybe fixed flickering listview (lp:1038633)
+
[phone]  noahy  <[e-mail]>
+
+	* src/org/tomdroid/ui/CompareNotes.java:
+	* src/org/tomdroid/ui/SyncDialog.java:
+	* AndroidManifest.xml:
+	* src/org/tomdroid/NoteManager.java:
+	* src/org/tomdroid/sync/SyncService.java:
+	* src/org/tomdroid/sync/web/SnowySyncService.java:
+
+	renamed syncdialog class
+
[phone]  noahy  <[e-mail]>
+
+	* src/org/tomdroid/sync/SyncService.java:
+	* src/org/tomdroid/sync/sd/SdCardSyncService.java:
+	* src/org/tomdroid/sync/web/SnowySyncService.java:
+	* src/org/tomdroid/ui/SyncDialog.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	fixed sync dialog to integrate with sync properly, show progress, etc.
+
[phone]  noahy  <[e-mail]>
+
+	* res/layout/note_compare.xml:
+	* res/values/strings.xml:
+	* src/org/tomdroid/NoteManager.java:
+	* src/org/tomdroid/sync/SyncService.java:
+	* src/org/tomdroid/sync/sd/SdCardSyncService.java:
+	* src/org/tomdroid/sync/web/SnowySyncService.java:
+	* src/org/tomdroid/ui/EditNote.java:
+	* src/org/tomdroid/ui/SyncDialog.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	added routine to check for two different notes with same title, run conflict resolution; may have also fixed lp:1038118
+
[phone]  noahy  <[e-mail]>
+
+	* locales/tomdroid.pot:
+	* res/values/strings.xml:
+	* src/org/tomdroid/ui/EditNote.java:
+
+	merge with Stefan
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* locales/tomdroid.pot:
+	* res/values/strings.xml:
+	* src/org/tomdroid/ui/EditNote.java:
+
+	checked strings, changed discard question to yes and no and updated translations.
+
[phone]  noahy  <[e-mail]>
+
+	* src/org/tomdroid/sync/web/SnowySyncService.java:
+
+	added cancel to push function
+
[phone]  noahy  <[e-mail]>
+
+	* res/values/styles.xml:
+
+	compat title reflects dark/light choice
+
[phone]  noahy  <[e-mail]>
+
+	* AndroidManifest.xml:
+	* NEWS:
+	* res/layout/main.xml:
+	* res/layout/note_edit.xml:
+	* res/menu-sw600dp-land/edit_note.xml:
+	* res/menu/edit_note.xml:
+	* res/values-v11/styles.xml:
+	* res/values/attrs.xml:
+	* res/values/strings.xml:
+	* res/values/styles.xml:
+	* res/xml/preferences.xml:
+	* src/org/tomdroid/ui/EditNote.java:
+	* src/org/tomdroid/ui/PreferencesActivity.java:
+	* src/org/tomdroid/ui/Search.java:
+	* src/org/tomdroid/ui/ShortcutActivity.java:
+	* src/org/tomdroid/ui/SyncDialog.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/ui/ViewNote.java:
+	* src/org/tomdroid/util/Preferences.java:
+
+	added option to choose light/dark theme, formatbar tweaks
+
[phone]  noahy  <[e-mail]>
+
+	* res/drawable-hdpi/actionbar_shadow.9.png:
+	* res/drawable-ldpi/actionbar_shadow.9.png:
+	* res/drawable-mdpi/actionbar_shadow.9.png:
+	* res/drawable-xhdpi/actionbar_shadow.9.png:
+	* res/drawable/actionbar_compat_item.xml:
+	* res/drawable/actionbar_compat_item_focused.xml:
+	* res/drawable/actionbar_compat_item_pressed.xml:
+	* res/drawable/tray_handle_normal.png:
+	* res/layout-v11:
+	* res/layout-v11/actionbar_indeterminate_progress.xml:
+	* res/layout/actionbar_compat.xml:
+	* res/menu-sw600dp-land/search.xml:
+	* res/menu/search.xml:
+	* res/values/attrs.xml:
+	* res/values/ids.xml:
+	* src/org/tomdroid/ui/actionbar:
+	* src/org/tomdroid/ui/actionbar/ActionBarActivity.java:
+	* src/org/tomdroid/ui/actionbar/ActionBarHelper.java:
+	* src/org/tomdroid/ui/actionbar/ActionBarHelperBase.java:
+	* src/org/tomdroid/ui/actionbar/ActionBarHelperHoneycomb.java:
+	* src/org/tomdroid/ui/actionbar/ActionBarHelperICS.java:
+	* src/org/tomdroid/ui/actionbar/ActionBarListActivity.java:
+	* src/org/tomdroid/ui/actionbar/SimpleMenu.java:
+	* src/org/tomdroid/ui/actionbar/SimpleMenuItem.java:
+	* res/anim:
+	* res/anim/pulse.xml:
+	* res/drawable-hdpi/btn_small.9.png:
+	* res/drawable-hdpi/btn_small_toggle.9.png:
+	* res/drawable-hdpi/button_toggle.xml:
+	* res/drawable-hdpi/icon_actionbar_dot.png:
+	* res/drawable-hdpi/icon_actionbar_sync.png:
+	* res/drawable-hdpi/icon_actionbar_sync_background.png:
+	* res/drawable-hdpi/icon_focused.png:
+	* res/drawable-ldpi/btn_small.9.png:
+	* res/drawable-ldpi/btn_small_toggle.9.png:
+	* res/drawable-ldpi/button_toggle.xml:
+	* res/drawable-ldpi/icon_actionbar_dot.png:
+	* res/drawable-ldpi/icon_actionbar_sync.png:
+	* res/drawable-ldpi/icon_actionbar_sync_background.png:
+	* res/drawable-ldpi/icon_focused.png:
+	* res/drawable-mdpi/btn_small.9.png:
+	* res/drawable-mdpi/btn_small_toggle.9.png:
+	* res/drawable-mdpi/button_toggle.xml:
+	* res/drawable-mdpi/icon_actionbar_dot.png:
+	* res/drawable-mdpi/icon_actionbar_sync.png:
+	* res/drawable-mdpi/icon_actionbar_sync_background.png:
+	* res/drawable-mdpi/icon_focused.png:
+	* res/drawable-xhdpi/icon_actionbar_dot.png:
+	* res/drawable-xhdpi/icon_actionbar_sync.png:
+	* res/drawable-xhdpi/icon_actionbar_sync_background.png:
+	* res/drawable-xhdpi/icon_focused.png:
+	* res/drawable/actionbar_background.png:
+	* res/drawable/actionbar_icon.xml:
+	* res/drawable/ic_menu_sync.png:
+	* res/drawable/icon.png:
+	* res/drawable/icon_focused.png:
+	* res/drawable/text.png:
+	* res/drawable/xml.png:
+	* AndroidManifest.xml:
+	* res/drawable-hdpi/ic_launcher.png:
+	* res/drawable-hdpi/ic_menu_sync.png:
+	* res/drawable-ldpi/ic_launcher.png:
+	* res/drawable-ldpi/ic_menu_sync.png:
+	* res/drawable-ldpi/icon.png:
+	* res/drawable-mdpi/ic_launcher.png:
+	* res/drawable-mdpi/ic_menu_sync.png:
+	* res/drawable-mdpi/icon.png:
+	* res/drawable-xhdpi/ic_menu_sync.png:
+	* res/layout-sw600dp-land/main.xml:
+	* res/layout-sw800dp-land/main.xml:
+	* res/layout/main.xml:
+	* res/layout/main_list_item.xml:
+	* res/layout/note_edit.xml:
+	* res/layout/search.xml:
+	* res/layout/shortcuts_list.xml:
+	* res/menu-sw600dp-land/edit_note.xml:
+	* res/menu-sw600dp-land/main.xml:
+	* res/menu-sw600dp-land/view_note.xml:
+	* res/menu/edit_note.xml:
+	* res/menu/main.xml:
+	* res/menu/view_note.xml:
+	* res/values/dimen.xml:
+	* res/values/strings.xml:
+	* res/values/styles.xml:
+	* src/org/tomdroid/ui/EditNote.java:
+	* src/org/tomdroid/ui/Search.java:
+	* src/org/tomdroid/ui/ShortcutActivity.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/ui/ViewNote.java:
+
+	merged with lp:~tomdroid-dev/tomdroid/note-editing-and-syncing-with-combatActionBar
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* res/layout-sw600dp-land/right_pane.xml:
+	* res/layout-sw800dp-land/right_pane.xml:
+	* res/layout-sw600dp-land/main.xml:
+	* res/layout-sw800dp-land/main.xml:
+	* res/layout/note_view.xml:
+	* src/org/tomdroid/ui/EditNote.java:
+
+	merged note-editing-and-syncing
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* src/org/tomdroid/ui/EditNote.java:
+
+	merge
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* res/menu-sw600dp-land/edit_note.xml:
+	* res/menu/edit_note.xml:
+	* res/values/strings.xml:
+	* res/xml/preferences.xml:
+	* src/org/tomdroid/ui/EditNote.java:
+	* src/org/tomdroid/util/Preferences.java:
+
+	merged note-editing-and-syncing
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	merged note-editing-and-syncing
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* res/layout-sw800dp-land/right_pane.xml:
+	* res/layout-sw600dp-land/right_pane.xml:
+	* res/layout/note_view.xml:
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	merge
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* res/drawable-hdpi/ic_menu_refresh.png:
+	* res/drawable-ldpi/ic_menu_sync.png:
+	* res/drawable-mdpi/ic_menu_sync.png:
+
+	icon update
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	in main activity click on actionbar icon should do nothing.
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* AndroidManifest.xml:
+	* src/org/tomdroid/ui/ShortcutActivity.java:
+	* src/org/tomdroid/ui/ViewNote.java:
+
+	merge note-editing-and-syncing branch
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* AndroidManifest.xml:
+	* res/layout/main.xml:
+	* res/layout/main_list_item.xml:
+	* res/layout/note_edit.xml:
+	* res/layout/note_view.xml:
+	* res/layout/strings.xml:
+	* res/values/strings.xml:
+	* src/org/tomdroid/Note.java:
+
+	No commit message
[phone]  Stefan Hammer  <[e-mail]>
+
+	* AndroidManifest.xml:
+	* res/values/strings.xml:
+	* src/org/tomdroid/ui/EditNote.java:
+	* src/org/tomdroid/ui/Search.java:
+	* src/org/tomdroid/ui/ViewNote.java:
+
+	clean up, fix home icon in ActionBar
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* src/org/tomdroid/Note.java:
+	* src/org/tomdroid/sync/sd/NoteHandler.java:
+	* src/org/tomdroid/ui/SyncMessageHandler.java:
+	* src/org/tomdroid/ui/ViewNote.java:
+	* src/org/tomdroid/util/NoteXMLContentBuilder.java:
+
+	merge note-editing-and-syncing
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* res/layout/main_list_item.xml:
+	* res/values/strings.xml:
+	* src/org/tomdroid/ui/EditNote.java:
+	* src/org/tomdroid/ui/Search.java:
+	* src/org/tomdroid/ui/SyncMessageHandler.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/ui/ViewNote.java:
+	* src/org/tomdroid/ui/actionbar/ActionBarActivity.java:
+
+	Fix home button in action bar for newAPIs
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* res/menu-sw600dp-land/search.xml:
+	* src/org/tomdroid/ui/TextSizeDialog.java:
+	* res/menu-sw600dp-land/edit_note.xml:
+	* res/menu-sw600dp-land/main.xml:
+	* res/menu-sw600dp-land/view_note.xml:
+	* res/menu/edit_note.xml:
+	* res/menu/main.xml:
+	* res/menu/view_note.xml:
+	* res/values/strings.xml:
+	* src/org/tomdroid/ui/EditNote.java:
+	* src/org/tomdroid/ui/Search.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	edited actionbar icons and made a radiobutton list for textsize selector
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* .bzrignore:
+	* res/layout/note_edit.xml:
+	* res/layout/note_view.xml:
+	* src/org/tomdroid/ui/EditNote.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/ui/ViewNote.java:
+
+	merged changes from note-editing-and-syncing branch
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* bin:
+	* .bzrignore:
+	* src/org/tomdroid/ui/SyncMessageHandler.java:
+
+	merged note-editing-and-syncing branch
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* res/drawable-hdpi/actionbar_shadow.9.png:
+	* res/drawable-hdpi/ic_menu_refresh.png:
+	* res/drawable-ldpi/actionbar_shadow.9.png:
+	* res/drawable-mdpi/actionbar_shadow.9.png:
+	* res/drawable-xhdpi/actionbar_shadow.9.png:
+	* res/drawable/actionbar_compat_item.xml:
+	* res/drawable/actionbar_compat_item_focused.xml:
+	* res/drawable/actionbar_compat_item_pressed.xml:
+	* res/layout-v11:
+	* res/layout-v11/actionbar_indeterminate_progress.xml:
+	* res/layout/actionbar_compat.xml:
+	* res/menu/search.xml:
+	* res/values/attrs.xml:
+	* res/values/ids.xml:
+	* src/org/tomdroid/ui/actionbar:
+	* src/org/tomdroid/ui/actionbar/ActionBarActivity.java:
+	* src/org/tomdroid/ui/actionbar/ActionBarHelper.java:
+	* src/org/tomdroid/ui/actionbar/ActionBarHelperBase.java:
+	* src/org/tomdroid/ui/actionbar/ActionBarHelperHoneycomb.java:
+	* src/org/tomdroid/ui/actionbar/ActionBarHelperICS.java:
+	* src/org/tomdroid/ui/actionbar/ActionBarListActivity.java:
+	* src/org/tomdroid/ui/actionbar/SimpleMenu.java:
+	* src/org/tomdroid/ui/actionbar/SimpleMenuItem.java:
+	* bin:
+	* bin/tomdroid-debug.apk:
+	* res/anim:
+	* res/anim/pulse.xml:
+	* res/drawable-hdpi/btn_small.9.png:
+	* res/drawable-hdpi/btn_small_toggle.9.png:
+	* res/drawable-hdpi/button_toggle.xml:
+	* res/drawable-hdpi/icon_actionbar_dot.png:
+	* res/drawable-hdpi/icon_actionbar_sync.png:
+	* res/drawable-hdpi/icon_actionbar_sync_background.png:
+	* res/drawable-hdpi/icon_focused.png:
+	* res/drawable-ldpi/btn_small.9.png:
+	* res/drawable-ldpi/btn_small_toggle.9.png:
+	* res/drawable-ldpi/button_toggle.xml:
+	* res/drawable-ldpi/icon_actionbar_dot.png:
+	* res/drawable-ldpi/icon_actionbar_sync.png:
+	* res/drawable-ldpi/icon_actionbar_sync_background.png:
+	* res/drawable-ldpi/icon_focused.png:
+	* res/drawable-mdpi/btn_small.9.png:
+	* res/drawable-mdpi/btn_small_toggle.9.png:
+	* res/drawable-mdpi/button_toggle.xml:
+	* res/drawable-mdpi/icon_actionbar_dot.png:
+	* res/drawable-mdpi/icon_actionbar_sync.png:
+	* res/drawable-mdpi/icon_actionbar_sync_background.png:
+	* res/drawable-mdpi/icon_focused.png:
+	* res/drawable-xhdpi/icon_actionbar_dot.png:
+	* res/drawable-xhdpi/icon_actionbar_sync.png:
+	* res/drawable-xhdpi/icon_actionbar_sync_background.png:
+	* res/drawable-xhdpi/icon_focused.png:
+	* res/drawable/actionbar_background.png:
+	* res/drawable/actionbar_icon.xml:
+	* res/drawable/ic_menu_sync.png:
+	* res/drawable/icon.png:
+	* res/drawable/icon_focused.png:
+	* res/drawable/text.png:
+	* res/drawable/xml.png:
+	* AndroidManifest.xml:
+	* res/drawable-hdpi/ic_launcher.png:
+	* res/drawable-hdpi/ic_menu_sync.png:
+	* res/drawable-ldpi/ic_launcher.png:
+	* res/drawable-ldpi/ic_menu_sync.png:
+	* res/drawable-ldpi/icon.png:
+	* res/drawable-mdpi/ic_launcher.png:
+	* res/drawable-mdpi/ic_menu_sync.png:
+	* res/drawable-mdpi/icon.png:
+	* res/drawable-xhdpi/ic_menu_sync.png:
+	* res/layout-sw600dp-land/main.xml:
+	* res/layout-sw800dp-land/main.xml:
+	* res/layout/main.xml:
+	* res/layout/main_list_item.xml:
+	* res/layout/search.xml:
+	* res/layout/shortcuts_list.xml:
+	* res/menu/edit_note.xml:
+	* res/menu/main.xml:
+	* res/menu/view_note.xml:
+	* res/values/dimen.xml:
+	* res/values/styles.xml:
+	* src/org/tomdroid/ui/EditNote.java:
+	* src/org/tomdroid/ui/Search.java:
+	* src/org/tomdroid/ui/ShortcutActivity.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/ui/ViewNote.java:
+
+	Implemented ActionBar Compartibility for Android 1.5 to 2.3. First revision with an native Actionbar for all Android versions.
+
[phone]  noahy  <[e-mail]>
+
+	* res/layout/note_edit.xml:
+	* src/org/tomdroid/ui/EditNote.java:
+
+	new format bar
+
[phone]  noahy  <[e-mail]>
+
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	fixed scroll to top after delete note (lp:1038115)
+
[phone]  noahy  <[e-mail]>
+
+	* src/org/tomdroid/sync/SyncService.java:
+
+	fixed revert all for deleted notes
+
[phone]  noahy  <[e-mail]>
+
+	* src/org/tomdroid/sync/SyncService.java:
+	* src/org/tomdroid/sync/web/SnowySyncService.java:
+
+	added routine to circumvent full sync if snowy server revision is old (only push changed notes)
+
[phone]  noahy  <[e-mail]>
+
+	* AndroidManifest.xml:
+	* res/layout/note_edit.xml:
+	* res/values-v11/styles.xml:
+	* res/values/styles.xml:
+
+	fixed sentence caps bug leading to single line, added theme to prefs, search
+
[phone]  noahy  <[e-mail]>
+
+	* src/org/tomdroid/sync/SyncService.java:
+
+	stopped pushing note templates, may be causing problems
+
[phone]  noahy  <[e-mail]>
+
+	* AndroidManifest.xml:
+	* NEWS:
+
+	merges
+
[phone]  Olivier Bilodeau  <[e-mail]>
+
+	* NEWS:
+
+	merge
+	
+	conflict on NEWS
+
[phone]  Olivier Bilodeau  <[e-mail]>
+
+	* AndroidManifest.xml:
+	* NEWS:
+
+	version bump
+	
+	unfortunately late, the release doesn't include the last few commits
+
[phone]  noahy  <[e-mail]>
+
+	* res/values/strings.xml:
+	* src/org/tomdroid/sync/SyncService.java:
+	* src/org/tomdroid/sync/web/SnowySyncService.java:
+	* src/org/tomdroid/ui/PreferencesActivity.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/util/ErrorList.java:
+
+	re-added cancel sync if no changes, fixed preferences sync toasts
+
[phone]  noahy  <[e-mail]>
+
+	* NEWS:
+
+	added sync cancel to NEWS
+
[phone]  noahy  <[e-mail]>
+
+	* res/layout/note_edit.xml:
+
+	set note content entry to "sentence caps"
+
[phone]  noahy  <[e-mail]>
+
+	* bin:
+	* bin/tomdroid-debug.apk:
+	* .bzrignore:
+	* AUTHORS:
+	* AndroidManifest.xml:
+	* ChangeLog:
+	* NEWS:
+	* doc/dev/RELEASE-CHECKLIST:
+	* doc/dev/TODO:
+	* res/values-fr/strings.xml:
+	* res/values/strings.xml:
+	* doc/user/README:
+	* README:
+
+	merges
+
[phone]  Olivier Bilodeau  <[e-mail]>
+
+	* bin:
+	* bin/tomdroid-debug.apk:
+	* .bzrignore:
+
+	don't store binary blobs in the repository
+
[phone]  Olivier Bilodeau  <[e-mail]>
+
+	* AUTHORS:
+	* AndroidManifest.xml:
+	* ChangeLog:
+	* NEWS:
+	* doc/dev/RELEASE-CHECKLIST:
+	* doc/dev/TODO:
+	* res/values-fr/strings.xml:
+	* res/values/strings.xml:
+	* doc/user/README:
+	* README:
+
+	merged lp:tomdroid
+
 2012-08-16  Olivier Bilodeau  <[e-mail]>
 
 	* NEWS:
@@ -334,6 +4194,969 @@
 	
 	This way we can have it translated by our fantastic community.
 
[phone]  noahy  <[e-mail]>
+
+	* bin/tomdroid-debug.apk:
+	* res/values/strings.xml:
+	* src/org/tomdroid/sync/SyncManager.java:
+	* src/org/tomdroid/sync/SyncService.java:
+	* src/org/tomdroid/sync/sd/SdCardSyncService.java:
+	* src/org/tomdroid/sync/web/SnowySyncService.java:
+	* src/org/tomdroid/ui/PreferencesActivity.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	added ability to cancel sync, reset sync date on switching service
+
[phone]  noahy  <[e-mail]>
+
+	* NEWS:
+	* bin/tomdroid-debug.apk:
+	* res/values/strings.xml:
+	* res/xml/preferences.xml:
+	* src/org/tomdroid/sync/SyncService.java:
+	* src/org/tomdroid/sync/sd/SdCardSyncService.java:
+	* src/org/tomdroid/sync/web/SnowySyncService.java:
+	* src/org/tomdroid/ui/PreferencesActivity.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/util/Preferences.java:
+
+	made sync bundle all remote updates in one, added ability to clear remote notes
+
[phone]  noahy  <[e-mail]>
+
+	* NEWS:
+	* bin/tomdroid-debug.apk:
+	* src/org/tomdroid/NoteManager.java:
+	* src/org/tomdroid/ui/EditNote.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	fixed note unique title function, added auto-delete for blank notes
+
[phone]  noahy  <[e-mail]>
+
+	* NEWS:
+
+	added NEWS
+
[phone]  noahy  <[e-mail]>
+
+	* bin/tomdroid-debug.apk:
+	* src/org/tomdroid/ui/EditNote.java:
+
+	delete empty note on revert changes
+
[phone]  noahy  <[e-mail]>
+
+	* bin/tomdroid-debug.apk:
+	* res/menu-sw600dp-land/edit_note.xml:
+
+	moved save button to menu, revert button to actionbar (save is now automatic)
+
[phone]  noahy  <[e-mail]>
+
+	* bin/tomdroid-debug.apk:
+	* res/menu/edit_note.xml:
+
+	commented out xml button from menu (probably not useful)
+
[phone]  noahy  <[e-mail]>
+
+	* bin/tomdroid-debug.apk:
+	* res/values/strings.xml:
+	* src/org/tomdroid/ui/EditNote.java:
+
+	fixed empty/duplicate note title - causing problems in sync
+
[phone]  noahy  <[e-mail]>
+
+	* bin/tomdroid-debug.apk:
+	* src/org/tomdroid/sync/SyncService.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	fixed sync dialog stuck on no notes to sync, changed toast to LENGTH_SHORT
+
[phone]  noahy  <[e-mail]>
+
+	* bin/tomdroid-debug.apk:
+	* src/org/tomdroid/ui/EditNote.java:
+
+	set textChanged to false on save
+
[phone]  noahy  <[e-mail]>
+
+	* bin/tomdroid-debug.apk:
+	* src/org/tomdroid/ui/PreferencesActivity.java:
+	* src/org/tomdroid/util/FirstNote.properties:
+
+	removed note that changing services will empty notes (it won't now)
+
[phone]  noahy  <[e-mail]>
+
+	* bin/tomdroid-debug.apk:
+	* src/org/tomdroid/util/FirstNote.properties:
+
+	added missing text to firstnote
+
[phone]  noahy  <[e-mail]>
+
+	* res/menu/edit_note.xml:
+	* src/org/tomdroid/util/FirstNote.properties:
+
+	moved save to menu, tweak firstnote
+
[phone]  noahy  <[e-mail]>
+
+	* bin/tomdroid-debug.apk:
+	* res/layout/note_edit.xml:
+	* res/menu-sw600dp-land/edit_note.xml:
+	* res/menu/edit_note.xml:
+	* res/values/strings.xml:
+	* res/xml/preferences.xml:
+	* src/org/tomdroid/NoteManager.java:
+	* src/org/tomdroid/sync/SyncService.java:
+	* src/org/tomdroid/sync/sd/SdCardSyncService.java:
+	* src/org/tomdroid/sync/web/OAuthConnection.java:
+	* src/org/tomdroid/sync/web/SnowySyncService.java:
+	* src/org/tomdroid/ui/EditNote.java:
+	* src/org/tomdroid/ui/PreferencesActivity.java:
+	* src/org/tomdroid/ui/SyncDialog.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/util/FirstNote.java:
+	* src/org/tomdroid/util/FirstNote.properties:
+	* src/org/tomdroid/util/Preferences.java:
+
+	lots of sync fixes, moved authentication to just before syncing, removed some toasts, etc.
+
[phone]  noahy  <[e-mail]>
+
+	* bin/tomdroid-debug.apk:
+	* src/org/tomdroid/Note.java:
+	* src/org/tomdroid/NoteManager.java:
+	* src/org/tomdroid/sync/SyncService.java:
+	* src/org/tomdroid/sync/sd/SdCardSyncService.java:
+	* src/org/tomdroid/ui/EditNote.java:
+	* src/org/tomdroid/ui/PreferencesActivity.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/util/NewNote.java:
+	* src/org/tomdroid/util/NoteXMLContentBuilder.java:
+
+	fixed note-content tag, fixed xml <>& replacements, fixed sd card backup
+
[phone]  noahy  <[e-mail]>
+
+	* bin/tomdroid-debug.apk:
+	* res/values/strings.xml:
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	more progressbar tweaks
+
[phone]  noahy  <[e-mail]>
+
+	* bin/tomdroid-debug.apk:
+	* res/values/strings.xml:
+	* src/org/tomdroid/sync/SyncService.java:
+	* src/org/tomdroid/sync/web/SnowySyncService.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	progress bar fixes
+
[phone]  noahy  <[e-mail]>
+
+	* bin/tomdroid-debug.apk:
+	* res/values/strings.xml:
+	* res/xml/preferences.xml:
+	* src/org/tomdroid/sync/SyncManager.java:
+	* src/org/tomdroid/sync/sd/SdCardSyncService.java:
+	* src/org/tomdroid/ui/PreferencesActivity.java:
+	* src/org/tomdroid/util/Preferences.java:
+
+	fixed sync to sd card on no notes, added pref for backup to sd card when using online sync
+
[phone]  noahy  <[e-mail]>
+
+	* bin/tomdroid-debug.apk:
+	* res/values/strings.xml:
+	* src/org/tomdroid/Note.java:
+	* src/org/tomdroid/NoteManager.java:
+	* src/org/tomdroid/sync/SyncService.java:
+	* src/org/tomdroid/sync/sd/SdCardSyncService.java:
+	* src/org/tomdroid/sync/web/SnowySyncService.java:
+	* src/org/tomdroid/ui/EditNote.java:
+	* src/org/tomdroid/ui/PreferencesActivity.java:
+	* src/org/tomdroid/ui/SyncDialog.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* tests/org/tomdroid/NoteManagerTest.java:
+
+	radically simplified sync, progress on progress bar...
+
[phone]  noahy  <[e-mail]>
+
+	* src/org/tomdroid/ui/SyncMessageHandler.java:
+	* bin/tomdroid-debug.apk:
+	* src/org/tomdroid/Note.java:
+	* src/org/tomdroid/NoteManager.java:
+	* src/org/tomdroid/sync/SyncService.java:
+	* src/org/tomdroid/sync/web/SnowySyncService.java:
+	* src/org/tomdroid/ui/EditNote.java:
+	* src/org/tomdroid/ui/Search.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/ui/ViewNote.java:
+
+	sync progress dialog
+
[phone]  noahy  <[e-mail]>
+
+	* bin/tomdroid-debug.apk:
+	* res/layout/note_edit.xml:
+	* res/values/strings.xml:
+	* src/org/tomdroid/Note.java:
+	* src/org/tomdroid/NoteManager.java:
+	* src/org/tomdroid/sync/SyncManager.java:
+	* src/org/tomdroid/sync/SyncService.java:
+	* src/org/tomdroid/sync/sd/SdCardSyncService.java:
+	* src/org/tomdroid/sync/web/SnowySyncService.java:
+	* src/org/tomdroid/ui/EditNote.java:
+	* src/org/tomdroid/ui/SyncDialog.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	reworked sync notification, finishing, refreshing; added slider for formatting bar
+
[phone]  noahy  <[e-mail]>
+
+	* bin/tomdroid-debug.apk:
+	* src/org/tomdroid/sync/web/SnowySyncService.java:
+	* src/org/tomdroid/ui/SyncDialog.java:
+	* src/org/tomdroid/ui/SyncMessageHandler.java:
+
+	fixed sync refresh, readded apk
+
[phone]  noahy  <[e-mail]>
+
+	* libs/diffutils-1.2.1.jar:
+	* res/layout/note_compare.xml:
+	* src/org/tomdroid/ui/SyncDialog.java:
+	* src/org/tomdroid/SyncDialog.java:
+	* .classpath:
+	* AndroidManifest.xml:
+	* res/layout/note_edit.xml:
+	* res/layout/note_view.xml:
+	* res/values/strings.xml:
+	* src/org/tomdroid/Note.java:
+	* src/org/tomdroid/NoteManager.java:
+	* src/org/tomdroid/sync/web/SnowySyncService.java:
+	* src/org/tomdroid/ui/SyncMessageHandler.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/util/LinkifyPhone.java:
+
+	added diff activity on conflicts
+
[phone]  noahy  <[e-mail]>
+
+	* src/org/tomdroid/sync/sd/SdCardSyncService.java:
+	* src/org/tomdroid/sync/web/SnowySyncService.java:
+
+	added missing last-sync-date to sdcardsync
+
[phone]  noahy  <[e-mail]>
+
+	* src/org/tomdroid/ui/SyncMessageHandler.java:
+
+	added refresh
+
[phone]  noahy  <[e-mail]>
+
+	* res/menu-sw600dp-land/main_longclick.xml:
+	* res/menu-sw600dp-land/main.xml:
+	* res/menu/main.xml:
+	* res/menu/main_longclick.xml:
+	* res/values/strings.xml:
+	* src/org/tomdroid/sync/SyncManager.java:
+	* src/org/tomdroid/sync/SyncService.java:
+	* src/org/tomdroid/sync/sd/SdCardSyncService.java:
+	* src/org/tomdroid/sync/web/SnowySyncService.java:
+	* src/org/tomdroid/ui/EditNote.java:
+	* src/org/tomdroid/ui/SyncMessageHandler.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/util/NoteContentBuilder.java:
+
+	added revert options, xml editing in case the note doesn't parse
+
[phone]  noahy  <[e-mail]>
+
+	* src/org/tomdroid/SyncDialog.java:
+
+	added SyncDialog file
+
[phone]  noahy  <[e-mail]>
+
+	* AndroidManifest.xml:
+	* res/values/styles.xml:
+	* src/org/tomdroid/NoteManager.java:
+	* src/org/tomdroid/ui/PreferencesActivity.java:
+	* src/org/tomdroid/ui/SyncMessageHandler.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/util/Preferences.java:
+
+	added sync dialog on conflict
+
[phone]  noahy  <[e-mail]>
+
+	* res/values/strings.xml:
+	* src/org/tomdroid/NoteManager.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	new auto-sync: try to push and pull at the same time, let choose if both are newer than last sync
+
[phone]  noahy  <[e-mail]>
+
+	* src/org/tomdroid/ui/EditNote.java:
+
+	reverted to fix xml-disappear bug
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* res/layout-sw600dp-land/right_pane.xml:
+	* res/layout-sw800dp-land/right_pane.xml:
+	* res/layout-sw600dp-land/main.xml:
+	* res/layout-sw800dp-land/main.xml:
+
+	modify xml layouts
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* res/layout-sw600dp-land/right_pane.xml:
+	* res/layout-sw800dp-land/right_pane.xml:
+	* res/layout/note_view.xml:
+	* src/org/tomdroid/ui/EditNote.java:
+
+	fix xml-button-no-content-bug. the bug was not there during step by step debugging, but only if you run the program. adding a small delay for shownote() fixed it. but there must be a nicer solution.
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* src/org/tomdroid/ui/EditNote.java:
+
+	you can now change the textsize without selecting before. the curser is then the start of the new size. the end is, when you change the size again.
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* src/org/tomdroid/ui/TextSizeDialog.java:
+	* res/values/strings.xml:
+	* src/org/tomdroid/ui/EditNote.java:
+
+	choose text size dialog as radiobutton list also in this branch.
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* res/menu-sw600dp-land/edit_note.xml:
+	* res/menu/edit_note.xml:
+	* res/values/strings.xml:
+	* res/xml/preferences.xml:
+	* src/org/tomdroid/ui/EditNote.java:
+	* src/org/tomdroid/util/Preferences.java:
+
+	Always autosave as it is default in Tomboy and we risk loss of data when the Activity comes into the background eg by a call. therefore remove preferences option and include a discard changes button to revert the changes since the last save.
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* .bzrignore:
+
+	bzr ignore bin
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* res/layout-sw800dp-land/right_pane.xml:
+	* res/layout-sw600dp-land/right_pane.xml:
+	* res/layout/note_view.xml:
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	consistent look for all versions and tablets.
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* AndroidManifest.xml:
+	* src/org/tomdroid/ui/ShortcutActivity.java:
+	* src/org/tomdroid/ui/ViewNote.java:
+
+	Fix crash: tomdroid is not in the RAM - call ViewNote from shortcut -crash. same for creating a shortcut: have to call Preferences.init() first. Further, change strings of shortcut activity to meaningfull things.
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* res/layout/main.xml:
+	* res/layout/main_list_item.xml:
+	* res/layout/note_edit.xml:
+	* res/layout/note_view.xml:
+	* res/layout/strings.xml:
+	* res/values/strings.xml:
+	* src/org/tomdroid/Note.java:
+
+	clean up and reviewd half of the code
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* src/org/tomdroid/Note.java:
+	* src/org/tomdroid/sync/sd/NoteHandler.java:
+	* src/org/tomdroid/ui/SyncMessageHandler.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/ui/ViewNote.java:
+	* src/org/tomdroid/util/NoteXMLContentBuilder.java:
+
+	clean imports
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* res/layout/note_edit.xml:
+	* res/layout/note_view.xml:
+
+	scrolling again
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* res/layout/note_edit.xml:
+	* res/layout/note_view.xml:
+	* src/org/tomdroid/ui/ViewNote.java:
+
+	make scrolling smoother and insert overscroll animation to noteview and editview.
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* res/layout/note_edit.xml:
+	* res/layout/note_view.xml:
+	* src/org/tomdroid/ui/EditNote.java:
+	* src/org/tomdroid/ui/ViewNote.java:
+
+	made scroll bars and highlighted title consistent with desktop tomboy.
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* .bzrignore:
+
+	update .bzrignore
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* bin/tomdroid-debug.apk:
+
+	bzrignore bin/ folder
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* src/org/tomdroid/ui/EditNote.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	fixed crasher when longpress on listitem and edit. now it really calls editview.
+
[phone]  noahy  <[e-mail]>
+
+	* bin/tomdroid-debug.apk:
+	* src/org/tomdroid/ui/SyncMessageHandler.java:
+
+	fixed "Syncing..." by restarting activity
+
[phone]  noahy  <[e-mail]>
+
+	* AndroidManifest.xml:
+	* bin/tomdroid-debug.apk:
+	* res/layout-sw600dp-land/right_pane.xml:
+	* res/layout/note_view.xml:
+	* res/values/strings.xml:
+	* res/xml/preferences.xml:
+	* src/org/tomdroid/Note.java:
+	* src/org/tomdroid/ui/EditNote.java:
+	* src/org/tomdroid/ui/ViewNote.java:
+	* src/org/tomdroid/util/NoteXMLContentBuilder.java:
+	* src/org/tomdroid/util/Preferences.java:
+
+	fixed linking, shortcuts, grey bar on list, data loss onPause(), added pref to save onPause(), link to main activity on app icon
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* AndroidManifest.xml:
+
+	About Dialog was just one liner on Anroid 2.3, changed MainActivity to MyTheme fixed it.
+
[phone]  noahy  <[e-mail]>
+
+	* tests/org/tomdroid:
+	* tests/org/tomdroid/NoteManagerTest.java:
+	* tests/org/tomdroid/NoteTest.java:
+	* res/layout-sw600dp-land/main.xml:
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	readded tests, fixed color problem
+
[phone]  noahy  <[e-mail]>
+
+	* bin:
+	* bin/tomdroid-debug.apk:
+	* res/layout-sw600dp-land/main.xml:
+	* res/layout/main_list_item.xml:
+	* res/menu-sw600dp-land/main_longclick.xml:
+	* res/menu/main_longclick.xml:
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	added "Edit" to context menu, uploaded debug apk for testing
+
[phone]  noahy  <[e-mail]>
+
+	* res/layout-sw600dp-land/right_pane.xml:
+	* res/values/strings.xml:
+	* res/xml/preferences.xml:
+	* src/org/tomdroid/NoteManager.java:
+	* src/org/tomdroid/ui/EditNote.java:
+	* src/org/tomdroid/ui/PreferencesActivity.java:
+	* src/org/tomdroid/ui/Search.java:
+	* src/org/tomdroid/ui/ShortcutActivity.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/ui/ViewNote.java:
+	* src/org/tomdroid/util/Preferences.java:
+
+	added ability to delete all notes, toggle including note templates, bug fixes for all note titles empty and no notes in list
+
[phone]  noahy  <[e-mail]>
+
+	* res/layout/note_edit.xml:
+
+	set note height in note_edit to match_parent
+
[phone]  noahy  <[e-mail]>
+
+	* src/org/tomdroid/NoteManager.java:
+	* src/org/tomdroid/ui/Search.java:
+	* src/org/tomdroid/ui/ShortcutActivity.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+
+	fixed notebook template showing in list (lp Bug #360732)
+
[phone]  noahy  <[e-mail]>
+
+	* res/layout/main_list_item.xml:
+	* res/layout/note_edit.xml:
+	* src/org/tomdroid/ui/EditNote.java:
+
+	converted highlight and mono to togglebuttons, fixed listview font color
+
[phone]  noahy  <[e-mail]>
+
+	* AndroidManifest.xml:
+	* res/layout/main_list_item.xml:
+	* res/values-v11/styles.xml:
+
+	fixed 2.3 bug (again)
+
[phone]  noahy  <[e-mail]>
+
+	* AndroidManifest.xml:
+	* res/layout/note_edit.xml:
+	* res/layout/note_view.xml:
+	* res/values/strings.xml:
+	* res/values/styles.xml:
+	* src/org/tomdroid/ui/EditNote.java:
+	* src/org/tomdroid/ui/PreferencesActivity.java:
+	* src/org/tomdroid/ui/SyncMessageHandler.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/ui/ViewNote.java:
+
+	bug fixes
+
[phone]  noahy  <[e-mail]>
+
+	* res/layout/strings.xml:
+	* res/values-v11:
+	* res/values-v11/styles.xml:
+	* res/values/styles.xml:
+	* res/layout/note_edit.xml:
+
+	merged Stefan's changes, upped targetSDK to 10, otherwise it won't build for me
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* res/layout/note_edit.xml:
+	* res/layout/note_view.xml:
+
+	title was cropped in note-view and edit when using big fonts
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* AndroidManifest.xml:
+
+	themes for all activities, including search and preferences.
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* res/values-v11/styles.xml:
+
+	changed to holo.light for consistency.
+
[phone]  Stefan Hammer  <[e-mail]>
+
+	* res/layout/strings.xml:
+	* res/values-v11:
+	* res/values-v11/styles.xml:
+	* res/values/styles.xml:
+
+	No commit message
[phone]  Stefan Hammer  <[e-mail]>
+
+	* AndroidManifest.xml:
+	* res/layout/note_edit.xml:
+
+	Fix Android 2.3 textview only in one line with using Lighttheme an api11 and below. Further mobe content of textedit to top.
+
[phone]  noahy  <[e-mail]>
+
+	* sdcard.img:
+	* src/org/tomdroid/sync/sd/NoteHandler.java:
+	* src/org/tomdroid/sync/sd/SdCardSyncService.java:
+
+	added tagging to sdcard export
+
[phone]  noahy  <[e-mail]>
+
+	* res/drawable/mono.png:
+	* res/drawable/size.png:
+	* res/layout-sw600dp-land:
+	* res/layout-sw600dp-land/main.xml:
+	* res/layout-sw600dp-land/right_pane.xml:
+	* res/layout-sw800dp-land:
+	* res/layout-sw800dp-land/main.xml:
+	* res/menu-sw600dp-land:
+	* res/menu-sw600dp-land/edit_note.xml:
+	* res/menu-sw600dp-land/main.xml:
+	* res/menu-sw600dp-land/main_longclick.xml:
+	* res/menu-sw600dp-land/view_note.xml:
+	* res/values/dimen.xml:
+	* AndroidManifest.xml:
+	* res/layout/note_edit.xml:
+	* res/layout/note_view.xml:
+	* res/values/strings.xml:
+	* sdcard.img:
+	* src/org/tomdroid/Note.java:
+	* src/org/tomdroid/NoteManager.java:
+	* src/org/tomdroid/sync/SyncManager.java:
+	* src/org/tomdroid/sync/SyncService.java:
+	* src/org/tomdroid/sync/sd/NoteHandler.java:
+	* src/org/tomdroid/sync/sd/SdCardSyncService.java:
+	* src/org/tomdroid/sync/web/SnowySyncService.java:
+	* src/org/tomdroid/ui/EditNote.java:
+	* src/org/tomdroid/ui/Search.java:
+	* src/org/tomdroid/ui/SyncMessageHandler.java:
+	* src/org/tomdroid/ui/TextSizeDialog.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/ui/ViewNote.java:
+	* src/org/tomdroid/util/NewNote.java:
+	* src/org/tomdroid/util/NoteXMLContentBuilder.java:
+
+	tablet ui, sd card preserve old metadata
+
[phone]  noahy  <[e-mail]>
+
+	* res/drawable-hdpi/text.png:
+	* res/drawable-hdpi/xml.png:
+	* res/drawable-ldpi/ic_menu_sync.png:
+	* res/drawable-ldpi/text.png:
+	* res/drawable-ldpi/xml.png:
+	* res/drawable-mdpi/ic_menu_sync.png:
+	* res/drawable-mdpi/text.png:
+	* res/drawable-mdpi/xml.png:
+	* res/drawable-xhdpi/ic_menu_sync.png:
+	* res/drawable/btn_small.9.png:
+	* res/drawable/btn_small_toggle.9.png:
+	* res/drawable/button_toggle.xml:
+	* res/drawable/ic_menu_sync.png:
+	* res/drawable/text.png:
+	* res/drawable/xml.png:
+	* src/org/tomdroid/sync/SyncProvider.java:
+	* res/layout/note_edit.xml:
+	* res/layout/note_view.xml:
+	* sdcard.img:
+	* src/org/tomdroid/ui/EditNote.java:
+	* src/org/tomdroid/ui/ViewNote.java:
+
+	working with 1.5
+
[phone]  noahy  <[e-mail]>
+
+	* res/drawable-hdpi/ic_menu_sync.png:
+	* res/drawable-xhdpi/text.png:
+	* res/drawable-xhdpi/xml.png:
+	* res/drawable/highlight.png:
+	* res/xml/sync_provider.xml:
+	* src/org/tomdroid/sync/SyncProvider.java:
+
+	added missing res
+
[phone]  noahy  <[e-mail]>
+
+	* res/layout/actionbar.xml:
+	* res/layout/actionbar_edit.xml:
+	* res/layout/actionbar_view.xml:
+	* src/org/tomdroid/ui/Actionbar.java:
+	* res/layout/note_edit.xml:
+	* res/layout/note_view.xml:
+	* res/values/strings.xml:
+	* sdcard.img:
+	* src/org/tomdroid/Note.java:
+	* src/org/tomdroid/NoteManager.java:
+	* src/org/tomdroid/sync/SyncManager.java:
+	* src/org/tomdroid/sync/SyncService.java:
+	* src/org/tomdroid/sync/sd/SdCardSyncService.java:
+	* src/org/tomdroid/sync/web/SnowySyncService.java:
+	* src/org/tomdroid/ui/EditNote.java:
+	* src/org/tomdroid/ui/PreferencesActivity.java:
+	* src/org/tomdroid/ui/ShortcutActivity.java:
+	* src/org/tomdroid/ui/SyncMessageHandler.java:
+	* src/org/tomdroid/ui/Tomdroid.java:
+	* src/org/tomdroid/ui/ViewNote.java:
+	* src/org/tomdroid/util/Preferences.java:
+
+	push changes only on sync
+
[phone]  noahy  <[e-mail]>
+
+	* AndroidManifest.xml:
+	* res/layout/main.xml:
+	* res/layout/note_edit.xml:
+	* res/layout/note_view.xml:
+	* res/layout/search.xml:
+	* res/layout/shortcuts_list.xml:
+	* res/menu/edit_note.xml:
+	* res/menu/main.xml:
+	* res/menu/view_note.xml: