Commit 4fe49329 authored by Luigi Toscano's avatar Luigi Toscano

Merge remote-tracking branch 'origin/master' into frameworks

Also adapt "Fix conflicting shortcuts: change Hint shortcut".
parents 95f72e20 784d503c
......@@ -484,10 +484,14 @@ void KSudoku::setupActions()
KStandardGameAction::undo(this, SLOT(undo()), actionCollection());
KStandardGameAction::redo(this, SLOT(redo()), actionCollection());
KStandardGameAction::hint(this, SLOT(giveHint()), actionCollection());
QAction * a = KStandardGameAction::hint(this, SLOT(giveHint()), actionCollection());
// The default value (H) conflicts with the keys assigned
// to add letter/numbers to the board.
actionCollection()->setDefaultShortcut(a, QKeySequence(Qt::Key_F2));
KStandardGameAction::solve(this, SLOT(autoSolve()), actionCollection());
QAction * a = new QAction(this);
a = new QAction(this);
actionCollection()->addAction( QLatin1String( "move_dub_puzzle" ), a);
a->setText(i18n("Check"));
a->setIcon(QIcon::fromTheme( QLatin1String( "games-endturn" )));
......
......@@ -8,6 +8,14 @@ SentUpstream: 2014-09-24
<id>org.kde.ksudoku.desktop</id>
<metadata_license>CC0-1.0</metadata_license>
<name>KSudoku</name>
<name xml:lang="ca">KSudoku</name>
<name xml:lang="cs">KSudoku</name>
<name xml:lang="de">KSudoku</name>
<name xml:lang="nl">KSudoku</name>
<name xml:lang="pt">KSudoku</name>
<name xml:lang="sv">Ksudoku</name>
<name xml:lang="uk">KSudoku</name>
<name xml:lang="x-test">xxKSudokuxx</name>
<summary>Complete a numeric puzzle with the numbers from one to nine</summary>
<summary xml:lang="ca">Completeu un puzle numèric puzzle amb nombres des de l'u al nou.</summary>
<summary xml:lang="ca-valencia">Completeu un puzle numèric puzzle amb nombres des de l'u al nou.</summary>
......
......@@ -107,57 +107,14 @@ GenericName[x-test]=xxSudoku Gamexx
GenericName[zh_CN]=数独游戏
GenericName[zh_TW]=Sudoku 數獨遊戲
Comment=KSudoku, Sudoku game & more by KDE
Comment[ast]=KSudoku, xuegu Sudoku y más pa KDE
Comment[bs]=KSudoku, Sudoku igra & mnogo toga za KDE
Comment[ca]=KSudoku, joc de Sudoku per KDE
Comment[ca@valencia]=KSudoku, joc de Sudoku per KDE
Comment[cs]=KSudoku, Sudoku hra pro KDE
Comment[da]=KSudoku, sudoku-spil med mere til KDE
Comment[de]=KSudoku, Sudoku-Spiel & mehr für KDE
Comment[el]=KSudoku, παιχνίδι Sudoku & άλλα για το KDE
Comment[en_GB]=KSudoku, Sudoku game & more for KDE
Comment[eo]=KSudoku, sudoka ludo kaj pli por KDE
Comment[es]=KSudoku, juego Sudoku y más para KDE
Comment[et]=KSudoku, KDE sudoku mäng ja palju enam
Comment[eu]=KSudoku, Sudoku jokoa eta gehiago KDErentzako
Comment[fa]=KSudoku، بازی Sudoku و بیشتر برای KDE
Comment[fi]=KSudoku, Sudoku-peli ja enemmän KDE:lle
Comment[fr]=KSudoku, jeu de Sodoku et plus pour KDE
Comment[ga]=KSudoku, Cluiche Sudoku KDE agus tuilleadh
Comment[gl]=KSudoku, o xogo do Sudoku e outros para KDE
Comment[hne]=के-सुडोकु, सुडोकु खेल अउ केडीई बर अधिक
Comment[hu]=KSudoku, egy KDE-alapú sukodu
Comment[it]=KSudoku, gioco del Sudoku ed altri per KDE
Comment[ja]=KSudoku, KDE の数字パズルゲーム
Comment[kk]=KSudoku, құр ғана KDE-нің Судоку ойыны емес
Comment[km]=KSudoku ល្បែង Sudoku សម្រាប់ KDE
Comment[ko]=KSudoku, KDE를 위한 스도쿠 게임과 그 이상
Comment[lv]=KSudoku, sudoku spēle un vēl priekš KDE
Comment[mr]=के-सुडोलु, सुडोकु खेळ केडीई करिता
Comment[nb]=KSudoku. Sudoku-spill og mer for KDE 4
Comment[nds]=KSudoku, Sudoku-Speel un mehr för KDE
Comment[ne]=केडीईका लागि केडीई सुडोकु, सुडोकु खेल र धेरै
Comment[nl]=KSudoku, sudoku-spel en meer voor KDE
Comment[nn]=KSudoku – omfattande sudoku-spel for KDE
Comment[pl]=KSudoku, gra Sudoku i więcej w KDE
Comment[pt]=KSudoku, um jogo de Sudoku e mais para o KDE
Comment[pt_BR]=KSudoku, Jogo Sudoku e variações para KDE
Comment[ro]=KSudoku, joc de sudoku și altele pentru KDE
Comment[ru]=KSudoku — не просто судоку для KDE
Comment[sk]=KSudoku, Sudoku hra a ďalšie pre KDE
Comment[sl]=KSudoku, igra Sudoku in ostale za KDE
Comment[sr]=К‑судоку, судоку и још штошта за КДЕ
Comment[sr@ijekavian]=К‑судоку, судоку и још штошта за КДЕ
Comment[sr@ijekavianlatin]=K‑sudoku, sudoku i još štošta za KDE
Comment[sr@latin]=K‑sudoku, sudoku i još štošta za KDE
Comment[sv]=Ksudoku, Sudoku-spel med mera för KDE
Comment[tr]=KDE için sudoku oyunu ve fazlası
Comment[ug]=Ksudoku,Sudoku ئويۇنى شۇنداقلا KDE ئۈچۈن تىخمۇ كۆپ نەرسىلەر
Comment[uk]=KSudoku, Гра у судоку і інше для KDE
Comment[wa]=Djeu KSudoku, Sudoku eyet pus po KDE
Comment[x-test]=xxKSudoku, Sudoku game & more for KDExx
Comment[zh_CN]=KSudoku,KDE 下的增强型数独游戏
Comment[zh_TW]=KDE Sudoku 遊戲,以及其變化
Comment[ca]=KSudoku, joc de Sudoku i més, pel KDE
Comment[cs]=KSudoku, Sudoku hra od KDE
Comment[de]=KSudoku, Sudoku-Spiel & mehr von KDE
Comment[nl]=KSudoku, sudoku-spel en meer door KDE
Comment[pt]=KSudoku, um jogo de Sudoku & mais do KDE
Comment[sv]=Ksudoku, Sudoku-spel med mera av KDE
Comment[uk]=KSudoku, гра у судоку і інше від KDE
Comment[x-test]=xxKSudoku, Sudoku game & more by KDExx
Terminal=false
Categories=Qt;KDE;Game;LogicGame;
X-DBUS-ServiceName=org.kde.ksudoku
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment