Impyy
c49ce6208e
Load user status from data file
2015-09-25 20:56:11 +02:00
agilob
3ceb289020
Merge remote-tracking branch 'PKEv/QRegExp_for_local_file'
2015-09-25 18:46:37 +01:00
PKev
f476b752d1
Added support for local links in messages and correct detect links like "www.123.com"
2015-09-25 01:20:20 +03:00
agilob
1673b43e26
Merge remote-tracking branch 'zetok/taskbar'
2015-09-24 21:41:16 +01:00
Zetok Zalbavar
c8b4142066
Add old, small taskbar icons back
2015-09-24 19:53:13 +01:00
agilob
45db1dff91
Merge remote-tracking branch 'antis81/ngf/fix/multi-window-buttons'
2015-09-24 19:23:04 +01:00
agilob
dabb346c3a
Merge remote-tracking branch 'PKEv/correct_remove_profile'
2015-09-24 19:06:34 +01:00
agilob
b67a5bbd1d
Merge remote-tracking branch 'antis81/ngf/fix/screen-grabber'
2015-09-24 19:04:52 +01:00
Nils Fenner
cf9ed8d580
fix screen grabbing for screenshots
2015-09-24 16:44:07 +02:00
PKEv
ae9b29cfae
correct remove profile
...
fix #2284
2015-09-24 02:00:22 +03:00
agilob
eb1d70176d
Merge remote-tracking branch 'Impyy/fix-friend-rm-dialog'
2015-09-23 20:18:18 +01:00
agilob
dcfc0d7bc7
Merge remote-tracking branch 'Impyy/fix-friend-rm-dialog'
2015-09-23 19:20:27 +01:00
Impyy
25ff57ad23
Make the cancel button the default button
2015-09-23 20:04:13 +02:00
Impyy
91e51f8a10
Changed the buttons back to 'Cancel' and 'Remove'
2015-09-23 18:10:55 +02:00
Impyy
3d72a75ed3
Made the 'remove friend dialog' userfriendly
2015-09-23 17:06:57 +02:00
Nils Fenner
41500f2134
fix window buttons in "multi-window" mode
2015-09-23 11:57:50 +02:00
agilob
c7b5337723
Merge remote-tracking branch 'PKEv/correct_screenshot_tooltip'
2015-09-22 21:17:02 +01:00
PKev
a14d917703
correct screenshot tooltip
...
fix #2267
2015-09-22 12:51:46 +03:00
Zetok Zalbavar
2bdb6339a5
Make whole icon change colour to orange when blinking on new event
...
Previous ones blinked with only small status dot, which was hardly visible.
Now blinking icon should be a lot more visible.
closes #2273
2015-09-22 08:03:49 +01:00
Zetok Zalbavar
7cec81d764
Merge pull request #2256 from kehugter:master
...
Spanish translation update
2015-09-21 18:16:00 +01:00
agilob
a53f6f2adf
Merge remote-tracking branch 'PKEv/restor_window_after_screenshot'
2015-09-19 23:03:26 +01:00
Zetok Zalbavar
2ab13c4f08
Merge pull request #2266 from aaannndddyyy:patch-10
...
Update German translation
2015-09-19 12:12:11 +01:00
aaannndddyyy
fa8004bbaa
Update German translation
2015-09-19 10:43:03 +00:00
Zetok Zalbavar
b5b7bcfdd0
Merge pull request #2265 from TheNain38:translation-fr
...
Update fr.ts
2015-09-19 10:58:57 +01:00
TheNain38
5a4726835e
Update fr.ts
2015-09-19 10:23:59 +02:00
Zetok Zalbavar
1bbd777390
Merge pull request #2239 from PKEv:Update_translation_ru
...
Update translation RU fix #2234
fix some bugs + correct after #2250 + change translation for "chats"
2015-09-19 09:20:30 +01:00
Zetok Zalbavar
2acfeaf7c4
Change references to tox.im to tox.chat
2015-09-19 08:55:28 +01:00
Zetok Zalbavar
d4fadf75b1
Merge pull request #2260 from TheNain38:trans-fr
...
Update fr.ts
2015-09-19 08:37:41 +01:00
agilob
fc40c484bb
Merge remote-tracking branch 'zetok/readme'
2015-09-19 01:04:24 +01:00
agilob
a09d448ec4
Merge remote-tracking branch 'zetok/login'
2015-09-19 01:03:38 +01:00
PKev
9484488c31
restore window after screenshot
2015-09-18 22:45:58 +03:00
TheNain38
232e145d53
Update fr.ts
2015-09-18 20:29:58 +02:00
Zetok Zalbavar
6998c2c757
Make 'None' and 'Desktop' camera device names translatable
...
fixes #2252
2015-09-18 19:12:10 +01:00
Zetok Zalbavar
0d45c2fcbe
INSTALL.md: fix typo in a link to section
2015-09-18 19:00:16 +01:00
Zetok Zalbavar
e05f7c46bf
Merge pull request #2258 from translation-regroup
...
More consistent translation strings in groupchatform.cpp
2015-09-18 18:16:16 +01:00
TheNain38
6c526fe5fe
More consistent translation strings in groupchatform.cpp
...
It should not be able to be translated differently as one update when the number of user in the group chat change and the other is when language change, so it should be translated together.
2015-09-18 19:10:37 +02:00
kehugter
b0fa836c26
Spanish translation update
2015-09-18 13:30:11 +02:00
Zetok Zalbavar
35a15f119e
Reword login window: "Login" → "Load Profile"
...
thanks to @LittleVulpix suggestion
fixes #1898
2015-09-18 08:07:58 +01:00
Zetok Zalbavar
f8352d63ff
Merge pull request #2238 from TheNain38:master
...
Update fr.ts
2015-09-17 23:07:56 +01:00
TheNain38
bed9a0b2c2
Update fr.ts
2015-09-17 23:32:44 +02:00
PKev
2960b520c9
fix some bugs + correct after #2250 + change translation for "chats"
2015-09-18 00:09:22 +03:00
PKEv
1bed1bea23
Update translation RU
...
fix #2234
2015-09-17 23:47:01 +03:00
Zetok Zalbavar
9a47a88125
Merge pull request #2243 from aaannndddyyy:patch-7
...
Update fr.ts
2015-09-17 20:04:05 +01:00
Zetok Zalbavar
ff3ebf0698
Merge pull request #2242 from aaannndddyyy:patch-6
...
Update pt.ts
2015-09-17 20:01:06 +01:00
Zetok Zalbavar
a78fea6f16
Merge pull request #2250 from aaannndddyyy:patch-8
...
rename two options
2015-09-17 19:56:03 +01:00
aaannndddyyy
9269b0f967
rename two options
2015-09-17 18:25:23 +00:00
Zetok Zalbavar
631aa72303
Merge pull request #2184 from aaannndddyyy:patch-2
...
Update es.ts
2015-09-17 15:03:34 +01:00
aaannndddyyy
246919b59e
Update fr.ts
2015-09-17 10:00:29 +00:00
aaannndddyyy
15e37bf3b4
Update pt.ts
2015-09-17 07:42:15 +00:00
aaannndddyyy
2e61655ba5
Update es.ts
2015-09-17 06:59:22 +00:00
