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"

diff --git a/src/dolphinpart.json.in b/src/dolphinpart.json.in
index 4adb3b6b627c9a14e82689689250b6869b063536..fe97910bdb6ccd042ac7cfe39ae977651464401d 100644 (file)
--- a/src/dolphinpart.json.in
+++ b/src/dolphinpart.json.in
@@ -55,6 +55,7 @@
         "Name[pt_BR]": "Visualização do Dolphin",
         "Name[ro]": "Vizualizare Dolphin",
         "Name[ru]": "Представление Dolphin",
+        "Name[sa]": "डॉल्फिन दृश्य",
         "Name[se]": "Dolphinčájeheapmi",
         "Name[sk]": "Dolphin pohľad",
         "Name[sl]": "Dolphin - pogled",

diff --git a/src/dolphinpartactions.desktop b/src/dolphinpartactions.desktop
index d6f15b4de7dcabdcc43e2ee61fb9e139241676d6..139e497c6e0af810d3e63c7f514967a5054c2394 100644 (file)
--- a/src/dolphinpartactions.desktop
+++ b/src/dolphinpartactions.desktop
@@ -50,6 +50,7 @@ Name[pt]=Ícones
 Name[pt_BR]=Ícones
 Name[ro]=Pictograme
 Name[ru]=Значки
+Name[sa]=चिह्नानि
 Name[se]=Govažat
 Name[sk]=Ikony
 Name[sl]=Ikone
@@ -113,6 +114,7 @@ Name[pt]=Compacta
 Name[pt_BR]=Compacto
 Name[ro]=Compactă
 Name[ru]=Столбцы
+Name[sa]=संकुचित
 Name[sk]=Kompaktný
 Name[sl]=Strnjeno
 Name[sr]=Сажето
@@ -176,6 +178,7 @@ Name[pt]=Detalhes
 Name[pt_BR]=Detalhes
 Name[ro]=Detalii
 Name[ru]=Таблица
+Name[sa]=वर्णन
 Name[sk]=Podrobnosti
 Name[sl]=Podrobnosti
 Name[sr]=Детаљи

diff --git a/src/itemactions/movetonewfolderitemaction.json b/src/itemactions/movetonewfolderitemaction.json
index c2956ea10a5c6531c5a983da210e73e8ec1d5a2e..185667c327e51010db99bcd0eccfcaa44053c7ae 100644 (file)
--- a/src/itemactions/movetonewfolderitemaction.json
+++ b/src/itemactions/movetonewfolderitemaction.json
@@ -38,6 +38,7 @@
         "Name[pt_BR]": "Mover para pasta",
         "Name[ro]": "Mută în dosar nou",
         "Name[ru]": "Переместить в новую папку",
+        "Name[sa]": "New Folder इत्यत्र गच्छन्तु",
         "Name[sl]": "Premakni v novo mapo",
         "Name[sv]": "Flytta till ny katalog",
         "Name[ta]": "புதிய அடைவிற்கு நகர்த்து",

diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index 827b9d3cbfc000a037d4ba91a9f66da95731e6c9..df0ef4da0876222ed74bf70ab480008febab1d8a 100755 (executable)
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -43,6 +43,7 @@ Name[pt]=Dolphin
 Name[pt_BR]=Dolphin
 Name[ro]=Dolphin
 Name[ru]=Dolphin
+Name[sa]=डॉल्फिन
 Name[se]=Dolphin
 Name[sk]=Dolphin
 Name[sl]=Dolphin
@@ -108,6 +109,7 @@ GenericName[pt]=Gestor de Ficheiros
 GenericName[pt_BR]=Gerenciador de arquivos
 GenericName[ro]=Gestionar de fișiere
 GenericName[ru]=Диспетчер файлов
+GenericName[sa]=सञ्चिकाप्रबन्धकः
 GenericName[se]=Fiilagieđahalli
 GenericName[sk]=Správca súborov
 GenericName[sl]=Upravljalnik datotek
@@ -166,6 +168,7 @@ Keywords[pt]=ficheiros;gestão de ficheiros;navegação de ficheiros;samba;parti
 Keywords[pt_BR]=arquivo;gerenciamento de arquivos;navegação de arquivos;samba;compartilhamentos de rede;explorador;localizador;
 Keywords[ro]=fișiere;gestiune fișiere;răsfoire fișiere;samba;partajări de rețea;unități de rețea;Explorer;Finder;
 Keywords[ru]=files;file management;file browsing;samba;network shares;Explorer;Finder;файлы,управление файлами,просмотр файлов,сетевые папки
+Keywords[sa]=सञ्चिकाः;सञ्चिकाप्रबन्धनम्;सञ्चिकाब्राउजिंग्;साम्बा;जालसाझेदारी;अन्वेषकः;अन्वेषकः;
 Keywords[sk]=súbory;správa súborov;prehliadanie súborov;samba;zdieľanie v sieti;Prieskumník;Vyhľadávač;
 Keywords[sl]=datoteke;upravljanje z datotekami;brskanje po datotekah;samba;mrežni diski;Raziskovalec;Iskalec;
 Keywords[sv]=filer;filhantering;filbläddring;samba;delade nätverksresurser;Utforskare;Finder;

diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json
index ba3228894f730ddfefab2b15b24a693c188ca57f..eec426486acbb476627ca50a38b0cb83711a1101 100644 (file)
--- a/src/settings/kcm/kcmdolphingeneral.json
+++ b/src/settings/kcm/kcmdolphingeneral.json
@@ -41,6 +41,7 @@
         "Name[pt_BR]": "Geral",
         "Name[ro]": "Generale",
         "Name[ru]": "Основные параметры",
+        "Name[sa]": "सामान्य",
         "Name[sk]": "Všeobecné",
         "Name[sl]": "Splošno",
         "Name[sv]": "Allmänt",

diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json
index 7383193b92303c365308c8f163eafbc65c55c2dc..4af7e5b2b3b90ca8ac221243e9a920fe289263dc 100644 (file)
--- a/src/settings/kcm/kcmdolphinviewmodes.json
+++ b/src/settings/kcm/kcmdolphinviewmodes.json
@@ -44,6 +44,7 @@
         "Name[pt_BR]": "Modos de exibição",
         "Name[ro]": "Regimuri de vizualizare",
         "Name[ru]": "Режимы просмотра",
+        "Name[sa]": "दृश्यविधानानि",
         "Name[se]": "Čájehanmodusat",
         "Name[sk]": "Režimy zobrazenia",
         "Name[sl]": "Načini prikaza",