diff options
| author | l10n daemon script <[email protected]> | 2024-08-28 01:32:24 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-08-28 01:32:24 +0000 |
| commit | 6b1a5a2779f404165fd1e0b117fdac6dbdf75cc5 (patch) | |
| tree | 387b08a9a802cd34a58d248004c52b54a5c9b499 /src | |
| parent | 5797371c789f8814b2310b2ee659724d10a413c2 (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.in | 1 | ||||
| -rw-r--r-- | src/itemactions/movetonewfolderitemaction.json | 1 | ||||
| -rw-r--r-- | src/settings/kcm/kcmdolphingeneral.json | 6 | ||||
| -rw-r--r-- | src/settings/kcm/kcmdolphinviewmodes.json | 1 |
4 files changed, 9 insertions, 0 deletions
diff --git a/src/dolphinpart.json.in b/src/dolphinpart.json.in index 1b1343d11..d0cf5174a 100644 --- a/src/dolphinpart.json.in +++ b/src/dolphinpart.json.in @@ -17,6 +17,7 @@ "Name[da]": "Dolphin-visning", "Name[de]": "Dolphin-Ansicht", "Name[el]": "Προβολή Dolphin", + "Name[en_GB]": "Dolphin View", "Name[eo]": "Dolfin-Vido", "Name[es]": "Vista de Dolphin", "Name[et]": "Dolphini vaade", diff --git a/src/itemactions/movetonewfolderitemaction.json b/src/itemactions/movetonewfolderitemaction.json index 3f8efeddc..29603122f 100644 --- a/src/itemactions/movetonewfolderitemaction.json +++ b/src/itemactions/movetonewfolderitemaction.json @@ -13,6 +13,7 @@ "Name[cs]": "Přesunout do nové složky", "Name[de]": "In neuen Ordner verschieben", "Name[el]": "Μετακίνηση σε Νέο Φάκελο", + "Name[en_GB]": "Move to New Folder", "Name[eo]": "Movi al Nova Dosierujo", "Name[es]": "Mover a una nueva carpeta", "Name[eu]": "Eraman karpeta berrira", diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json index c2fd44577..ba3228894 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -7,11 +7,15 @@ "Name[az]": "Əsas", "Name[be]": "Асноўныя", "Name[bg]": "Общи", + "Name[ca@valencia]": "General", + "Name[ca]": "General", "Name[cs]": "Obecné", "Name[da]": "Generelt", "Name[de]": "Allgemein", "Name[el]": "Γενικά", + "Name[en_GB]": "General", "Name[eo]": "Ĝenerala", + "Name[es]": "General", "Name[eu]": "Orokorra", "Name[fi]": "Perusasetukset", "Name[fr]": "Général", @@ -19,7 +23,9 @@ "Name[he]": "כללי", "Name[hi]": "साधारण", "Name[hu]": "Általános", + "Name[ia]": "General", "Name[id]": "Umum", + "Name[ie]": "General", "Name[is]": "Almennt", "Name[it]": "Generale", "Name[ka]": "მთავარი", diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json index f02d99a09..7383193b9 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.json +++ b/src/settings/kcm/kcmdolphinviewmodes.json @@ -12,6 +12,7 @@ "Name[da]": "Visningstilstande", "Name[de]": "Ansichts-Modi", "Name[el]": "Λειτουργίες Προβολής", + "Name[en_GB]": "View Modes", "Name[eo]": "Vidreĝimoj", "Name[es]": "Modos de vistas", "Name[et]": "Vaaterežiimid", |