From b0d1f0b41257a5b3f8aa3977c0806c8fe8b55397 Mon Sep 17 00:00:00 2001 From: Sup Yut Sum Date: Sun, 4 Nov 2012 14:18:19 +0800 Subject: [PATCH] Fix typo 'loose' vs 'lose' (Fixes issue #1506) Signed-off-by: Sup Yut Sum --- Languages/Tortoise.pot | 4 ++-- Languages/Tortoise_cs.po | 4 ++-- Languages/Tortoise_de.po | 4 ++-- Languages/Tortoise_es_ES.po | 4 ++-- Languages/Tortoise_fr.po | 4 ++-- Languages/Tortoise_it_IT.po | 4 ++-- Languages/Tortoise_ja.po | 4 ++-- Languages/Tortoise_ko_KR.po | 4 ++-- Languages/Tortoise_pl_PL.po | 4 ++-- Languages/Tortoise_pt_BR.po | 4 ++-- Languages/Tortoise_ru.po | 4 ++-- Languages/Tortoise_tr.po | 4 ++-- Languages/Tortoise_zh_CN.po | 4 ++-- Languages/Tortoise_zh_TW.po | 4 ++-- src/Resources/TortoiseMergeENG.rc | 4 ++-- src/Resources/TortoiseProcENG.rc | 4 ++-- src/TortoiseMerge/MainFrm.cpp | 2 +- src/TortoiseMerge/resource.h | 6 +++--- src/TortoiseShell/RemoteCacheLink.cpp | 2 +- 19 files changed, 37 insertions(+), 37 deletions(-) diff --git a/Languages/Tortoise.pot b/Languages/Tortoise.pot index c9f591394..d8366cda9 100644 --- a/Languages/Tortoise.pot +++ b/Languages/Tortoise.pot @@ -3212,7 +3212,7 @@ msgid "Do you really want to remove \"%s\"?" msgstr "" #. Resource IDs: (69) -msgid "Do you really want to restore the copy? You will loose all changes that you have done after creating the copy." +msgid "Do you really want to restore the copy? You will lose all changes that you have done after creating the copy." msgstr "" #. Resource IDs: (119) @@ -8432,7 +8432,7 @@ msgid "You haven't entered your Signed-Off-By line!" msgstr "" #. Resource IDs: (68) -msgid "You marked some files as \"Restore after commit\".\nDo you want to restore them now? You might loose all changes to this file after marking it." +msgid "You marked some files as \"Restore after commit\".\nDo you want to restore them now? You might lose all changes to this file after marking it." msgstr "" #. Resource IDs: (1002) diff --git a/Languages/Tortoise_cs.po b/Languages/Tortoise_cs.po index 9ab7ce4a9..b680d2b0a 100644 --- a/Languages/Tortoise_cs.po +++ b/Languages/Tortoise_cs.po @@ -3399,7 +3399,7 @@ msgstr "" #. Resource IDs: (69) msgid "" -"Do you really want to restore the copy? You will loose all changes that you " +"Do you really want to restore the copy? You will lose all changes that you " "have done after creating the copy." msgstr "" @@ -9086,7 +9086,7 @@ msgstr "" #. Resource IDs: (68) msgid "" "You marked some files as \"Restore after commit\".\n" -"Do you want to restore them now? You might loose all changes to this file after marking it." +"Do you want to restore them now? You might lose all changes to this file after marking it." msgstr "" #. Resource IDs: (1002) diff --git a/Languages/Tortoise_de.po b/Languages/Tortoise_de.po index df6cd2c1e..d49bf13cc 100644 --- a/Languages/Tortoise_de.po +++ b/Languages/Tortoise_de.po @@ -3399,7 +3399,7 @@ msgstr "Sind Sie sicher, dass Sie \"%s\" löschen möchten?" #. Resource IDs: (69) msgid "" -"Do you really want to restore the copy? You will loose all changes that you " +"Do you really want to restore the copy? You will lose all changes that you " "have done after creating the copy." msgstr "Möchten Sie die Kopie wirklich wiederherstellen? Sie werden alle Änderungen, die Sie nach dem Anlegen der Kopie vorgenommen haben, verlieren." @@ -9086,7 +9086,7 @@ msgstr "Sie haben keine Signed-Off-By eignegeben!" #. Resource IDs: (68) msgid "" "You marked some files as \"Restore after commit\".\n" -"Do you want to restore them now? You might loose all changes to this file after marking it." +"Do you want to restore them now? You might lose all changes to this file after marking it." msgstr "Sie haben einige Dateien als \"Wiederherstellen nach Eintragen\" markiert.\nMöchten Sie diese jetzt wiederherstellen? Sie können dabei alle Änderungen in den Dateien, die Sie nach der Markierung erstellt haben, verlieren." #. Resource IDs: (1002) diff --git a/Languages/Tortoise_es_ES.po b/Languages/Tortoise_es_ES.po index 59b002b96..bc8dee147 100644 --- a/Languages/Tortoise_es_ES.po +++ b/Languages/Tortoise_es_ES.po @@ -3398,7 +3398,7 @@ msgstr "¿Realmente deseas eliminar \"%s\"?" #. Resource IDs: (69) msgid "" -"Do you really want to restore the copy? You will loose all changes that you " +"Do you really want to restore the copy? You will lose all changes that you " "have done after creating the copy." msgstr "¿Realmente deseas restaurar la copia? Perderás todos los cambios que has hecho después de crear la copia." @@ -9085,7 +9085,7 @@ msgstr "¡No has introducido tu línea de Firmado-por!" #. Resource IDs: (68) msgid "" "You marked some files as \"Restore after commit\".\n" -"Do you want to restore them now? You might loose all changes to this file after marking it." +"Do you want to restore them now? You might lose all changes to this file after marking it." msgstr "Has marcado algunos archivos como \"Restaurar después de consignar\".\n¿Quieres restaurarlos ahora? Perderás todos los cambios en este archivo después de marcarlo." #. Resource IDs: (1002) diff --git a/Languages/Tortoise_fr.po b/Languages/Tortoise_fr.po index f57694a4b..0ceda1c9a 100644 --- a/Languages/Tortoise_fr.po +++ b/Languages/Tortoise_fr.po @@ -3401,7 +3401,7 @@ msgstr "Voulez-vous vraiment supprimer \"%s\" ?" #. Resource IDs: (69) msgid "" -"Do you really want to restore the copy? You will loose all changes that you " +"Do you really want to restore the copy? You will lose all changes that you " "have done after creating the copy." msgstr "Êtes-vous sûr de vouloir restaurer la copie ? Vous perdrez toutes vos modifications depuis la création de la copie." @@ -9088,7 +9088,7 @@ msgstr "Vous n'avez pas indiqué votre signature !" #. Resource IDs: (68) msgid "" "You marked some files as \"Restore after commit\".\n" -"Do you want to restore them now? You might loose all changes to this file after marking it." +"Do you want to restore them now? You might lose all changes to this file after marking it." msgstr "Vous avez marqué certain fichier à \"restaurer après livraison\".\nVoulez-vous les restaurer maintenant ? Vous pourriez perdre toute modification de ces fichiers après cette opération." #. Resource IDs: (1002) diff --git a/Languages/Tortoise_it_IT.po b/Languages/Tortoise_it_IT.po index 7d0abeb3c..a20560bdd 100644 --- a/Languages/Tortoise_it_IT.po +++ b/Languages/Tortoise_it_IT.po @@ -3399,7 +3399,7 @@ msgstr "" #. Resource IDs: (69) msgid "" -"Do you really want to restore the copy? You will loose all changes that you " +"Do you really want to restore the copy? You will lose all changes that you " "have done after creating the copy." msgstr "" @@ -9086,7 +9086,7 @@ msgstr "" #. Resource IDs: (68) msgid "" "You marked some files as \"Restore after commit\".\n" -"Do you want to restore them now? You might loose all changes to this file after marking it." +"Do you want to restore them now? You might lose all changes to this file after marking it." msgstr "" #. Resource IDs: (1002) diff --git a/Languages/Tortoise_ja.po b/Languages/Tortoise_ja.po index 60b49166f..19e3fb18a 100644 --- a/Languages/Tortoise_ja.po +++ b/Languages/Tortoise_ja.po @@ -3403,7 +3403,7 @@ msgstr "\"%s\" を削除しても宜しいですか？" #. Resource IDs: (69) msgid "" -"Do you really want to restore the copy? You will loose all changes that you " +"Do you really want to restore the copy? You will lose all changes that you " "have done after creating the copy." msgstr "本当にコピーをリストアしてもよろしいですか？コピーを作成した後の全て変更が失われます。" @@ -9090,7 +9090,7 @@ msgstr "Signed-off-by 行がありません。" #. Resource IDs: (68) msgid "" "You marked some files as \"Restore after commit\".\n" -"Do you want to restore them now? You might loose all changes to this file after marking it." +"Do you want to restore them now? You might lose all changes to this file after marking it." msgstr "「コミット後にリストア」といくつかのファイルがマークされました。\n今、それらをリストアしますか？マークした後、このファイルに対する全ての変更が失われるかもしれません。" #. Resource IDs: (1002) diff --git a/Languages/Tortoise_ko_KR.po b/Languages/Tortoise_ko_KR.po index 51f99a8ca..35989c9f0 100644 --- a/Languages/Tortoise_ko_KR.po +++ b/Languages/Tortoise_ko_KR.po @@ -3399,7 +3399,7 @@ msgstr "" #. Resource IDs: (69) msgid "" -"Do you really want to restore the copy? You will loose all changes that you " +"Do you really want to restore the copy? You will lose all changes that you " "have done after creating the copy." msgstr "" @@ -9086,7 +9086,7 @@ msgstr "" #. Resource IDs: (68) msgid "" "You marked some files as \"Restore after commit\".\n" -"Do you want to restore them now? You might loose all changes to this file after marking it." +"Do you want to restore them now? You might lose all changes to this file after marking it." msgstr "" #. Resource IDs: (1002) diff --git a/Languages/Tortoise_pl_PL.po b/Languages/Tortoise_pl_PL.po index 2cb89fef6..836bdbfd6 100644 --- a/Languages/Tortoise_pl_PL.po +++ b/Languages/Tortoise_pl_PL.po @@ -3399,7 +3399,7 @@ msgstr "" #. Resource IDs: (69) msgid "" -"Do you really want to restore the copy? You will loose all changes that you " +"Do you really want to restore the copy? You will lose all changes that you " "have done after creating the copy." msgstr "" @@ -9094,7 +9094,7 @@ msgstr "" #. Resource IDs: (68) msgid "" "You marked some files as \"Restore after commit\".\n" -"Do you want to restore them now? You might loose all changes to this file after marking it." +"Do you want to restore them now? You might lose all changes to this file after marking it." msgstr "" #. Resource IDs: (1002) diff --git a/Languages/Tortoise_pt_BR.po b/Languages/Tortoise_pt_BR.po index 6b323f64f..fc8084d0b 100644 --- a/Languages/Tortoise_pt_BR.po +++ b/Languages/Tortoise_pt_BR.po @@ -3399,7 +3399,7 @@ msgstr "Você realmente quer remover \"%s\"?" #. Resource IDs: (69) msgid "" -"Do you really want to restore the copy? You will loose all changes that you " +"Do you really want to restore the copy? You will lose all changes that you " "have done after creating the copy." msgstr "Você realmente quer restaurar a cópia? Você irá perder todas as mudanças que você tiver feito após criar a cópia." @@ -9086,7 +9086,7 @@ msgstr "Você não inseriu sua linha Signed-Off-By!" #. Resource IDs: (68) msgid "" "You marked some files as \"Restore after commit\".\n" -"Do you want to restore them now? You might loose all changes to this file after marking it." +"Do you want to restore them now? You might lose all changes to this file after marking it." msgstr "Você marcou alguns arquivos como \"Restaurar após submissão\".\nVocê quer restaurá-los agora? Você pode perder todas as mudanças que fez nestes arquivos após marcá-los." #. Resource IDs: (1002) diff --git a/Languages/Tortoise_ru.po b/Languages/Tortoise_ru.po index 6a8a6389c..9106b06dc 100644 --- a/Languages/Tortoise_ru.po +++ b/Languages/Tortoise_ru.po @@ -3400,7 +3400,7 @@ msgstr "" #. Resource IDs: (69) msgid "" -"Do you really want to restore the copy? You will loose all changes that you " +"Do you really want to restore the copy? You will lose all changes that you " "have done after creating the copy." msgstr "" @@ -9087,7 +9087,7 @@ msgstr "" #. Resource IDs: (68) msgid "" "You marked some files as \"Restore after commit\".\n" -"Do you want to restore them now? You might loose all changes to this file after marking it." +"Do you want to restore them now? You might lose all changes to this file after marking it." msgstr "" #. Resource IDs: (1002) diff --git a/Languages/Tortoise_tr.po b/Languages/Tortoise_tr.po index e335f7d4f..9ade1995b 100644 --- a/Languages/Tortoise_tr.po +++ b/Languages/Tortoise_tr.po @@ -3402,7 +3402,7 @@ msgstr "" #. Resource IDs: (69) msgid "" -"Do you really want to restore the copy? You will loose all changes that you " +"Do you really want to restore the copy? You will lose all changes that you " "have done after creating the copy." msgstr "" @@ -9089,7 +9089,7 @@ msgstr "" #. Resource IDs: (68) msgid "" "You marked some files as \"Restore after commit\".\n" -"Do you want to restore them now? You might loose all changes to this file after marking it." +"Do you want to restore them now? You might lose all changes to this file after marking it." msgstr "" #. Resource IDs: (1002) diff --git a/Languages/Tortoise_zh_CN.po b/Languages/Tortoise_zh_CN.po index 581a58ca7..99e2b4cab 100644 --- a/Languages/Tortoise_zh_CN.po +++ b/Languages/Tortoise_zh_CN.po @@ -3401,7 +3401,7 @@ msgstr "是否你真的想删除\"%s\"" #. Resource IDs: (69) msgid "" -"Do you really want to restore the copy? You will loose all changes that you " +"Do you really want to restore the copy? You will lose all changes that you " "have done after creating the copy." msgstr "是否你真的想恢复拷贝? 所有的自从创建拷贝后的改动将被丢失。" @@ -9088,7 +9088,7 @@ msgstr "没有输入你的Signed-Off-By" #. Resource IDs: (68) msgid "" "You marked some files as \"Restore after commit\".\n" -"Do you want to restore them now? You might loose all changes to this file after marking it." +"Do you want to restore them now? You might lose all changes to this file after marking it." msgstr "你标记一些文件为\"提交后恢复\"。\n你现在想恢复码？这可能丢失标记后所有这些文件的改动。" #. Resource IDs: (1002) diff --git a/Languages/Tortoise_zh_TW.po b/Languages/Tortoise_zh_TW.po index b39008301..bdccd6d63 100644 --- a/Languages/Tortoise_zh_TW.po +++ b/Languages/Tortoise_zh_TW.po @@ -3400,7 +3400,7 @@ msgstr "確定要移除 \"%s\"？" #. Resource IDs: (69) msgid "" -"Do you really want to restore the copy? You will loose all changes that you " +"Do you really want to restore the copy? You will lose all changes that you " "have done after creating the copy." msgstr "確定要還原這複本？你會丟失所有改動" @@ -9087,7 +9087,7 @@ msgstr "未輸入 Signed-Off-By" #. Resource IDs: (68) msgid "" "You marked some files as \"Restore after commit\".\n" -"Do you want to restore them now? You might loose all changes to this file after marking it." +"Do you want to restore them now? You might lose all changes to this file after marking it." msgstr "有一些檔案加上 \"提交後還原\"\n是否現在就還原這些檔案？你可能會丟失這些檔案的改動" #. Resource IDs: (1002) diff --git a/src/Resources/TortoiseMergeENG.rc b/src/Resources/TortoiseMergeENG.rc index 2eb4d2907..b7111588f 100644 --- a/src/Resources/TortoiseMergeENG.rc +++ b/src/Resources/TortoiseMergeENG.rc @@ -709,10 +709,10 @@ BEGIN IDS_OPENDIFFFILETITLE "Select diff file..." IDS_GETVERSIONOFFILETITLE "Fetching file..." IDS_GETVERSIONOFFILE "Fetching revision %s of file:" - IDS_WARNMODIFIEDLOOSECHANGES + IDS_WARNMODIFIEDLOSECHANGES "There are unsaved modifications!\nDo you want to save your changes?" IDS_ASKFORSAVE "Do you want to save your changes?" - IDS_WARNMODIFIEDLOOSECHANGESOPTIONS + IDS_WARNMODIFIEDLOSECHANGESOPTIONS "Do you want to reload the documents to reflect the settings changes?\nNote: you will lose all changes you've made!" END diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc index f57f19bd0..82c6b5b82 100644 --- a/src/Resources/TortoiseProcENG.rc +++ b/src/Resources/TortoiseProcENG.rc @@ -2806,7 +2806,7 @@ BEGIN IDS_PROC_SENDMAIL_WRAPTOOLTIP "Be warned that email clients tend to automatic wrap lines.\r\nRecommendation: Use attachments." IDS_STATUSLIST_RESTOREPATH - "Do you really want to restore the copy? You will loose all changes that you have done after creating the copy." + "Do you really want to restore the copy? You will lose all changes that you have done after creating the copy." IDS_RESTOREBUTTON "&Restore" IDS_STATUSLIST_STATUSLINE1 "line: %d(+) %d(-) files: %s = %d\n%s = %d\n%s = %d\n%s = %d" @@ -3599,7 +3599,7 @@ BEGIN IDS_PROC_COMMIT_DETACHEDWARNING "Current HEAD Detached, you are working on (no branch).\nDo you want to a create branch now?" IDS_PROC_COMMIT_RESTOREFILES - "You marked some files as ""Restore after commit"".\nDo you want to restore them now? You might loose all changes to this file after marking it." + "You marked some files as ""Restore after commit"".\nDo you want to restore them now? You might lose all changes to this file after marking it." IDS_PROC_COMMIT_RESTOREFILES_RESTORE "&Restore old state" IDS_PROC_COMMIT_RESTOREFILES_KEEP "&Keep current state" END diff --git a/src/TortoiseMerge/MainFrm.cpp b/src/TortoiseMerge/MainFrm.cpp index acc035d6d..2861439d4 100644 --- a/src/TortoiseMerge/MainFrm.cpp +++ b/src/TortoiseMerge/MainFrm.cpp @@ -2005,7 +2005,7 @@ int CMainFrame::CheckForSave() ((m_pwndRightView)&&(m_pwndRightView->IsModified()))) { CString sTemp; - sTemp.LoadString(IDS_WARNMODIFIEDLOOSECHANGES); + sTemp.LoadString(IDS_WARNMODIFIEDLOSECHANGES); ret = MessageBox(sTemp, 0, MB_YESNOCANCEL | MB_ICONQUESTION); if (ret == IDYES) diff --git a/src/TortoiseMerge/resource.h b/src/TortoiseMerge/resource.h index ff3d54dc9..e0bcea9e9 100644 --- a/src/TortoiseMerge/resource.h +++ b/src/TortoiseMerge/resource.h @@ -177,10 +177,10 @@ #define IDS_OPENDIFFFILETITLE 5002 #define IDS_GETVERSIONOFFILETITLE 5003 #define IDS_GETVERSIONOFFILE 5004 -#define IDS_WARNMODIFIEDLOOSECHANGES 5005 +#define IDS_WARNMODIFIEDLOSECHANGES 5005 #define IDS_ASKFORSAVE 5006 -#define IDS_WARNMODIFIEDLOOSECHANGES_ 5007 -#define IDS_WARNMODIFIEDLOOSECHANGESOPTIONS 5007 +#define IDS_WARNMODIFIEDLOSECHANGES_ 5007 +#define IDS_WARNMODIFIEDLOSECHANGESOPTIONS 5007 #define IDS_WARNBETTERPATCHPATHFOUND 5008 #define IDS_NOTFOUNDVIEWTITLEINDICATOR 5009 #define IDS_WARNABSOLUTEPATHFOUND 5010 diff --git a/src/TortoiseShell/RemoteCacheLink.cpp b/src/TortoiseShell/RemoteCacheLink.cpp index cd876cbb2..ca7d0c1ab 100644 --- a/src/TortoiseShell/RemoteCacheLink.cpp +++ b/src/TortoiseShell/RemoteCacheLink.cpp @@ -298,7 +298,7 @@ bool CRemoteCacheLink::GetStatusFromRemoteCache(const CTGitPath& Path, TGITCache // we still can get out of it. We NEVER MUST BLOCK THE SHELL! // A blocked shell is a very bad user impression, because users // who don't know why it's blocked might find the only solution - // to such a problem is a reboot and therefore they might loose + // to such a problem is a reboot and therefore they might lose // valuable data. // One particular situation where the shell could hang is when // the cache crashes and our crash report dialog comes up. -- 2.11.4.GIT