Commit graph

233 commits

Author SHA1 Message Date
Dana Jansens
18141d78da Merge branch 'backport' into work
Conflicts:

	openbox/client.c
2008-03-06 02:46:32 -05:00
洪任諭
e3530560f4 Update traditional chinese translation. 2008-03-05 18:12:11 +01:00
Og Maciel
c150f557ce Update brazilian portuguese translation. 2008-03-04 22:22:46 +01:00
Ryoichiro Suzuki
c00e5e5fa1 Update japanese translation. 2008-03-04 16:33:43 +01:00
Mikael Magnusson
d78ae0546d Merge branch 'backport' into work
Conflicts:

	openbox/session.c
2008-03-03 17:10:53 +01:00
Mikael Magnusson
3c7636afb1 Add new strings to the very outdated hr.po file (which is not activated). 2008-03-03 02:20:01 +01:00
Cyrille Bagard
c5f01fd310 Update french translation and fix a typo in actions/session.c 2008-03-03 02:11:57 +01:00
Mikael Magnusson
3c148bf275 Change ja and pt_BR back to 3.4.6.1 as they now have untranslated strings again. 2008-03-03 00:50:05 +01:00
Mikael Magnusson
325e3f78b8 Update swedish translation.
Was a bit inconsistent with capitalizing titles.
2008-03-03 00:43:24 +01:00
Dana Jansens
4b5373f609 Merge branch 'backport' into work 2008-03-02 18:36:32 -05:00
Dana Jansens
20bd592f8b change the logout button to same capitilization as the title, and update translatable strings 2008-03-02 18:34:28 -05:00
Dana Jansens
5b4e483366 add the new translatable strings 2008-03-02 18:10:21 -05:00
Mikael Magnusson
d24c710db3 Update swedish translation. 2008-03-03 00:07:41 +01:00
Dana Jansens
c70379fa8f Merge branch 'backport' into work 2008-03-02 15:03:10 -05:00
Dana Jansens
b8960827b7 make code to show a prompt when you just want to display and message and not do anything when the user presses the button 2008-03-02 15:02:34 -05:00
Mikael Magnusson
9676757a08 Merge branch 'backport' into work
Conflicts:

	openbox/actions/desktop.c
	openbox/actions/if.c
2008-03-02 19:41:32 +01:00
Mikael Magnusson
e4691468cd Update portuguese translation. 2008-03-02 19:33:20 +01:00
Ryoichiro Suzuki
f1c7a1c343 Update japanese translation with the last couple of strings. 2008-03-02 19:33:20 +01:00
Ryoichiro Suzuki
0e3ad63445 Update japanese translation. Chu 2008-03-02 17:22:58 +01:00
Mikael Magnusson
173b9b7648 Merge branch 'backport' into work
Conflicts:

	openbox/client.c
	openbox/screen.c
2008-02-29 04:21:02 +01:00
Og Maciel
55cfb7496c Update brasilian portuguese translation. 2008-02-28 23:42:03 +01:00
Mikael Magnusson
ab089515ef Update po/ with new strings, and update swedish translation.
Also add an overly long comment about translating FILE in the help output.
2008-02-28 23:20:49 +01:00
Dana Jansens
8bd02bf4b8 Merge branch 'backport' into work
Conflicts:

	openbox/actions/execute.c
2008-02-27 21:07:10 -05:00
Dana Jansens
fbacc56d9d some new translated strings 2008-02-27 21:04:04 -05:00
Dana Jansens
2c8bc0c904 add a boolean <prompt> option to the Exit action, which will ask before exiting openbox 2008-02-27 20:59:17 -05:00
Dana Jansens
26cc41f6c6 Merge branch 'backport' into work 2008-02-27 19:37:48 -05:00
Mikael Magnusson
e35a4697a7 Update po files with new strings, update swedish translation. 2008-02-27 04:58:12 +01:00
Dana Jansens
198d98986b Merge branch 'backport' into work
Conflicts:

	openbox/openbox.c
	openbox/session.c
2008-02-21 13:24:19 -05:00
Mikael Magnusson
2cb31da22c Change all single quotes to double quotes in strings. 2008-02-21 12:02:18 +01:00
Mikael Magnusson
4642d896a8 Update finnish translation. 2008-02-21 11:51:31 +01:00
Dana Jansens
3263845459 Merge branch 'backport' into work
Conflicts:

	openbox/grab.c
	openbox/keyboard.c
2008-02-18 20:43:18 -05:00
Elián Hanisch
b889d86e63 Update spanish translation. 2008-02-19 00:16:29 +01:00
Mikael Magnusson
6be85936ae Add a comment for translators about how to change order of arguments. 2008-02-17 17:01:07 +01:00
Mikael Magnusson
da2b83ff26 Update all the po files so they contain the new prompt strings so translators can translate them. 2008-02-17 16:39:56 +01:00
Mikael Magnusson
28aa0990ac Update swedish translation. 2008-02-17 16:38:22 +01:00
洪任諭
e89efbc5f9 Update traditional chinese translation. 2008-02-17 16:35:52 +01:00
Mikael Magnusson
2eb130ef3c Update swedish translation. 2008-02-17 16:10:58 +01:00
Dana Jansens
c313b219a2 you can create dialog windows called "prompts" which have a message and some buttons! they don't do anything interesting yet. 2008-02-14 14:24:07 -05:00
Mikael Magnusson
1124d10369 Merge branch 'backport' into work
Diffing against the old work branch where most of the changes
in backport were cherry-picked from indicates this should be
alright. (0de9097017d4d1991388a35e380a57dc1135b431)
2008-02-14 19:43:02 +01:00
Mikael Magnusson
eddcfdfdcd Update dutch translation. 2008-02-12 19:48:31 +01:00
Dana Jansens
3167fc223e Merge branch 'backport' 2008-02-09 19:07:55 -05:00
Mikael Magnusson
e5f21a4a87 Update swedish translation.
NB: using 3.4.6.1 to mean the --config-file translation is included and 3.4.6 for everything before that.
2008-02-09 09:42:31 +01:00
Martin Sova
afb9e64100 Update czech translation. 2008-02-09 09:38:28 +01:00
Dana Jansens
a01ece1353 you can create dialog windows called "prompts" which have a message and some buttons! they don't do anything interesting yet. 2008-02-07 02:14:43 -05:00
Dana Jansens
5f04ca85ef Merge branch 'backport' into work
Conflicts:

	openbox/config.c
2008-02-07 02:06:42 -05:00
Dana Jansens
8d67e4569a update the po files as they appear in 3.4.6 with the new strings 2008-02-02 12:59:23 -05:00
Dana Jansens
0dc7eca4cd Merge branch 'backport' into work
Conflicts:

	openbox/client.c
	openbox/event.c
	openbox/mouse.c
	openbox/openbox.c
	openbox/prop.c
	openbox/prop.h
	openbox/screen.c
	parser/parse.c
	parser/parse.h
2008-02-02 11:37:35 -05:00
Dana Jansens
674c042c68 make update-po 2008-02-02 09:07:03 -05:00
Dana Jansens
a21840cbb7 make ob_debug use the g_log system, and make openbox log messages to..a log file ! this will help everyone since most people do not run openbox in a terminal.. 2008-01-31 12:54:51 -05:00
Dana Jansens
20b8fcfa33 Merge branch 'backport' into work
Conflicts:

	openbox/client.c
	openbox/config.c
	openbox/event.c
	openbox/extensions.c
	openbox/focus_cycle_indicator.c
	openbox/focus_cycle_popup.c
	openbox/menuframe.c
	openbox/moveresize.c
	openbox/openbox.c
	openbox/screen.c
	openbox/stacking.c
	openbox/startupnotify.c
2008-01-31 12:51:38 -05:00