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"
prathikshetty2002 · Jul 6, 2020 · 0c32010 · 0c32010
1 parent be3b89a
commit 0c32010
Show file tree

Hide file tree

Showing 10 changed files with 0 additions and 13 deletions.
diff --git a/app/org.kde.kdeconnect.app.desktop b/app/org.kde.kdeconnect.app.desktop
@@ -19,7 +19,6 @@ Name[fr]=KDE Connect
 Name[gl]=KDE Connect
 Name[he]=KDE Connect
 Name[hu]=KDE Connect
-Name[ia]=KDE Connect
 Name[id]=KDE Connect
 Name[it]=KDE Connect
 Name[ko]=KDE Connect

diff --git a/daemon/org.kde.kdeconnect.daemon.desktop.cmake b/daemon/org.kde.kdeconnect.daemon.desktop.cmake
@@ -29,7 +29,6 @@ Name[fr]=KDE Connect
 Name[gl]=KDE Connect
 Name[he]=KDE Connect
 Name[hu]=KDE Connect
-Name[ia]=KDE Connect
 Name[id]=KDE Connect
 Name[it]=KDE Connect
 Name[ko]=KDE Connect

diff --git a/data/kdeconnect-thunar.desktop b/data/kdeconnect-thunar.desktop
@@ -18,7 +18,6 @@ Name[fi]=Lähetä tiedosto KDE Connectilla
 Name[fr]=Envoyer via KDE Connect
 Name[gl]=Enviar por KDE Connect
 Name[hu]=Küldés a KDE Connecttel
-Name[ia]=Invia via KDE Connect
 Name[it]=Invia tramite KDE Connect
 Name[ko]=KDE Connect로 통해 보내기
 Name[lt]=Siųsti per KDE Connect

diff --git a/data/org.kde.kdeconnect_open.desktop b/data/org.kde.kdeconnect_open.desktop
@@ -13,7 +13,6 @@ GenericName[fi]=Avaa kytkettyyn laitteeseen KDE Connectilla
 GenericName[fr]=Ouvrir sur un appareil connecté via KDE Connect
 GenericName[gl]=Abrir no dispositivo conectado por KDE Connect
 GenericName[hu]=Megnyitás a csatlakoztatott eszközön a KDE Connecttel
-GenericName[ia]=Aperi sur dispositivo connectite via KDE Connect
 GenericName[it]=Apri nel dispositivo connesso tramite KDE Connect
 GenericName[ko]=KDE Connect로 연결된 장치에서 열기
 GenericName[lt]=Atverti prijungtame įrenginyje per KDE Connect
@@ -44,7 +43,6 @@ Name[fi]=Avaa kytkettyyn laitteeseen KDE Connectilla
 Name[fr]=Ouvrir sur un appareil connecté via KDE Connect
 Name[gl]=Abrir no dispositivo conectado por KDE Connect
 Name[hu]=Megnyitás a csatlakoztatott eszközön a KDE Connecttel
-Name[ia]=Aperi sur dispositivo connectite via KDE Connect
 Name[it]=Apri nel dispositivo connesso tramite KDE Connect
 Name[ko]=KDE Connect로 연결된 장치에서 열기
 Name[lt]=Atverti prijungtame įrenginyje per KDE Connect

diff --git a/kcm/kcm_kdeconnect.desktop b/kcm/kcm_kdeconnect.desktop
@@ -30,7 +30,6 @@ Name[fr]=KDE Connect
 Name[gl]=KDE Connect
 Name[he]=KDE Connect
 Name[hu]=KDE Connect
-Name[ia]=KDE Connect
 Name[id]=KDE Connect
 Name[it]=KDE Connect
 Name[ko]=KDE Connect

diff --git a/plasmoid/package/metadata.desktop b/plasmoid/package/metadata.desktop
@@ -19,7 +19,6 @@ Name[fr]=KDE Connect
 Name[gl]=KDE Connect
 Name[he]=KDE Connect
 Name[hu]=KDE Connect
-Name[ia]=KDE Connect
 Name[id]=KDE Connect
 Name[it]=KDE Connect
 Name[ko]=KDE Connect

diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc
@@ -20,7 +20,6 @@ Name[fr]=KDE Connect
 Name[gl]=KDE Connect
 Name[he]=KDE Connect
 Name[hu]=KDE Connect
-Name[ia]=KDE Connect
 Name[id]=KDE Connect
 Name[it]=KDE Connect
 Name[ko]=KDE Connect
@@ -280,7 +279,6 @@ Name[fr]=Appel manqué
 Name[gl]=Chamada perdida
 Name[he]=שיחה שלא נענתה
 Name[hu]=Nem fogadott hívás
-Name[ia]=Appello perdite
 Name[id]=Panggilan Tidak Terjawab
 Name[it]=Chiamata persa
 Name[ko]=부재중 전화

diff --git a/runners/remotecommands/plasma-runner-kdeconnect-remotecommands.desktop b/runners/remotecommands/plasma-runner-kdeconnect-remotecommands.desktop
@@ -12,7 +12,6 @@ Name[eu]=Exekutatu komandoa
 Name[fi]=Suorita komento
 Name[fr]=Exécuter une commande
 Name[gl]=Executar unha orde
-Name[ia]=Executa Commando
 Name[it]=Esegui comando
 Name[ko]=명령 실행
 Name[lt]=Vykdyti komandą

diff --git a/settings/org.kde.kdeconnect.settings.desktop b/settings/org.kde.kdeconnect.settings.desktop
@@ -21,7 +21,6 @@ Name[fr]=Paramètres de KDE Connect
 Name[gl]=Configuración de KDE Connect
 Name[he]=הגדרות KDE Connect 
 Name[hu]=A KDE Connect beállításai
-Name[ia]=Preferentias de KDE Connect
 Name[id]=Pengaturan KDE Connect
 Name[it]=Impostazioni di KDE Connect
 Name[ko]=KDE Connect 설정

diff --git a/smsapp/org.kde.kdeconnect.sms.desktop b/smsapp/org.kde.kdeconnect.sms.desktop
@@ -14,7 +14,6 @@ Name[fi]=KDE Connectin tekstiviestit
 Name[fr]=KDE Connect SMS
 Name[gl]=SMS de KDE Connect
 Name[hu]=KDE Connect SMS
-Name[ia]=KDE Connect SMS
 Name[id]=SMS KDE Connect
 Name[it]=KDE Connect SMS
 Name[ko]=KDE Connect SMS
@@ -47,7 +46,6 @@ GenericName[fi]=Tekstiviesti
 GenericName[fr]=SMS
 GenericName[gl]=SMS
 GenericName[hu]=SMS
-GenericName[ia]=SMS
 GenericName[id]=SMS
 GenericName[it]=SMS
 GenericName[ko]=SMS