diff options
| author | l10n daemon script <[email protected]> | 2026-02-06 01:41:48 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2026-02-06 01:41:48 +0000 |
| commit | 0a18c04e19da3d94e3c885237c9d4d2a9fc822e1 (patch) | |
| tree | a34fad31fa1d73deeba55924ec03c5f93c868d75 /src/itemactions | |
| parent | f2cedf6a093983911d4da7488fd3f574a189c1fc (diff) | |
SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
Diffstat (limited to 'src/itemactions')
| -rw-r--r-- | src/itemactions/hidefileitemaction.json | 1 | ||||
| -rw-r--r-- | src/itemactions/movetonewfolderitemaction.json | 1 | ||||
| -rw-r--r-- | src/itemactions/setfoldericonitemaction.json | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/src/itemactions/hidefileitemaction.json b/src/itemactions/hidefileitemaction.json index 288e0cb69..fa3d202f6 100644 --- a/src/itemactions/hidefileitemaction.json +++ b/src/itemactions/hidefileitemaction.json @@ -15,6 +15,7 @@ "Name[eu]": "Ezkutatu", "Name[fi]": "Piilota", "Name[fr]": "Masquer", + "Name[ga]": "Folaigh", "Name[he]": "הסתרה", "Name[hu]": "Elrejtés", "Name[ia]": "Cela", diff --git a/src/itemactions/movetonewfolderitemaction.json b/src/itemactions/movetonewfolderitemaction.json index a44732b8a..0b1b67551 100644 --- a/src/itemactions/movetonewfolderitemaction.json +++ b/src/itemactions/movetonewfolderitemaction.json @@ -21,6 +21,7 @@ "Name[eu]": "Eraman karpeta berrira", "Name[fi]": "Siirrä uuteen kansioon", "Name[fr]": "Déplacer vers le nouveau dossier", + "Name[ga]": "Bog go Fillteán Nua", "Name[gl]": "Mover a un novo cartafol", "Name[he]": "העברה לתיקייה חדשה", "Name[hu]": "Áthelyezés új mappába", diff --git a/src/itemactions/setfoldericonitemaction.json b/src/itemactions/setfoldericonitemaction.json index b730aff84..2d888da56 100644 --- a/src/itemactions/setfoldericonitemaction.json +++ b/src/itemactions/setfoldericonitemaction.json @@ -15,6 +15,7 @@ "Name[eu]": "Ezarri karpetaren ikonoa", "Name[fi]": "Aseta kansiokuvake", "Name[fr]": "Définir l'icône de dossiers", + "Name[ga]": "Socraigh Deilbhín Fillteáin", "Name[gl]": "Definir a icona do cartafol", "Name[he]": "הגדרת סמל תיקייה", "Name[hu]": "Mappaikon beállítása", |