[geany/geany] 3a7453: po/et.po: Git trashed the translations

[Andreas Ots]

Branch:      refs/heads/master
Author:      Andreas Ots <andreasots at gmail.com>
Committer:   Andreas Ots <andreasots at gmail.com>
Date:        Thu, 27 Dec 2012 13:32:27 UTC
Commit:      3a7453bec4c5fdd41b735bd464abdc485063296b
             https://github.com/geany/geany/commit/3a7453bec4c5fdd41b735bd464abdc485063296b

Log Message:
-----------
po/et.po: Git trashed the translations


Modified Paths:
--------------
    po/et.po

Modified: po/et.po
4 files changed, 0 insertions(+), 4 deletions(-)
===================================================================
@@ -540,11 +540,7 @@ msgstr ""
 
 #: ../data/geany.glade.h:125
 msgid "\"Smart\" home key"
-<<<<<<< HEAD
 msgstr "\"Tark\" Home-klahv"
-=======
-msgstr "\"Tark\" <i>home</i>-klahv"
->>>>>>> 4e950a39db1bb046572b0d1c7ba1be922f3969e6
 
 #: ../data/geany.glade.h:126
 msgid "When \"smart\" home is enabled, the HOME key will move the caret to the first non-blank character of the line, unless it is already there, it moves to the very beginning of the line. When this feature is disabled, the HOME key always moves the caret to the start of the current line, regardless of its current position."



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: TBD).