Skip to content

Commit

Permalink
Merge branch 'master' into jeremypw/fix-warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
@ryonakano
ryonakano authored Mar 5, 2025
2 parents d251d04 + 6eb0a44 commit 9e2ad9a
Show file tree
Hide file tree
Showing 6 changed files with 42 additions and 98 deletions.
27 changes: 7 additions & 20 deletions po/ca.po
View file
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: 2025-03-02 18:11+0000\n"
"PO-Revision-Date: 2025-02-06 11:38+0000\n"
"PO-Revision-Date: 2025-03-03 20:15+0000\n"
"Last-Translator: David M <[email protected]>\n"
"Language-Team: Catalan <https://l10n.elementary.io/projects/code/code/ca/>\n"
"Language: ca\n"
Expand Down Expand Up @@ -291,28 +291,22 @@ msgid "Restore Anyway"
msgstr "Restaura'l tanmateix"

#: src/Dialogs/CloseProjectsConfirmationDialog.vala:40
#, fuzzy
#| msgid "This folder is the parent of an open project"
msgid "This folder is the parent of an open project"
msgid_plural "This folder is the parent of open projects"
msgstr[0] "Aquesta carpeta és la principal d'un projecte obert."
msgstr[1] "Aquesta carpeta és la principal d'un projecte obert."
msgstr[1] "Aquestes carpetes són les principals de projectes oberts."

#: src/Dialogs/CloseProjectsConfirmationDialog.vala:46
#, fuzzy
#| msgid "Opening this folder will close the child project"
msgid "Opening this folder will close the child project"
msgid_plural "Opening this folder will close all child projects"
msgstr[0] "En obrir aquesta carpeta es tancarà el projecte secundari."
msgstr[1] "En obrir aquesta carpeta es tancarà el projecte secundari."
msgstr[1] "En obrir aquesta carpeta es tancaran els projectes secundaris."

#: src/Dialogs/CloseProjectsConfirmationDialog.vala:52
#, fuzzy
#| msgid "Close Child Project"
msgid "Close Child Project"
msgid_plural "Close Child Projects"
msgstr[0] "Tanca el projecte secundari"
msgstr[1] "Tanca el projecte secundari"
msgstr[1] "Tanca els projectes secundaris"

#: src/Dialogs/CloseProjectsConfirmationDialog.vala:57
msgid "This folder is a child of an open project"
Expand All @@ -336,25 +330,18 @@ msgstr "Hi ha canvis no aplicats a la branca actual."

#. /TRANSLATORS '%s' is a placeholder for the name of the branch to be checked out
#: src/Dialogs/OverwriteUncommittedConfirmationDialog.vala:42
#, fuzzy, c-format
#| msgid ""
#| "Uncommitted changes will be permanently lost if <b>'%s'</b> is checked "
#| "out now.\n"
#| "\n"
#| "<i>It is recommended that uncommitted changes are stashed, committed, or "
#| "reverted before proceeding </i>"
#, c-format
msgid ""
"Uncommitted changes will be permanently lost if <b>'%s'</b> is checked out "
"now.\n"
"\n"
"<i>It is recommended that uncommitted changes are stashed, committed, or "
"reverted before proceeding.</i>"
msgstr ""
"Els canvis no aplicats es perdran permanentment si ara es revisa <b>'%s'</"
"b>.\n"
"Els canvis no aplicats es perdran permanentment si ara es revisa <b>%s</b>.\n"
"\n"
"<i>Es recomana que els canvis no aplicats es desin, s'apliquin o es "
"reverteixin abans de continuar </i>"
"reverteixin abans de continuar. </i>"

#: src/Dialogs/OverwriteUncommittedConfirmationDialog.vala:44
msgid "Do not Checkout"
Expand Down
24 changes: 6 additions & 18 deletions po/fr.po
View file
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: 2025-03-02 18:11+0000\n"
"PO-Revision-Date: 2025-02-07 15:16+0000\n"
"PO-Revision-Date: 2025-03-05 09:35+0000\n"
"Last-Translator: Nathan <[email protected]>\n"
"Language-Team: French <https://l10n.elementary.io/projects/code/code/fr/>\n"
"Language: fr\n"
Expand Down Expand Up @@ -290,28 +290,22 @@ msgid "Restore Anyway"
msgstr "Restaurer quand-même"

#: src/Dialogs/CloseProjectsConfirmationDialog.vala:40
#, fuzzy
#| msgid "This folder is the parent of an open project"
msgid "This folder is the parent of an open project"
msgid_plural "This folder is the parent of open projects"
msgstr[0] "Ce dossier est le parent d'un projet ouvert"
msgstr[1] "Ce dossier est le parent d'un projet ouvert"
msgstr[0] "Ce dossier est le parent de projets ouverts"
msgstr[1] "Ce dossier est le parent de projets ouverts"

#: src/Dialogs/CloseProjectsConfirmationDialog.vala:46
#, fuzzy
#| msgid "Opening this folder will close the child project"
msgid "Opening this folder will close the child project"
msgid_plural "Opening this folder will close all child projects"
msgstr[0] "Ouvrir ce dossier fermera le projet enfant"
msgstr[1] "Ouvrir ce dossier fermera le projet enfant"
msgstr[1] "Ouvrir ce dossier fermera les projets enfants"

#: src/Dialogs/CloseProjectsConfirmationDialog.vala:52
#, fuzzy
#| msgid "Close Child Project"
msgid "Close Child Project"
msgid_plural "Close Child Projects"
msgstr[0] "Fermer le projet enfant"
msgstr[1] "Fermer le projet enfant"
msgstr[1] "Fermer les projets enfants"

#: src/Dialogs/CloseProjectsConfirmationDialog.vala:57
msgid "This folder is a child of an open project"
Expand All @@ -335,13 +329,7 @@ msgstr "Il y a des modifications non validées dans la branche courante"

#. /TRANSLATORS '%s' is a placeholder for the name of the branch to be checked out
#: src/Dialogs/OverwriteUncommittedConfirmationDialog.vala:42
#, fuzzy, c-format
#| msgid ""
#| "Uncommitted changes will be permanently lost if <b>'%s'</b> is checked "
#| "out now.\n"
#| "\n"
#| "<i>It is recommended that uncommitted changes are stashed, committed, or "
#| "reverted before proceeding </i>"
#, c-format
msgid ""
"Uncommitted changes will be permanently lost if <b>'%s'</b> is checked out "
"now.\n"
Expand Down
17 changes: 4 additions & 13 deletions po/he.po
View file
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: 2025-03-02 18:11+0000\n"
"PO-Revision-Date: 2025-03-02 10:12+0000\n"
"PO-Revision-Date: 2025-03-04 07:40+0000\n"
"Last-Translator: Yaron Shahrabani <[email protected]>\n"
"Language-Team: Hebrew <https://l10n.elementary.io/projects/code/code/he/>\n"
"Language: he\n"
Expand Down Expand Up @@ -286,13 +286,10 @@ msgid "Restore Anyway"
msgstr "לשחזר בכל זאת"

#: src/Dialogs/CloseProjectsConfirmationDialog.vala:40
#, fuzzy
#| msgid "This folder is the parent of an open project"
#| msgid_plural "This folder is the parent of %u open projects"
msgid "This folder is the parent of an open project"
msgid_plural "This folder is the parent of open projects"
msgstr[0] "התיקייה הזאת היא תיקיית העל של מיזם פתוח"
msgstr[1] "התיקייה הזאת היא תיקיית העל של %u מיזמים פתוחים"
msgstr[1] "התיקייה הזאת היא תיקיית העל של מיזמים פתוחים"

#: src/Dialogs/CloseProjectsConfirmationDialog.vala:46
msgid "Opening this folder will close the child project"
Expand Down Expand Up @@ -328,20 +325,14 @@ msgstr "יש שינויים שלא קובעו בענף הנוכחי"

#. /TRANSLATORS '%s' is a placeholder for the name of the branch to be checked out
#: src/Dialogs/OverwriteUncommittedConfirmationDialog.vala:42
#, fuzzy, c-format
#| msgid ""
#| "Uncommitted changes will be permanently lost if <b>'%s'</b> is checked "
#| "out now.\n"
#| "\n"
#| "<i>It is recommended that uncommitted changes are stashed, committed, or "
#| "reverted before proceeding </i>"
#, c-format
msgid ""
"Uncommitted changes will be permanently lost if <b>'%s'</b> is checked out "
"now.\n"
"\n"
"<i>It is recommended that uncommitted changes are stashed, committed, or "
"reverted before proceeding.</i>"
msgstr "שינויים שלא קובעו יאבדו לצמיתות אם"
msgstr ""

#: src/Dialogs/OverwriteUncommittedConfirmationDialog.vala:44
msgid "Do not Checkout"
Expand Down
28 changes: 8 additions & 20 deletions po/hu.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ msgstr ""
"Project-Id-Version: scratch\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2025-03-02 18:11+0000\n"
"PO-Revision-Date: 2025-02-26 19:46+0000\n"
"PO-Revision-Date: 2025-03-03 20:15+0000\n"
"Last-Translator: TomiOhl <[email protected]>\n"
"Language-Team: Hungarian <https://l10n.elementary.io/projects/code/code/hu/"
">\n"
"Language-Team: Hungarian <https://l10n.elementary.io/projects/code/code/hu/>"
"\n"
"Language: hu\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -290,27 +290,21 @@ msgid "Restore Anyway"
msgstr "Visszaállítás mindenképp"

#: src/Dialogs/CloseProjectsConfirmationDialog.vala:40
#, fuzzy
#| msgid "This folder is the parent of an open project"
msgid "This folder is the parent of an open project"
msgid_plural "This folder is the parent of open projects"
msgstr[0] "Ez a mappa egy megnyitott projekt szülője"
msgstr[1] "Ez a mappa egy megnyitott projekt szülője"
msgstr[1] "Ez a mappa megnyitott projektek szülője"

#: src/Dialogs/CloseProjectsConfirmationDialog.vala:46
#, fuzzy
#| msgid "Opening this folder will close the child project"
msgid "Opening this folder will close the child project"
msgid_plural "Opening this folder will close all child projects"
msgstr[0] "A mappa megnyitása be fogja zárni a leszármazott projektet"
msgstr[1] "A mappa megnyitása be fogja zárni a leszármazott projektet"
msgstr[1] "A mappa megnyitása be fogja zárni a leszármazott projekteket"

#: src/Dialogs/CloseProjectsConfirmationDialog.vala:52
#, fuzzy
#| msgid "Close Child Project"
msgid "Close Child Project"
msgid_plural "Close Child Projects"
msgstr[0] "Leszármazott projekt bezárása"
msgstr[0] "Leszármazott projektek bezárása"
msgstr[1] "Leszármazott projekt bezárása"

#: src/Dialogs/CloseProjectsConfirmationDialog.vala:57
Expand All @@ -335,13 +329,7 @@ msgstr "Nem commitolt módosítások vannak a jelenlegi elágazáson"

#. /TRANSLATORS '%s' is a placeholder for the name of the branch to be checked out
#: src/Dialogs/OverwriteUncommittedConfirmationDialog.vala:42
#, fuzzy, c-format
#| msgid ""
#| "Uncommitted changes will be permanently lost if <b>'%s'</b> is checked "
#| "out now.\n"
#| "\n"
#| "<i>It is recommended that uncommitted changes are stashed, committed, or "
#| "reverted before proceeding </i>"
#, c-format
msgid ""
"Uncommitted changes will be permanently lost if <b>'%s'</b> is checked out "
"now.\n"
Expand All @@ -353,7 +341,7 @@ msgstr ""
"elágazásra vált most.\n"
"\n"
"<i>Javasolt a nem commitolt változtatásokat stash-elni, commitolni vagy "
"visszaállítani a továbblépés előtt </i>"
"visszaállítani a továbblépés előtt.</i>"

#: src/Dialogs/OverwriteUncommittedConfirmationDialog.vala:44
msgid "Do not Checkout"
Expand Down
10 changes: 6 additions & 4 deletions po/ja.po
View file
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: 2025-03-02 18:11+0000\n"
"PO-Revision-Date: 2025-03-02 10:28+0000\n"
"PO-Revision-Date: 2025-03-03 20:14+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 @@ -287,8 +287,6 @@ msgid "Restore Anyway"
msgstr "了解して復元"

#: src/Dialogs/CloseProjectsConfirmationDialog.vala:40
#, fuzzy
#| msgid "This folder is the parent of an open project"
msgid "This folder is the parent of an open project"
msgid_plural "This folder is the parent of open projects"
msgstr[0] "開いているプロジェクトの親フォルダーです"
Expand Down Expand Up @@ -321,7 +319,7 @@ msgstr "キャンセル"

#: src/Dialogs/OverwriteUncommittedConfirmationDialog.vala:40
msgid "There are uncommitted changes in the current branch"
msgstr "コミットされてない変更が現在のブランチにあります"
msgstr "コミットしていない変更が現在のブランチにあります"

#. /TRANSLATORS '%s' is a placeholder for the name of the branch to be checked out
#: src/Dialogs/OverwriteUncommittedConfirmationDialog.vala:42
Expand All @@ -333,6 +331,10 @@ msgid ""
"<i>It is recommended that uncommitted changes are stashed, committed, or "
"reverted before proceeding.</i>"
msgstr ""
"<b>'%s'</b> にチェックアウトすると、コミットしていない変更は破棄されます。\n"
"\n"
"<i>続行する前に、コミットしていない変更をスタッシュ、コミット、またはリバート"
"することをおすすめします。</i>"

#: src/Dialogs/OverwriteUncommittedConfirmationDialog.vala:44
msgid "Do not Checkout"
Expand Down
34 changes: 11 additions & 23 deletions po/uk.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ msgstr ""
"Project-Id-Version: scratch\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2025-03-02 18:11+0000\n"
"PO-Revision-Date: 2025-02-06 00:33+0000\n"
"PO-Revision-Date: 2025-03-03 20:14+0000\n"
"Last-Translator: Ihor Hordiichuk <[email protected]>\n"
"Language-Team: Ukrainian <https://l10n.elementary.io/projects/code/code/uk/"
">\n"
"Language-Team: Ukrainian <https://l10n.elementary.io/projects/code/code/uk/>"
"\n"
"Language: uk\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -290,31 +290,25 @@ msgid "Restore Anyway"
msgstr "Все одно відновити"

#: src/Dialogs/CloseProjectsConfirmationDialog.vala:40
#, fuzzy
#| msgid "This folder is the parent of an open project"
msgid "This folder is the parent of an open project"
msgid_plural "This folder is the parent of open projects"
msgstr[0] "Це батьківська тека відкритого проєкту"
msgstr[1] "Це батьківська тека відкритого проєкту"
msgstr[2] "Це батьківська тека відкритого проєкту"
msgstr[1] "Це батьківська тека відкритих проєктів"
msgstr[2] "Це батьківська тека відкритих проєктів"

#: src/Dialogs/CloseProjectsConfirmationDialog.vala:46
#, fuzzy
#| msgid "Opening this folder will close the child project"
msgid "Opening this folder will close the child project"
msgid_plural "Opening this folder will close all child projects"
msgstr[0] "Відкриття цієї теки призведе до закриття вкладеного проєкту"
msgstr[1] "Відкриття цієї теки призведе до закриття вкладеного проєкту"
msgstr[2] "Відкриття цієї теки призведе до закриття вкладеного проєкту"
msgstr[1] "Відкриття цієї теки призведе до закриття вкладених проєктів"
msgstr[2] "Відкриття цієї теки призведе до закриття вкладених проєктів"

#: src/Dialogs/CloseProjectsConfirmationDialog.vala:52
#, fuzzy
#| msgid "Close Child Project"
msgid "Close Child Project"
msgid_plural "Close Child Projects"
msgstr[0] "Закрити вкладений проєкт"
msgstr[1] "Закрити вкладений проєкт"
msgstr[2] "Закрити вкладений проєкт"
msgstr[1] "Закрити вкладені проєкти"
msgstr[2] "Закрити вкладені проєкти"

#: src/Dialogs/CloseProjectsConfirmationDialog.vala:57
msgid "This folder is a child of an open project"
Expand All @@ -338,13 +332,7 @@ msgstr "У поточній гілці є не надіслані зміни"

#. /TRANSLATORS '%s' is a placeholder for the name of the branch to be checked out
#: src/Dialogs/OverwriteUncommittedConfirmationDialog.vala:42
#, fuzzy, c-format
#| msgid ""
#| "Uncommitted changes will be permanently lost if <b>'%s'</b> is checked "
#| "out now.\n"
#| "\n"
#| "<i>It is recommended that uncommitted changes are stashed, committed, or "
#| "reverted before proceeding </i>"
#, c-format
msgid ""
"Uncommitted changes will be permanently lost if <b>'%s'</b> is checked out "
"now.\n"
Expand All @@ -356,7 +344,7 @@ msgstr ""
"<b>'%s'</b>.\n"
"\n"
"<i>Рекомендується, сховати, надіслати або скасувати не надіслані зміни перед "
"продовженням</i>"
"продовженням.</i>"

#: src/Dialogs/OverwriteUncommittedConfirmationDialog.vala:44
msgid "Do not Checkout"
Expand Down

0 comments on commit 9e2ad9a

Please sign in to comment.