Skip to content

Commit 2f2c220

Browse files
authored
Merge branch 'master' into jeremypw/open-after-close-unnamed
2 parents 38b8777 + 9804df9 commit 2f2c220

File tree

4 files changed

+64
-72
lines changed

4 files changed

+64
-72
lines changed

po/extra/fr.po

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ msgstr ""
88
"Project-Id-Version: scratch\n"
99
"Report-Msgid-Bugs-To: \n"
1010
"POT-Creation-Date: 2025-02-05 10:55+0000\n"
11-
"PO-Revision-Date: 2024-07-23 15:16+0000\n"
11+
"PO-Revision-Date: 2025-02-07 15:16+0000\n"
1212
"Last-Translator: Nathan <bonnemainsnathan@gmail.com>\n"
1313
"Language-Team: French <https://l10n.elementary.io/projects/code/extra/fr/>\n"
1414
"Language: fr\n"
1515
"MIME-Version: 1.0\n"
1616
"Content-Type: text/plain; charset=UTF-8\n"
1717
"Content-Transfer-Encoding: 8bit\n"
1818
"Plural-Forms: nplurals=2; plural=n > 1;\n"
19-
"X-Generator: Weblate 5.6.2\n"
19+
"X-Generator: Weblate 5.9.2\n"
2020
"X-Launchpad-Export-Date: 2017-05-03 06:04+0000\n"
2121

2222
#: data/code.metainfo.xml.in:9
@@ -151,7 +151,7 @@ msgstr "Mises à jour mineures :"
151151

152152
#: data/code.metainfo.xml.in:75
153153
msgid "Add symbol filter to Outline pane"
154-
msgstr ""
154+
msgstr "Ajout d'un filtre de symbole au panneau"
155155

156156
#: data/code.metainfo.xml.in:76 data/code.metainfo.xml.in:96
157157
#: data/code.metainfo.xml.in:132 data/code.metainfo.xml.in:173

po/fr.po

Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ msgstr ""
88
"Project-Id-Version: scratch\n"
99
"Report-Msgid-Bugs-To: \n"
1010
"POT-Creation-Date: 2025-02-05 10:55+0000\n"
11-
"PO-Revision-Date: 2024-11-04 15:16+0000\n"
11+
"PO-Revision-Date: 2025-02-07 15:16+0000\n"
1212
"Last-Translator: Nathan <bonnemainsnathan@gmail.com>\n"
1313
"Language-Team: French <https://l10n.elementary.io/projects/code/code/fr/>\n"
1414
"Language: fr\n"
1515
"MIME-Version: 1.0\n"
1616
"Content-Type: text/plain; charset=UTF-8\n"
1717
"Content-Transfer-Encoding: 8bit\n"
1818
"Plural-Forms: nplurals=2; plural=n > 1;\n"
19-
"X-Generator: Weblate 5.6.2\n"
19+
"X-Generator: Weblate 5.9.2\n"
2020
"X-Launchpad-Export-Date: 2017-05-03 06:01+0000\n"
2121

2222
#: src/Application.vala:38 src/Widgets/DocumentView.vala:99
@@ -291,52 +291,48 @@ msgstr "Restaurer quand-même"
291291

292292
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:40
293293
msgid "This folder is the parent of an open project"
294-
msgstr ""
294+
msgstr "Ce dossier est le parent d'un projet ouvert"
295295

296296
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:41
297297
#, c-format
298298
msgid "This folder is the parent of %u open projects"
299-
msgstr ""
299+
msgstr "Ce dossier est le parent de %u projets ouverts"
300300

301301
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:46
302302
msgid "Opening this folder will close the child project"
303-
msgstr ""
303+
msgstr "Ouvrir ce dossier fermera le projet enfant"
304304

305305
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:47
306306
msgid "Opening this folder will close all child projects"
307-
msgstr ""
307+
msgstr "Ouvrir ce dossier fermera tous les projets enfants"
308308

309309
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:52
310310
msgid "Close Child Project"
311-
msgstr ""
311+
msgstr "Fermer le projet enfant"
312312

313313
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:53
314314
msgid "Close Child Projects"
315-
msgstr ""
315+
msgstr "Fermer les projets enfants"
316316

317317
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:57
318318
msgid "This folder is a child of an open project"
319-
msgstr ""
319+
msgstr "Ce dossier est l'enfant d'un projet ouvert"
320320

321321
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:58
322322
msgid "Opening this folder will close the parent project"
323-
msgstr ""
323+
msgstr "Ouvrir ce dossier fermera le projet parent"
324324

325325
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:59
326326
msgid "Close Parent Project"
327-
msgstr ""
327+
msgstr "Fermer le projet parent"
328328

329329
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:62
330-
#, fuzzy
331-
#| msgid "Don't Restore"
332330
msgid "Don't Open"
333-
msgstr "Ne pas restaurer"
331+
msgstr "Ne pas ouvrir"
334332

335333
#: src/Dialogs/OverwriteUncommittedConfirmationDialog.vala:40
336-
#, fuzzy
337-
#| msgid "There are unsaved changes in Scratch!"
338334
msgid "There are uncommitted changes in the current branch"
339-
msgstr "Des changements dans Scratch n'ont pas été enregistrés !"
335+
msgstr "Il y a des modifications non validées dans la branche courante"
340336

341337
#. /TRANSLATORS '%s' is a placeholder for the name of the branch to be checked out
342338
#: src/Dialogs/OverwriteUncommittedConfirmationDialog.vala:42
@@ -348,14 +344,20 @@ msgid ""
348344
"<i>It is recommended that uncommitted changes are stashed, committed, or "
349345
"reverted before proceeding </i>"
350346
msgstr ""
347+
"Les modifications non validées seront définitivement perdues si vous "
348+
"basculez sur <b>« %s »</b> maintenant.\n"
349+
"\n"
350+
"<i>Il est recommandé que les modifications non validées soient mises en "
351+
"attente (stash), validées (commit), ou annulées (revert) avant de continuer "
352+
"</i>"
351353

352354
#: src/Dialogs/OverwriteUncommittedConfirmationDialog.vala:44
353355
msgid "Checkout and Overwrite"
354-
msgstr ""
356+
msgstr "Basculer et écraser"
355357

356358
#: src/Dialogs/OverwriteUncommittedConfirmationDialog.vala:46
357359
msgid "Do not Checkout"
358-
msgstr ""
360+
msgstr "Ne pas basculer"
359361

360362
#: src/FolderManager/FileItem.vala:46 src/FolderManager/FolderItem.vala:92
361363
#: src/FolderManager/ProjectFolderItem.vala:148
@@ -416,10 +418,8 @@ msgid "new file"
416418
msgstr "nouveau fichier"
417419

418420
#: src/FolderManager/ProjectFolderItem.vala:140
419-
#, fuzzy
420-
#| msgid "Active Git project: %s"
421421
msgid "Set as Active Project"
422-
msgstr "Projet Git actif : %s"
422+
msgstr "Définir comme projet actif"
423423

424424
#: src/FolderManager/ProjectFolderItem.vala:179
425425
msgid "Close Folder"
@@ -567,12 +567,11 @@ msgstr ""
567567
"modifications n'ont pas été enregistrées."
568568

569569
#: src/Services/Document.vala:886
570-
#, fuzzy, c-format
571-
#| msgid "File “%s” was deleted and there are unsaved changes."
570+
#, c-format
572571
msgid "File “%s” was deleted, renamed or moved and there are unsaved changes."
573572
msgstr ""
574-
"Le fichier « %s » a été supprimé et certaines modifications n'ont pas été "
575-
"enregistrées."
573+
"Le fichier « %s » a été supprimé, renommé ou déplacé et certaines "
574+
"modifications n'ont pas été enregistrées."
576575

577576
#. Check external changes after loading
578577
#. The file has become unwritable while changes are pending
@@ -702,8 +701,7 @@ msgid "No Project Selected"
702701
msgstr "Aucun projet sélectionné"
703702

704703
#: src/Widgets/ChooseProjectButton.vala:21
705-
#, fuzzy, c-format
706-
#| msgid "Active Git project: %s"
704+
#, c-format
707705
msgid "Active Git Project: %s"
708706
msgstr "Projet Git actif : %s"
709707

po/hu.po

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ msgstr ""
88
"Project-Id-Version: scratch\n"
99
"Report-Msgid-Bugs-To: \n"
1010
"POT-Creation-Date: 2025-02-05 10:55+0000\n"
11-
"PO-Revision-Date: 2025-01-16 17:55+0000\n"
11+
"PO-Revision-Date: 2025-02-07 15:16+0000\n"
1212
"Last-Translator: TomiOhl <ohlslager.tom@gmail.com>\n"
13-
"Language-Team: Hungarian <https://l10n.elementary.io/projects/code/code/hu/"
14-
">\n"
13+
"Language-Team: Hungarian <https://l10n.elementary.io/projects/code/code/hu/>"
14+
"\n"
1515
"Language: hu\n"
1616
"MIME-Version: 1.0\n"
1717
"Content-Type: text/plain; charset=UTF-8\n"
@@ -291,46 +291,44 @@ msgstr "Visszaállítás mindenképp"
291291

292292
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:40
293293
msgid "This folder is the parent of an open project"
294-
msgstr ""
294+
msgstr "Ez a mappa egy megnyitott projekt szülője"
295295

296296
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:41
297297
#, c-format
298298
msgid "This folder is the parent of %u open projects"
299-
msgstr ""
299+
msgstr "Ez a mappa %u megnyitott projekt szülője"
300300

301301
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:46
302302
msgid "Opening this folder will close the child project"
303-
msgstr ""
303+
msgstr "A mappa megnyitása be fogja zárni a leszármazott projektet"
304304

305305
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:47
306306
msgid "Opening this folder will close all child projects"
307-
msgstr ""
307+
msgstr "A mappa megnyitása be fogja zárni az összes leszármazott projektet"
308308

309309
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:52
310310
msgid "Close Child Project"
311-
msgstr ""
311+
msgstr "Leszármazott projekt bezárása"
312312

313313
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:53
314314
msgid "Close Child Projects"
315-
msgstr ""
315+
msgstr "Leszármazott projektek bezárása"
316316

317317
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:57
318318
msgid "This folder is a child of an open project"
319-
msgstr ""
319+
msgstr "Ez a mappa egy megnyitott projekt leszármazottja"
320320

321321
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:58
322322
msgid "Opening this folder will close the parent project"
323-
msgstr ""
323+
msgstr "A mappa megnyitása be fogja zárni a szülőprojektet"
324324

325325
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:59
326326
msgid "Close Parent Project"
327-
msgstr ""
327+
msgstr "Szülőprojekt bezárása"
328328

329329
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:62
330-
#, fuzzy
331-
#| msgid "Don't Restore"
332330
msgid "Don't Open"
333-
msgstr "Ne állítsa vissza"
331+
msgstr "Ne nyissa meg"
334332

335333
#: src/Dialogs/OverwriteUncommittedConfirmationDialog.vala:40
336334
#, fuzzy
@@ -416,10 +414,8 @@ msgid "new file"
416414
msgstr "új fájl"
417415

418416
#: src/FolderManager/ProjectFolderItem.vala:140
419-
#, fuzzy
420-
#| msgid "Active Git project: %s"
421417
msgid "Set as Active Project"
422-
msgstr "Aktív Git projekt: %s"
418+
msgstr "Beállítás aktív projektként"
423419

424420
#: src/FolderManager/ProjectFolderItem.vala:179
425421
msgid "Close Folder"

po/pl.po

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgstr ""
88
"Project-Id-Version: scratch\n"
99
"Report-Msgid-Bugs-To: \n"
1010
"POT-Creation-Date: 2025-02-05 10:55+0000\n"
11-
"PO-Revision-Date: 2025-01-11 23:16+0000\n"
11+
"PO-Revision-Date: 2025-02-08 13:02+0000\n"
1212
"Last-Translator: Marcin Serwin <marcin@serwin.dev>\n"
1313
"Language-Team: Polish <https://l10n.elementary.io/projects/code/code/pl/>\n"
1414
"Language: pl\n"
@@ -293,52 +293,48 @@ msgstr "Przywróć mimo wszystko"
293293

294294
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:40
295295
msgid "This folder is the parent of an open project"
296-
msgstr ""
296+
msgstr "Ten folder jest nadrzędny dla otwartego projektu"
297297

298298
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:41
299299
#, c-format
300300
msgid "This folder is the parent of %u open projects"
301-
msgstr ""
301+
msgstr "Ten folder jest nadrzędny dla %u otwartych projektów"
302302

303303
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:46
304304
msgid "Opening this folder will close the child project"
305-
msgstr ""
305+
msgstr "Otworzenie tego folderu zamknie projekt podrzędny"
306306

307307
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:47
308308
msgid "Opening this folder will close all child projects"
309-
msgstr ""
309+
msgstr "Otwarcie tego folderu zamknie wszystkie projekty podrzędne"
310310

311311
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:52
312312
msgid "Close Child Project"
313-
msgstr ""
313+
msgstr "Zamknij projekt podrzędny"
314314

315315
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:53
316316
msgid "Close Child Projects"
317-
msgstr ""
317+
msgstr "Zamknij projekty podrzędne"
318318

319319
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:57
320320
msgid "This folder is a child of an open project"
321-
msgstr ""
321+
msgstr "Ten folder jest podrzędny dla otwartego projektu"
322322

323323
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:58
324324
msgid "Opening this folder will close the parent project"
325-
msgstr ""
325+
msgstr "Otwarcie tego projektu zamknie projekt nadrzędny"
326326

327327
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:59
328328
msgid "Close Parent Project"
329-
msgstr ""
329+
msgstr "Zamknij projekt nadrzędny"
330330

331331
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:62
332-
#, fuzzy
333-
#| msgid "Don't Restore"
334332
msgid "Don't Open"
335-
msgstr "Nie przywracaj"
333+
msgstr "Nie otwieraj"
336334

337335
#: src/Dialogs/OverwriteUncommittedConfirmationDialog.vala:40
338-
#, fuzzy
339-
#| msgid "There are unsaved changes in Scratch!"
340336
msgid "There are uncommitted changes in the current branch"
341-
msgstr "Istnieją niezapisane zmiany w Scratch'u!"
337+
msgstr "Istnieją niescommitowane zmiany w aktualnym odgałęzieniu"
342338

343339
#. /TRANSLATORS '%s' is a placeholder for the name of the branch to be checked out
344340
#: src/Dialogs/OverwriteUncommittedConfirmationDialog.vala:42
@@ -350,14 +346,19 @@ msgid ""
350346
"<i>It is recommended that uncommitted changes are stashed, committed, or "
351347
"reverted before proceeding </i>"
352348
msgstr ""
349+
"Niescommitowane zmiany zostaną na zawsze stracone jeśli <b>'%s'</b> zostanie "
350+
"teraz otwarty.\n"
351+
"\n"
352+
"<i>Zalecane jest by niescommitowane zmiany zostały przechowane w stashu, "
353+
"scommitowane, lub odrzucone przed kontynuowaniem</i>"
353354

354355
#: src/Dialogs/OverwriteUncommittedConfirmationDialog.vala:44
355356
msgid "Checkout and Overwrite"
356-
msgstr ""
357+
msgstr "Otwórz gałąź i nadpisz"
357358

358359
#: src/Dialogs/OverwriteUncommittedConfirmationDialog.vala:46
359360
msgid "Do not Checkout"
360-
msgstr ""
361+
msgstr "Nie otwieraj gałęzi"
361362

362363
#: src/FolderManager/FileItem.vala:46 src/FolderManager/FolderItem.vala:92
363364
#: src/FolderManager/ProjectFolderItem.vala:148
@@ -418,10 +419,8 @@ msgid "new file"
418419
msgstr "nowy plik"
419420

420421
#: src/FolderManager/ProjectFolderItem.vala:140
421-
#, fuzzy
422-
#| msgid "Active Git project: %s"
423422
msgid "Set as Active Project"
424-
msgstr "Aktywny projekt Git: %s"
423+
msgstr "Ustaw jako aktywny projekt"
425424

426425
#: src/FolderManager/ProjectFolderItem.vala:179
427426
msgid "Close Folder"
@@ -702,8 +701,7 @@ msgid "No Project Selected"
702701
msgstr "Nie wybrano projektu"
703702

704703
#: src/Widgets/ChooseProjectButton.vala:21
705-
#, fuzzy, c-format
706-
#| msgid "Active Git project: %s"
704+
#, c-format
707705
msgid "Active Git Project: %s"
708706
msgstr "Aktywny projekt Git: %s"
709707

0 commit comments

Comments
 (0)