[geany/geany] e22d8d: Merge?

Andreas Ots git-noreply at geany.org
Thu Dec 27 13:28:19 UTC 2012

Branch:      refs/heads/master
Author:      Andreas Ots <andreasots at gmail.com>
Committer:   Andreas Ots <andreasots at gmail.com>
Date:        Thu, 27 Dec 2012 13:28:19 UTC
Commit:      e22d8d7e99dba936abcdb8d33867e9f21cdad645

Log Message:

Modified Paths:

Modified: po/et.po
8 files changed, 8 insertions(+), 0 deletions(-)
@@ -8,7 +8,11 @@ msgstr ""
 "Project-Id-Version: geany 1.22\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-12-26 18:25+0200\n"
+<<<<<<< HEAD
 "PO-Revision-Date: 2012-12-27 15:25+0300\n"
+"PO-Revision-Date: 2012-12-27 13:23+0300\n"
+>>>>>>> 4e950a39db1bb046572b0d1c7ba1be922f3969e6
 "Last-Translator: Andreas Ots <andreasots at gmail.com>\n"
 "Language-Team: Estonian\n"
 "Language: et\n"
@@ -540,7 +544,11 @@ 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).

More information about the Commits mailing list