Skip to content

Commit

Permalink
Merge branch 'master' into fix-replace-shortcut
Browse files Browse the repository at this point in the history
  • Loading branch information
zeebok authored Nov 12, 2023
2 parents 96de074 + c17451c commit bb55690
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 23 deletions.
5 changes: 0 additions & 5 deletions data/io.elementary.code.gschema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,6 @@
<summary>The saved state of the window.</summary>
<description>The saved state of the window.</description>
</key>
<key name="window-position" type="(ii)">
<default>(-1, -1)</default>
<summary>Window position</summary>
<description>Most recent window position (x, y)</description>
</key>
<key name="window-size" type="(ii)">
<default>(850, 550)</default>
<summary>Most recent window size</summary>
Expand Down
6 changes: 3 additions & 3 deletions po/he.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ msgstr ""
"Project-Id-Version: scratch\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-08-01 20:46+0000\n"
"PO-Revision-Date: 2023-07-12 15:07+0000\n"
"PO-Revision-Date: 2023-11-11 06:10+0000\n"
"Last-Translator: Yaron Shahrabani <[email protected]>\n"
"Language-Team: Hebrew <https://l10n.elementary.io/projects/code/code/he/>\n"
"Language: he\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Weblate 4.17\n"
"X-Generator: Weblate 5.0.2\n"
"X-Launchpad-Export-Date: 2017-05-03 06:02+0000\n"

#: src/Application.vala:37
Expand Down Expand Up @@ -648,7 +648,7 @@ msgstr "ניהול תיקיות המיזם"

#: src/Widgets/SearchBar.vala:71
msgid "Find"
msgstr "חיפוש"
msgstr "איתור"

#: src/Widgets/SearchBar.vala:74
msgid "No Results"
Expand Down
4 changes: 2 additions & 2 deletions po/ja.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: scratch\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-08-01 20:46+0000\n"
"PO-Revision-Date: 2023-07-12 15:07+0000\n"
"PO-Revision-Date: 2023-09-24 01:08+0000\n"
"Last-Translator: Ryo Nakano <[email protected]>\n"
"Language-Team: Japanese <https://l10n.elementary.io/projects/code/code/ja/>\n"
"Language: ja\n"
Expand Down Expand Up @@ -569,7 +569,7 @@ msgstr "行へ移動:"
#, c-format
msgid "%d Space"
msgid_plural "%d Spaces"
msgstr[0] "%d個のスペース"
msgstr[0] "%dスペース"

#: src/Widgets/FormatBar.vala:289
#, c-format
Expand Down
8 changes: 4 additions & 4 deletions po/pl.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: scratch\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-08-01 20:46+0000\n"
"PO-Revision-Date: 2023-07-14 18:07+0000\n"
"PO-Revision-Date: 2023-11-04 23:10+0000\n"
"Last-Translator: Marcin Serwin <[email protected]>\n"
"Language-Team: Polish <https://l10n.elementary.io/projects/code/code/pl/>\n"
"Language: pl\n"
Expand All @@ -17,7 +17,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2;\n"
"X-Generator: Weblate 4.17\n"
"X-Generator: Weblate 5.0.2\n"
"X-Launchpad-Export-Date: 2017-05-03 06:03+0000\n"

#: src/Application.vala:37
Expand Down Expand Up @@ -305,7 +305,7 @@ msgstr "Katalog bez nazwy"

#: src/FolderManager/FolderItem.vala:360
msgid "new file"
msgstr "Nowy plik"
msgstr "nowy plik"

#: src/FolderManager/ProjectFolderItem.vala:111
msgid "Close Folder"
Expand Down Expand Up @@ -664,7 +664,7 @@ msgstr "Zarządzaj folderami projektu"

#: src/Widgets/SearchBar.vala:71
msgid "Find"
msgstr "Szukaj"
msgstr "Znajdź"

#: src/Widgets/SearchBar.vala:74
msgid "No Results"
Expand Down
9 changes: 0 additions & 9 deletions src/MainWindow.vala
Original file line number Diff line number Diff line change
Expand Up @@ -265,10 +265,6 @@ namespace Scratch {
fullscreen ();
break;
default:
Scratch.saved_state.get ("window-position", "(ii)", out rect.x, out rect.y);
if (rect.x != -1 && rect.y != -1) {
move (rect.x, rect.y);
}
break;
}

Expand Down Expand Up @@ -718,11 +714,6 @@ namespace Scratch {
Scratch.saved_state.set ("window-size", "(ii)", width, height);
}

// Save window position
int x, y;
get_position (out x, out y);
Scratch.saved_state.set ("window-position", "(ii)", x, y);

// Plugin panes size
Scratch.saved_state.set_int ("hp1-size", hp1.get_position ());
Scratch.saved_state.set_int ("vp-size", vp.get_position ());
Expand Down

0 comments on commit bb55690

Please sign in to comment.