Skip to content

Commit

Permalink
Bazaar merge
Browse files Browse the repository at this point in the history
  • Loading branch information
torkve committed Mar 23, 2014
2 parents 3c05a29 + 055ddea commit 7ef678f
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 21 deletions.
14 changes: 7 additions & 7 deletions modules/core/he.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: qutim\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2013-01-28 19:34+0000\n"
"PO-Revision-Date: 2013-07-12 16:13+0000\n"
"PO-Revision-Date: 2014-03-22 08:29+0000\n"
"Last-Translator: GenghisKhan <genghiskhan@gmx.ca>\n"
"Language-Team: Rahut\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-07-13 06:27+0000\n"
"X-Generator: Launchpad (build 16696)\n"
"X-Launchpad-Export-Date: 2014-03-23 06:36+0000\n"
"X-Generator: Launchpad (build 16967)\n"
"X-Qt-Contexts: true\n"

#: ../../../core/libqutim/account.cpp:144
Expand Down Expand Up @@ -885,7 +885,7 @@ msgstr "אי אפשר למצוא אף דיוקן"
#, qt-format
msgctxt "Core::MobileAboutDialog|"
msgid "qutIM %1<br>Uses Qt %2<p>Developers:<p>"
msgstr ""
msgstr "qutIM %1<br>משתמש בערכת כלי פיתוח Qt %2<p>מפתחים:<p>"

#: ../../../core/src/corelayers/mobilecontactinfo/mobilecontactinfo.cpp:62
msgctxt "Core::MobileContactInfoWindow|"
Expand Down Expand Up @@ -1038,7 +1038,7 @@ msgstr "דיוקן כבר קיים, להחליף?"
#: ../../../core/src/widgets/profilecreationpage.cpp:180
msgctxt "Core::ProfileCreationPage|"
msgid "Unable to create profile hash"
msgstr ""
msgstr "אין אפשרות ליצור מערבל דיוקן"

#: ../../../core/src/widgets/profilecreationpage.cpp:305
msgctxt "Core::ProfileCreationPage|"
Expand Down Expand Up @@ -1333,7 +1333,7 @@ msgstr "מאסף סטטיסטיקות"
#: ../../../core/src/widgets/submitpage.cpp:54
msgctxt "Core::SubmitPage|"
msgid "Your system settings differ from the ones sent last time"
msgstr ""
msgstr "הגדרות המערכת שלך שונות מאלו אשר נשלחו בפעם האחרונה"

#: ../../../core/src/widgets/submitpage.cpp:67
msgctxt "Core::SubmitPage|"
Expand Down Expand Up @@ -1503,7 +1503,7 @@ msgstr "חיפוש"
#: ../../../core/src/corelayers/jsonhistory/historywindow.ui:97
msgctxt "HistoryWindowClass|"
msgid "Return"
msgstr ""
msgstr "חזור"

#: ../../../core/src/corelayers/jsonhistory/historywindow.ui:133
msgctxt "HistoryWindowClass|"
Expand Down
8 changes: 4 additions & 4 deletions modules/plugman/he.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: qutim\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2013-01-28 19:33+0000\n"
"PO-Revision-Date: 2013-05-30 15:38+0000\n"
"PO-Revision-Date: 2014-03-22 08:18+0000\n"
"Last-Translator: GenghisKhan <genghiskhan@gmx.ca>\n"
"Language-Team: Hebrew <he@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-05-31 06:13+0000\n"
"X-Generator: Launchpad (build 16660)\n"
"X-Launchpad-Export-Date: 2014-03-23 06:36+0000\n"
"X-Generator: Launchpad (build 16967)\n"
"X-Qt-Contexts: true\n"

#: ../../../plugins/plugman/tools/packgen/choosecategorypage.ui:14
Expand Down Expand Up @@ -56,7 +56,7 @@ msgstr ""
#: ../../../plugins/plugman/tools/packgen/choosecategorypage.cpp:66
msgctxt "ChooseCategoryPage|"
msgid "Select art"
msgstr ""
msgstr "בחר אמנות"

#: ../../../plugins/plugman/tools/packgen/choosecategorypage.cpp:75
msgctxt "ChooseCategoryPage|"
Expand Down
12 changes: 6 additions & 6 deletions modules/urlpreview/he.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: qutim\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2013-01-29 12:42+0000\n"
"PO-Revision-Date: 2013-02-06 16:54+0000\n"
"PO-Revision-Date: 2014-03-22 08:21+0000\n"
"Last-Translator: GenghisKhan <genghiskhan@gmx.ca>\n"
"Language-Team: Hebrew <he@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-02-07 05:16+0000\n"
"X-Generator: Launchpad (build 16477)\n"
"X-Launchpad-Export-Date: 2014-03-23 06:36+0000\n"
"X-Generator: Launchpad (build 16967)\n"
"X-Qt-Contexts: true\n"

#: ../../../plugins/urlpreview/__data_from_cmakelists_txt.cpp:1
Expand All @@ -34,7 +34,7 @@ msgstr "הצגה מקדימה של תמונות ישירות מתוך חלון
#: ../../../plugins/urlpreview/src/messagehandler.cpp:66
msgctxt "UrlPreview::UrlHandler|"
msgid "URL Preview"
msgstr ""
msgstr "הצגה מקדימה של URL"

#: ../../../plugins/urlpreview/src/messagehandler.cpp:66
msgctxt "UrlPreview::UrlHandler|"
Expand Down Expand Up @@ -71,7 +71,7 @@ msgstr "וידאו HTML5"
#: ../../../plugins/urlpreview/src/urlpreviewsettings.ui:14
msgctxt "UrlPreviewSettingsForm|"
msgid "Form"
msgstr ""
msgstr "טופס"

#: ../../../plugins/urlpreview/src/urlpreviewsettings.ui:26
msgctxt "UrlPreviewSettingsForm|"
Expand All @@ -81,7 +81,7 @@ msgstr "גודל קובץ מרבי"
#: ../../../plugins/urlpreview/src/urlpreviewsettings.ui:33
msgctxt "UrlPreviewSettingsForm|"
msgid "Max picture size to preview "
msgstr ""
msgstr "גודל תמונה מרבי לשם הצגה מקדימה "

#: ../../../plugins/urlpreview/src/urlpreviewsettings.ui:36
msgctxt "UrlPreviewSettingsForm|"
Expand Down
8 changes: 4 additions & 4 deletions modules/yandexnarod/he.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: qutim\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2013-01-29 20:12+0000\n"
"PO-Revision-Date: 2013-05-30 18:10+0000\n"
"PO-Revision-Date: 2014-03-22 08:19+0000\n"
"Last-Translator: GenghisKhan <genghiskhan@gmx.ca>\n"
"Language-Team: Hebrew <he@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-05-31 06:13+0000\n"
"X-Generator: Launchpad (build 16660)\n"
"X-Launchpad-Export-Date: 2014-03-23 06:36+0000\n"
"X-Generator: Launchpad (build 16967)\n"
"X-Qt-Contexts: true\n"

#: ../../../plugins/yandexnarod/src/yandexnarod.cpp:58
Expand Down Expand Up @@ -54,7 +54,7 @@ msgstr ""
#: ../../../plugins/yandexnarod/src/yandexnarodauthorizator.cpp:90
msgctxt "YandexNarodAuthorizator|"
msgid "Has no login or password"
msgstr ""
msgstr "אין מזהה או סיסמה"

#: ../../../plugins/yandexnarod/src/yandexnarodauthorizator.cpp:99
msgctxt "YandexNarodAuthorizator|"
Expand Down

0 comments on commit 7ef678f

Please sign in to comment.