Diffusion KDE Japan Website b9c51bf06be0

Merge branch 'revert-aa9235c4' into 'master'
b9c51bf06be0
Actions

Authored by phanect on Jul 6 2019, 9:16 AM.

Description

Merge branch 'revert-aa9235c4' into 'master'

Revert "Merge branch 'cleanup' into 'master'"

See merge request kdecommunity/jp.kde.org!12

Details

Committed

phanect

Jul 6 2019, 9:16 AM

Parents

R927:5cd23b2a7bc9: Revert "Merge branch 'cleanup' into 'master'"
R927:aa9235c430f8: Merge branch 'cleanup' into 'master'

Branches

Unknown

Tags

Unknown

phanect committed R927:b9c51bf06be0: Merge branch 'revert-aa9235c4' into 'master' (authored by phanect).Jul 6 2019, 9:16 AM

Merged Changes

	Commit			Author	Details	Committed
	5cd23b2a7bc9			phanect	Revert "Merge branch 'cleanup' into 'master'"	Jul 6 2019

Changes (519)

		Path
M		.gitignore
M		.htaccess
M		404.php
P		community/donation/index.php Copied to multiple locations: community/whatiskdejp/donation/index.php community/whatiskdejp/whatiskdejp/donation/index.php
A		community/getinvolved/MAGICfunctions.php
A		community/getinvolved/README
A		community/getinvolved/images/feedback.png
A		community/getinvolved/images/gettingstarted.png
A		community/getinvolved/images/user.xcf
P		community/getinvolved/index.php Copied to community/whatiskdejp/getinvolved/index.php
A	(dir)	community/getinvolved/promotion/
A		community/getinvolved/promotion/index.php
A		community/index.php
M		community/whatiskde/index.php
P		community/whatiskdejp/code-of-conduct/index.php Copied to community/whatiskdejp/whatiskdejp/code-of-conduct/index.php
A	(dir)	community/whatiskdejp/donation/
P		community/whatiskdejp/donation/index.php Copied from community/donation/index.php
A	(dir)	community/whatiskdejp/english/
A		community/whatiskdejp/english/index.php
A	(dir)	community/whatiskdejp/getinvolved/
A	(dir)	community/whatiskdejp/getinvolved/images/
A		community/whatiskdejp/getinvolved/images/accessibility.png
A		community/whatiskdejp/getinvolved/images/art.png
A		community/whatiskdejp/getinvolved/images/bugtriaging.png
A		community/whatiskdejp/getinvolved/images/development.png
A		community/whatiskdejp/getinvolved/images/documentation.png
A		community/whatiskdejp/getinvolved/images/feedback.png
A		community/whatiskdejp/getinvolved/images/gettingstarted.png
A		community/whatiskdejp/getinvolved/images/promotion.png
A		community/whatiskdejp/getinvolved/images/translation.png
A		community/whatiskdejp/getinvolved/images/user.xcf
P		community/whatiskdejp/getinvolved/index.php Copied from community/getinvolved/index.php
A	(dir)	community/whatiskdejp/getinvolved/promotion/
A		community/whatiskdejp/getinvolved/promotion/index.php
P		community/whatiskdejp/index.php Copied to community/whatiskdejp/whatiskdejp/index.php
A	(dir)	community/whatiskdejp/whatiskdejp/code-of-conduct/
P		community/whatiskdejp/whatiskdejp/code-of-conduct/index.php Copied from community/whatiskdejp/code-of-conduct/index.php
A	(dir)	community/whatiskdejp/whatiskdejp/communicate/
A		community/whatiskdejp/whatiskdejp/communicate/index.php
A	(dir)	community/whatiskdejp/whatiskdejp/donation/
P		community/whatiskdejp/whatiskdejp/donation/index.php Copied from community/donation/index.php
P		community/whatiskdejp/whatiskdejp/index.php Copied from community/whatiskdejp/index.php
A	(dir)	community/whatiskdejp/whatiskdejp/staff/
A		community/whatiskdejp/whatiskdejp/staff/index.php
A		images/buttons/download.png
A	(dir)	images/flags/
A		images/flags/ar.png
A		images/flags/ba.png
A		images/flags/bg.png
A		images/flags/br.png
A		images/flags/cl.png
A		images/flags/cn.png
A		images/flags/cz.png
A		images/flags/de.png
A		images/flags/es.png
A		images/flags/eu.png
A		images/flags/fr.png
A		images/flags/gb.png
A		images/flags/hu.png
A		images/flags/ie.png
A		images/flags/il.png
A		images/flags/in.png
A		images/flags/ir.png
A		images/flags/is.png
A		images/flags/it.png
A		images/flags/jp.png
A		images/flags/kr.png
A		images/flags/nl.png
A		images/flags/pl.png
A		images/flags/ro.png
A		images/flags/ru.png
A		images/flags/sk.png
A		images/flags/tr.png
A		images/flags/tw.png
A		images/flags/ua.png
A		images/flags/yu.png
A	(dir)	images/olddays/
A		images/olddays/snapshot01-mini.png
A		images/olddays/snapshot01.jpg
A		images/olddays/snapshot02-mini.png
A		images/olddays/snapshot02.jpg
A		images/olddays/snapshot03-mini.png
A		images/olddays/snapshot03.jpg
A	(dir)	images/pics/
A		images/pics/blog.png
A		images/pics/facebook.png
A		images/pics/identica.png
A		images/pics/kde.png
A		images/pics/opendesktop.png
A		images/pics/twitter.png
A	(dir)	images/screenshots/
A		images/screenshots/akregator.png
A		images/screenshots/amarok.png
A		images/screenshots/ark.png
A		images/screenshots/blinken.png
A		images/screenshots/blogilo.png
A		images/screenshots/bomber.png
A		images/screenshots/bovo.png
A		images/screenshots/cantor.png
A		images/screenshots/cervisia.png
A		images/screenshots/choqok.png
A		images/screenshots/digikam.png
A		images/screenshots/dolphin.png
A		images/screenshots/dragonplayer.png
A		images/screenshots/granatier.png
A		images/screenshots/gwenview.png
A		images/screenshots/juk.png
A		images/screenshots/k3b.png
A		images/screenshots/kaddressbook.png
A		images/screenshots/kaffeine.png
A		images/screenshots/kalarm.png
A		images/screenshots/kalgebra.png
A		images/screenshots/kalzium.png
A		images/screenshots/kanagram.png
A		images/screenshots/kapman.png
A		images/screenshots/kappfinder.png
A		images/screenshots/kapptemplate.png
A		images/screenshots/karbon14.png
A		images/screenshots/kate.png
A		images/screenshots/katomic.png
A		images/screenshots/kaudiocreator.png
A		images/screenshots/kbattleship.png
A		images/screenshots/kblackbox.png
A		images/screenshots/kblocks.png
A		images/screenshots/kbounce.png
A		images/screenshots/kbreakout.png
A		images/screenshots/kbruch.png
A		images/screenshots/kbugbuster.png
A		images/screenshots/kcachegrind.png
A		images/screenshots/kcalc.png
A		images/screenshots/kcharselect.png
A		images/screenshots/kcolorchooser.png
A		images/screenshots/kcoloredit.png
A		images/screenshots/kdepartitionmanager.png
A		images/screenshots/kdevelop.png
A		images/screenshots/kdiamond.png
A		images/screenshots/kdiff3.png
A		images/screenshots/kdiskfree.png
A		images/screenshots/keurocalc.png
A		images/screenshots/kfax.png
A		images/screenshots/kfilereplace.png
A		images/screenshots/kfind.png
A		images/screenshots/kfloppy.png
A		images/screenshots/kfourinline.png
A		images/screenshots/kftpgrabber.png
A		images/screenshots/kgeography.png
A		images/screenshots/kget.png
A		images/screenshots/kgoldrunner.png
A		images/screenshots/kgpg.png
A		images/screenshots/kgrab.png
A		images/screenshots/kgraphviewer.png
A		images/screenshots/khangman.png
A		images/screenshots/kiconedit.png
A		images/screenshots/kig.png
A		images/screenshots/kigo.png
A		images/screenshots/kile.png
A		images/screenshots/killbots.png
A		images/screenshots/kimagemapeditor.png
A		images/screenshots/kinfocenter.png
A		images/screenshots/kiriki.png
A		images/screenshots/kiten.png
A		images/screenshots/kjots.png
A		images/screenshots/kjumpingcube.png
A		images/screenshots/kleopatra.png
A		images/screenshots/klettres.png
A		images/screenshots/klines.png
A		images/screenshots/klinkstatus.png
A		images/screenshots/kmag.png
A		images/screenshots/kmahjongg.png
A		images/screenshots/kmail.png
A		images/screenshots/kmines.png
A		images/screenshots/kmix.png
A		images/screenshots/kmldonkey.png
A		images/screenshots/kmousetool.png
A		images/screenshots/kmouth.png
A		images/screenshots/kmplayer.png
A		images/screenshots/kmplot.png
A		images/screenshots/knemo.png
A		images/screenshots/knetwalk.png
A		images/screenshots/knode.png
A		images/screenshots/knotes.png
A		images/screenshots/kolf.png
A		images/screenshots/kollision.png
A		images/screenshots/kolourpaint.png
A		images/screenshots/kommander.png
A		images/screenshots/kompare.png
A		images/screenshots/konqueror.png
A		images/screenshots/konquest.png
A		images/screenshots/konsole.png
A		images/screenshots/kontact.png
A		images/screenshots/konversation.png
A		images/screenshots/kopete.png
A		images/screenshots/korganizer.png
A		images/screenshots/kpager.png
A		images/screenshots/kpatience.png
A		images/screenshots/kplato.png
A		images/screenshots/kplayer.png
A		images/screenshots/kpovmodeler.png
A		images/screenshots/kppp.png
A		images/screenshots/kpresenter.png
A		images/screenshots/krdc.png
A		images/screenshots/krecipes.png
A		images/screenshots/kreversi.png
A		images/screenshots/krfb.png
A		images/screenshots/krita.png
A		images/screenshots/kron.png
A		images/screenshots/kruler.png
A		images/screenshots/krusader.png
A		images/screenshots/ksame.png
A		images/screenshots/kscd.png
A		images/screenshots/kshisen.png
A		images/screenshots/ksirk.png
A		images/screenshots/ksnapshot.png
A		images/screenshots/kspaceduel.png
A		images/screenshots/kspread.png
A		images/screenshots/ksquares.png
A		images/screenshots/kstars.png
A		images/screenshots/ksudoku.png
A		images/screenshots/ksystemlog.png
A		images/screenshots/kteatime.png
A		images/screenshots/ktimer.png
A		images/screenshots/ktimetracker.png
A		images/screenshots/ktorrent.png
A		images/screenshots/ktouch.png
A		images/screenshots/ktron.png
A		images/screenshots/ktts.png
A		images/screenshots/ktuberling.png
A		images/screenshots/kturtle.png
A		images/screenshots/kubrick.png
A		images/screenshots/kuickshow.png
A		images/screenshots/kuiviewer.png
A		images/screenshots/kuser.png
A		images/screenshots/kwalletmanager.png
A		images/screenshots/kword.png
A		images/screenshots/kwordquiz.png
A		images/screenshots/kwrite.png
A		images/screenshots/lokalize.png
A		images/screenshots/lskat.png
A		images/screenshots/marble.png
A		images/screenshots/no_screenshot_available.png
A		images/screenshots/okteta.png
A		images/screenshots/okular.png
A		images/screenshots/palapeli.png
A		images/screenshots/parley.png
A		images/screenshots/partitionmanager.png
A		images/screenshots/printerapplet.png
A	(dir)	images/screenshots/resized/
A		images/screenshots/resized/akregator.png
A		images/screenshots/resized/amarok.png
A		images/screenshots/resized/ark.png
A		images/screenshots/resized/blinken.png
A		images/screenshots/resized/blogilo.png
A		images/screenshots/resized/bomber.png
A		images/screenshots/resized/bovo.png
A		images/screenshots/resized/cantor.png
A		images/screenshots/resized/cervisia.png
A		images/screenshots/resized/choqok.png
A		images/screenshots/resized/digikam.png
A		images/screenshots/resized/dolphin.png
A		images/screenshots/resized/dragonplayer.png
A		images/screenshots/resized/granatier.png
A		images/screenshots/resized/gwenview.png
A		images/screenshots/resized/juk.png
A		images/screenshots/resized/k3b.png
A		images/screenshots/resized/kaddressbook.png
A		images/screenshots/resized/kaffeine.png
A		images/screenshots/resized/kalarm.png
A		images/screenshots/resized/kalgebra.png
A		images/screenshots/resized/kalzium.png
A		images/screenshots/resized/kanagram.png
A		images/screenshots/resized/kapman.png
A		images/screenshots/resized/kappfinder.png
A		images/screenshots/resized/kapptemplate.png
A		images/screenshots/resized/karbon14.png
A		images/screenshots/resized/kate.png
A		images/screenshots/resized/katomic.png
A		images/screenshots/resized/kaudiocreator.png
A		images/screenshots/resized/kbattleship.png
A		images/screenshots/resized/kblackbox.png
A		images/screenshots/resized/kblocks.png
A		images/screenshots/resized/kbounce.png
A		images/screenshots/resized/kbreakout.png
A		images/screenshots/resized/kbruch.png
A		images/screenshots/resized/kbugbuster.png
A		images/screenshots/resized/kcachegrind.png
A		images/screenshots/resized/kcalc.png
A		images/screenshots/resized/kcharselect.png
A		images/screenshots/resized/kcolorchooser.png
A		images/screenshots/resized/kcoloredit.png
A		images/screenshots/resized/kdepartitionmanager.png
A		images/screenshots/resized/kdevelop.png
A		images/screenshots/resized/kdiamond.png
A		images/screenshots/resized/kdiff3.png
A		images/screenshots/resized/kdiskfree.png
A		images/screenshots/resized/keurocalc.png
A		images/screenshots/resized/kfax.png
A		images/screenshots/resized/kfilereplace.png
A		images/screenshots/resized/kfind.png
A		images/screenshots/resized/kfloppy.png
A		images/screenshots/resized/kfourinline.png
A		images/screenshots/resized/kftpgrabber.png
A		images/screenshots/resized/kgeography.png
A		images/screenshots/resized/kget.png
A		images/screenshots/resized/kgoldrunner.png
A		images/screenshots/resized/kgpg.png
A		images/screenshots/resized/kgrab.png
A		images/screenshots/resized/kgraphviewer.png
A		images/screenshots/resized/khangman.png
A		images/screenshots/resized/kiconedit.png
A		images/screenshots/resized/kig.png
A		images/screenshots/resized/kigo.png
A		images/screenshots/resized/kile.png
A		images/screenshots/resized/killbots.png
A		images/screenshots/resized/kimagemapeditor.png
A		images/screenshots/resized/kinfocenter.png
A		images/screenshots/resized/kiriki.png
A		images/screenshots/resized/kiten.png
A		images/screenshots/resized/kjots.png
A		images/screenshots/resized/kjumpingcube.png
A		images/screenshots/resized/kleopatra.png
A		images/screenshots/resized/klettres.png
A		images/screenshots/resized/klines.png
A		images/screenshots/resized/klinkstatus.png
A		images/screenshots/resized/kmag.png
A		images/screenshots/resized/kmahjongg.png
A		images/screenshots/resized/kmail.png
A		images/screenshots/resized/kmines.png
A		images/screenshots/resized/kmix.png
A		images/screenshots/resized/kmldonkey.png
A		images/screenshots/resized/kmousetool.png
A		images/screenshots/resized/kmouth.png
A		images/screenshots/resized/kmplayer.png
A		images/screenshots/resized/kmplot.png
A		images/screenshots/resized/knemo.png
A		images/screenshots/resized/knetwalk.png
A		images/screenshots/resized/knode.png
A		images/screenshots/resized/knotes.png
A		images/screenshots/resized/kolf.png
A		images/screenshots/resized/kollision.png
A		images/screenshots/resized/kolourpaint.png
A		images/screenshots/resized/kommander.png
A		images/screenshots/resized/kompare.png
A		images/screenshots/resized/konqueror.png
A		images/screenshots/resized/konquest.png
A		images/screenshots/resized/konsole.png
A		images/screenshots/resized/kontact.png
A		images/screenshots/resized/konversation.png
A		images/screenshots/resized/kopete.png
A		images/screenshots/resized/korganizer.png
A		images/screenshots/resized/kpager.png
A		images/screenshots/resized/kpatience.png
A		images/screenshots/resized/kplato.png
A		images/screenshots/resized/kplayer.png
A		images/screenshots/resized/kpovmodeler.png
A		images/screenshots/resized/kppp.png
A		images/screenshots/resized/kpresenter.png
A		images/screenshots/resized/krdc.png
A		images/screenshots/resized/krecipes.png
A		images/screenshots/resized/kreversi.png
A		images/screenshots/resized/krfb.png
A		images/screenshots/resized/krita.png
A		images/screenshots/resized/kruler.png
A		images/screenshots/resized/krusader.png
A		images/screenshots/resized/ksame.png
A		images/screenshots/resized/kscd.png
A		images/screenshots/resized/kshisen.png
A		images/screenshots/resized/ksirk.png
A		images/screenshots/resized/ksnapshot.png
A		images/screenshots/resized/kspaceduel.png
A		images/screenshots/resized/kspread.png
A		images/screenshots/resized/ksquares.png
A		images/screenshots/resized/kstars.png
A		images/screenshots/resized/ksudoku.png
A		images/screenshots/resized/ksystemlog.png
A		images/screenshots/resized/kteatime.png
A		images/screenshots/resized/ktimer.png
A		images/screenshots/resized/ktimetracker.png
A		images/screenshots/resized/ktorrent.png
A		images/screenshots/resized/ktouch.png
A		images/screenshots/resized/ktron.png
A		images/screenshots/resized/ktts.png
A		images/screenshots/resized/ktuberling.png
A		images/screenshots/resized/kturtle.png
A		images/screenshots/resized/kubrick.png
A		images/screenshots/resized/kuickshow.png
A		images/screenshots/resized/kuiviewer.png
A		images/screenshots/resized/kuser.png
A		images/screenshots/resized/kwalletmanager.png
A		images/screenshots/resized/kword.png
A		images/screenshots/resized/kwordquiz.png
A		images/screenshots/resized/kwrite.png
A		images/screenshots/resized/lokalize.png
A		images/screenshots/resized/lskat.png
A		images/screenshots/resized/marble.png
A		images/screenshots/resized/okteta.png
A		images/screenshots/resized/okular.png
A		images/screenshots/resized/palapeli.png
A		images/screenshots/resized/parley.png
A		images/screenshots/resized/printerapplet.png
A		images/screenshots/resized/rocs.png
A		images/screenshots/resized/rsibreak.png
A		images/screenshots/resized/skanlite.png
A		images/screenshots/resized/skrooge.png
A		images/screenshots/resized/step.png
A		images/screenshots/resized/superkaramba.png
A		images/screenshots/resized/sweeper.png
A		images/screenshots/resized/tellico.png
A		images/screenshots/resized/yakuake.png
A		images/screenshots/rocs.png
A		images/screenshots/rsibreak.png
A		images/screenshots/skanlite.png
A		images/screenshots/skrooge.png
A		images/screenshots/step.png
A		images/screenshots/superkaramba.png
A		images/screenshots/sweeper.png
A		images/screenshots/tellico.png
A		images/screenshots/umrello.png
A		images/screenshots/yakuake.png
M		images/teaser/banner.png
M		index.php
A		patch/.directory
A	(dir)	patch/.pics/
A	(dir)	patch/.pics/med/
A		patch/.pics/med/m17n.png
A		patch/index-ja.html.010928
A		patch/index-ja.html.020129
A		patch/index-ja.php.030403
A		patch/index-ja.php.100415
A		patch/index-ja.php.100421
A		patch/index-ja.php.100422
A		patch/index-ja.php.old
A		patch/index.html.010928
A		patch/index.html.020129
A		patch/index.php.030403
A		patch/index.php.100415
A		patch/index.php.100421
A		patch/index.php.100422
A		patch/index.php.old
A		patch/index_en_old.php
A		patch/index_ja_old.php
A		patch/redir.php
M		plasmaMenu.inc
M		support/bugs/index.php
A	(dir)	support/documents/document/printing/
A	(dir)	support/documents/document/printing/.xvpics/
A		support/documents/document/printing/.xvpics/lpr.png
A		support/documents/document/printing/cupsd-japanese-resources.tar.bz2
A		support/documents/document/printing/detail_lpr.html
A		support/documents/document/printing/full_logo.jpg
A		support/documents/document/printing/index.html
A		support/documents/document/printing/ipp1.png
A		support/documents/document/printing/ipp2.png
A		support/documents/document/printing/ipp3.png
A		support/documents/document/printing/ipp4.png
A		support/documents/document/printing/ipp5.png
A		support/documents/document/printing/ipp6.png
A		support/documents/document/printing/ipp_fromwin.html
A		support/documents/document/printing/kprint1.png
A		support/documents/document/printing/kprint10.png
A		support/documents/document/printing/kprint11.png
A		support/documents/document/printing/kprint12.png
A		support/documents/document/printing/kprint13.png
A		support/documents/document/printing/kprint14.png
A		support/documents/document/printing/kprint15.png
A		support/documents/document/printing/kprint16.png
A		support/documents/document/printing/kprint17.png
A		support/documents/document/printing/kprint2.png
A		support/documents/document/printing/kprint3.png
A		support/documents/document/printing/kprint4.png
A		support/documents/document/printing/kprint5.png
A		support/documents/document/printing/kprint6.png
A		support/documents/document/printing/kprint7.png
A		support/documents/document/printing/kprint8.png
A		support/documents/document/printing/kprint9.png
A		support/documents/document/printing/lpr.png
A		support/documents/document/printing/lprtocups.html
A		support/documents/document/printing/nowprint.html
A		support/documents/document/printing/nowprint1.png
A		support/documents/document/printing/nowprint2.png
A		support/documents/document/printing/nowprint3.png
A		support/documents/document/printing/nowprint4.png
A		support/documents/document/printing/remote.html
A		support/documents/document/printing/remote1.png
A		support/documents/document/printing/remote10.png
A		support/documents/document/printing/remote11.png
A		support/documents/document/printing/remote12.png
A		support/documents/document/printing/remote13.png
A		support/documents/document/printing/remote14.png
A		support/documents/document/printing/remote15.png
A		support/documents/document/printing/remote16.png
A		support/documents/document/printing/remote17.png
A		support/documents/document/printing/remote18.png
A		support/documents/document/printing/remote19.png
A		support/documents/document/printing/remote2.png
A		support/documents/document/printing/remote20.png
A		support/documents/document/printing/remote21.png
A		support/documents/document/printing/remote22.png
A		support/documents/document/printing/remote23.png
A		support/documents/document/printing/remote24.png
A		support/documents/document/printing/remote25.png
A		support/documents/document/printing/remote26.png
A		support/documents/document/printing/remote27.png
A		support/documents/document/printing/remote28.png
A		support/documents/document/printing/remote3.png
A		support/documents/document/printing/remote4.png
A		support/documents/document/printing/remote5.png
A		support/documents/document/printing/remote6.png
A		support/documents/document/printing/remote7.png
A		support/documents/document/printing/remote8.png
A		support/documents/document/printing/remote9.png
A		support/documents/document/printing/remote_cups.html
A		support/documents/document/printing/remote_kde.html
A		support/documents/document/printing/samba_cups.html
A		support/documents/document/printing/setting.html
A		support/documents/document/printing/template.html
A		support/documents/document/qpl.html
A		support/documents/document/staff.html
A	(dir)	support/documents/printing/.xvpics/
A		support/documents/printing/.xvpics/lpr.png