Skip to content

Commit a2de916

Browse files
authored
Merge branch 'master' into ryonakano/overwrite-dialog-fix
2 parents 0049593 + 6cad63b commit a2de916

File tree

3 files changed

+16
-29
lines changed

3 files changed

+16
-29
lines changed

po/es.po

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ msgstr ""
88
"Project-Id-Version: scratch\n"
99
"Report-Msgid-Bugs-To: \n"
1010
"POT-Creation-Date: 2025-03-02 09:16+0000\n"
11-
"PO-Revision-Date: 2025-02-06 00:33+0000\n"
12-
"Last-Translator: Italo Felipe Capasso Ballesteros <edwood.grant@gmail.com>\n"
11+
"PO-Revision-Date: 2025-03-02 12:17+0000\n"
12+
"Last-Translator: Italo Felipe Capasso Ballesteros <italo@gp-mail.com>\n"
1313
"Language-Team: Spanish <https://l10n.elementary.io/projects/code/code/es/>\n"
1414
"Language: es\n"
1515
"MIME-Version: 1.0\n"
@@ -290,28 +290,23 @@ msgid "Restore Anyway"
290290
msgstr "Restaurar de todos modos"
291291

292292
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:40
293-
#, fuzzy, c-format
294-
#| msgid "This folder is the parent of an open project"
293+
#, c-format
295294
msgid "This folder is the parent of an open project"
296295
msgid_plural "This folder is the parent of %u open projects"
297296
msgstr[0] "Esta carpeta es una carpeta padre de un proyecto abierto"
298-
msgstr[1] "Esta carpeta es una carpeta padre de un proyecto abierto"
297+
msgstr[1] "Esta carpeta es una carpeta padre de %u proyectos abiertos"
299298

300299
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:46
301-
#, fuzzy
302-
#| msgid "Opening this folder will close the child project"
303300
msgid "Opening this folder will close the child project"
304301
msgid_plural "Opening this folder will close all child projects"
305302
msgstr[0] "Al abrir esta carpeta se cerrará el proyecto hijo"
306-
msgstr[1] "Al abrir esta carpeta se cerrará el proyecto hijo"
303+
msgstr[1] "Al abrir esta carpeta se cerrarán todos los proyectos hijos"
307304

308305
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:52
309-
#, fuzzy
310-
#| msgid "Close Child Project"
311306
msgid "Close Child Project"
312307
msgid_plural "Close Child Projects"
313308
msgstr[0] "Cerrar el proyecto hijo"
314-
msgstr[1] "Cerrar el proyecto hijo"
309+
msgstr[1] "Cerrar los proyectos hijos"
315310

316311
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:57
317312
msgid "This folder is a child of an open project"

po/he.po

Lines changed: 5 additions & 10 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-03-02 09:16+0000\n"
11-
"PO-Revision-Date: 2025-02-12 00:44+0000\n"
11+
"PO-Revision-Date: 2025-03-02 10:12+0000\n"
1212
"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
1313
"Language-Team: Hebrew <https://l10n.elementary.io/projects/code/code/he/>\n"
1414
"Language: he\n"
@@ -286,28 +286,23 @@ msgid "Restore Anyway"
286286
msgstr "לשחזר בכל זאת"
287287

288288
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:40
289-
#, fuzzy, c-format
290-
#| msgid "This folder is the parent of an open project"
289+
#, c-format
291290
msgid "This folder is the parent of an open project"
292291
msgid_plural "This folder is the parent of %u open projects"
293292
msgstr[0] "התיקייה הזאת היא תיקיית העל של מיזם פתוח"
294-
msgstr[1] "התיקייה הזאת היא תיקיית העל של מיזם פתוח"
293+
msgstr[1] "התיקייה הזאת היא תיקיית העל של %u מיזמים פתוחים"
295294

296295
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:46
297-
#, fuzzy
298-
#| msgid "Opening this folder will close the child project"
299296
msgid "Opening this folder will close the child project"
300297
msgid_plural "Opening this folder will close all child projects"
301298
msgstr[0] "פתיחת התיקייה הזאת תסגור את מיזם הצאצא"
302-
msgstr[1] "פתיחת התיקייה הזאת תסגור את מיזם הצאצא"
299+
msgstr[1] "פתיחת התיקייה הזאת תסגור את כל המיזמים הצאצאיים"
303300

304301
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:52
305-
#, fuzzy
306-
#| msgid "Close Child Project"
307302
msgid "Close Child Project"
308303
msgid_plural "Close Child Projects"
309304
msgstr[0] "סגירת מיזם צאצא"
310-
msgstr[1] "סגירת מיזם צאצא"
305+
msgstr[1] "סגירת מיזמים צאצאיים"
311306

312307
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:57
313308
msgid "This folder is a child of an open project"

po/ja.po

Lines changed: 5 additions & 8 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-03-02 09:16+0000\n"
11-
"PO-Revision-Date: 2025-03-02 09:36+0000\n"
11+
"PO-Revision-Date: 2025-03-02 10:28+0000\n"
1212
"Last-Translator: Ryo Nakano <ryonakaknock3@gmail.com>\n"
1313
"Language-Team: Japanese <https://l10n.elementary.io/projects/code/code/ja/>\n"
1414
"Language: ja\n"
@@ -336,11 +336,11 @@ msgstr ""
336336

337337
#: src/Dialogs/OverwriteUncommittedConfirmationDialog.vala:44
338338
msgid "Checkout and Overwrite"
339-
msgstr ""
339+
msgstr "チェックアウトして上書き"
340340

341341
#: src/Dialogs/OverwriteUncommittedConfirmationDialog.vala:46
342342
msgid "Do not Checkout"
343-
msgstr ""
343+
msgstr "チェックアウトしない"
344344

345345
#: src/FolderManager/FileItem.vala:46 src/FolderManager/FolderItem.vala:92
346346
#: src/FolderManager/ProjectFolderItem.vala:148
@@ -401,10 +401,8 @@ msgid "new file"
401401
msgstr "新しいファイル"
402402

403403
#: src/FolderManager/ProjectFolderItem.vala:140
404-
#, fuzzy
405-
#| msgid "Active Git project: %s"
406404
msgid "Set as Active Project"
407-
msgstr "アクティブな Git プロジェクト: %s"
405+
msgstr "アクティブなプロジェクトに設定"
408406

409407
#: src/FolderManager/ProjectFolderItem.vala:179
410408
msgid "Close Folder"
@@ -675,8 +673,7 @@ msgid "No Project Selected"
675673
msgstr "プロジェクト未選択"
676674

677675
#: src/Widgets/ChooseProjectButton.vala:21
678-
#, fuzzy, c-format
679-
#| msgid "Active Git project: %s"
676+
#, c-format
680677
msgid "Active Git Project: %s"
681678
msgstr "アクティブな Git プロジェクト: %s"
682679

0 commit comments

Comments
 (0)