┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorl10n daemon script <[email protected]>2025-09-25 01:35:17 +0000
committerl10n daemon script <[email protected]>2025-09-25 01:35:17 +0000
commit0778b805cd823172f179809f535048c41bccef8d (patch)
tree1a9cc482825dfb633ab1e7107f03da8b26432031 /src
parenteb94e6dd675da09f1d8979be42ced179ec853a23 (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')
-rw-r--r--src/dolphinpart.json.in2
-rw-r--r--src/itemactions/hidefileitemaction.json15
-rw-r--r--src/itemactions/movetonewfolderitemaction.json1
-rw-r--r--src/itemactions/setfoldericonitemaction.json2
-rw-r--r--src/settings/kcm/kcmdolphingeneral.json1
5 files changed, 19 insertions, 2 deletions
diff --git a/src/dolphinpart.json.in b/src/dolphinpart.json.in
index 4537f88a0..2e7b68a75 100644
--- a/src/dolphinpart.json.in
+++ b/src/dolphinpart.json.in
@@ -58,7 +58,7 @@
"Name[sa]": "डॉल्फिन दृश्य",
"Name[se]": "Dolphinčájeheapmi",
"Name[sk]": "Dolphin pohľad",
- "Name[sl]": "Dolphin - pogled",
+ "Name[sl]": "Dolphinov pogled",
"Name[sr@ijekavian]": "Делфинов приказ",
"Name[sr@ijekavianlatin]": "Dolphinov prikaz",
"Name[sr@latin]": "Dolphinov prikaz",
diff --git a/src/itemactions/hidefileitemaction.json b/src/itemactions/hidefileitemaction.json
index 7b4627254..04cd35dd0 100644
--- a/src/itemactions/hidefileitemaction.json
+++ b/src/itemactions/hidefileitemaction.json
@@ -4,7 +4,20 @@
"MimeTypes": [
"application/octet-stream"
],
- "Name": "Hide"
+ "Name": "Hide",
+ "Name[ar]": "أخفِ",
+ "Name[ca]": "Oculta",
+ "Name[es]": "Ocultar",
+ "Name[he]": "הסתרה",
+ "Name[ia]": "Cela",
+ "Name[it]": "Nascondi",
+ "Name[ka]": "დამალვა",
+ "Name[nl]": "Verbergen",
+ "Name[pt_BR]": "Ocultar",
+ "Name[sl]": "Skrij",
+ "Name[tr]": "Gizle",
+ "Name[uk]": "Приховати",
+ "Name[zh_TW]": "隱藏"
},
"X-KDE-Show-In-Submenu": true
}
diff --git a/src/itemactions/movetonewfolderitemaction.json b/src/itemactions/movetonewfolderitemaction.json
index 3b995afa8..a44732b8a 100644
--- a/src/itemactions/movetonewfolderitemaction.json
+++ b/src/itemactions/movetonewfolderitemaction.json
@@ -28,6 +28,7 @@
"Name[ie]": "Mover a un nov fólder",
"Name[is]": "Færa í nýja möppu",
"Name[it]": "Sposta in una nuova cartella",
+ "Name[ja]": "新しいフォルダに移動",
"Name[ka]": "გადატანა ახალ საქაღალდეში",
"Name[ko]": "새 폴더로 이동",
"Name[lt]": "Perkelti į naują aplanką",
diff --git a/src/itemactions/setfoldericonitemaction.json b/src/itemactions/setfoldericonitemaction.json
index 85febdccf..6868e0e85 100644
--- a/src/itemactions/setfoldericonitemaction.json
+++ b/src/itemactions/setfoldericonitemaction.json
@@ -17,8 +17,10 @@
"Name[gl]": "Definir a icona do cartafol",
"Name[he]": "הגדרת סמל תיקייה",
"Name[hu]": "Mappaikon beállítása",
+ "Name[ia]": "Assigna icone de dossier",
"Name[is]": "Velja möpputákn",
"Name[it]": "Imposta icona della cartella",
+ "Name[ja]": "フォルダのアイコンをセットする",
"Name[ka]": "საქაღალდის ხატულას დაყენება",
"Name[ko]": "폴더 아이콘 설정",
"Name[lv]": "Norādīt datnes ikonu",
diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json
index 36b99c7d7..8c743d781 100644
--- a/src/settings/kcm/kcmdolphingeneral.json
+++ b/src/settings/kcm/kcmdolphingeneral.json
@@ -28,6 +28,7 @@
"Name[ie]": "General",
"Name[is]": "Almennt",
"Name[it]": "Generale",
+ "Name[ja]": "全般",
"Name[ka]": "მთავარი",
"Name[ko]": "일반",
"Name[lt]": "Bendrosios",